Sarand/Common-VS2019
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BusinessMgr

Browse Source
This commit is contained in:
Andy Howard
2024-11-26 11:35:04 +00:00
parent 804a3bd853
commit 48348d64b5
19 changed files with 247 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SacsCoreWeb/Web/Components/SaController.cs
+1
View File
@@ -363,6 +363,7 @@ namespace Sacs.Web.Components
/// <summary>Item code and desc values.</summary>
public class ItemCodeDesc
{
public ItemCodeDesc() { }
public ItemCodeDesc(String code, String desc)
{
this.Code = code;
SacsStandardBase/Base/Bus/SysId.cs
+1 -1
View File
@@ -211,7 +211,7 @@ namespace Sarand.Net.Standard.Base.Bus
/// <returns></returns>
public static String Concat(this ICollection<SysId> values, String delimiter, bool ignoreInvalid = true)
{
List<String> ids = new List<string>();
HashSet<String> ids = new HashSet<string>();
foreach (SysId id in values.Where(id => !ignoreInvalid || SysId.IsValid(id)))
ids.Add(id.ToString());
return ids.Concat(delimiter);
SacsStandardBase/Base/ReferenceData/SaCurrency.cs
+2 -2
View File
@@ -263,8 +263,8 @@ namespace Sarand.Net.Standard.Base.ReferenceData
public new class Params : SacsHierarchyItem.Params
{
// List filtering.
public List<SysId> IncludedIds { get; } = new List<SysId>();
public List<SysId> ExcludedIds { get; } = new List<SysId>();
public List<SysId> IdsIncluded { get; } = new List<SysId>();
public List<SysId> IdsExcluded { get; } = new List<SysId>();
// Currency.
public String Code { get; set; }
public String CodePartial { get; set; }
SacsStandardBase/Base/ReferenceData/SaLanguage.cs
+3 -3
View File
@@ -185,9 +185,9 @@ namespace Sarand.Net.Standard.Base.ReferenceData
public new class Params : SacsHierarchyItem.Params
{
// List filtering.
public List<SysId> IncludedIds { get; } = new List<SysId>();
public List<SysId> ExcludedIds { get; } = new List<SysId>();
// Language.
public List<SysId> IdsIncluded { get; } = new List<SysId>();
public List<SysId> IdsExcluded { get; } = new List<SysId>();
// Item properties.
public String Code { get; set; }
public String CodePartial { get; set; }
public String Name { get; set; }
SacsStandardBase/Base/ReferenceData/SaRegion.cs
+2 -2
View File
@@ -178,8 +178,8 @@ namespace Sarand.Net.Standard.Base.ReferenceData
public new class Params : SacsHierarchyItem.Params
{
// List filtering.
public List<SysId> IncludedIds { get; } = new List<SysId>();
public List<SysId> ExcludedIds { get; } = new List<SysId>();
public List<SysId> IdsIncluded { get; } = new List<SysId>();
public List<SysId> IdsExcluded { get; } = new List<SysId>();
// Region.
public SaRegionType RegionType { get; set; } = SaRegionType.Unknown;
public String Name { get; set; }
SacsStandardBase/Base/ReferenceData/SaTaxCode.cs
+2 -2
View File
@@ -279,8 +279,8 @@ namespace Sarand.Net.Standard.Base.ReferenceData
public new class Params : SacsHierarchyItem.Params
{
// List filtering.
public List<SysId> IncludedIds { get; } = new List<SysId>();
public List<SysId> ExcludedIds { get; } = new List<SysId>();
public List<SysId> IdsIncluded { get; } = new List<SysId>();
public List<SysId> IdsExcluded { get; } = new List<SysId>();
// Tax Code properties.
public String Code { get; set; }
public String CodePartial { get; set; }
SacsStandardBase/Base/ReferenceData/SaUnitMeasure.cs
+2 -4
View File
@@ -319,15 +319,13 @@ namespace Sarand.Net.Standard.Base.ReferenceData
public new class Params : SacsHierarchyItem.Params
{
// List filtering.
public List<SysId> IncludedIds { get; } = new List<SysId>();
public List<SysId> ExcludedIds { get; } = new List<SysId>();
public List<SysId> IdsIncluded { get; } = new List<SysId>();
public List<SysId> IdsExcluded { get; } = new List<SysId>();
// UnitMeasure.
public SaUomCategory Category { get; set; }
public SaUomType UnitType { get; set; }
public String Code { get; set; }
public String CodePartial { get; set; }
public String Desc { get; set; }
public String DescPartial { get; set; }
public String NotesPartial { get; set; }
public StatusCat StatusCat { get; set; } = StatusCat.Any;
}
SacsStandardBase/Base/Security/SaSecurityItem.cs
+3 -3
View File
@@ -436,8 +436,8 @@ namespace Sarand.Net.Standard.Base.Security
/// </summary>
public new class Params : SacsHierarchyItem.Params
{
public List<SysId> IncludedIds { get; } = new List<SysId>();
public List<SysId> ExcludedIds { get; } = new List<SysId>();
public HashSet<SysId> IdsIncluded { get; } = new HashSet<SysId>();
public HashSet<SysId> IdsExcluded { get; } = new HashSet<SysId>();
public SaSecurity.ItemType SecurityItemType { get; set; } = SaSecurity.ItemType.Any;
public String Code { get; set; }
public String CodePartial { get; set; }
@@ -445,7 +445,7 @@ namespace Sarand.Net.Standard.Base.Security
public String EmailAddressPartial { get; set; }
public String Description { get; set; }
public String DescriptionPartial { get; set; }
public List<SysId> IncludedGroupIds { get; } = new List<SysId>();
public HashSet<SysId> GroupIdsIncluded { get; } = new HashSet<SysId>();
public StatusCat StatusCat { get; set; } = StatusCat.EnabledOnly;
}
SacsStandardBase/Base/Utils/StringListUtil.cs
+1 -1
View File
@@ -66,7 +66,7 @@ namespace Sarand.Net.Standard.Base.Utils
/// <summary>Does the list have any entries.</summary>
public static bool IsEmpty (this ICollection<String> values)
{
return (values.Count == 0);
return !values.Any();
}
/// <summary>Case-insensitive contains.</summary>
public static bool ContainsCI (this IEnumerable<String> values, String value)
SacsStandardBase/Base/Utils/StringUtil.cs
+1
View File
@@ -207,6 +207,7 @@ namespace Sarand.Net.Standard.Base.Utils
if (!Decimal.TryParse(value, out number)) return false;
return (allowNegative || number >= 0);
}
//-------------------------------------------------------------------
/// <summary>Test for Hex character.</summary>
public static bool IsHex(this char c)
SacsStandardDbas/Dbas/Interfaces/SaInterfaceProcess_Db_Local.cs
+2 -3
View File
@@ -70,7 +70,6 @@ namespace Sarand.Net.Standard.Dbas.Interfaces
}
public override void PopulateFrom (DbDataReader dbDataReader)
{
String fn = this.GetFn("PopulateFrom");
base.PopulateFrom(dbDataReader);
// 'Process At' legacy fields: ProcDate (Int32) & ProcTime (Int32).
if (!DateUtil.IsValid(_ProcessAt) && colExists_ProcDate && colExists_ProcTime)
@@ -80,7 +79,7 @@ namespace Sarand.Net.Standard.Dbas.Interfaces
// Populate Process datetime from 'ProcDate/Time' integer fields.
_ProcessAt = DateUtil.SetTime(DateUtil.Int32ToDate(dbDataReader.GetInt32(GetColumnOrdinal(dbDataReader, colNameProcDate))), DateUtil.Int32ToTime(dbDataReader.GetInt32(GetColumnOrdinal(dbDataReader, colNameProcTime))));
}
catch (Exception exc) { SaLogger.Warn(fn + " " + ExceptionUtil.GetLogMessage(exc)); }
catch (Exception exc) { SaLogger.Warn($"{SysUtil.Fn} " + ExceptionUtil.GetLogMessage(exc)); }
}
// 'Batch At' legacy fields: BatchDate (Int32) & BatchTime (Int32).
if (!DateUtil.IsValid(_BatchAt) && colExists_BatchDate && colExists_BatchTime)
@@ -90,7 +89,7 @@ namespace Sarand.Net.Standard.Dbas.Interfaces
// Populate Batch datetime from 'BatchDate/Time' integer fields.
_BatchAt = DateUtil.SetTime(DateUtil.Int32ToDate(dbDataReader.GetInt32(GetColumnOrdinal(dbDataReader, colNameBatchDate))), DateUtil.Int32ToTime(dbDataReader.GetInt32(GetColumnOrdinal(dbDataReader, colNameBatchTime))));
}
catch (Exception exc) { SaLogger.Warn(fn + " " + ExceptionUtil.GetLogMessage(exc)); }
catch (Exception exc) { SaLogger.Warn($"{SysUtil.Fn} " + ExceptionUtil.GetLogMessage(exc)); }
}
}
SacsStandardDbas/Dbas/Proc/SaDbProcess_ConvertDbSchema.cs
+1 -2
View File
@@ -63,7 +63,6 @@ namespace Sarand.Net.Standard.Dbas.Proc
public List<DbDfnTable> ConvertXmlToTables(String xmlSchemaData)
{
ClearProcessMessages();
String fn = GetType().Name + ".ConvertXmlToTables";
Dictionary<String, DbDfnTable> tables = new Dictionary<String, DbDfnTable>(StringComparer.OrdinalIgnoreCase);
try
@@ -170,7 +169,7 @@ namespace Sarand.Net.Standard.Dbas.Proc
catch (Exception exc)
{
AddErrorMessage(exc.GetErrorStateMessage());
SaLogger.Warn(fn + " " + ExceptionUtil.GetLogMessage(exc));
SaLogger.Warn($"{SysUtil.Fn} {ExceptionUtil.GetLogMessage(exc)}");
}
return tables.Values.ToList();
SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-Currency.cs
+14 -16
View File
@@ -344,31 +344,29 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData
// Currency Id.
String colCurrency_Id = SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Currency_Id, aliasCurrency);
String includedIds = prm.IncludedIds.Concat(",");
if (!includedIds.IsEmpty())
filter.Add(colCurrency_Id + " IN (" + includedIds + ")");
String excludedIds = prm.ExcludedIds.Concat(",");
if (!excludedIds.IsEmpty())
filter.Add(colCurrency_Id + " NOT IN (" + excludedIds + ")");
if (prm.IdsIncluded.HasValidIds())
filter.Add($"{colCurrency_Id} IN ({prm.IdsIncluded.Concat(",")})");
if (prm.IdsExcluded.HasValidIds())
filter.Add($"{colCurrency_Id} NOT IN ({prm.IdsExcluded.Concat(",")})");
// Code.
String colCurrency_Code = SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Currency_Code, aliasCurrency);
if (!StringUtil.IsEmpty(prm.Code))
filter.Add(colCurrency_Code + "='" + DbQuery.FormatForCondition(prm.Code) + "'");
if (!StringUtil.IsEmpty(prm.CodePartial))
filter.Add(colCurrency_Code + " LIKE '%" + DbQuery.FormatForLike(prm.CodePartial) + "%'");
if (!StringUtil.IsBlank(prm.Code))
filter.Add($"{colCurrency_Code}='{DbQuery.FormatForCondition(prm.Code)}'");
else if (!StringUtil.IsBlank(prm.CodePartial))
filter.Add($"{colCurrency_Code} LIKE '%{DbQuery.FormatForLike(prm.CodePartial)}%'");
// Name.
String colCurrency_Name = SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Currency_Name, aliasCurrency);
if (!StringUtil.IsEmpty(prm.Name))
filter.Add(colCurrency_Name + "='" + DbQuery.FormatForCondition(prm.Name) + "'");
if (!StringUtil.IsEmpty(prm.NamePartial))
filter.Add(colCurrency_Name + " LIKE '%" + DbQuery.FormatForLike(prm.NamePartial) + "%'");
if (!StringUtil.IsBlank(prm.Name))
filter.Add($"{colCurrency_Name}='{DbQuery.FormatForCondition(prm.Name)}'");
else if (!StringUtil.IsBlank(prm.NamePartial))
filter.Add($"{colCurrency_Name} LIKE '%{DbQuery.FormatForLike(prm.NamePartial)}%'");
// RegionId.
String colCurrency_Region = SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Currency_Region, aliasCurrency);
if (SysId.IsValid(prm.RegionId))
filter.Add(colCurrency_Region + "=" + SysId.ToString(prm.RegionId));
filter.Add($"{colCurrency_Region}={SysId.ToLong(prm.RegionId)}");
// Status - no status on currency.
@@ -508,7 +506,7 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData
// Populate filter.
query.Filters.AddRange(GetCurrencyQueryFilter(prm));
if (prm.IncludedIds.Count != 1)
if (prm.IdsIncluded.Count != 1)
{
// Configure sort sequence.
foreach (String sortColumn in GetCurrencySortColumns(prm))
SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-Language.cs
+17 -16
View File
@@ -357,28 +357,29 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData
List<String> filter = new List<String>();
// Language Id.
String includedIds = prm.IncludedIds.Concat(",");
if (!includedIds.IsEmpty())
filter.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Language_Id, aliasLanguage) + " IN (" + includedIds + ")");
String excludedIds = prm.ExcludedIds.Concat(",");
if (!excludedIds.IsEmpty())
filter.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Language_Id, aliasLanguage) + " NOT IN (" + excludedIds + ")");
String colId = SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Language_Id, aliasLanguage);
if (prm.IdsIncluded.HasValidIds())
filter.Add($"{colId} IN ({prm.IdsIncluded.Concat(",")})");
if (prm.IdsExcluded.HasValidIds())
filter.Add($"{colId} NOT IN ({prm.IdsExcluded.Concat(",")})");
// Code.
if (!StringUtil.IsEmpty(prm.Code))
filter.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Language_Code, aliasLanguage) + " = '" + DbQuery.FormatForCondition(prm.Code) + "'");
if (!StringUtil.IsEmpty(prm.CodePartial))
filter.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Language_Code, aliasLanguage) + " LIKE '%" + DbQuery.FormatForLike(prm.CodePartial) + "%'");
String colCode = SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Language_Code, aliasLanguage);
if (!StringUtil.IsBlank(prm.Code))
filter.Add($"{colCode}='{DbQuery.FormatForCondition(prm.Code)}'");
else if (!StringUtil.IsBlank(prm.CodePartial))
filter.Add($"{colCode} LIKE '%{DbQuery.FormatForLike(prm.CodePartial)}%'");
// Name.
if (!StringUtil.IsEmpty(prm.Name))
filter.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Language_Name, aliasLanguage) + " = '" + DbQuery.FormatForCondition(prm.Name) + "'");
if (!StringUtil.IsEmpty(prm.NamePartial))
filter.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Language_Name, aliasLanguage) + " LIKE '%" + DbQuery.FormatForLike(prm.NamePartial) + "%'");
String colName = SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Language_Name, aliasLanguage);
if (!StringUtil.IsBlank(prm.Name))
filter.Add($"{colName}='{DbQuery.FormatForCondition(prm.Name)}'");
else if (!StringUtil.IsBlank(prm.NamePartial))
filter.Add($"{colName} LIKE '%{DbQuery.FormatForLike(prm.NamePartial)}%'");
// Lang Primary Id.
if (SysId.IsValid(prm.LanguageIdPrimary))
filter.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Language_Primary, aliasCurrency) + " = " + SysId.ToString(prm.LanguageIdPrimary,"0"));
filter.Add($"{SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Language_Primary, aliasLanguage)}={SysId.ToLong(prm.LanguageIdPrimary)}");
if (filter.Count < 1 && prm.IncludeDefaultFilter) filter.Add("1=1");
return filter;
@@ -506,7 +507,7 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData
// Populate filter.
query.Filters.AddRange(GetLanguageQueryFilter(prm));
if (prm.IncludedIds.Count != 1)
if (prm.IdsIncluded.Count != 1)
{
// Configure sort sequence.
foreach (String sortColumn in GetLanguageSortColumns(prm))
SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-Region.cs
+9 -10
View File
@@ -340,24 +340,23 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData
List<String> filter = new List<String>();
// Region Id.
String includedIds = prm.IncludedIds.Concat(",");
if (!includedIds.IsEmpty())
filter.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Region_Id, aliasRegion) + " IN (" + includedIds + ")");
String excludedIds = prm.ExcludedIds.Concat(",");
if (!excludedIds.IsEmpty())
filter.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Region_Id, aliasRegion) + " NOT IN (" + excludedIds + ")");
String colId = SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Region_Id, aliasRegion);
if (prm.IdsIncluded.HasValidIds())
filter.Add($"{colId} IN ({prm.IdsIncluded.Concat(",")})");
if (prm.IdsExcluded.HasValidIds())
filter.Add($"{colId} NOT IN ({prm.IdsExcluded.Concat(",")})");
// Type.
if ((int)prm.RegionType > 0)
filter.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Region_Type, aliasRegion) + "='" + regionTypes.GetCodeForType(prm.RegionType) + "'");
filter.Add($"{SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Region_Type, aliasRegion)}='{regionTypes.GetCodeForType(prm.RegionType)}'");
// Parent.
if (SysId.IsValid(prm.RegionIdParent))
filter.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Region_Parent, aliasCurrency) + "=" + SysId.ToInt(prm.RegionIdParent));
filter.Add($"{SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Region_Parent, aliasRegion)}={SysId.ToInt(prm.RegionIdParent)}");
// Status.
if (prm.StatusCat == SaRegion.StatusCat.ActiveOnly)
filter.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Region_Status, aliasRegion) + " In ('" + SacsSystem.GetStatusCode(SaStatus.Current) + "','" + SacsSystem.GetStatusCode(SaStatus.Active) + "')");
filter.Add($"{SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Region_Status, aliasRegion)} In ('{SacsSystem.GetStatusCode(SaStatus.Current)}','{SacsSystem.GetStatusCode(SaStatus.Active)}')");
if (filter.Count < 1 && prm.IncludeDefaultFilter) filter.Add("1=1");
return filter;
@@ -479,7 +478,7 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData
// Populate filter.
query.Filters.AddRange(GetRegionQueryFilter(prm));
if (prm.IncludedIds.Count != 1)
if (prm.IdsIncluded.Count != 1)
{
// Configure sort sequence.
foreach (String sortColumn in GetRegionSortColumns(prm))
SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-TaxCode.cs
+21 -21
View File
@@ -360,45 +360,45 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData
List<String> filter = new List<String>();
// TaxCode Id.
String includedIds = prm.IncludedIds.Concat(",");
if (!includedIds.IsEmpty())
filter.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.TaxCode_Id, aliasTaxCode) + " IN (" + includedIds + ")");
String excludedIds = prm.ExcludedIds.Concat(",");
if (!excludedIds.IsEmpty())
filter.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.TaxCode_Id, aliasTaxCode) + " NOT IN (" + excludedIds + ")");
String colId = SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.TaxCode_Id, aliasTaxCode);
if (prm.IdsIncluded.HasValidIds())
filter.Add($"{colId} IN ({prm.IdsIncluded.Concat(",")})");
if (prm.IdsExcluded.HasValidIds())
filter.Add($"{colId} NOT IN ({prm.IdsExcluded.Concat(",")})");
// Code.
if (!StringUtil.IsEmpty(prm.Code))
filter.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.TaxCode_Code, aliasTaxCode) + "='" + DbQuery.FormatForCondition(prm.Code) + "'");
if (!StringUtil.IsEmpty(prm.CodePartial))
filter.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.TaxCode_Code, aliasTaxCode) + " LIKE '%" + DbQuery.FormatForLike(prm.CodePartial) + "%'");
String colCode = SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.TaxCode_Code, aliasTaxCode);
if (!StringUtil.IsBlank(prm.Code))
filter.Add($"{colCode}='{DbQuery.FormatForCondition(prm.Code)}'");
if (!StringUtil.IsBlank(prm.CodePartial))
filter.Add($"{colCode} LIKE '%{DbQuery.FormatForLike(prm.CodePartial)}%'");
// Code Alt 1.
if (!StringUtil.IsEmpty(prm.CodeAlt1))
filter.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.TaxCode_CodeAlt1, aliasTaxCode) + "='" + DbQuery.FormatForCondition(prm.CodeAlt1) + "'");
if (!StringUtil.IsBlank(prm.CodeAlt1))
filter.Add($"{SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.TaxCode_CodeAlt1, aliasTaxCode)}='{DbQuery.FormatForCondition(prm.CodeAlt1)}'");
// Code Alt 2.
if (!StringUtil.IsEmpty(prm.CodeAlt2))
filter.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.TaxCode_CodeAlt2, aliasTaxCode) + "='" + DbQuery.FormatForCondition(prm.CodeAlt2) + "'");
if (!StringUtil.IsBlank(prm.CodeAlt2))
filter.Add($"{SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.TaxCode_CodeAlt2, aliasTaxCode)}='{DbQuery.FormatForCondition(prm.CodeAlt2)}'");
// RegionId.
if (SysId.IsValid(prm.RegionId))
filter.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.TaxCode_RegionId, aliasTaxCode) + "=" + SysId.ToInt(prm.RegionId));
filter.Add($"{SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.TaxCode_RegionId, aliasTaxCode)}={SysId.ToInt(prm.RegionId)}");
// Effect On.
if (DateUtil.IsValid(prm.EffectOn))
{
filter.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.TaxCode_EffectFrom, aliasTaxCode) + ">" + DbQuery.FormatDateForCondition(prm.EffectOn));
filter.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.TaxCode_EffectTo, aliasTaxCode) + "<" + DbQuery.FormatDateForCondition(DateUtil.IncrementDate(prm.EffectOn,1)));
filter.Add($"{SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.TaxCode_EffectFrom, aliasTaxCode)}>{DbQuery.FormatDateForCondition(prm.EffectOn)}");
filter.Add($"{SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.TaxCode_EffectTo, aliasTaxCode)}<{DbQuery.FormatDateForCondition(DateUtil.IncrementDate(prm.EffectOn, 1))}");
}
// Notes.
if (!StringUtil.IsEmpty(prm.NotesPartial))
filter.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.TaxCode_Notes, aliasTaxCode) + " LIKE '%" + DbQuery.FormatForLike(prm.NotesPartial) + "%'");
if (!StringUtil.IsBlank(prm.NotesPartial))
filter.Add($"{SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.TaxCode_Notes, aliasTaxCode)} LIKE '%{DbQuery.FormatForLike(prm.NotesPartial)}%'");
// Status.
if (prm.StatusCat == SaTaxCode.StatusCat.ActiveOnly)
filter.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.TaxCode_Status, aliasTaxCode) + " In ('" + SacsSystem.GetStatusCode(SaStatus.Current) + "','" + SacsSystem.GetStatusCode(SaStatus.Active) + "')");
filter.Add($"{SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.TaxCode_Status, aliasTaxCode)} In ('{SacsSystem.GetStatusCode(SaStatus.Current)}','{SacsSystem.GetStatusCode(SaStatus.Active)}')");
if (filter.Count < 1 && prm.IncludeDefaultFilter) filter.Add("1=1");
return filter;
@@ -534,7 +534,7 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData
// Populate filter.
query.Filters.AddRange(GetTaxCodeQueryFilter(prm));
if (prm.IncludedIds.Count != 1)
if (prm.IdsIncluded.Count != 1)
{
// Configure sort sequence.
foreach (String sortColumn in GetTaxCodeSortColumns(prm))
SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-UnitMeasure.cs
+18 -26
View File
@@ -372,42 +372,34 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData
List<String> filter = new List<String>();
// UnitMeasure Id.
String includedIds = prm.IncludedIds.Concat(",");
if (!includedIds.IsEmpty())
filter.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.UnitMeasure_Id, aliasUnitMeasure) + " IN (" + includedIds + ")");
String excludedIds = prm.ExcludedIds.Concat(",");
if (!excludedIds.IsEmpty())
filter.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.UnitMeasure_Id, aliasUnitMeasure) + " NOT IN (" + excludedIds + ")");
String colId = SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.UnitMeasure_Id, aliasUnitMeasure);
if (prm.IdsIncluded.HasValidIds())
filter.Add($"{colId} IN ({prm.IdsIncluded.Concat(",")})");
if (prm.IdsExcluded.HasValidIds())
filter.Add($"{colId} NOT IN ({prm.IdsExcluded.Concat(",")})");
// Category.
/*
if (!StringUtil.IsEmpty(prm.Category))
filter.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.UnitMeasure_Category, aliasUnitMeasure) + " = '" + DbQuery.FormatForCondition(prm.Category) + "'");
if (!StringUtil.IsEmpty(prm.CategoryPartial))
filter.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.UnitMeasure_Category, aliasUnitMeasure) + " LIKE '%" + DbQuery.FormatForLike(prm.CategoryPartial) + "%'");
if (prm.Category > 0)
filter.Add($"{SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.UnitMeasure_Category, aliasUnitMeasure)}={(int)prm.Category}");
// Unit Type.
if (!StringUtil.IsEmpty(prm.UnitType))
filter.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.UnitMeasure_UnitType, aliasUnitMeasure) + " = '" + DbQuery.FormatForCondition(prm.UnitType) + "'");
if (!StringUtil.IsEmpty(prm.UnitTypePartial))
filter.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.UnitMeasure_UnitType, aliasUnitMeasure) + " LIKE '%" + DbQuery.FormatForLike(prm.UnitTypePartial) + "%'");
*/
if (prm.UnitType > 0)
filter.Add($"{SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.UnitMeasure_UnitType, aliasUnitMeasure)}={(int)prm.UnitType}");
// Code.
if (!StringUtil.IsEmpty(prm.Code))
filter.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.UnitMeasure_Code, aliasUnitMeasure) + " = '" + DbQuery.FormatForCondition(prm.Code) + "'");
if (!StringUtil.IsEmpty(prm.CodePartial))
filter.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.UnitMeasure_Code, aliasUnitMeasure) + " LIKE '%" + DbQuery.FormatForLike(prm.CodePartial) + "%'");
String colCode = SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.UnitMeasure_Code, aliasUnitMeasure);
if (!StringUtil.IsBlank(prm.Code))
filter.Add($"{colCode}='{DbQuery.FormatForCondition(prm.Code)}'");
else if (!StringUtil.IsBlank(prm.CodePartial))
filter.Add($"{colCode} LIKE '%{DbQuery.FormatForLike(prm.CodePartial)}%'");
// Notes.
/*
if (!StringUtil.IsEmpty(prm.NotesPartial))
filter.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.UnitMeasure_Notes, aliasUnitMeasure) + " LIKE '%" + DbQuery.FormatForLike(prm.NotesPartial) + "%'");
if (!StringUtil.IsBlank(prm.NotesPartial))
filter.Add($"{SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.UnitMeasure_Notes, aliasUnitMeasure)} LIKE '%{DbQuery.FormatForLike(prm.NotesPartial)}%'");
// Status.
if (prm.StatusCat == SaUnitMeasure.StatusCat.ActiveOnly)
filter.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.UnitMeasure_Status, aliasUnitMeasure) + " = '" + SacsSystem.GetStatusCode(SaStatus.Active) + "'");
*/
filter.Add($"{SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.UnitMeasure_Status, aliasUnitMeasure)}='{SacsSystem.GetStatusCode(SaStatus.Active)}'");
if (filter.Count < 1 && prm.IncludeDefaultFilter) filter.Add("1=1");
return filter;
@@ -547,7 +539,7 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData
// Populate filter.
query.Filters.AddRange(GetUnitMeasureQueryFilter(prm));
if (prm.IncludedIds.Count != 1)
if (prm.IdsIncluded.Count != 1)
{
// Configure sort sequence.
foreach (String sortColumn in GetUnitMeasureSortColumns(prm))
SacsStandardDbas/Dbas/Security/SaSecurityConsole_Dbas.cs
+5 -5
View File
@@ -286,8 +286,8 @@ namespace Sarand.Net.Standard.Dbas.Security
// Retrieve security Group and Right items.
SaSecurityItem.Params prmSecItem = new SaSecurityItem.Params();
prmSecItem.IncludedIds.AddRange(groupLinks.GetTargetItemIds());
prmSecItem.IncludedIds.AddRange(rightLinks.GetTargetItemIds());
prmSecItem.IdsIncluded.UnionWith(groupLinks.GetTargetItemIds());
prmSecItem.IdsIncluded.UnionWith(rightLinks.GetTargetItemIds());
List<SaSecurityItem> secItems = securityMgr.GetSecurityItemList(prmSecItem);
// Add the Groups to the profile.
@@ -437,7 +437,7 @@ namespace Sarand.Net.Standard.Dbas.Security
// Filter.
SaSecurityItem.Params prmSecItem = new SaSecurityItem.Params();
prmSecItem.IncludedIds.Add(itemId);
prmSecItem.IdsIncluded.Add(itemId);
prmSecItem.StatusCat = SaSecurityItem.StatusCat.Any;
if (securityMgr.GetSecurityItemCount(prmSecItem) != 1) return null;
@@ -469,7 +469,7 @@ namespace Sarand.Net.Standard.Dbas.Security
// Filter.
SaSecurityItem.Params prmSecItem = new SaSecurityItem.Params();
prmSecItem.IncludedIds.Add(itemId);
prmSecItem.IdsIncluded.Add(itemId);
prmSecItem.StatusCat = SaSecurityItem.StatusCat.Any;
if (securityMgr.GetSecurityItemCount(prmSecItem) != 1) return null;
@@ -498,7 +498,7 @@ namespace Sarand.Net.Standard.Dbas.Security
// Filter.
SaSecurityItem.Params prmSecItem = new SaSecurityItem.Params();
prmSecItem.IncludedIds.AddRange(securityItemIds);
prmSecItem.IdsIncluded.UnionWith(securityItemIds);
prmSecItem.StatusCat = SaSecurityItem.StatusCat.Any;
// Execute query.
SacsStandardDbas/Dbas/Security/SaSecurityMgr_Dbas-SecurityItem.cs
+21 -23
View File
@@ -61,7 +61,7 @@ namespace Sarand.Net.Standard.Dbas.Security
ClearErrorState();
if (!SysId.IsValid(id)) return false;
SaSecurityItem.Params prmSecItem = new SaSecurityItem.Params();
prmSecItem.IncludedIds.Add(id);
prmSecItem.IdsIncluded.Add(id);
prmSecItem.StatusCat = SaSecurityItem.StatusCat.Any;
return GetSecurityItemCount(prmSecItem) == 1;
}
@@ -111,7 +111,7 @@ namespace Sarand.Net.Standard.Dbas.Security
ClearErrorState();
if (!SysId.IsValid(id)) return null;
SaSecurityItem.Params prmSecItem = new SaSecurityItem.Params();
prmSecItem.IncludedIds.Add(id);
prmSecItem.IdsIncluded.Add(id);
prmSecItem.StatusCat = SaSecurityItem.StatusCat.Any;
return GetSecurityItem(GetSecurityItemQueryFilter(prmSecItem).Concat(" AND ", "(", ")"));
}
@@ -120,7 +120,7 @@ namespace Sarand.Net.Standard.Dbas.Security
ClearErrorState();
if ((int)securityItemType < 1 || !SysId.IsValid(id)) return null;
SaSecurityItem.Params prmSecItem = new SaSecurityItem.Params();
prmSecItem.IncludedIds.Add(id);
prmSecItem.IdsIncluded.Add(id);
prmSecItem.SecurityItemType = securityItemType;
prmSecItem.StatusCat = SaSecurityItem.StatusCat.Any;
return GetSecurityItem(GetSecurityItemQueryFilter(prmSecItem).Concat(" AND ", "(", ")"));
@@ -421,43 +421,41 @@ namespace Sarand.Net.Standard.Dbas.Security
// Security Item Id.
String colId = SaSecurityDbDfn.GetColumnNameQual(SaSecurityDbDfn.ColumnIdx.SaSecItem_Id, aliasSecurityItem);
String includedIds = prm.IncludedIds.Concat(",");
if (!includedIds.IsEmpty())
filter.Add(colId + " IN (" + includedIds + ")");
String excludedIds = prm.ExcludedIds.Concat(",");
if (!excludedIds.IsEmpty())
filter.Add(colId + " NOT IN (" + excludedIds + ")");
if (prm.IdsIncluded.HasValidIds())
filter.Add($"{colId} IN ({prm.IdsIncluded.Concat(",")})");
if (prm.IdsExcluded.HasValidIds())
filter.Add($"{colId} NOT IN ({prm.IdsExcluded.Concat(",")})");
// Item type.
String colType = SaSecurityDbDfn.GetColumnNameQual(SaSecurityDbDfn.ColumnIdx.SaSecItem_Type, aliasSecurityItem);
if (prm.SecurityItemType > 0)
filter.Add(colType + "=" + (int)prm.SecurityItemType);
filter.Add($"{colType}={(int)prm.SecurityItemType}");
// Code.
String colCode = SaSecurityDbDfn.GetColumnNameQual(SaSecurityDbDfn.ColumnIdx.SaSecItem_Code, aliasSecurityItem);
if (!StringUtil.IsEmpty(prm.Code))
filter.Add(colCode + "='" + DbQuery.FormatForCondition(prm.Code) + "'");
if (!StringUtil.IsEmpty(prm.CodePartial))
filter.Add(colCode + " LIKE '%" + DbQuery.FormatForLike(prm.CodePartial) + "%'");
filter.Add($"{colCode}='{DbQuery.FormatForCondition(prm.Code)}'");
else if (!StringUtil.IsEmpty(prm.CodePartial))
filter.Add($"{colCode} LIKE '%{DbQuery.FormatForLike(prm.CodePartial)}%'");
// Email address.
String colEmailAddress = SaSecurityDbDfn.GetColumnNameQual(SaSecurityDbDfn.ColumnIdx.SaSecItem_EmailAddress, aliasSecurityItem);
if (!StringUtil.IsEmpty(prm.EmailAddress))
filter.Add(colEmailAddress + "='" + DbQuery.FormatForCondition(prm.EmailAddress) + "'");
if (!StringUtil.IsEmpty(prm.EmailAddressPartial))
filter.Add(colEmailAddress + " LIKE '%" + DbQuery.FormatForLike(prm.EmailAddressPartial) + "%'");
filter.Add($"{colEmailAddress}='{DbQuery.FormatForCondition(prm.EmailAddress)}'");
else if (!StringUtil.IsEmpty(prm.EmailAddressPartial))
filter.Add($"{colEmailAddress} LIKE '%{DbQuery.FormatForLike(prm.EmailAddressPartial)}%'");
// Description.
String colDesc = SaSecurityDbDfn.GetColumnNameQual(SaSecurityDbDfn.ColumnIdx.SaSecItem_Description, aliasSecurityItem);
if (!StringUtil.IsEmpty(prm.Description))
filter.Add(colDesc + "='" + DbQuery.FormatForCondition(prm.Description) + "'");
filter.Add($"{colDesc}='{DbQuery.FormatForCondition(prm.Description)}'");
if (!StringUtil.IsEmpty(prm.DescriptionPartial))
filter.Add(colDesc + " LIKE '%" + DbQuery.FormatForLike(prm.DescriptionPartial) + "%'");
filter.Add($"{colDesc} LIKE '%{DbQuery.FormatForLike(prm.DescriptionPartial)}%'");
// Security Groups.
String includedGroupIds = prm.IncludedGroupIds.Concat(",");
String includedGroupIds = prm.GroupIdsIncluded.Concat(",");
if (!includedGroupIds.IsEmpty())
filter.Add(colId + " IN " +
filter.Add($"{colId} IN " +
"(Select " + SaSecurityDbDfn.GetColumnNameQual(SaSecurityDbDfn.ColumnIdx.SaSecLink_ItemOwner) +
" FROM " + SaSecurityDbDfn.GetTableName(SaSecurityDbDfn.TableIdx.SaSecLink) +
" WHERE " + SaSecurityDbDfn.GetColumnNameQual(SaSecurityDbDfn.ColumnIdx.SaSecLink_ItemTarget) + " IN (" + includedGroupIds + "))");
@@ -465,9 +463,9 @@ namespace Sarand.Net.Standard.Dbas.Security
// Status.
String colStatus = SaSecurityDbDfn.GetColumnNameQual(SaSecurityDbDfn.ColumnIdx.SaSecItem_Status, aliasSecurityItem);
if (prm.StatusCat == SaSecurityItem.StatusCat.EnabledOnly)
filter.Add(colStatus + " = '" + SacsSystem.GetStatusCode(SaStatus.Enabled) + "'");
filter.Add($"{colStatus}='{SacsSystem.GetStatusCode(SaStatus.Enabled)}'");
else if (prm.StatusCat == SaSecurityItem.StatusCat.DisabledOnly)
filter.Add(colStatus + " = '" + SacsSystem.GetStatusCode(SaStatus.Disabled) + "'");
filter.Add($"{colStatus}='{SacsSystem.GetStatusCode(SaStatus.Disabled)}'");
if (filter.Count < 1 && prm.IncludeDefaultFilter) filter.Add("1=1");
return filter;
@@ -655,7 +653,7 @@ namespace Sarand.Net.Standard.Dbas.Security
// Populate filter.
query.Filters.AddRange(GetSecurityItemQueryFilter(prm));
if (prm.IncludedIds.Count != 1)
if (prm.IdsIncluded.Count != 1)
{
// Configure sort sequence.
foreach (String sortColumn in GetSecurityItemSortColumns(prm))