Sarand/BusinessMgr-2019
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

3.0.1.1 Portal tidy.

Browse Source
This commit is contained in:
Andy Howard
2025-02-19 16:01:05 +00:00
parent f8aaa534d1
commit d7dc5f8fbc
41 changed files with 481 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SaBusMgrStandardBase/Base/App/Sbm-Version.cs
+2 -1
View File
@@ -15,7 +15,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.App
//-------------------------------------------------------------------
public static class Version
{
private static String version { get; } = "3.0.1.0";
private static String version { get; } = "3.0.1.1";
// Retrieve version.
public static String GetFullVersion() { return version; }
public static String GetAppVersion()
@@ -38,6 +38,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.App
// Version history.
//-------------------------------------------------------------------
// 3.0.1 19-Feb-25 Portal Transactions.
// 3.0.1.1 19-Feb-25 Portal tidy.
//-------------------------------------------------------------------
// 3.0.0 Jul-2021 Initial demo test version.
// 02-Feb-25 Initial live deployment.
SaBusMgrStandardBase/Base/Bus/SbmAffiliate.cs
+2
View File
@@ -55,6 +55,8 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Bus
GroupMembers,
AssociationOwner_Count,
AssociationTarget_Count,
IsCustomer,
IsSupplier,
// Common properties.
Notes,
Flag,
SaBusMgrStandardBase/Base/Mgr/SbmAccountMgr_Association-Util.cs
+6 -4
View File
@@ -5,6 +5,7 @@ using Sarand.Net.Standard.Base.Dbas;
using Sarand.Net.Standard.Base.Utils;
using System;
using System.Collections.Generic;
using static Sarand.BusinessMgr.Net.Standard.Base.App.Sbm;
namespace Sarand.BusinessMgr.Net.Standard.Base.Mgr
{
@@ -35,10 +36,11 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Mgr
//-------------------------------------------------------------------
// Association Targets.
public abstract List<SysId> GetMemberTargetIds(SysId affiliateIdOwner);
public abstract List<SysId> GetCustomerTargetIds(List<SysId> affiliateIdsInclude, List<SysId> affiliateIdsExclude);
public abstract List<SysId> GetCustomerAssocIdsForTargets(List<SysId> affiliateIdsTarget);
public abstract List<SysId> GetAssocIdsForTargets(SysId affiliateIdOwner, Sbm.AssociationType associationType, List<SysId> affiliateIdsTarget);
public abstract HashSet<SysId> GetMemberTargetIds(SysId affiliateIdOwner);
public abstract HashSet<SysId> GetCustomerTargetIds(HashSet<SysId> affiliateIdsInclude, HashSet<SysId> affiliateIdsExclude);
public abstract HashSet<SysId> GetCustomerAssocIdsForTargets(HashSet<SysId> affiliateIdsTarget);
public abstract HashSet<SysId> GetAssocIdsForTargets(SysId affiliateIdOwner, Sbm.AssociationType associationType, HashSet<SysId> affiliateIdsTarget);
public abstract HashSet<Sbm.AssociationType> GetAssociationTypesForTarget(SysId affiliateIdTarget);
//-------------------------------------------------------------------
// Associated data.
SaBusMgrStandardBase/Base/Mgr/SbmCoreMgr.cs
+1 -1
View File
@@ -188,7 +188,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Mgr
// Session.
protected ISbmUserOrganisationContext UserContext { get; }
protected SbmSessionContext SessionContext { get { return UserContext.SessionContext; } }
public SysId AffiliateId_Owner { get { return UserContext.OrganisationAffiliateId; } }
protected SysId AffiliateId_Owner { get { return UserContext.OrganisationAffiliateId; } }
protected SbmAccountsConsole AccountsDfn { get { return Internals.AccountsConsole; } }
protected DbUpdateInfo DbUpdateInfo { get { return Internals.DbUpdateInfo; } }
// User security profile.
SaBusMgrStandardDbas/Dbas/Mgr/SbmAccountMgr_Dbas-Address.cs
+2 -2
View File
@@ -58,9 +58,9 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
qry.Filters.Add(colAddress_Id + "<>" + addressPrimaryId.ToString());
qry.Filters.Add(GetPrimaryAddressFilter(true, aliasAddress));
using (DbResultSet dbResultSet = DbResultSet_DataReader.ExecuteQuery(Database, qry.ToString()))
using (DbResultSet dbResultSet = DbResultSet_DataReader.ExecuteQuery(Database, qry.BuildQuery()))
{
if (dbResultSet != null && dbResultSet.NextRecord())
while (dbResultSet != null && dbResultSet.NextRecord())
{
NamedValue.Map values = dbResultSet.GetRecordValues();
SbmAddress address = GetAddressById(new SysId((int)values.GetValue(colAddress_Id).AsLong()));
SaBusMgrStandardDbas/Dbas/Mgr/SbmAccountMgr_Dbas-Affiliate.cs
+43 -6
View File
@@ -484,12 +484,14 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
//-------------------------------------------------------------------
// Column definitions.
private static readonly String aliasAffiliate = "aAffil";
private static readonly String aliasAffiliate_AddPrim = "Aff_AddPrim";
private static readonly String prefixAffiliate_AddPrim = aliasAffiliate_AddPrim + "_";
private static readonly String colNameAffiliate_GroupMembers = "GroupMembers";
private static readonly String colNameAffiliate_AssociationOwnerCount = "AssocOwnerCount";
private static readonly String colNameAffiliate_AssociationTargetCount = "AssocTargetCount";
private const String aliasAffiliate = "aAffil";
private const String aliasAffiliate_AddPrim = "Aff_AddPrim";
private const String prefixAffiliate_AddPrim = aliasAffiliate_AddPrim + "_";
private const String colNameAffiliate_GroupMembers = "GroupMembers";
private const String colNameAffiliate_AssociationOwnerCount = "AssocOwnerCount";
private const String colNameAffiliate_AssociationTargetCount = "AssocTargetCount";
private const String colNameAffiliate_IsCustomer = "AffilIsCust";
private const String colNameAffiliate_IsSupplier = "AffilIsSupp";
// Column definition population.
private void SetAffiliateColDfn
@@ -630,6 +632,14 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
SetAffiliateColDfn(columnDfn, "Target Assocs", 90, SbmDbDfn.ColumnIdx.Unknown, ColumnAlignment.Right);
columnDfn.DataName = colNameAffiliate_AssociationTargetCount;
break;
case SbmAffiliate.Column.IsCustomer:
SetAffiliateColDfn(columnDfn, "Customer", 60, SbmDbDfn.ColumnIdx.Unknown, ColumnAlignment.Center);
columnDfn.DataName = colNameAffiliate_IsCustomer;
break;
case SbmAffiliate.Column.IsSupplier:
SetAffiliateColDfn(columnDfn, "Supplier", 60, SbmDbDfn.ColumnIdx.Unknown, ColumnAlignment.Center);
columnDfn.DataName = colNameAffiliate_IsSupplier;
break;
//-----------------------------------------------------------------
// Common properties.
@@ -1217,6 +1227,33 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
query.Columns.Add("(" + qryAssocs.BuildQuery() + ")", colNameAffiliate_AssociationTargetCount);
}
if (columns.HasId(SbmAffiliate.Column.IsCustomer))
{
// Check if Target is Customer.
String aliasIsCustomer = "AffIsCust";
DbQuery qryIsCust = new DbQuery(Database.DbmsType);
qryIsCust.Tables.Add((SbmDbDfn.TableIdx.Association).ToString(), aliasIsCustomer);
qryIsCust.Columns.Add($"Count(*)");
qryIsCust.Filters.Add($"{SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Association_AffIdOwner, aliasIsCustomer)}={SysId.ToLong(AffiliateId_Owner)}");
qryIsCust.Filters.Add($"{SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Association_AffIdTarget, aliasIsCustomer)}={SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Affiliate_Id, aliasAffiliate)}");
qryIsCust.Filters.Add($"{SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Association_Type, aliasIsCustomer)}={(int)Sbm.AssociationType.Customer}");
qryIsCust.Filters.Add($"{SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Association_Status, aliasIsCustomer)}!='{StatusDeleted}'");
query.Columns.Add($"({qryIsCust.BuildQuery()})", colNameAffiliate_IsCustomer);
}
if (columns.HasId(SbmAffiliate.Column.IsSupplier))
{
// Check if Target is Supplier.
String aliasIsSupplier = "AffIsSupp";
DbQuery qryIsSupp = new DbQuery(Database.DbmsType);
qryIsSupp.Tables.Add((SbmDbDfn.TableIdx.Association).ToString(), aliasIsSupplier);
qryIsSupp.Columns.Add($"Count(*)");
qryIsSupp.Filters.Add($"{SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Association_AffIdOwner, aliasIsSupplier)}={SysId.ToLong(AffiliateId_Owner)}");
qryIsSupp.Filters.Add($"{SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Association_AffIdTarget, aliasIsSupplier)}={SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Affiliate_Id, aliasAffiliate)}");
qryIsSupp.Filters.Add($"{SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Association_Type, aliasIsSupplier)}={(int)Sbm.AssociationType.Supplier}");
qryIsSupp.Filters.Add($"{SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Association_Status, aliasIsSupplier)}!='{StatusDeleted}'");
query.Columns.Add($"({qryIsSupp.BuildQuery()})", colNameAffiliate_IsSupplier);
}
//---------------------------------------------------------------
// Populate filter.
query.Filters.AddRange(GetAffiliateQueryFilter(prm));
SaBusMgrStandardDbas/Dbas/Mgr/SbmAccountMgr_Dbas-Association-Utils.cs
+55 -39
View File
@@ -1,5 +1,6 @@
using Sarand.BusinessMgr.Net.Standard.Base.App;
using Sarand.BusinessMgr.Net.Standard.Base.Bus;
using Sarand.Net.Standard.Base.App;
using Sarand.Net.Standard.Base.Bus;
using Sarand.Net.Standard.Base.CodeTypes;
using Sarand.Net.Standard.Base.Core;
@@ -9,6 +10,7 @@ using Sarand.Net.Standard.Dbas.Data;
using System;
using System.Collections.Generic;
using System.Linq;
using static Sarand.BusinessMgr.Net.Standard.Base.App.Sbm;
namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
{
@@ -42,7 +44,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
qry.Filters.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Association_AffIdOwner) + "=" + AffiliateId_Owner.ToString());
using (DbResultSet dbResultSet = DbResultSet_DataReader.ExecuteQuery(Database, qry.BuildQuery()))
{
if (dbResultSet != null && dbResultSet.NextRecord())
while (dbResultSet != null && dbResultSet.NextRecord())
{
NamedValue.Map values = dbResultSet.GetRecordValues();
types.Add((Sbm.AssociationType)values.GetValue(colAssociation_Type).AsLong());
@@ -68,7 +70,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
qry.Filters.AddRange(GetAssociationQueryFilter(prmAssociation));
using (DbResultSet dbResultSet = DbResultSet_DataReader.ExecuteQuery(Database, qry.BuildQuery()))
{
if (dbResultSet != null && dbResultSet.NextRecord())
while (dbResultSet != null && dbResultSet.NextRecord())
{
NamedValue.Map values = dbResultSet.GetRecordValues();
SysId affiliteIdOwner = new SysId(values.GetValue(colAffIdOwner).AsLong());
@@ -79,40 +81,34 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
return affiliateIdsOwner;
}
public override List<SysId> GetMemberTargetIds(SysId affiliateIdOwner)
public override HashSet<SysId> GetMemberTargetIds(SysId affiliateIdOwner)
{
List<SysId> affiliateIncludeIds = new List<SysId>();
List<SysId> affiliateExcludeIds = new List<SysId>();
HashSet<SysId> affiliateIncludeIds = new HashSet<SysId>();
HashSet<SysId> affiliateExcludeIds = new HashSet<SysId>();
return GetTargetIds(affiliateIdOwner, Sbm.AssociationType.Member, affiliateIncludeIds, affiliateExcludeIds);
}
public override List<SysId> GetCustomerTargetIds(List<SysId> affiliateIncludeIds, List<SysId> affiliateExcludeIds)
public override HashSet<SysId> GetCustomerTargetIds(HashSet<SysId> affiliateIncludeIds, HashSet<SysId> affiliateExcludeIds)
{
return GetTargetIds(AffiliateId_Owner, Sbm.AssociationType.Customer, affiliateIncludeIds, affiliateExcludeIds);
}
public List<SysId> GetTargetIds(SysId affiliateIdOwner, Sbm.AssociationType associationType, List<SysId> affiliateIncludeIds, List<SysId> affiliateExcludeIds)
public HashSet<SysId> GetTargetIds(SysId affiliateIdOwner, Sbm.AssociationType associationType, HashSet<SysId> affiliateIncludeIds, HashSet<SysId> affiliateExcludeIds)
{
List<SysId> affiliateIdsTarget = new List<SysId>();
HashSet<SysId> affiliateIdsTarget = new HashSet<SysId>();
if (Database == null) return affiliateIdsTarget;
bool validConfig = true;
if (!SysId.IsValid(affiliateIdOwner) || (int)associationType < 1)
{
#if _DEBUG
SATRACE("SapAssociationMgr_Odbc::GetTargetIds Invalid owner or association type.\n");
#endif
validConfig = false;
SaLogger.Debug($"{SysUtil.Fn} Invalid owner or association type.");
return affiliateIdsTarget;
}
else if (associationType == Sbm.AssociationType.Customer || associationType == Sbm.AssociationType.Supplier)
{
if (affiliateIdOwner != AffiliateId_Owner)
{
#if _DEBUG
SATRACE("SapAssociationMgr_Odbc::GetTargetIds Invalid customer/supplier owner.\n");
#endif
validConfig = false;
SaLogger.Debug($"{SysUtil.Fn} Invalid customer/supplier owner.");
return affiliateIdsTarget;
}
}
if (validConfig)
{
String colAffiliateIdTarget = "AffIdTgt";
DbQuery qry = new DbQuery(Database.DbmsType);
qry.Tables.Add(SbmDbDfn.GetTableName(SbmDbDfn.TableIdx.Association));
@@ -124,45 +120,38 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
if (affiliateExcludeIds.Count > 0)
qry.Filters.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Association_AffIdTarget) + " NOT IN(" + affiliateExcludeIds.Concat(",") + ")");
using (DbResultSet dbResultSet = DbResultSet_DataReader.ExecuteQuery(Database, qry.ToString()))
using (DbResultSet dbResultSet = DbResultSet_DataReader.ExecuteQuery(Database, qry.BuildQuery()))
{
if (dbResultSet != null && dbResultSet.NextRecord())
while (dbResultSet != null && dbResultSet.NextRecord())
{
NamedValue.Map values = dbResultSet.GetRecordValues();
affiliateIdsTarget.Add(new SysId(StringUtil.ToInt(values.GetValue(colAffiliateIdTarget))));
}
}
}
return affiliateIdsTarget;
}
public override List<SysId> GetCustomerAssocIdsForTargets(List<SysId> affiliateIdsTarget)
public override HashSet<SysId> GetCustomerAssocIdsForTargets(HashSet<SysId> affiliateIdsTarget)
{
return GetAssocIdsForTargets(AffiliateId_Owner, Sbm.AssociationType.Customer, affiliateIdsTarget);
}
public override List<SysId> GetAssocIdsForTargets(SysId affiliateIdOwner, Sbm.AssociationType associationType, List<SysId> affiliateIdsTarget)
public override HashSet<SysId> GetAssocIdsForTargets(SysId affiliateIdOwner, Sbm.AssociationType associationType, HashSet<SysId> affiliateIdsTarget)
{
List<SysId> associations = new List<SysId>();
HashSet<SysId> associations = new HashSet<SysId>();
if (Database == null) return associations;
bool validConfig = true;
if (!SysId.IsValid(affiliateIdOwner) || (int)associationType < 1)
{
#if _DEBUG
SATRACE("SapAssociationMgr_Odbc::GetAssocIdsForTargets Invalid owner or association type.\n");
#endif
validConfig = false;
SaLogger.Debug($"{SysUtil.Fn} Invalid owner or association type.");
return associations;
}
else if (associationType == Sbm.AssociationType.Customer || associationType == Sbm.AssociationType.Supplier)
{
if (affiliateIdOwner != AffiliateId_Owner)
{
#if _DEBUG
SATRACE("SapAssociationMgr_Odbc::GetAssocIdsForTargets Invalid customer/supplier owner.\n");
#endif
validConfig = false;
SaLogger.Debug($"{SysUtil.Fn} Invalid customer/supplier owner.");
return associations;
}
}
if (validConfig)
{
String colAssociationId = "AssocId";
DbQuery qry = new DbQuery(Database.DbmsType);
qry.Tables.Add(SbmDbDfn.GetTableName(SbmDbDfn.TableIdx.Association));
@@ -171,18 +160,45 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
qry.Filters.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Association_Type) + "=" + ((int)associationType).ToString());
qry.Filters.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Association_AffIdTarget) + " IN " + affiliateIdsTarget.Concat(","));
using (DbResultSet dbResultSet = DbResultSet_DataReader.ExecuteQuery(Database, qry.ToString()))
using (DbResultSet dbResultSet = DbResultSet_DataReader.ExecuteQuery(Database, qry.BuildQuery()))
{
if (dbResultSet != null && dbResultSet.NextRecord())
while (dbResultSet != null && dbResultSet.NextRecord())
{
NamedValue.Map values = dbResultSet.GetRecordValues();
associations.Add(new SysId(StringUtil.ToInt(values.GetValue(colAssociationId))));
}
}
}
return associations;
}
public override HashSet<Sbm.AssociationType> GetAssociationTypesForTarget(SysId affiliateIdTarget)
{
HashSet<Sbm.AssociationType> associationTypes = new HashSet<Sbm.AssociationType>();
if (Database == null) return associationTypes;
if (!SysId.IsValid(affiliateIdTarget))
{
SaLogger.Debug($"{SysUtil.Fn} Invalid target.");
return associationTypes;
}
String colAssociationType = "AssocType";
DbQuery qry = new DbQuery(Database.DbmsType);
qry.Tables.Add(SbmDbDfn.GetTableName(SbmDbDfn.TableIdx.Association));
qry.Columns.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Association_Type), colAssociationType);
qry.Filters.Add($"{SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Association_AffIdOwner)}={SysId.ToLong(AffiliateId_Owner)}");
qry.Filters.Add($"{SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Association_AffIdTarget)}={SysId.ToLong(affiliateIdTarget)}");
using (DbResultSet dbResultSet = DbResultSet_DataReader.ExecuteQuery(Database, qry.BuildQuery()))
{
while (dbResultSet != null && dbResultSet.NextRecord())
{
NamedValue.Map values = dbResultSet.GetRecordValues();
associationTypes.Add((Sbm.AssociationType)(values.GetLong(colAssociationType)));
}
}
return associationTypes;
}
//-------------------------------------------------------------------
// Associated data.
public override bool AssociationHasTransactions(SysId associationId)
SaBusMgrStandardDbas/Dbas/Mgr/SbmCommodityMgr_Dbas-Commodity.cs
+6 -6
View File
@@ -54,9 +54,9 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
qry.Tables.Add(SbmDbDfn.GetTableName(SbmDbDfn.TableIdx.Commodity));
qry.Columns.Add("DISTINCT " + SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Commodity_Type));
qry.Filters.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Commodity_AffIdOwner) + "=" + AffiliateId_Owner.ToString());
using (DbResultSet dbResultSet = DbResultSet_DataReader.ExecuteQuery(Database, qry.ToString()))
using (DbResultSet dbResultSet = DbResultSet_DataReader.ExecuteQuery(Database, qry.BuildQuery()))
{
if (dbResultSet != null && dbResultSet.NextRecord())
while (dbResultSet != null && dbResultSet.NextRecord())
{
NamedValue.Map values = dbResultSet.GetRecordValues();
types.Add((Sbm.CommodityType)values.GetValue(SbmDbDfn.GetColumnName(SbmDbDfn.ColumnIdx.Commodity_Type)).AsLong());
@@ -75,7 +75,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
qry.Tables.Add(SbmDbDfn.GetTableName(SbmDbDfn.TableIdx.Commodity));
qry.Columns.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Commodity_Type), colType);
qry.Filters.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Commodity_Id) + "=" + commodityId.ToString());
using (DbResultSet dbResultSet = DbResultSet_DataReader.ExecuteQuery(Database, qry.ToString()))
using (DbResultSet dbResultSet = DbResultSet_DataReader.ExecuteQuery(Database, qry.BuildQuery()))
{
if (dbResultSet != null && dbResultSet.NextRecord())
{
@@ -97,7 +97,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
qry.Tables.Add(SbmDbDfn.GetTableName(SbmDbDfn.TableIdx.Commodity));
qry.Columns.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Commodity_CostPrice), colCostPrice);
qry.Filters.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Commodity_Id) + "=" + commodityId.ToString());
using (DbResultSet dbResultSet = DbResultSet_DataReader.ExecuteQuery(Database, qry.ToString()))
using (DbResultSet dbResultSet = DbResultSet_DataReader.ExecuteQuery(Database, qry.BuildQuery()))
{
if (dbResultSet != null && dbResultSet.NextRecord())
{
@@ -125,9 +125,9 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
qry.Filters.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Commodity_CommodityIdSalesProj, aliasCommodity) + "=" + SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Commodity_Id, aliasCommodityTemplate));
qry.Filters.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Commodity_AffIdOwner, aliasCommodityTemplate) + "=" + AffiliateId_Owner.ToString());
qry.Filters.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Commodity_AffIdOwner, aliasCommodity) + "=" + AffiliateId_Owner.ToString());
using (DbResultSet dbResultSet = DbResultSet_DataReader.ExecuteQuery(Database, qry.ToString()))
using (DbResultSet dbResultSet = DbResultSet_DataReader.ExecuteQuery(Database, qry.BuildQuery()))
{
if (dbResultSet != null && dbResultSet.NextRecord())
while (dbResultSet != null && dbResultSet.NextRecord())
{
NamedValue.Map values = dbResultSet.GetRecordValues();
commodities.Add(new SysIdString(new SysId((int)values.GetValue(SbmDbDfn.GetColumnName(SbmDbDfn.ColumnIdx.Commodity_Id)).AsLong()),
SaBusMgrStandardDbas/Dbas/Mgr/SbmCommodityMgr_Dbas-PortfolioItem.cs
+2 -2
View File
@@ -111,9 +111,9 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
qry.Tables.Add(TableName_PortfolioItem);
qry.Columns.Add("DISTINCT " + SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.PortfolioItem_Type));
qry.Filters.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.PortfolioItem_AffIdOwner) + "=" + AffiliateId_Owner.ToString());
using (DbResultSet dbResultSet = DbResultSet_DataReader.ExecuteQuery(Database, qry.ToString()))
using (DbResultSet dbResultSet = DbResultSet_DataReader.ExecuteQuery(Database, qry.BuildQuery()))
{
if (dbResultSet != null && dbResultSet.NextRecord())
while (dbResultSet != null && dbResultSet.NextRecord())
{
NamedValue.Map values = dbResultSet.GetRecordValues();
types.Add((Sbm.PortfolioItemType)values.GetValue(SbmDbDfn.GetColumnName(SbmDbDfn.ColumnIdx.PortfolioItem_Type)).AsLong());
SaBusMgrStandardDbas/Dbas/Mgr/SbmProcessMgr_Dbas-ItemProcess.cs
+2 -2
View File
@@ -174,9 +174,9 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
#endif
// Filter the 'To' item to match the process.
using (DbResultSet dbResultSet = DbResultSet_DataReader.ExecuteQuery(Database, qry.ToString()))
using (DbResultSet dbResultSet = DbResultSet_DataReader.ExecuteQuery(Database, qry.BuildQuery()))
{
if (dbResultSet != null && dbResultSet.NextRecord())
while (dbResultSet != null && dbResultSet.NextRecord())
{
NamedValue.Map values = dbResultSet.GetRecordValues();
SaBusMgrStandardDbas/Dbas/Mgr/SbmTransactionMgr_Dbas-Constituent.cs
+4 -4
View File
@@ -67,7 +67,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
qryTrans.Columns.Add(colTransaction_Id);
using (DbResultSet dbResultSet = DbResultSet_DataReader.ExecuteQuery(Database, qryTrans.ToString()))
{
if (dbResultSet != null && dbResultSet.NextRecord())
while (dbResultSet != null && dbResultSet.NextRecord())
{
NamedValue.Map values = dbResultSet.GetRecordValues();
SysId transactionId = new SysId((int)values.GetValue(colTransaction_Id).AsLong());
@@ -82,7 +82,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
qryReqnt.Columns.Add(colRequirement_Id);
using (DbResultSet dbResultSet = DbResultSet_DataReader.ExecuteQuery(Database, qryReqnt.ToString()))
{
if (dbResultSet != null && dbResultSet.NextRecord())
while (dbResultSet != null && dbResultSet.NextRecord())
{
NamedValue.Map values = dbResultSet.GetRecordValues();
SysId transactionId = new SysId((int)values.GetValue(colRequirement_Id).AsLong());
@@ -214,9 +214,9 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
qry.GroupBy.Add(SbmDbDfn.GetColumnName(SbmDbDfn.ColumnIdx.Constituent_AffIdTarget));
qry.GroupBy.Add(SbmDbDfn.GetColumnName(SbmDbDfn.ColumnIdx.Constituent_UomId));
// Retrieve results.
using (DbResultSet dbResultSet = DbResultSet_DataReader.ExecuteQuery(Database, qry.ToString()))
using (DbResultSet dbResultSet = DbResultSet_DataReader.ExecuteQuery(Database, qry.BuildQuery()))
{
if (dbResultSet != null && dbResultSet.NextRecord())
while (dbResultSet != null && dbResultSet.NextRecord())
{
NamedValue.Map values = dbResultSet.GetRecordValues();
DateTime effective = values.GetValue(SbmDbDfn.GetColumnName(SbmDbDfn.ColumnIdx.Constituent_Effective, false)).AsDate();
SaBusMgrStandardDbas/Dbas/Mgr/SbmTransactionMgr_Dbas-Transaction-Utils.cs
+1 -1
View File
@@ -128,7 +128,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
qry.Filters.Add(SbmDbDfn.GetColumnName(SbmDbDfn.ColumnIdx.Transaction_Id) + "=" + transactionId.ToString());
qry.Filters.Add(SbmDbDfn.GetColumnName(SbmDbDfn.ColumnIdx.Transaction_CostLabourRateHour) + " IS NOT null");
using (DbResultSet dbResultSet = DbResultSet_DataReader.ExecuteQuery(Database, qry.ToString()))
using (DbResultSet dbResultSet = DbResultSet_DataReader.ExecuteQuery(Database, qry.BuildQuery()))
{
if (dbResultSet != null && dbResultSet.NextRecord())
{
SaBusMgrStandardDbas/Dbas/Mgr/SbmTransactionMgr_Dbas.cs
+1 -1
View File
@@ -99,7 +99,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
qry.Joins.Add(joinReqnt);
// Execute the query.
if (DebugMode) SaLogger.Debug($"{SysUtil.Fn} Query: " + qry.BuildQuery());
using (DbResultSet dbResultSet = DbResultSet_DataReader.ExecuteQuery(Database, qry.ToString()))
using (DbResultSet dbResultSet = DbResultSet_DataReader.ExecuteQuery(Database, qry.BuildQuery()))
{
while (!HasErrorState() && dbResultSet != null && dbResultSet.NextRecord())
{
SaBusinessMgrCoreWebControl/wwwroot/js/sbc-ins-rep-db.js
+1 -1
View File
@@ -93,7 +93,7 @@
//--------------------------------------------------------------
$(function ()
{
let env = cd.env.init = { data: {}, ajax: {}, $pnl: {}, $frm: {}, $ctrl: {}, $dlg: {} };
let env = cd.env.init = { mode: { search: 1 }, data: {}, ajax: {}, $pnl: {}, $frm: {}, $ctrl: {}, $dlg: {} };
env.$pnl.items = $('.sbc-panel.Tables');
env.$pnl.header = env.$pnl.items.find('.sbc-panel-header');
SaBusinessMgrCoreWebControl/wwwroot/js/sbc-ins-rep-init.js
+1 -1
View File
@@ -82,7 +82,7 @@
//--------------------------------------------------------------
$(function ()
{
let env = ir.env.init = { data: {}, ajax: {}, $pnl: {}, $frm: {}, $ctrl: {}, $dlg: {} };
let env = ir.env.init = { mode: { search: 1 }, data: {}, ajax: {}, $pnl: {}, $frm: {}, $ctrl: {}, $dlg: {} };
env.$pnl.init = $('.sbc-panel.RepositoryInit');
env.$frm.itemId = env.$pnl.init.find('.RepositoryIdForm');
SaBusinessMgrCoreWebControl/wwwroot/js/sbc-ins-rep-sch.js
+1 -1
View File
@@ -103,7 +103,7 @@
//--------------------------------------------------------------
$(function ()
{
let env = { data: {}, ajax: {}, $pnl: {}, $frm: {}, $ctrl: {}, $dlg: {} };
let env = { mode: { search: 1 }, data: {}, ajax: {}, $pnl: {}, $frm: {}, $ctrl: {}, $dlg: {} };
env.$pnl.items = $('.sbc-panel.Schema');
env.$pnl.header = env.$pnl.items.find('.sbc-panel-header');
SaBusinessMgrCoreWebPortal/Portal/Components/SbmModel_Portal.cs
+3 -1
View File
@@ -8,6 +8,7 @@ using Sarand.BusinessMgr.Net.Standard.Base.Mgr;
using Sarand.BusinessMgr.Net.Standard.Dbas.Data;
using Sarand.BusinessMgr.Web.Portal.App;
using Sarand.Net.Standard.Base.App;
using Sarand.Net.Standard.Base.Bus;
using Sarand.Net.Standard.Base.CodeTypes;
using Sarand.Net.Standard.Base.Core;
using Sarand.Net.Standard.Base.Diary;
@@ -58,7 +59,8 @@ namespace Sarand.BusinessMgr.Web.Portal.Components
//-------------------------------------------------------------------
// Properties.
protected SbmSessionData_Portal SessionData_Portal { get { return SessionData_Web as SbmSessionData_Portal; } }
public string OrganisationName { get { return SessionData_Portal?.Organisation?.DisplayName ?? ""; } }
public SysId GetAffiliateIdOwner() { return SessionData_Portal?.OrganisationAffiliateId; }
public string GetOrganisationName() { return SessionData_Portal?.Organisation?.DisplayName ?? ""; }
protected override SbmInstanceSchemaConsole InstanceSchemaConsole { get { return Internals.InstanceSchemaConsole; } }
//-------------------------------------------------------------------
SaBusinessMgrCoreWebPortal/Portal/Consoles/SbmDemoInstanceConsole_Portal.cs
+1 -1
View File
@@ -429,7 +429,7 @@ namespace Sarand.BusinessMgr.Web.Portal.Consoles
{
int transactionCount = 0;
DateTime raisedOn = DateTime.Today;
for (int i = 0; i < SacsRandomHelper.GetInt32(6, 24); i++)
for (int i = 0; i < SacsRandomHelper.GetInt32(12, 24); i++)
{
// Prepare transaction data.
transactionCount++;
SaBusinessMgrCoreWebPortal/Portal/Controllers/Codes/CodeController-Ajax.cs
+6 -4
View File
@@ -33,6 +33,7 @@ namespace Sarand.BusinessMgr.Web.Portal.Controllers.Codes
private class CodeItemData : CodeListData
{
public String CodeTypeId { get; set; }
public String CodeTypeCode { get; set; }
public ushort? Sequence { get; set; }
public String DataValue { get; set; }
}
@@ -50,6 +51,7 @@ namespace Sarand.BusinessMgr.Web.Portal.Controllers.Codes
{
PopulateCodeResponseListData(model, data, codeType, code);
data.CodeTypeId = SysId.ToString(code.CodeTypeId);
data.CodeTypeCode = codeType.Code;
if (code.Sequence > 0)
data.Sequence = code.Sequence;
data.DataValue = code.DataValue;
@@ -64,7 +66,7 @@ namespace Sarand.BusinessMgr.Web.Portal.Controllers.Codes
// Construction.
public AjaxResponse_CodeList(SbmModel_Portal model) : base(model) { }
// Reference data.
public List<ItemIdName> CodeTypes { get; } = new List<ItemIdName>();
public List<ItemCodeDesc> CodeTypes { get; } = new List<ItemCodeDesc>();
public List<ItemCodeDesc> Statuses { get; } = new List<ItemCodeDesc>();
public List<ItemCodeDesc> StatusesCreate { get; } = new List<ItemCodeDesc>();
public String StatusCodeDefault { get; set; }
@@ -90,7 +92,7 @@ namespace Sarand.BusinessMgr.Web.Portal.Controllers.Codes
SaCodeType.Params prmCodeType = new SaCodeType.Params();
prmCodeType.StatusCat = SaCodeType.StatusCat.NotDeleted;
foreach (SaCodeType codeType in CodeTypeConsole.GetCodeTypeList(prmCodeType))
responseData.CodeTypes.Add(new AjaxResponse_Data.ItemIdName(codeType.Id, codeType.Name));
responseData.CodeTypes.Add(new AjaxResponse_Data.ItemCodeDesc(codeType.Code, codeType.Name));
// Reference data - statuses.
foreach (SaStatus status in SaCode.ValidStatuses)
@@ -272,11 +274,11 @@ namespace Sarand.BusinessMgr.Web.Portal.Controllers.Codes
}
else
{
codeType = CodeTypeConsole.GetCodeTypeById(SysId.ToSysId(model.Code.CodeTypeId));
codeType = CodeTypeConsole.GetCodeTypeByCode(model.Code.CodeTypeCode);
disposables.Add(codeType);
if (codeType == null)
{
SaLogger.Warn($"{SysUtil.Fn} Failed to retrieve Code Type for new Code. Id: '" + model.Code.CodeTypeId + "'");
SaLogger.Warn($"{SysUtil.Fn} Failed to retrieve Code Type for new Code. Code: '" + model.Code.CodeTypeCode + "'");
return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.system"]));
}
}
SaBusinessMgrCoreWebPortal/Portal/Controllers/Contacts/AssociationController-Ajax.cs
+1 -1
View File
@@ -385,7 +385,7 @@ namespace Sarand.BusinessMgr.Web.Portal.Controllers.Contacts
return Json(responseData.SetGoHome(messageTitle, Localiser["msg.error.system"]));
}
// New item.
association = AccountMgr.CreateAssociation(SessionData_Portal.Organisation.AffiliateId, associationType, SysId.ToSysId(model.Association.ContactIdTarget));
association = AccountMgr.CreateAssociation(SessionData_Portal.Organisation.AffiliateId, associationType, SysId.ToSysId(model.Association.TargetId));
disposables.Add(association);
}
SaBusinessMgrCoreWebPortal/Portal/Controllers/Contacts/ContactController-Ajax.cs
+42 -20
View File
@@ -28,9 +28,12 @@ namespace Sarand.BusinessMgr.Web.Portal.Controllers.Contacts
private class AffiliateListData : AjaxResponse_Data.ItemData_Base
{
// Item properties with specific handling.
public bool? IsOwner { get; set; }
public String Name { get; set; }
// Affiliate properties for list with specific handling.
public long? AssociationCount { get; set; }
public bool? IsCust { get; set; }
public bool? IsSupp { get; set; }
// Field values.
public AjaxResponse_Data.FieldValuesData Field { get; } = new AjaxResponse_Data.FieldValuesData();
}
@@ -43,7 +46,14 @@ namespace Sarand.BusinessMgr.Web.Portal.Controllers.Contacts
private void PopulateAffiliateResponseListData(Model_Contact model, SbmAffiliate affiliate, AffiliateListData data)
{
data.Id = SysId.ToString(affiliate.Id);
if (affiliate.Id.Equals(model.GetAffiliateIdOwner())) data.IsOwner = true;
// Associations.
data.AssociationCount = AccountMgr.GetAffiliateTargetAssociationCount(affiliate.Id, Sbm.AssociationType.NotInternal);
HashSet<Sbm.AssociationType> associationTypes = AccountMgr.GetAssociationTypesForTarget(affiliate.Id);
if (associationTypes.Contains(Sbm.AssociationType.Customer))
data.IsCust = true;
if (associationTypes.Contains(Sbm.AssociationType.Supplier))
data.IsSupp = true;
}
private void PopulateAffiliateResponseItemData(Model_Contact model, SbmAffiliate affiliate, AffiliateItemData data)
{
@@ -105,11 +115,14 @@ namespace Sarand.BusinessMgr.Web.Portal.Controllers.Contacts
{
// Construction.
public AjaxResponse_ContactConfig(SbmModel_Portal model) : base(model) { }
// Configuration.
public Model_Contact.ListConfigData Config { get; } = new Model_Contact.ListConfigData();
public Model_Contact.ItemConfigData ConfigInd { get; } = new Model_Contact.ItemConfigData();
public Model_Contact.ItemConfigData ConfigOrg { get; } = new Model_Contact.ItemConfigData();
public Model_Contact.ItemConfigData ConfigGrp { get; } = new Model_Contact.ItemConfigData();
// Configuration data - object copied directly to env.datain script.
public class ConfigData
{
// Configurations.
public Model_Contact.ListConfigData CfgList { get; } = new Model_Contact.ListConfigData();
public Model_Contact.ItemConfigData CfgInd { get; } = new Model_Contact.ItemConfigData();
public Model_Contact.ItemConfigData CfgOrg { get; } = new Model_Contact.ItemConfigData();
public Model_Contact.ItemConfigData CfgGrp { get; } = new Model_Contact.ItemConfigData();
// Reference data.
public List<AjaxResponse_Data.ItemCodeDesc> OrganisationTypes { get; } = new List<AjaxResponse_Data.ItemCodeDesc>();
public List<AjaxResponse_Data.ItemCodeDesc> Titles { get; } = new List<AjaxResponse_Data.ItemCodeDesc>();
@@ -117,6 +130,8 @@ namespace Sarand.BusinessMgr.Web.Portal.Controllers.Contacts
public List<AjaxResponse_Data.ItemCodeDesc> Statuses { get; } = new List<AjaxResponse_Data.ItemCodeDesc>();
public String DefaultStatusCode { get; set; }
}
public ConfigData Data { get; set; } = new ConfigData();
}
// Ajax request.
[HttpPost]
[Route("Contact/Ajax/Config")]
@@ -141,28 +156,28 @@ namespace Sarand.BusinessMgr.Web.Portal.Controllers.Contacts
private void PopulateContactConfig(Model_Contact model, AjaxResponse_ContactConfig responseData)
{
// Configuration.
model.PopulateListConfig(responseData.Config);
model.PopulateItemConfig(responseData.ConfigInd, null, Sbm.AffiliateType.Individual);
model.PopulateItemConfig(responseData.ConfigOrg, null, Sbm.AffiliateType.Commercial);
model.PopulateItemConfig(responseData.ConfigGrp, null, Sbm.AffiliateType.ContactGroup);
model.PopulateListConfig(responseData.Data.CfgList);
model.PopulateItemConfig(responseData.Data.CfgInd, null, Sbm.AffiliateType.Individual);
model.PopulateItemConfig(responseData.Data.CfgOrg, null, Sbm.AffiliateType.Commercial);
model.PopulateItemConfig(responseData.Data.CfgGrp, null, Sbm.AffiliateType.ContactGroup);
// Reference data - Organisation types.
foreach (TypeCodeDesc affiliateType in GetSystemCodes(Sbm.SystemCode.AffiliateType).Where(item => item.Type != (short)Sbm.AffiliateType.Individual && item.Type != (short)Sbm.AffiliateType.ContactGroup))
responseData.OrganisationTypes.Add(new AjaxResponse_Data.ItemCodeDesc(affiliateType.Code, affiliateType.Desc));
responseData.Data.OrganisationTypes.Add(new AjaxResponse_Data.ItemCodeDesc(affiliateType.Code, affiliateType.Desc));
// Reference data - titles.
responseData.Titles.Add(new AjaxResponse_Data.ItemCodeDesc("", ""));
responseData.Data.Titles.Add(new AjaxResponse_Data.ItemCodeDesc("", ""));
foreach (SaCode title in CodeTypeConsole.GetCodesForCodeType(SbmSystem.GetCodeTypeCode(Sbm.ApplCodeType.ContactTitle)))
responseData.Titles.Add(new AjaxResponse_Data.ItemCodeDesc(title.Code, title.Description));
responseData.Data.Titles.Add(new AjaxResponse_Data.ItemCodeDesc(title.Code, title.Description));
// Reference data - salutation.
responseData.Salutations.Add(new AjaxResponse_Data.ItemCodeDesc("", ""));
responseData.Salutations.Add(new AjaxResponse_Data.ItemCodeDesc("Dear", "Dear"));
responseData.Data.Salutations.Add(new AjaxResponse_Data.ItemCodeDesc("", ""));
responseData.Data.Salutations.Add(new AjaxResponse_Data.ItemCodeDesc("Dear", "Dear"));
// Reference data - statuses.
foreach (SaStatus status in SbmAffiliate.ValidStatuses.FindAll(item => item != SaStatus.Deleted))
responseData.Statuses.Add(new AjaxResponse_Data.ItemCodeDesc(SacsSystem.GetStatusCode(status), Localiser.GetStatusCaption(status)));
responseData.DefaultStatusCode = SacsSystem.GetStatusCode(SbmAffiliate.DefaultStatus);
responseData.Data.Statuses.Add(new AjaxResponse_Data.ItemCodeDesc(SacsSystem.GetStatusCode(status), Localiser.GetStatusCaption(status)));
responseData.Data.DefaultStatusCode = SacsSystem.GetStatusCode(SbmAffiliate.DefaultStatus);
}
//-------------------------------------------------------------------
@@ -231,6 +246,8 @@ namespace Sarand.BusinessMgr.Web.Portal.Controllers.Contacts
ColumnDfn colPhoneDirect = AccountMgr.GetAffiliateColumnDfn(SbmAffiliate.Column.PhoneDirect);
ColumnDfn colEmail = AccountMgr.GetAffiliateColumnDfn(SbmAffiliate.Column.Email);
ColumnDfn colAssocTargetCount = AccountMgr.GetAffiliateColumnDfn(SbmAffiliate.Column.AssociationTarget_Count);
ColumnDfn colIsCustomer = AccountMgr.GetAffiliateColumnDfn(SbmAffiliate.Column.IsCustomer);
ColumnDfn colIsSupplier = AccountMgr.GetAffiliateColumnDfn(SbmAffiliate.Column.IsSupplier);
ColumnDfn colNotes = AccountMgr.GetAffiliateColumnDfn(SbmAffiliate.Column.Notes);
ColumnDfn colStatus = AccountMgr.GetAffiliateColumnDfn(SbmAffiliate.Column.Status);
ColumnDfn colCreatedOn = AccountMgr.GetAffiliateColumnDfn(SbmAffiliate.Column.CreateOn_Date);
@@ -238,14 +255,15 @@ namespace Sarand.BusinessMgr.Web.Portal.Controllers.Contacts
List<ColumnDfn> columns = new List<ColumnDfn>()
{
colId, colName, colAffiliateType,
colAddress, colContact, colPhoneMain, colPhoneAlt, colPhoneMobile, colPhoneDirect, colEmail, colAssocTargetCount,
colAddress, colContact, colPhoneMain, colPhoneAlt, colPhoneMobile, colPhoneDirect, colEmail,
colAssocTargetCount, colIsCustomer, colIsSupplier,
colNotes, colStatus, colCreatedOn, colUpdatedOn
};
if (responseData.Config.Column.Hide.Contains($"{Model_Contact.ItemField.Address}"))
if (responseData.Data.CfgList.Column.Hide.Contains($"{Model_Contact.ItemField.Address}"))
columns.Remove(colAddress);
if (responseData.Config.Column.Hide.Contains($"{Model_Contact.ItemField.Email}"))
if (responseData.Data.CfgList.Column.Hide.Contains($"{Model_Contact.ItemField.Email}"))
columns.Remove(colEmail);
if (responseData.Config.Column.Hide.Contains($"{Model_Contact.ItemField.Associations}"))
if (responseData.Data.CfgList.Column.Hide.Contains($"{Model_Contact.ItemField.Associations}"))
columns.Remove(colAssocTargetCount);
// Sort Columns.
@@ -265,6 +283,7 @@ namespace Sarand.BusinessMgr.Web.Portal.Controllers.Contacts
Name = values.GetString(colName.DataName),
StatusCode = values.GetString(colStatus.DataName),
};
if (SysId.ToLong(model.GetAffiliateIdOwner()) == StringUtil.ToLong(affiliateData.Id)) affiliateData.IsOwner = true;
affiliateData.Field.Value.Add($"{Model_Contact.ItemField.Name}", affiliateData.Name);
affiliateData.Field.Value.Add($"{Model_Contact.ItemField.Type}", Internals.AffiliateTypeCodes.GetDescForType(affiliateType));
affiliateData.Field.Value.Add($"{Model_Contact.ItemField.Address}", StringUtil.NullOnBlank(AccountMgr.GetAffiliateDataValue(colAddress, values).AsString()));
@@ -275,9 +294,12 @@ namespace Sarand.BusinessMgr.Web.Portal.Controllers.Contacts
affiliateData.Field.Value.Add($"{Model_Contact.ItemField.Status}", SacsSystem.GetStatusDescForCode(values.GetString(colStatus.DataName)));
affiliateData.Field.Value.Add($"{Model_Contact.ItemField.CreatedOn}", Localiser.FormatDate(values.GetDate(colCreatedOn.DataName)));
affiliateData.Field.Value.Add($"{Model_Contact.ItemField.UpdatedOn}", Localiser.FormatDate(values.GetDate(colUpdatedOn.DataName)));
// Associations.
long assocCount = values.GetLong(colAssocTargetCount.DataName);
if (assocCount > 0)
affiliateData.AssociationCount = assocCount;
if (values.GetLong(colIsCustomer.DataName) > 0) affiliateData.IsCust = true;
if (values.GetLong(colIsSupplier.DataName) > 0) affiliateData.IsSupp = true;
// Cleanse item values.
affiliateData.Field.Value.RemoveAll(item => StringUtil.IsBlank(item.Value));
responseData.Contacts.Add(affiliateData);
SaBusinessMgrCoreWebPortal/Portal/Controllers/Transactions/TransactionController-Ajax.cs
+15 -1
View File
@@ -173,6 +173,8 @@ namespace Sarand.BusinessMgr.Web.Portal.Controllers.Transactions
public bool? TransactionsForAssociation { get; set; }
}
public ModeData Mode { get; set; }
/// <summary>Status Cats to refresh caption with transaction count.</summary>
public List<ItemCodeDesc> StatusCats { get; set; }
// Transaction list.
public List<TransactionListData> Transactions { get; } = new List<TransactionListData>();
}
@@ -209,6 +211,9 @@ namespace Sarand.BusinessMgr.Web.Portal.Controllers.Transactions
else
responseData.Mode.Search = true;
// Status Cats.
responseData.StatusCats = model.GetTransactionStatusCats(model.GetFilterTransactionType()).Select(item => new AjaxResponse_Data.ItemCodeDesc(item.Code, item.Desc)).ToList();
// Item filter.
SbmTransaction.Params prmTransaction = new SbmTransaction.Params();
prmTransaction.Search = model.Filter.Search;
@@ -357,13 +362,21 @@ namespace Sarand.BusinessMgr.Web.Portal.Controllers.Transactions
//-------------------------------------------------------------------
// Store Transaction ajax request.
//-------------------------------------------------------------------
private class AjaxResponse_StoreTransaction : AjaxResponse_Transaction
{
// Construction.
public AjaxResponse_StoreTransaction(SbmModel_Portal model) : base(model) { }
/// <summary>Status Cats to refresh caption with transaction count.</summary>
public List<ItemCodeDesc> StatusCats { get; set; }
}
//-------------------------------------------------------------------
[HttpPost]
[Route("Transaction/Ajax/Store")]
[Route("Transaction/Ajax/StoreItem")]
public IActionResult Ajax_StoreItem(Model_Transaction model)
{
String messageTitle = Localiser["label.transaction"];
AjaxResponse_Transaction responseData = new AjaxResponse_Transaction(model);
AjaxResponse_StoreTransaction responseData = new AjaxResponse_StoreTransaction(model);
// Validate session and referrer.
if (!ValidUserSession) return GetAjaxResult_InvalidSession(responseData);
@@ -476,6 +489,7 @@ namespace Sarand.BusinessMgr.Web.Portal.Controllers.Transactions
PopulateTransactionResponseItemData(model, transaction, responseData.transaction);
// Complete response.
responseData.StatusCats = model.GetTransactionStatusCats(transaction.TransactionType).Select(item => new AjaxResponse_Data.ItemCodeDesc(item.Code, item.Desc)).ToList();
responseData.Success = true;
return Json(responseData);
SaBusinessMgrCoreWebPortal/Portal/Models/Codes/Model_Code.cs
+4 -4
View File
@@ -59,7 +59,7 @@ namespace Sarand.BusinessMgr.Web.Portal.Models.Codes
{
public String Exists { get; set; }
public String Id { get; set; }
public String CodeTypeId { get; set; }
public String CodeTypeCode { get; set; }
public String Code { get; set; }
public String Description { get; set; }
public String Sequence { get; set; }
@@ -80,12 +80,12 @@ namespace Sarand.BusinessMgr.Web.Portal.Models.Codes
{
// Code Type.
if (Code.CodeTypeId != null)
if (Code.CodeTypeCode != null)
{
String controlName = "CodeType";
if (StringUtil.IsBlank(Code.CodeTypeId))
if (StringUtil.IsBlank(Code.CodeTypeCode))
responseData.SetControlError(controlName, Localiser["msg.validation.mandatory.value"]);
else if (!CodeTypeConsole.CodeTypeExistsById(SysId.ToSysId(Code.CodeTypeId)))
else if (!CodeTypeConsole.CodeTypeExistsByCode(Code.CodeTypeCode))
responseData.SetControlError(controlName, Localiser["msg.validation.invalid.value"]);
}
SaBusinessMgrCoreWebPortal/Portal/Models/Contacts/Model_Association.cs
+37 -14
View File
@@ -3,6 +3,7 @@ using Sarand.BusinessMgr.Net.Standard.Base.App;
using Sarand.BusinessMgr.Net.Standard.Base.Bus;
using Sarand.BusinessMgr.Web.Portal.Components;
using Sarand.Net.Standard.Base.App;
using Sarand.Net.Standard.Base.Bus;
using Sarand.Net.Standard.Base.Core;
using Sarand.Net.Standard.Base.Utils;
using System;
@@ -58,7 +59,7 @@ namespace Sarand.BusinessMgr.Web.Portal.Models.Contacts
public string Exists { get; set; }
public string Id { get; set; }
public string ContactIdOwner { get; set; }
public string ContactIdTarget { get; set; }
public string TargetId { get; set; }
public string Type { get; set; }
public string Code { get; set; }
public string ReferenceExt { get; set; }
@@ -122,19 +123,41 @@ namespace Sarand.BusinessMgr.Web.Portal.Models.Contacts
public bool ValidateAssociationData(Sacs.Web.Components.SaController.AjaxResponse_Data responseData)
{
//---------------------------------------------------------------
SysId associationId = SysId.ToSysId(Association.Id);
bool associationExists = StringUtil.ToBool(Association.Exists);
// Association Type.
if (Association.Type != null)
{
String controlName = "AssociationType";
if (StringUtil.IsBlank(Association.Type))
String controlName = GetFieldName(ItemField.Type);
if (StringUtil.IsBlank(Association.Type) || GetAssociationType() <= 0)
responseData.SetControlError(controlName, Localiser["msg.validation.mandatory.value"]);
}
// Target.
if (Association.TargetId != null)
{
String controlName = GetFieldName(ItemField.Target);
SysId affiliateIdTarget = SysId.ToSysId(Association.TargetId);
if (!SysId.IsValid(affiliateIdTarget) && !associationExists)
responseData.SetControlError(controlName, Localiser["msg.validation.mandatory.value"]);
else if (SysId.IsValid(affiliateIdTarget) && !associationExists && GetAssociationType() > 0)
{
// Ensure that the Association does not already exist.
SbmAssociation.Params prmAssociation = new SbmAssociation.Params();
prmAssociation.IdsIncluded.AddId(associationId);
prmAssociation.AffiliateIdTarget = affiliateIdTarget;
prmAssociation.AssociationType = GetAssociationType();
prmAssociation.StatusCat = SbmAssociation.StatusCat.Any;
if (AccountMgr.GetAssociationCount(prmAssociation) > 0)
responseData.SetControlError(controlName, Localiser["msg.validation.duplicate.value"]);
}
}
// Code.
if (Association.Code != null)
{
String controlName = "AssociationCode";
String controlName = GetFieldName(ItemField.Code);
Association.Code = Association.Code.ToUpperInvariant();
responseData.SetControlValue(controlName, Association.Code);
if (StringUtil.GetLength(Association.Code) > GetControlMaxLength(SbmDbDfn.ColumnIdx.Association_Code))
@@ -144,7 +167,7 @@ namespace Sarand.BusinessMgr.Web.Portal.Models.Contacts
// External Reference.
if (Association.ReferenceExt != null)
{
String controlName = "AssociationReferenceExt";
String controlName = GetFieldName(ItemField.ReferenceExt);
Association.ReferenceExt = Association.ReferenceExt.ToUpperInvariant();
responseData.SetControlValue(controlName, Association.ReferenceExt);
if (StringUtil.GetLength(Association.ReferenceExt) > GetControlMaxLength(SbmDbDfn.ColumnIdx.Association_ExtRef))
@@ -154,7 +177,7 @@ namespace Sarand.BusinessMgr.Web.Portal.Models.Contacts
// Location.
if (Association.Location != null)
{
String controlName = "AssociationLocation";
String controlName = GetFieldName(ItemField.Location);
responseData.SetControlValue(controlName, Association.Location);
if (StringUtil.GetLength(Association.Location) > GetControlMaxLength(SbmDbDfn.ColumnIdx.Association_Location))
responseData.SetControlError(controlName, Localiser["msg.validation.maximum.length", GetControlMaxLength(SbmDbDfn.ColumnIdx.Association_Location)]);
@@ -163,7 +186,7 @@ namespace Sarand.BusinessMgr.Web.Portal.Models.Contacts
// Role.
if (Association.Role != null)
{
String controlName = "AssociationRole";
String controlName = GetFieldName(ItemField.Role);
responseData.SetControlValue(controlName, Association.Role);
if (StringUtil.GetLength(Association.Role) > GetControlMaxLength(SbmDbDfn.ColumnIdx.Association_Role))
responseData.SetControlError(controlName, Localiser["msg.validation.maximum.length", GetControlMaxLength(SbmDbDfn.ColumnIdx.Association_Role)]);
@@ -172,7 +195,7 @@ namespace Sarand.BusinessMgr.Web.Portal.Models.Contacts
// Phone Main.
if (Association.PhoneMain != null)
{
String controlName = "AssociationPhoneMain";
String controlName = GetFieldName(ItemField.PhoneMain);
responseData.SetControlValue(controlName, Association.PhoneMain);
if (StringUtil.GetLength(Association.PhoneMain) > GetControlMaxLength(SbmDbDfn.ColumnIdx.Association_PhoneMain))
responseData.SetControlError(controlName, Localiser["msg.validation.maximum.length", GetControlMaxLength(SbmDbDfn.ColumnIdx.Association_PhoneMain)]);
@@ -181,7 +204,7 @@ namespace Sarand.BusinessMgr.Web.Portal.Models.Contacts
// Email.
if (Association.Email != null)
{
String controlName = "AssociationEmail";
String controlName = GetFieldName(ItemField.Email);
responseData.SetControlValue(controlName, Association.Email);
if (StringUtil.GetLength(Association.Email) > GetControlMaxLength(SbmDbDfn.ColumnIdx.Association_Email))
responseData.SetControlError(controlName, Localiser["msg.validation.maximum.length", GetControlMaxLength(SbmDbDfn.ColumnIdx.Association_Email)]);
@@ -190,7 +213,7 @@ namespace Sarand.BusinessMgr.Web.Portal.Models.Contacts
// Group.
if (Association.Group != null)
{
String controlName = "AssociationGroup";
String controlName = GetFieldName(ItemField.Group);
responseData.SetControlValue(controlName, Association.Group);
if (StringUtil.GetLength(Association.Group) > GetControlMaxLength(SbmDbDfn.ColumnIdx.Association_Group))
responseData.SetControlError(controlName, Localiser["msg.validation.maximum.length", GetControlMaxLength(SbmDbDfn.ColumnIdx.Association_Group)]);
@@ -199,7 +222,7 @@ namespace Sarand.BusinessMgr.Web.Portal.Models.Contacts
// Description.
if (Association.DescDetail != null)
{
String controlName = "AssociationDescDetail";
String controlName = GetFieldName(ItemField.DescDetail);
responseData.SetControlValue(controlName, Association.DescDetail);
if (StringUtil.GetLength(Association.DescDetail) > GetControlMaxLength(SbmDbDfn.ColumnIdx.Association_DescDetail))
responseData.SetControlError(controlName, Localiser["msg.validation.maximum.length", GetControlMaxLength(SbmDbDfn.ColumnIdx.Association_DescDetail)]);
@@ -208,7 +231,7 @@ namespace Sarand.BusinessMgr.Web.Portal.Models.Contacts
// Default Nominal Code.
if (Association.NominalCodeDefault != null)
{
String controlName = "AssociationNominalCodeDefault";
String controlName = GetFieldName(ItemField.DefaultNominalCode);
responseData.SetControlValue(controlName, Association.NominalCodeDefault);
if (StringUtil.GetLength(Association.NominalCodeDefault) > GetControlMaxLength(SbmDbDfn.ColumnIdx.Association_DefaultNominalCode))
responseData.SetControlError(controlName, Localiser["msg.validation.maximum.length", GetControlMaxLength(SbmDbDfn.ColumnIdx.Association_DefaultNominalCode)]);
@@ -272,7 +295,7 @@ namespace Sarand.BusinessMgr.Web.Portal.Models.Contacts
// Notes.
if (Association.Notes != null)
{
String controlName = "AssociationNotes";
String controlName = GetFieldName(ItemField.Notes);
responseData.SetControlValue(controlName, Association.Notes);
if (StringUtil.GetLength(Association.Notes) > GetControlMaxLength(SbmDbDfn.ColumnIdx.Association_Notes))
responseData.SetControlError(controlName, Localiser["msg.validation.maximum.length", GetControlMaxLength(SbmDbDfn.ColumnIdx.Association_Notes)]);
@@ -281,7 +304,7 @@ namespace Sarand.BusinessMgr.Web.Portal.Models.Contacts
// status.
if (Association.StatusCode != null)
{
String controlName = "AssociationStatusCode";
String controlName = GetFieldName(ItemField.Status);
if (StringUtil.IsBlank(Association.StatusCode))
responseData.SetControlError(controlName, Localiser["msg.validation.mandatory.value"]);
else if (!SbmAssociation.ValidStatuses.Contains(GetAssociationStatus()))
SaBusinessMgrCoreWebPortal/Portal/Models/Contacts/Model_Contact-Config.cs
+2 -1
View File
@@ -115,7 +115,7 @@ namespace Sarand.BusinessMgr.Web.Portal.Models.Contacts
{
ViewMode viewMode = GetFilterMode();
bool modeIsMaintain= viewMode == ViewMode.Maintain;
bool modeIsMaintain = viewMode == ViewMode.Maintain;
bool modeIsSearch = viewMode == ViewMode.Search;
Sbm.AffiliateType affiliateType = GetFilterContactType();
@@ -247,6 +247,7 @@ namespace Sarand.BusinessMgr.Web.Portal.Models.Contacts
bool importedFromAccounts = Internals.AccountsConsole.ItemIsImportedFromAccounts(affiliateItemId);
bool showNotes = true;
//---------------------------------------------------------------
// Id.
if (SbmSystem.DebugMode)
config.Field.Readonly.Add($"{ItemField.Id}");
SaBusinessMgrCoreWebPortal/Portal/Models/Transactions/Model_Transaction.cs
+25 -1
View File
@@ -2,6 +2,7 @@
using Sarand.BusinessMgr.Net.Core.Web.App;
using Sarand.BusinessMgr.Net.Standard.Base.App;
using Sarand.BusinessMgr.Net.Standard.Base.Bus;
using Sarand.BusinessMgr.Net.Standard.Base.Bus.Control;
using Sarand.BusinessMgr.Web.Portal.Components;
using Sarand.Net.Standard.Base.App;
using Sarand.Net.Standard.Base.Bus;
@@ -69,10 +70,33 @@ namespace Sarand.BusinessMgr.Web.Portal.Models.Transactions
return (SbmTransaction.StatusCat)Internals.GetSystemCodes(Sbm.SystemCode.TransactionStatusCat).GetTypeForCode(Filter.StatusCat);
}
//-------------------------------------------------------------------
/// <summary>Transaction Status Cats with transaction count for selected entries.</summary>
public List<TypeCodeDesc> GetTransactionStatusCats(Sbm.TransactionType transactionType)
{
List<TypeCodeDesc> statusCats = new List<TypeCodeDesc>();
foreach (TypeCodeDesc statusCat in SbmTransaction.GetTransactionStatusCats(GetFilterTransactionType()))
{
SbmTransaction.StatusCat transactionStatusCat = (SbmTransaction.StatusCat)statusCat.Type;
String statusCatDesc = statusCat.Desc;
if (transactionType > 0 && (transactionStatusCat == SbmTransaction.StatusCat.Pending || transactionStatusCat == SbmTransaction.StatusCat.Open))
{
SbmTransaction.Params prmTransaction = new SbmTransaction.Params();
prmTransaction.TransactionType = transactionType;
prmTransaction.StatusCat = transactionStatusCat;
long transactionCount = TransactionMgr.GetTransactionCount(prmTransaction);
if (transactionCount > 0)
statusCatDesc += $" [{transactionCount}]";
}
statusCats.Add(new TypeCodeDesc(statusCat.Type, statusCat.Code, statusCatDesc));
}
return statusCats;
}
/// <summary>Transaction Status Cats for filter dropdown.</summary>
public IEnumerable<SelectListItem> GetTransactionStatusCatsForFilterDropdown()
{
return new SelectList(SbmTransaction.GetTransactionStatusCats(GetFilterTransactionType()), "Code", "Desc");
return new SelectList(GetTransactionStatusCats(GetFilterTransactionType()), "Code", "Desc");
}
//-------------------------------------------------------------------
SaBusinessMgrCoreWebPortal/Views/Association/Panel-AssociationDialog.cshtml
+1 -1
View File
@@ -103,7 +103,7 @@
<div class="col-sm">
<div class="sbm-control row">
<div class="col">
<input type="hidden" name="Association.ContactIdTarget" id="" class=" AssociationTargetId sbm-input" />
<input type="hidden" name="Association.TargetId" id="" class=" AssociationTargetId sbm-input" />
<input type="text" id="ifAssociationTarget" class="AssociationTarget sbm-input sbm-auto-val" readonly="readonly" />
</div>
<div class="fixed">
SaBusinessMgrCoreWebPortal/Views/Codes/Code/Index.cshtml
+2 -2
View File
@@ -131,7 +131,7 @@
</div>
<div class="col-sm-9">
<div class="sbm-control">
<select id="cbCodeType" name="Code.CodeTypeId" class="CodeType sbm-select" readonly="readonly"></select>
<select id="cbCodeType" name="Code.CodeTypeCode" class="CodeType sbm-select" readonly="readonly"></select>
</div>
<div class="sbm-message"></div>
</div>
@@ -151,7 +151,7 @@
</div>
<div class="col-sm">
<div class="sbm-control">
@Html.TextBoxFor(model => model.Code.Code, new { @id = "ifCodeCode", @class = "CodeCode sbm-input upper", @maxlength = 3 })
@Html.TextBoxFor(model => model.Code.Code, new { @id = "ifCodeCode", @class = "CodeCode sbm-input upper", @maxlength = Model.GetControlMaxLength(SaCodeTypeDbDfn.ColumnIdx.SaCode_Code) })
</div>
<div class="sbm-message"></div>
</div>
SaBusinessMgrCoreWebPortal/Views/Contact/Panel-ContactMaintain.cshtml
+2
View File
@@ -14,6 +14,8 @@
sbm.lbl.createOrg = '@(Localiser.GetJavascriptText("caption.organisation.create"))';
sbm.lbl.createInd = '@(Localiser.GetJavascriptText("caption.individual.create"))';
sbm.lbl.createGrp = '@(Localiser.GetJavascriptText("caption.contact.group.create"))';
sbm.lbl.createCust = '@(Localiser.GetJavascriptText("caption.customer.create"))';
sbm.lbl.createSupp = '@(Localiser.GetJavascriptText("caption.supplier.create"))';
</script>
<div class="sbm-panel-data sbm-flex">
SaBusinessMgrCoreWebPortal/Views/Shared/_Layout.cshtml
+1 -1
View File
@@ -165,7 +165,7 @@
<footer id="sbm-page-footer" class="border-top footer text-muted">
<div class="container">
<div class="row">
<div class="col-md-6 text-center text-md-left">@(Model.OrganisationName)</div>
<div class="col-md-6 text-center text-md-left">@(Model.GetOrganisationName())</div>
<div class="col-md-6 text-center text-md-right">@(Model.CopyrightNotice) Sarand Ltd v@(Sbm.Version.GetAppVersion())</div>
</div>
</div>
SaBusinessMgrCoreWebPortal/wwwroot/css/sbm-cols.css
+13
View File
@@ -10,6 +10,7 @@
--color-OldGold: #d4af37;
--color-MintGreen: #98fb98;
--color-LimeGreen: #32cd32;
--color-SeaGreen: #2e8b57;
--color-KellyGreen: #4cbb17;
--color-OliveGreen: #808000;
--color-ForestGreen: #228b22;
@@ -61,6 +62,12 @@
--color-panel-data: var(--color-RoyalBlue);
}
.CodeTypes .sbm-panel-data,
.Codes .sbm-panel-data
{
--color-panel-data: var(--color-SeaGreen);
}
/* Dialogs */
:root
@@ -103,4 +110,10 @@
--color-dialog: var(--color-RoyalBlue);
}
.ui-dialog.sbm-CodeTypes,
.ui-dialog.sbm-Codes
{
--color-dialog: var(--color-SeaGreen);
}
/* The End */
SaBusinessMgrCoreWebPortal/wwwroot/js/sbm-asset-cat.js
+1 -1
View File
@@ -263,7 +263,7 @@
//--------------------------------------------------------------
ac.initEnv = function ($pnlItems)
{
let env = { data: {}, ajax: {}, $pnl: {}, $frm: {}, $ctrl: {}, $dlg: {} };
let env = { mode: { search: 1 }, data: {}, ajax: {}, $pnl: {}, $frm: {}, $ctrl: {}, $dlg: {} };
env.$pnl.items = $($pnlItems);
env.$pnl.header = env.$pnl.items.find('.sbm-panel-header');
SaBusinessMgrCoreWebPortal/wwwroot/js/sbm-asset.js
+1 -1
View File
@@ -283,7 +283,7 @@
//--------------------------------------------------------------
as.initEnv = function ($pnlItems)
{
let env = { data: {}, ajax: {}, $pnl: {}, $frm: {}, $ctrl: {}, $dlg: {} };
let env = { mode: { search: 1 }, data: {}, ajax: {}, $pnl: {}, $frm: {}, $ctrl: {}, $dlg: {} };
env.$pnl.items = $($pnlItems);
env.$pnl.header = env.$pnl.items.find('.sbm-panel-header');
SaBusinessMgrCoreWebPortal/wwwroot/js/sbm-assoc.js
+28 -3
View File
@@ -126,7 +126,7 @@
}
//--------------------------------------------------------------
as.createItem = function (env, cfg, title)
as.createItem = function (env, cfg, title, target)
{
as.clearItem(env, cfg);
let prefix = cfg.field.prefix;
@@ -134,6 +134,11 @@
if (cfg.type) sbm.populateSelectCodeDesc('#cbAssociationType', [{ code: cfg.type.code, desc: cfg.type.desc }])
env.$ctrl.targetActions.filter('.AssocTargetSearch').show();
$ctrls.filter('.AssociationTarget').off('dblclick').on('dblclick', function () { as.selectTarget(env); });
if ((target || {}).id)
{
$ctrls.filter('.AssociationTargetId').val(target.id);
$ctrls.filter('.AssociationTarget').val(target.name);
}
$ctrls.filter('.AssociationStatus').val(env.data.defaultStatusCode);
as.openItemDlg(env, cfg, title);
}
@@ -153,7 +158,7 @@
let $dlg = env.$dlg.item;
let btns = {};
btns[sbm.lbl.ok] = function () { as.storeItem(env); };
btns[sbm.lbl.cancel] = function () { $(this).dialog('close'); };
btns[sbm.lbl.cancel] = function () { delete env.prmEdit; $(this).dialog('close'); };
$dlg.dialog('option', 'buttons', btns);
if (title) $dlg.dialog('option', 'title', title);
sbm.openDialog($dlg, 720, 640);
@@ -301,10 +306,30 @@
delete env.prmSelect;
}
/* Params: type, target{id,name}, fnSuccess. */
sbm.fn.createAssociation = function (prm)
{
sbm.debug('createAssociation', prm);
let env = as.env.select;
env.prmEdit = prm;
sbm.debug(env.data.cfgCust);
if (prm.type == env.data.cfgCust.type.code)
as.createItem(env, env.data.cfgCust, sbm.lbl.createCust, prm.target)
else if (prm.type == env.data.cfgSupp.type.code)
as.createItem(env, env.data.cfgSupp, sbm.lbl.createSupp, prm.target)
}
as.onItemEdited = function (env, item)
{
sbm.debug('onItemEdited', env, item);
let fn = (env.prmEdit || {}).fnSuccess;
if (fn) fn({ id: item.targetId });
}
//--------------------------------------------------------------
as.initContactEnv = function ($pnlItems)
{
let env = { data: {}, ajax: {}, $pnl: {}, $frm: {}, $ctrl: {}, $dlg: {} };
let env = { mode: { search: 1 }, data: {}, ajax: {}, $pnl: {}, $frm: {}, $ctrl: {}, $dlg: {} };
env.$pnl.items = $($pnlItems);
env.$pnl.header = env.$pnl.items.find('.sbm-panel-header');
SaBusinessMgrCoreWebPortal/wwwroot/js/sbm-cmd.js
+2 -2
View File
@@ -208,7 +208,7 @@
}
co.onUpdateItem = function (env, response)
{
sbm.debug('onUpdateItem', env, response);
//sbm.debug('onUpdateItem', env, response);
if (!response.success) return;
let cfg = response.config || {};
co.clearItem(env, cfg);
@@ -302,7 +302,7 @@
//--------------------------------------------------------------
co.initEnv = function ($pnlItems)
{
let env = { data: {}, ajax: {}, $pnl: {}, $frm: {}, $ctrl: {}, $dlg: {} };
let env = { mode: { search: 1 }, data: {}, ajax: {}, $pnl: {}, $frm: {}, $ctrl: {}, $dlg: {} };
let $items = env.$pnl.items = $($pnlItems);
env.$pnl.header = $items.find('.sbm-panel-header');
SaBusinessMgrCoreWebPortal/wwwroot/js/sbm-cod-typ.js
+2 -1
View File
@@ -188,7 +188,7 @@
//--------------------------------------------------------------
$(function ()
{
let env = { data: {}, ajax: {}, $pnl: {}, $frm: {}, $ctrl: {}, $dlg: {} };
let env = { mode: { search: 1 }, data: {}, ajax: {}, $pnl: {}, $frm: {}, $ctrl: {}, $dlg: {} };
let $items = env.$pnl.items = $('.sbm-panel.CodeTypes');
env.$pnl.header = $items.find('.sbm-panel-header');
env.$pnl.bgr = env.$pnl.header.find('.sbm-burger');
@@ -202,6 +202,7 @@
env.$frm.itemId = $items.find('#frmCodeTypeId');
var opt = sbm.dlgOpts();
opt.dialogClass += " sbm-CodeTypes";
env.$dlg.item = $items.find('#dlgCodeType').dialog(opt);
env.$frm.item = env.$dlg.item.find('#frmCodeType');
env.$frm.item.on('input', '.sbm-input, .sbm-textarea', function () { sbm.clearControlError(this); }).on('change', '.sbm-select', function () { sbm.clearControlError(this); });
SaBusinessMgrCoreWebPortal/wwwroot/js/sbm-cod.js
+11 -13
View File
@@ -17,8 +17,7 @@
env.$pnl.table.find('tbody tr').remove();
env.$pnl.msgs.hide().empty().append($('<div class="sbm-message">' + sbm.msg.dataQuerying + '</div>')).fadeIn(200);
}
env.ajax.codes = env.ajax.codes || { url: sbm.url.base + 'Codes/Code/Ajax/GetCodes', formSel: env.$frm.filter, callbackFn: function (response) { cd.handleCodes(env, response); } };
sbm.doAjaxRequest(env.ajax.codes, delay || 50);
sbm.doAjaxRequest(env.ajax.codes = env.ajax.codes || { url: sbm.url.base + 'Codes/Code/Ajax/GetCodes', formSel: env.$frm.filter, callbackFn: function (response) { cd.handleCodes(env, response); } }, delay || 50);
cd.awaitingRefreshResponse = true;
}
cd.handleCodes = function (env, response)
@@ -118,7 +117,8 @@
{
let $frm = env.$frm.item;
$frm.find('.sbm-input,.sbm-textarea,sbm-select').val('');
sbm.populateSelect('#cbCodeType', env.data.codeTypes, 'id', 'name');
sbm.populateSelect('#cbCodeType', env.data.codeTypes);
$('#cbCodeType').val(env.$frm.filter.find('.FilterCodeTypeCode').val());
sbm.populateSelectCodeDesc('#cbCodeStatus', env.data.statuses);
$frm.find('.CodeStatus').prop('disabled', false);
sbm.clearControlErrors();
@@ -140,12 +140,11 @@
{
cd.clearItem(env);
$('.CodeId', env.$frm.itemId).val(item.id);
env.ajax.updateItem = env.ajax.updateItem || { url: sbm.url.base + 'Codes/Code/Ajax/GetItem', formSel: env.$frm.itemId, callbackFn: function (response) { cd.onUpdateItem(env, response); } };
sbm.doAjaxRequest(env.ajax.updateItem, 50);
sbm.doAjaxRequest(env.ajax.updateItem = env.ajax.updateItem || { url: sbm.url.base + 'Codes/Code/Ajax/GetItem', formSel: env.$frm.itemId, callbackFn: function (response) { cd.onUpdateItem(env, response); } }, 50);
}
cd.onUpdateItem = function (env, response)
{
sbm.debug('onUpdateItem', response);
//sbm.debug('onUpdateItem', response);
cd.clearItem(env);
if (!response.success) return;
let item = response.code;
@@ -153,7 +152,7 @@
let $ctrls = $frm.find('.sbm-input,.sbm-textarea,.sbm-select');
$ctrls.filter('.CodeExists').val(1);
$ctrls.filter('.CodeId').val(item.id);
$ctrls.filter('.CodeType').val(item.codeTypeId);
$ctrls.filter('.CodeType').val(item.codeTypeCode);
$ctrls.filter('.CodeCode').val(item.code);
$ctrls.filter('.CodeDescription').val(item.description);
$ctrls.filter('.CodeCategory').val(item.categoryDesc);
@@ -180,19 +179,17 @@
$('.CodeCategoryId', env.$frm.item).val(item.id);
$('.CodeCategory', env.$frm.item).val(item.name);
}
env.ajax.categories = env.ajax.categories || { url: sbm.url.base + 'Codes/CodeCategory/Ajax/GetCodeCategories', formSel: env.$frm.categories, callbackFn: fnHandleCategories };
sbm.doAjaxRequest(env.ajax.categories, 50);
sbm.doAjaxRequest(env.ajax.categories = env.ajax.categories || { url: sbm.url.base + 'Codes/CodeCategory/Ajax/GetCodeCategories', formSel: env.$frm.categories, callbackFn: fnHandleCategories }, 50);
}
//--------------------------------------------------------------
cd.storeItem = function (env)
{
env.ajax.storeItem = env.ajax.storeItem || { url: sbm.url.base + 'Codes/Code/Ajax/StoreItem', formSel: env.$frm.item, callbackFn: function (response) { cd.onStoreItem(env, response); } };
sbm.doAjaxRequest(env.ajax.storeItem, 50);
sbm.doAjaxRequest(env.ajax.storeItem = env.ajax.storeItem || { url: sbm.url.base + 'Codes/Code/Ajax/StoreItem', formSel: env.$frm.item, callbackFn: function (response) { cd.onStoreItem(env, response); } }, 50);
}
cd.onStoreItem = function (env, response)
{
sbm.debug('onStoreItem', response);
//sbm.debug('onStoreItem', response);
sbm.refreshControlValues(response.controlValues);
if (!response.success) return;
env.$dlg.item.dialog('close');
@@ -213,7 +210,7 @@
//--------------------------------------------------------------
$(function ()
{
let env = { data: {}, ajax: {}, $pnl: {}, $frm: {}, $ctrl: {}, $dlg: {} };
let env = { mode: { search: 1 }, data: {}, ajax: {}, $pnl: {}, $frm: {}, $ctrl: {}, $dlg: {} };
let $items = env.$pnl.items = $('.sbm-panel.Codes');
env.$pnl.header = $items.find('.sbm-panel-header');
env.$pnl.bgr = env.$pnl.header.find('.sbm-burger');
@@ -228,6 +225,7 @@
env.$frm.itemId = $items.find('#frmCodeId');
env.$frm.categories = $('#frmCategories');
var opt = sbm.dlgOpts();
opt.dialogClass += " sbm-Codes";
env.$dlg.item = $items.find('#dlgCode').dialog(opt);
env.$frm.item = env.$dlg.item.find('#frmCode');
env.$frm.item.on('input', '.sbm-input, .sbm-textarea', function () { sbm.clearControlError(this); }).on('change', '.sbm-select', function () { sbm.clearControlError(this); });
SaBusinessMgrCoreWebPortal/wwwroot/js/sbm-contact.js
+36 -29
View File
@@ -10,24 +10,11 @@
//--------------------------------------------------------------
co.refreshConfig = function (env, delay)
{
env.ajax.refreshConfig = env.ajax.refreshConfig || { url: sbm.url.base + 'Contact/Ajax/Config', formSel: env.$frm.itemId, callbackFn: function (response) { co.doRefreshConfig(env, response); } };
sbm.doAjaxRequest(env.ajax.refreshConfig, delay || 50);
sbm.doAjaxRequest(env.ajax.refreshConfig = env.ajax.refreshConfig || { url: sbm.url.base + 'Contact/Ajax/Config', formSel: env.$frm.itemId, callbackFn: function (response) { co.doRefreshConfig(env, response); } }, delay || 50);
}
co.doRefreshConfig = function (env, response)
{
//sbm.debug('doRefreshConfig', env, response);
if (!response.success) return;
// Config.
env.mode = response.mode;
env.config = response.config;
env.configInd = response.configInd;
env.configOrg = response.configOrg;
env.configGrp = response.configGrp;
env.data.organisationTypes = response.organisationTypes;
env.data.titles = response.titles;
env.data.salutations = response.salutations;
env.data.statuses = response.statuses;
env.data.defaultStatusCode = response.defaultStatusCode;
Object.assign(env.data, response.data);
}
//--------------------------------------------------------------
@@ -39,8 +26,7 @@
env.$pnl.table.find('tbody tr').remove();
env.$pnl.msgs.hide().empty().append($('<div class="sbm-message">' + sbm.msg.dataQuerying + '</div>')).fadeIn(200);
}
env.ajax.refreshResults = env.ajax.refreshResults || { url: sbm.url.base + 'Contact/Ajax/List', formSel: env.$frm.filter, callbackFn: function (response) { co.doRefreshResults(env, response); } };
sbm.doAjaxRequest(env.ajax.refreshResults, delay || 50);
sbm.doAjaxRequest(env.ajax.refreshResults = env.ajax.refreshResults || { url: sbm.url.base + 'Contact/Ajax/List', formSel: env.$frm.filter, callbackFn: function (response) { co.doRefreshResults(env, response); } }, delay || 50);
co.awaitingRefreshResponse = true;
}
co.doRefreshResults = function (env, response)
@@ -52,6 +38,7 @@
sbm.refreshPaging(response, env.$frm.filter, function () { co.refreshResults(env); });
if (!response.success) return;
co.doRefreshConfig(env, response);
env.mode = response.mode;
// Menu.
if (env.$pnl.bgr.length)
@@ -59,9 +46,9 @@
env.$pnl.bgr.invisible();
env.$pnl.mnu.empty();
env.$pnl.mnu.append(co.getFilterMenuOption(env, sbm.lbl.refresh, function () { co.refreshResults(env); }, 'sbm-refresh'));
env.$pnl.mnu.append(co.getFilterMenuOption(env, sbm.lbl.createOrg, function () { co.createItem(env, env.configOrg, sbm.dlg.title.createContact); }, 'sbm-add'));
env.$pnl.mnu.append(co.getFilterMenuOption(env, sbm.lbl.createInd, function () { co.createItem(env, env.configInd, sbm.dlg.title.createContact); }, 'sbm-add'));
env.$pnl.mnu.append(co.getFilterMenuOption(env, sbm.lbl.createGrp, function () { co.createItem(env, env.configGrp, sbm.dlg.title.createContact); }, 'sbm-add'));
env.$pnl.mnu.append(co.getFilterMenuOption(env, sbm.lbl.createOrg, function () { co.createItem(env, env.data.cfgOrg, sbm.dlg.title.createContact); }, 'sbm-add'));
env.$pnl.mnu.append(co.getFilterMenuOption(env, sbm.lbl.createInd, function () { co.createItem(env, env.data.cfgInd, sbm.dlg.title.createContact); }, 'sbm-add'));
env.$pnl.mnu.append(co.getFilterMenuOption(env, sbm.lbl.createGrp, function () { co.createItem(env, env.data.cfgGrp, sbm.dlg.title.createContact); }, 'sbm-add'));
env.$pnl.bgr.toggleVisibility(!!$('.sbm-dropdown-item', env.$pnl.mnu).length);
}
@@ -71,13 +58,13 @@
return env.$pnl.msgs.append($('<div class="sbm-message">' + sbm.msg.dataNoneFound + '</div>')).fadeIn(500);
for (const item of items)
$table.append(co.populateItem(env, co.getItemTemplate(env), item));
sbm.configureItemTable(env.config, $table);
sbm.configureItemTable(env.data.cfgList, $table);
}
co.populateItem = function (env, $item, item)
{
if (!item) return $item;
$item.prop('id', co.getItemId(item));
let cfg = env.config;
let cfg = env.data.cfgList;
if (cfg) sbm.populateItemValues(cfg, $item, item.field.value);
if (!env.mode.search)
{
@@ -93,8 +80,9 @@
{
let fnUpd = function () { co.updateItem(env, item.id) };
$mnu.append(co.getItemMenuOption(env, sbm.lbl.edit, fnUpd, 'sbm-edit'));
$('.' + prefix + 'Name', $item).off('click').on('click', fnUpd).addClass('sbm-action-text');
$item.off('dblclick').on('dblclick', fnUpd);
$item.off('dblclick').on('dblclick', fnUpd).find('.' + prefix + 'Name').off('click').on('click', fnUpd).addClass('sbm-action-text');
if (!item.isOwner && !item.isCust) $mnu.append(co.getItemMenuOption(env, sbm.lbl.createCust, function () { co.createCustomer(env, item.id, item.name); }, 'sbm-add'));
if (!item.isOwner && !item.isSupp) $mnu.append(co.getItemMenuOption(env, sbm.lbl.createSupp, function () { co.createSupplier(env, item.id, item.name); }, 'sbm-add'));
}
$bgr.toggle(!!$('.sbm-dropdown-item', $mnu).length);
}
@@ -175,8 +163,7 @@
{
let $frm = env.$frm.itemId;
$('.ContactId', $frm).val(id);
env.ajax.updateItem = env.ajax.updateItem || { url: sbm.url.base + 'Contact/Ajax/GetItem', formSel: $frm, callbackFn: function (response) { co.onUpdateItem(env, response); } };
sbm.doAjaxRequest(env.ajax.updateItem, 50);
sbm.doAjaxRequest(env.ajax.updateItem = env.ajax.updateItem || { url: sbm.url.base + 'Contact/Ajax/GetItem', formSel: $frm, callbackFn: function (response) { co.onUpdateItem(env, response); } }, 50);
}
co.onUpdateItem = function (env, response)
{
@@ -196,11 +183,31 @@
co.openItemDlg(env, cfg, sbm.dlg.title.updateContact);
}
//--------------------------------------------------------------
co.createCustomer = function (env, id, name)
{
co.createAssociation(env, 'CUS', id, name);
}
co.createSupplier = function (env, id, name)
{
co.createAssociation(env, 'SUP', id, name);
}
co.createAssociation = function (env, type, id, name)
{
sbm.fn.createAssociation({ type: type, target: { id: id, name: name }, fnSuccess: function (item) { co.onCreateAssociation(env, item); } });
}
co.onCreateAssociation = function (env, item)
{
sbm.debug('onCreateAssociation', env, item);
let $frm = env.$frm.itemId;
$('.ContactId', $frm).val(item.id);
sbm.doAjaxRequest(env.ajax.refreshItem = env.ajax.refreshItem || { url: sbm.url.base + 'Contact/Ajax/GetItem', formSel: $frm, callbackFn: function (response) { co.onStoreItem(env, response); } }, 50);
}
//--------------------------------------------------------------
co.storeItem = function (env)
{
env.ajax.storeItem = env.ajax.storeItem || { url: sbm.url.base + 'Contact/Ajax/StoreItem', formSel: env.$frm.item, callbackFn: function (response) { co.onStoreItem(env, response); } };
sbm.doAjaxRequest(env.ajax.storeItem, 50);
sbm.doAjaxRequest(env.ajax.storeItem = env.ajax.storeItem || { url: sbm.url.base + 'Contact/Ajax/StoreItem', formSel: env.$frm.item, callbackFn: function (response) { co.onStoreItem(env, response); } }, 50);
}
co.onStoreItem = function (env, response)
{
@@ -282,7 +289,7 @@
//--------------------------------------------------------------
co.initContactEnv = function ($pnlItems)
{
let env = { data: {}, ajax: {}, $pnl: {}, $frm: {}, $ctrl: {}, $dlg: {} };
let env = { mode: { search: 1 }, data: {}, ajax: {}, $pnl: {}, $frm: {}, $ctrl: {}, $dlg: {} };
env.$pnl.items = $($pnlItems);
env.$pnl.header = env.$pnl.items.find('.sbm-panel-header');
SaBusinessMgrCoreWebPortal/wwwroot/js/sbm-main.js
+8 -4
View File
@@ -106,12 +106,16 @@
}
sbm.populateSelect = function ($sel, values, code, desc)
{
code = code || 'code';
desc = desc || 'desc';
$sel = $($sel).empty();
$sel = $($sel).empty(); code = code || 'code'; desc = desc || 'desc';
for (const value of values || [])
$sel.append($('<option>').prop('value', value[code]).text(value[desc]));
}
sbm.refreshSelectCaption = function ($sel, values, code, desc)
{
$sel = $($sel); code = code || 'code'; desc = desc || 'desc';
for (const value of values || [])
$sel.find($('option[value="'+value[code]+'"]').text(value[desc]));
}
sbm.populateSelectCodeDesc = function ($sel, values)
{
sbm.populateSelect($($sel), values);
@@ -138,7 +142,7 @@
}
sbm.initCalendars = function (sel, opt)
{
return $(sel).prop('autocomplete', false).datepicker(opt || {});
return $(sel).prop('autocomplete', 'off').datepicker(opt || {});
}
sbm.allowClearCalendar = function (sel)
{
SaBusinessMgrCoreWebPortal/wwwroot/js/sbm-security.js
+1 -1
View File
@@ -72,7 +72,7 @@
//--------------------------------------------------------------
$(function ()
{
let env = { data: {}, ajax: {}, $pnl: {}, $frm: {}, $ctrl: {}, $dlg: {} };
let env = { mode: { search: 1 }, data: {}, ajax: {}, $pnl: {}, $frm: {}, $ctrl: {}, $dlg: {} };
$(':input:enabled:visible:first').trigger('focus');
$('.sbm-input').on('input', function () { sbm.clearControlError(this); });
SaBusinessMgrCoreWebPortal/wwwroot/js/sbm-trn.js
+77 -77
View File
@@ -5,50 +5,51 @@
(function (win, doc, undef)
{
"use strict";
let co = sbm.mdl.Transactions = { env: {} };
let tr = sbm.mdl.Transactions = { env: {} };
//--------------------------------------------------------------
co.refreshConfig = function (env, delay)
tr.refreshConfig = function (env, delay)
{
sbm.doAjaxRequest(env.ajax.refreshConfig = env.ajax.refreshConfig || { url: sbm.url.base + 'Transaction/Ajax/Config', formSel: env.$frm.filter, callbackFn: function (response) { co.storeConfig(env, response); } }, delay || 50);
sbm.doAjaxRequest(env.ajax.refreshConfig = env.ajax.refreshConfig || { url: sbm.url.base + 'Transaction/Ajax/Config', formSel: env.$frm.filter, callbackFn: function (response) { tr.storeConfig(env, response); } }, delay || 50);
}
co.storeConfig = function (env, response)
tr.storeConfig = function (env, response)
{
Object.assign(env.data, response.data);
}
//--------------------------------------------------------------
co.refreshItems = function (env, delay)
tr.refreshItems = function (env, delay)
{
if (!co.awaitingRefreshResponse)
if (!tr.awaitingRefreshResponse)
{
env.$pnl.bgr.invisible();
env.$pnl.table.find('tbody tr').remove();
env.$pnl.msgs.hide().empty().append($('<div class="sbm-message">' + sbm.msg.dataQuerying + '</div>')).fadeIn(200);
}
sbm.doAjaxRequest(env.ajax.refreshResults = env.ajax.refreshResults || { url: sbm.url.base + 'Transaction/Ajax/List', formSel: env.$frm.filter, callbackFn: function (response) { co.displayItems(env, response); } }, delay || 50);
co.awaitingRefreshResponse = true;
sbm.doAjaxRequest(env.ajax.refreshResults = env.ajax.refreshResults || { url: sbm.url.base + 'Transaction/Ajax/List', formSel: env.$frm.filter, callbackFn: function (response) { tr.displayItems(env, response); } }, delay || 50);
tr.awaitingRefreshResponse = true;
}
co.displayItems = function (env, response)
tr.displayItems = function (env, response)
{
//sbm.debug('doRefreshResults', env, response);
delete co.awaitingRefreshResponse;
delete tr.awaitingRefreshResponse;
env.$pnl.msgs.hide().empty();
let $table = $('table', env.$pnl.table).find('tbody tr').remove().end();
sbm.refreshPaging(response, env.$frm.filter, function () { co.refreshItems(env); });
sbm.refreshPaging(response, env.$frm.filter, function () { tr.refreshItems(env); });
if (!response.success) return;
co.storeConfig(env, response);
tr.storeConfig(env, response);
let cfg = env.data.cfgList;
env.mode = response.mode;
if (cfg.caption) env.$pnl.items.find('.sbm-panel-caption').text(cfg.caption);
sbm.refreshSelectCaption(env.$frm.filter.find('.sbm-select.FilterStatusCat'), response.statusCats);
// Menu.
if (env.$pnl.bgr.length)
{
env.$pnl.bgr.invisible();
env.$pnl.mnu.empty();
env.$pnl.mnu.append(co.getFilterMenuOption(env, sbm.lbl.refresh, function () { co.refreshItems(env); }, 'sbm-refresh'));
if (cfg.action.allow.create) env.$pnl.mnu.append(co.getFilterMenuOption(env, sbm.lbl.create, function () { co.createItem(env, env.data.cfgItemNew); }, 'sbm-add'));
env.$pnl.mnu.append(tr.getFilterMenuOption(env, sbm.lbl.refresh, function () { tr.refreshItems(env); }, 'sbm-refresh'));
if (cfg.action.allow.create) env.$pnl.mnu.append(tr.getFilterMenuOption(env, sbm.lbl.create, function () { tr.createItem(env, env.data.cfgItemNew); }, 'sbm-add'));
env.$pnl.bgr.toggleVisibility(!!$('.sbm-dropdown-item', env.$pnl.mnu).length);
}
@@ -57,13 +58,13 @@
if (!items.length)
return env.$pnl.msgs.append($('<div class="sbm-message">' + sbm.msg.dataNoneFound + '</div>')).fadeIn(500);
for (const item of items)
$table.append(co.populateItem(env, co.getItemTemplate(env), item));
$table.append(tr.populateItem(env, tr.getItemTemplate(env), item));
sbm.configureItemTable(cfg, $table);
}
co.populateItem = function (env, $item, item)
tr.populateItem = function (env, $item, item)
{
if (!item) return $item;
$item.prop('id', co.getItemId(item));
$item.prop('id', tr.getItemId(item));
let cfg = env.data.cfgList;
if (cfg) sbm.populateItemValues(cfg, $item, item.field.value);
let prefix = cfg.column.prefix;
@@ -75,76 +76,75 @@
let $mnu = $('ul.sbm-dropdown-menu', $bgr).empty();
if (!item.deleted)
{
let fnUpd = function () { co.updateItem(env, item.id) };
$mnu.append(co.getItemMenuOption(env, sbm.lbl.edit, fnUpd, 'sbm-edit'));
$('.TransactionCode,.TransactionDesc', $item).off('click').on('click', fnUpd).addClass('sbm-action-text');
$item.off('dblclick').on('dblclick', fnUpd);
let fnUpd = function () { tr.updateItem(env, item.id) };
$mnu.append(tr.getItemMenuOption(env, sbm.lbl.edit, fnUpd, 'sbm-edit'));
$item.off('dblclick').on('dblclick', fnUpd).find('.TransactionReference').off('click').on('click', fnUpd).addClass('sbm-action-text');
}
$bgr.toggle(!!$('.sbm-dropdown-item', $mnu).length);
}
else
{
$item.off('click').on('click', function () { co.selectItemRow(env, $item, item); });
$item.off('dblclick').on('dblclick', function () { co.selectItem(env); });
$item.off('click').on('click', function () { tr.selectItemRow(env, $item, item); });
$item.off('dblclick').on('dblclick', function () { tr.selectItem(env); });
}
return $item;
}
co.getItemId = function (item)
tr.getItemId = function (item)
{
return 'Cmd_' + (item || {}).id;
}
//--------------------------------------------------------------
co.getFilterDropdownTemplate = function (env)
tr.getFilterDropdownTemplate = function (env)
{
return $('.sbm-dropdown-menu.TransactionList li.sbm-dropdown-item', env.$pnl.tmpl).clone();
}
co.getItemTemplate = function (env)
tr.getItemTemplate = function (env)
{
return $('table tr.sbm-row-item.Transaction', env.$pnl.tmpl).clone();
}
co.getItemDropdownTemplate = function (env)
tr.getItemDropdownTemplate = function (env)
{
return $('.sbm-dropdown-menu.Transaction li.sbm-dropdown-item', env.$pnl.tmpl).clone();
}
//--------------------------------------------------------------
co.getFilterMenuOption = function (env, lbl, fn, cls)
tr.getFilterMenuOption = function (env, lbl, fn, cls)
{
return co.getMenuOption(co.getFilterDropdownTemplate(env), lbl, fn, cls);
return tr.getMenuOption(tr.getFilterDropdownTemplate(env), lbl, fn, cls);
}
co.getItemMenuOption = function (env, lbl, fn, cls)
tr.getItemMenuOption = function (env, lbl, fn, cls)
{
return co.getMenuOption(co.getItemDropdownTemplate(env), lbl, fn, cls);
return tr.getMenuOption(tr.getItemDropdownTemplate(env), lbl, fn, cls);
}
co.getMenuOption = function ($opt, lbl, fn, cls)
tr.getMenuOption = function ($opt, lbl, fn, cls)
{
return $opt.find('div.sbm-label').text(lbl).end().on('click', fn).addClass(cls);
}
//--------------------------------------------------------------
co.createItem = function (env, cfg)
tr.createItem = function (env, cfg)
{
co.clearItem(env, cfg);
tr.clearItem(env, cfg);
let $frm = env.$frm.item;
env.$ctrl.trnType.val(env.$frm.filter.find('.sbm-input.FilterType').val());
env.$ctrl.searchTgtAssoc.show();
env.$ctrl.trnStatus.val(env.data.defaultStatusCode).trigger('change');
env.$ctrl.trnRaised.datepicker('setDate', 'today');
co.openItemDlg(env, cfg, sbm.dlg.title.createTransaction);
tr.openItemDlg(env, cfg, sbm.dlg.title.createTransaction);
}
co.clearItem = function (env, cfg)
tr.clearItem = function (env, cfg)
{
sbm.clearItemForm(env.$frm.item);
sbm.populateSelectCodeDesc(env.$ctrl.trnStatus, env.data.statuses);
}
co.openItemDlg = function (env, cfg, title)
tr.openItemDlg = function (env, cfg, title)
{
let $dlg = env.$dlg.item;
let $frm = env.$frm.item;
sbm.configureItemControls(cfg, $frm);
var btns = {};
btns[sbm.lbl.ok] = function () { co.storeItem(env); };
btns[sbm.lbl.ok] = function () { tr.storeItem(env); };
btns[sbm.lbl.cancel] = function () { delete env.prmEdit; $(this).dialog('close'); };
$dlg.dialog('option', 'buttons', btns);
if (title) $dlg.dialog('option', 'title', title);
@@ -152,47 +152,47 @@
}
//--------------------------------------------------------------
co.updateItem = function (env, id)
tr.updateItem = function (env, id)
{
let $frm = env.$frm.itemId;
$('.TransactionId', $frm).val(id);
$('.TransactionDataGroups', $frm).val('Sales');
env.ajax.updateItem = env.ajax.updateItem || { url: sbm.url.base + 'Transaction/Ajax/GetItem', formSel: $frm, callbackFn: function (response) { co.onUpdateItem(env, response); } };
sbm.doAjaxRequest(env.ajax.updateItem, 50);
sbm.doAjaxRequest(env.ajax.updateItem = env.ajax.updateItem || { url: sbm.url.base + 'Transaction/Ajax/GetItem', formSel: $frm, callbackFn: function (response) { tr.onUpdateItem(env, response); } }, 50);
}
co.onUpdateItem = function (env, response)
tr.onUpdateItem = function (env, response)
{
//sbm.debug('onUpdateItem', env, response);
if (!response.success) return;
let cfg = response.config || {};
co.clearItem(env, cfg);
tr.clearItem(env, cfg);
let item = response.transaction;
let $frm = env.$frm.item;
sbm.populateFormValues(cfg, $frm, item.field.value);
let $ctrls = $frm.find('.sbm-input,.sbm-textarea,.sbm-select');
$ctrls.filter('.TransactionId').val(item.id);
$ctrls.filter('.TransactionExists').val(1);
$ctrls.filter('.TransactionType').val(item.typeCode);
$ctrls.filter('.TransactionAssociationId').val(item.field.value.AssociationId);
env.$ctrl.searchTgtAssoc.hide();
sbm.selectOrAdd(env.$ctrl.trnStatus, item.statusCode, item.field.value.Status);
env.$ctrl.trnStatus.trigger('change');
co.openItemDlg(env, cfg, sbm.dlg.title.updateTransaction);
tr.openItemDlg(env, cfg, sbm.dlg.title.updateTransaction);
}
//--------------------------------------------------------------
co.selectAssocTarget = function (env)
tr.selectAssocTarget = function (env)
{
if (!!env.$frm.item.find('.sbm-input.TransactionId').val()) return;
sbm.fn.selectAssociation({ type: env.$frm.filter.find('.FilterAssociationType').val(), fnSuccess: function (item) { co.onSelectAssocTarget(env, item); } });
sbm.fn.selectAssociation({ type: env.$frm.filter.find('.FilterAssociationType').val(), fnSuccess: function (item) { tr.onSelectAssocTarget(env, item); } });
}
co.onSelectAssocTarget = function (env, item)
tr.onSelectAssocTarget = function (env, item)
{
//sbm.debug('onSelectAssocTarget', env, item);
env.$frm.item.find('.TransactionAssociationId').val(item.id);
env.$frm.item.find('.TransactionAssociation').val(item.name);
}
co.onChangeStatus = function (env)
tr.onChangeStatus = function (env)
{
let sta = env.$ctrl.trnStatus.val();
env.$ctrl.trnRaised.prop('readonly', sta != 'PRE');
@@ -204,32 +204,32 @@
}
//--------------------------------------------------------------
co.storeItem = function (env)
tr.storeItem = function (env)
{
env.ajax.storeItem = env.ajax.storeItem || { url: sbm.url.base + 'Transaction/Ajax/StoreItem', formSel: env.$frm.item, callbackFn: function (response) { co.onStoreItem(env, response); } };
sbm.doAjaxRequest(env.ajax.storeItem, 50);
sbm.doAjaxRequest(env.ajax.storeItem = env.ajax.storeItem || { url: sbm.url.base + 'Transaction/Ajax/StoreItem', formSel: env.$frm.item, callbackFn: function (response) { tr.onStoreItem(env, response); } }, 50);
}
co.onStoreItem = function (env, response)
tr.onStoreItem = function (env, response)
{
//sbm.debug('onStoreItem', env, response);
sbm.refreshControlValues(response.controlValues);
if (!response.success) return;
sbm.refreshSelectCaption(env.$frm.filter.find('.sbm-select.FilterStatusCat'), response.statusCats);
env.$dlg.item.dialog('close');
var item = response.transaction;
if (env.prmEdit)
{
co.onItemEdited(env, item);
tr.onItemEdited(env, item);
}
else if (env.$pnl.table.length)
{
env.$pnl.msgs.hide().empty();
var $item = $('#' + co.getItemId(item), env.$pnl.table);
var $item = $('#' + tr.getItemId(item), env.$pnl.table);
if (!$item.length)
{
$item = co.getItemTemplate(env);
$item = tr.getItemTemplate(env);
$('table tbody', env.$pnl.table).prepend($item).show();
}
co.populateItem(env, $item, item);
tr.populateItem(env, $item, item);
sbm.configureItemTable(env.data.cfgList, env.$pnl.table);
}
}
@@ -239,22 +239,22 @@
sbm.fn.selectTransaction = function (prm)
{
//sbm.debug('selectTransaction', prm);
let env = co.env.select;
let env = tr.env.select;
env.prmSelect = prm;
env.$frm.filter.find('.FilterType').val('');
env.$frm.filter.find('.FilterSearch').val(prm.search || '');
env.$pnl.table.find('tbody tr').remove();
sbm.openDialog(env.$dlg.select, 1000, 800);
if (env.$pnl.items.length) setTimeout(function () { co.refreshItems(env); }, 250);
if (env.$pnl.items.length) setTimeout(function () { tr.refreshItems(env); }, 250);
}
co.selectItemRow = function (env, $item, item)
tr.selectItemRow = function (env, $item, item)
{
//sbm.debug('selectItemRow', env, $item, item);
env.$pnl.table.find('tr').removeClass('sbm-sel');
$item.addClass('sbm-sel');
env.prmSelect.item = item;
}
co.selectItem = function (env)
tr.selectItem = function (env)
{
//sbm.debug('selectItem', env, env.prmSelect.item);
env.$dlg.select.dialog('close');
@@ -266,22 +266,22 @@
sbm.fn.editTransaction = function (prm)
{
//sbm.debug('editTransaction', prm);
let env = co.env.select;
let env = tr.env.select;
env.prmEdit = prm;
//sbm.debug(env, prm);
co.updateItem(env, prm.id);
tr.updateItem(env, prm.id);
}
co.onItemEdited = function (env, item)
tr.onItemEdited = function (env, item)
{
//sbm.debug('co.onItemEdited', env, item);
//sbm.debug('tr.onItemEdited', env, item);
env.prmEdit.fnSuccess(item);
delete env.prmEdit;
}
//--------------------------------------------------------------
co.initEnv = function ($pnlItems)
tr.initEnv = function ($pnlItems)
{
let env = { data: {}, ajax: {}, $pnl: {}, $frm: {}, $ctrl: {}, $dlg: {} };
let env = { mode: { search: 1 }, data: {}, ajax: {}, $pnl: {}, $frm: {}, $ctrl: {}, $dlg: {} };
let $items = env.$pnl.items = $($pnlItems);
env.$pnl.header = $items.find('.sbm-panel-header');
@@ -293,7 +293,7 @@
env.$frm.filter = $items.find('.frmTransactionFilter');
if (env.$frm.filter.length)
env.$frm.filter.on('input', '.FilterSearch', function () { co.refreshItems(env, 250); }).on('change', '.sbm-select.FilterType,.sbm-select.FilterStatusCat', function () { co.refreshItems(env, 50); });
env.$frm.filter.on('input', '.FilterSearch', function () { tr.refreshItems(env, 250); }).on('change', '.sbm-select.FilterType,.sbm-select.FilterStatusCat', function () { tr.refreshItems(env, 50); });
env.$frm.itemId = $items.find('#frmTransactionId');
var opt = sbm.dlgOpts();
opt.dialogClass += " sbm-Transaction";
@@ -303,10 +303,10 @@
{
env.$frm.item.on('blur', '.sbm-input.sbm-format-integer', function () { sbm.formatInteger($(this)); }).on('blur', '.sbm-input.sbm-format-currency', function () { sbm.formatCurrency($(this)); });
env.$ctrl.trnType = env.$frm.item.find('.sbm-input.TransactionType');
env.$frm.item.find('.TransactionAssociation').on('dblclick', function () { co.selectAssocTarget(env); });
env.$ctrl.searchTgtAssoc = env.$frm.item.find('.AssociationTargetSearch').on('click', function () { co.selectAssocTarget(env); });
env.$frm.item.find('.TransactionAssociation').on('dblclick', function () { tr.selectAssocTarget(env); });
env.$ctrl.searchTgtAssoc = env.$frm.item.find('.AssociationTargetSearch').on('click', function () { tr.selectAssocTarget(env); });
env.$ctrl.trnStatus = env.$frm.item.find('.sbm-select.TransactionStatus');
if (env.$ctrl.trnStatus.length) env.$ctrl.trnStatus.on('change', function () { co.onChangeStatus(env); });
if (env.$ctrl.trnStatus.length) env.$ctrl.trnStatus.on('change', function () { tr.onChangeStatus(env); });
sbm.initCalendars(env.$frm.item.find('.sbm-input.sbm-calendar'), {});
env.$ctrl.trnRaised = env.$frm.item.find('.sbm-input.TransactionRaised');
env.$ctrl.trnInProgress = env.$frm.item.find('.sbm-input.TransactionInProgress');
@@ -317,7 +317,7 @@
}
var opt = sbm.dlgOpts();
opt.dialogClass += " sbm-Transaction";
opt.buttons[sbm.lbl.ok] = function () { co.selectItem(env); };
opt.buttons[sbm.lbl.ok] = function () { tr.selectItem(env); };
opt.buttons[sbm.lbl.cancel] = function () { delete env.prmSelect; $(this).dialog('close'); };
env.$dlg.select = $('#dlgTransactionSelect').dialog(opt);
@@ -327,14 +327,14 @@
//--------------------------------------------------------------
$(function ()
{
co.env.maint = co.initEnv('.sbm-panel.Transactions');
if (co.env.maint.$pnl.items.length)
tr.env.maint = tr.initEnv('.sbm-panel.Transactions');
if (tr.env.maint.$pnl.items.length)
{
$('body').on('keydown', function (e) { let env = co.env.maint; if (e.which == 45/*Insert*/ && env.data.cfgList.action.allow.create) co.createItem(env, env.data.cfgItemNew); });
setTimeout(function () { co.refreshItems(co.env.maint); }, 250);
$('body').on('keydown', function (e) { let env = tr.env.maint; if (e.which == 45/*Insert*/ && env.data.cfgList.action.allow.create) tr.createItem(env, env.data.cfgItemNew); });
setTimeout(function () { tr.refreshItems(tr.env.maint); }, 250);
}
co.env.select = co.initEnv('#dlgTransactionSelect');
if (co.env.select.$pnl.items.length) setTimeout(function () { co.refreshConfig(co.env.select); }, 250);
tr.env.select = tr.initEnv('#dlgTransactionSelect');
if (tr.env.select.$pnl.items.length) setTimeout(function () { tr.refreshConfig(tr.env.select); }, 250);
});
//--------------------------------------------------------------