From 1692179120ba74782bbbff3f1efde6f67a3cf20d Mon Sep 17 00:00:00 2001 From: Andy Howard Date: Sat, 1 Feb 2025 17:53:29 +0000 Subject: [PATCH] BusinessMgr --- SacsCoreWeb/Web/Components/SaController.cs | 11 +++ .../Base/Bus/SacsHierarchyItem.cs | 11 +-- SacsStandardBase/Base/Bus/SacsItemMgr.cs | 12 ++-- SacsStandardBase/Base/Bus/SysIdDecimal.cs | 71 +++++++++++++++++++ .../Base/ItemData/SaItemDataConsole.cs | 30 ++++---- .../Base/ItemDocs/SaItemDocConsole.cs | 31 ++++---- .../Base/Security/SaSecurityLink.cs | 26 +++---- .../Dbas/CodeTypes/SaCodeTypeMgr_Dbas.cs | 52 +++++++------- .../SaInterfaceMgr_Dbas-InterfaceDataItems.cs | 32 ++++----- ...erfaceMgr_Dbas-InterfaceProcessMessages.cs | 24 +++---- .../SaInterfaceMgr_Dbas-InterfaceProcesses.cs | 46 ++++++------ .../SaInterfaceMgr_Dbas-Interfaces.cs | 26 +++---- .../Dbas/ItemData/SaItemDataMgr_Dbas.cs | 18 ++--- .../Dbas/ItemDocs/SaItemDocConsole_Dbas.cs | 18 ++--- .../Dbas/ItemDocs/SaItemDocMgr_Dbas.cs | 26 +++---- .../Dbas/ItemOptions/SaItemOptionMgr_Dbas.cs | 18 ++--- .../SbmReferenceDataMgr_Dbas-Language.cs | 20 +++--- .../SbmReferenceDataMgr_Dbas-Region.cs | 16 ++--- .../SbmReferenceDataMgr_Dbas-TaxCode.cs | 30 ++++---- .../SbmReferenceDataMgr_Dbas-UnitMeasure.cs | 34 ++++----- .../SaSecurityMgr_Dbas-SecurityItem.cs | 28 ++++---- .../SaSecurityMgr_Dbas-SecurityLink.cs | 22 +++--- .../Dbas/UpdateLog/SaUpdateLogMgr_Dbas.cs | 22 +++--- 23 files changed, 355 insertions(+), 269 deletions(-) create mode 100644 SacsStandardBase/Base/Bus/SysIdDecimal.cs diff --git a/SacsCoreWeb/Web/Components/SaController.cs b/SacsCoreWeb/Web/Components/SaController.cs index 2fbd838..f83bcd6 100644 --- a/SacsCoreWeb/Web/Components/SaController.cs +++ b/SacsCoreWeb/Web/Components/SaController.cs @@ -298,6 +298,17 @@ namespace Sacs.Web.Components { } + //--------------------------------------------------------------- + /// + /// Field values - automated population of list iten properties, + /// eg. in table cells with matching (prefixed) class name. + /// + public class FieldValuesData + { + // Item property values keyed to match field name. + public Dictionary Value { get; } = new Dictionary(); + } + //--------------------------------------------------------------- /// Item data - Common properties for data items. public class ItemData_Base diff --git a/SacsStandardBase/Base/Bus/SacsHierarchyItem.cs b/SacsStandardBase/Base/Bus/SacsHierarchyItem.cs index 84509c1..45b32e7 100644 --- a/SacsStandardBase/Base/Bus/SacsHierarchyItem.cs +++ b/SacsStandardBase/Base/Bus/SacsHierarchyItem.cs @@ -333,17 +333,18 @@ namespace Sarand.Net.Standard.Base.Bus //------------------------------------------------------------------- // Properties. - public virtual bool ItemHasId { get; } = true; + /// By default, all hierarchy itrems have an Id.
Override and return false where this is not the case. + public virtual bool ItemHasId() { return true; } public SysId Id { get { - if (!ItemHasId) throw new NotSupportedException($"{SysUtil.Fn}.get - Item has no Id property."); + if (!ItemHasId()) throw new NotSupportedException($"{SysUtil.Fn}.get - Item has no Id property."); return data.Id; } set { - if (!ItemHasId && SysId.IsValid(data.Id)) throw new NotSupportedException($"{SysUtil.Fn}.set - Item has no Id property."); + if (!ItemHasId() && SysId.IsValid(data.Id)) throw new NotSupportedException($"{SysUtil.Fn}.set - Item has no Id property."); if (SysId.IsValid(data.Id) && (!SysId.IsValid(value) || !data.Id.Equals(value))) throw new NotSupportedException($"{SysUtil.Fn}.set - Id already has a valid value."); data.Id = value; @@ -443,9 +444,9 @@ namespace Sarand.Net.Standard.Base.Bus if (this.data.GetType() != typeof(Data)) throw new NotSupportedException($"{SysUtil.Fn} Data object has already been specified"); // If Id has already been specified (on construction) and supplied Id is not valid, set it to the existing value. - if (ItemHasId && SysId.IsValid(Id) && !SysId.IsValid(data.Id)) data.Id = Id; + if (ItemHasId() && SysId.IsValid(Id) && !SysId.IsValid(data.Id)) data.Id = Id; // Properties that cannot be changed if previously specified. - if (ItemHasId && SysId.IsValid(Id) && SysId.ToInt(Id) != SysId.ToInt(data.Id)) + if (ItemHasId() && SysId.IsValid(Id) && SysId.ToInt(Id) != SysId.ToInt(data.Id)) throw new NotSupportedException($"{SysUtil.Fn} Id cannot be changed"); this.data.PopulateTo(data); this.data = data; diff --git a/SacsStandardBase/Base/Bus/SacsItemMgr.cs b/SacsStandardBase/Base/Bus/SacsItemMgr.cs index 6d6f417..3846635 100644 --- a/SacsStandardBase/Base/Bus/SacsItemMgr.cs +++ b/SacsStandardBase/Base/Bus/SacsItemMgr.cs @@ -16,22 +16,24 @@ namespace Sarand.Net.Standard.Base.Bus //------------------------------------------------------------------- // Data members. + public const String Msg_DatabaseNotAvailable = "database is not available"; + public const String Msg_InvalidItemSpecified = "Invalid item specified"; //------------------------------------------------------------------- // Static initialisation. - static SacsItemMgr () + static SacsItemMgr() { } //------------------------------------------------------------------- // Construction. - protected SacsItemMgr () + protected SacsItemMgr() { } //------------------------------------------------------------------- // Disposal. - protected override void Dispose (bool disposing) + protected override void Dispose(bool disposing) { if (disposing) { @@ -47,7 +49,7 @@ namespace Sarand.Net.Standard.Base.Bus //------------------------------------------------------------------- // String attribute validation (mandatory and maximum length. // If the value fails the validation, an exception is set: - protected bool IsValidValue (String value, String attributeName, long maxLen, bool mandatory = false, bool fixedLen = false) + protected bool IsValidValue(String value, String attributeName, long maxLen, bool mandatory = false, bool fixedLen = false) { // Check for mandatory values: if (mandatory && StringUtil.IsBlank(value)) @@ -64,7 +66,7 @@ namespace Sarand.Net.Standard.Base.Bus //------------------------------------------------------------------- // S o r t C o l u m n s //------------------------------------------------------------------- - protected void AddRandomSortColumn (SacsHierarchyItem.Params prm, HashSet sortColumns) + protected void AddRandomSortColumn(SacsHierarchyItem.Params prm, HashSet sortColumns) { if (!prm.RandomOrder) return; if (sortColumns.Any()) diff --git a/SacsStandardBase/Base/Bus/SysIdDecimal.cs b/SacsStandardBase/Base/Bus/SysIdDecimal.cs new file mode 100644 index 0000000..950b4f7 --- /dev/null +++ b/SacsStandardBase/Base/Bus/SysIdDecimal.cs @@ -0,0 +1,71 @@ +using System; +using System.Collections.Generic; + +namespace Sarand.Net.Standard.Base.Bus +{ + //======================================================================= + public class SysIdDecimal + { + //------------------------------------------------------------------- + // Construction. + public SysIdDecimal(SysId id, decimal value) + { + Id = id; + Value = value; + } + + //------------------------------------------------------------------- + // Properties. + public SysId Id { get; private set; } = new SysId(); + public decimal Value { get; private set; } + + //------------------------------------------------------------------- + // Utilities. + + //------------------------------------------------------------------- + // Comparison. + public override bool Equals(object obj) + { + if (obj == null) return false; + if (!(obj is SysIdDecimal)) return false; + return Equals(obj as SysIdDecimal); + } + public bool Equals(SysIdDecimal value) + { + if (value == null) return false; + // False if either Id value invalid. + if (SysId.IsValid(this.Id) != SysId.IsValid(value.Id)) return false; + return (SysId.ToInt(Id).Equals(SysId.ToInt(value.Id)) && Value.Equals(value.Value)); + } + public override int GetHashCode() + { + return SysId.ToInt(Id); + } + + //------------------------------------------------------------------- + // Conversion. + + //------------------------------------------------------------------- + } + + //======================================================================= + public static class SysIdDecimalList + { + public static void Add(this List values, SysId id, decimal value) + { + values.Add(new SysIdDecimal(id, value)); + } + public static decimal GetValueForId(this List values, SysId id) + { + if (SysId.IsValid(id)) + { + foreach (SysIdDecimal value in values) + if (value.Id.Equals(id)) + return value.Value; + } + return 0.0m; + } + } + + //======================================================================= +} diff --git a/SacsStandardBase/Base/ItemData/SaItemDataConsole.cs b/SacsStandardBase/Base/ItemData/SaItemDataConsole.cs index 8a2df9f..3511e20 100644 --- a/SacsStandardBase/Base/ItemData/SaItemDataConsole.cs +++ b/SacsStandardBase/Base/ItemData/SaItemDataConsole.cs @@ -18,13 +18,13 @@ namespace Sarand.Net.Standard.Base.ItemData //------------------------------------------------------------------- // Static initialisation. - static SaItemDataConsole () + static SaItemDataConsole() { } //------------------------------------------------------------------- // Construction. - protected SaItemDataConsole () + protected SaItemDataConsole() { } @@ -38,30 +38,30 @@ namespace Sarand.Net.Standard.Base.ItemData // I t e m D a t a //------------------------------------------------------------------- /// Type codes - specific for each type of item. - public abstract List GetDataTypeCodes (int itemType); + public abstract List GetDataTypeCodes(int itemType); //------------------------------------------------------------------- // Item data interface. - public abstract bool CanUpdateItemData (SaItemData itemData); - public abstract bool DoUpdateItemData (SaItemData itemData); - public abstract bool CanRemoveItemData (SaItemData itemData); + public abstract bool CanUpdateItemData(SaItemData itemData); + public abstract bool DoUpdateItemData(SaItemData itemData); + public abstract bool CanRemoveItemData(SaItemData itemData); //------------------------------------------------------------------- // Retrieve item data entries that match the specified params. - public abstract bool ItemDataExists (SaItemData.Params prmItemData); - public abstract long GetItemDataCount (SaItemData.Params prmItemData); - public abstract List GetItemDataList (SaItemData.Params prmItemData); + public abstract bool ItemDataExists(SaItemData.Params prmItemData); + public abstract long GetItemDataCount(SaItemData.Params prmItemData); + public abstract List GetItemDataList(SaItemData.Params prmItemData); //------------------------------------------------------------------- // Create a new item data. - public abstract SaItemData CreateItemData (ItemId itemId); - + public abstract SaItemData CreateItemData(ItemId itemId); + //------------------------------------------------------------------- // Store item data. - public abstract bool Store (SaItemData itemData, DbUpdateInfo dbUpdateInfo); - public abstract bool Remove (SaItemData itemData, DbUpdateInfo dbUpdateInfo); - public abstract bool ClearItemData (ItemId itemId, DbUpdateInfo dbUpdateInfo); - public abstract bool ClearItemData (ItemId itemId, String dataType, DbUpdateInfo dbUpdateInfo); + public abstract bool Store(SaItemData itemData, DbUpdateInfo dbUpdateInfo); + public abstract bool Remove(SaItemData itemData, DbUpdateInfo dbUpdateInfo); + public abstract bool ClearItemData(ItemId itemId, DbUpdateInfo dbUpdateInfo); + public abstract bool ClearItemData(ItemId itemId, String dataType, DbUpdateInfo dbUpdateInfo); //------------------------------------------------------------------- } diff --git a/SacsStandardBase/Base/ItemDocs/SaItemDocConsole.cs b/SacsStandardBase/Base/ItemDocs/SaItemDocConsole.cs index 3ff102f..734aa35 100644 --- a/SacsStandardBase/Base/ItemDocs/SaItemDocConsole.cs +++ b/SacsStandardBase/Base/ItemDocs/SaItemDocConsole.cs @@ -29,13 +29,13 @@ namespace Sarand.Net.Standard.Base.ItemDocs //------------------------------------------------------------------- // Static initialisation. - static SaItemDocConsole () + static SaItemDocConsole() { } //------------------------------------------------------------------- // Construction. - protected SaItemDocConsole () + protected SaItemDocConsole() { } @@ -49,35 +49,36 @@ namespace Sarand.Net.Standard.Base.ItemDocs // I t e m D o c s //------------------------------------------------------------------- // Category codes. - public abstract List GetCategoryCodes (); + public abstract List GetCategoryCodes(); /// eg. for 'Image' documents. - public abstract List GetCategoryTypeCodes (Category category); + public abstract List GetCategoryTypeCodes(Category category); //------------------------------------------------------------------- // 'Recent' and 'Favourite' folders - to populate drop-down list when selecting folder: /// How many recent foldes to retain? [default:5] - public abstract int GetMaxRecentFolderCount (); + public abstract int GetMaxRecentFolderCount(); /// List of favourites to always include in dropdown. - public abstract void SetFavouriteFolders (List folders); + public abstract void SetFavouriteFolders(List folders); /// Mix of recent and favourites. - public abstract List GetSuggestedFolders (); + public abstract List GetSuggestedFolders(); //------------------------------------------------------------------- // Retrieve list of docs that match the specified params: - public abstract bool ItemDocsExist (SaItemDoc.Params prmItemDoc); - public abstract List GetItemDocs (SaItemDoc.Params prmItemDoc); + public abstract bool ItemDocsExist(SaItemDoc.Params prmItemDoc); + public abstract List GetItemDocs(SaItemDoc.Params prmItemDoc); // Create a new document: - public abstract SaItemDoc CreateItemDoc (ItemId itemId, Category category); + public abstract SaItemDoc CreateItemDoc(ItemId itemId, Category category); // Store documents: - public abstract bool StoreItemDoc (SaItemDoc itemDoc, DbUpdateInfo dbUpdateInfo); - public abstract bool StoreItemDocs (List itemDocs, DbUpdateInfo dbUpdateInfo); - public abstract bool RemoveItemDoc (SaItemDoc itemDoc, DbUpdateInfo dbUpdateInfo); - public abstract bool ClearItemDocs (ItemId itemId, Category category, DbUpdateInfo dbUpdateInfo); + public abstract bool StoreItemDoc(SaItemDoc itemDoc, DbUpdateInfo dbUpdateInfo); + public abstract bool StoreItemDocs(List itemDocs, DbUpdateInfo dbUpdateInfo); + public abstract bool RemoveItemDoc(SaItemDoc itemDoc, DbUpdateInfo dbUpdateInfo); + public abstract bool ClearItemDocs(ItemId itemId, DbUpdateInfo dbUpdateInfo); + public abstract bool ClearItemDocs(ItemId itemId, Category category, DbUpdateInfo dbUpdateInfo); // Auto-assign documents. // The master items define 'auto-assign' docs for the item's type. // The 'File part' defines the filename excluding the extension. // If the extension list is empty, any extension is matched. - public abstract bool AutoAssignDocs (ItemId itemId, List masterItemIds, String filePart, List extension, DbUpdateInfo dbUpdateInfo); + public abstract bool AutoAssignDocs(ItemId itemId, List masterItemIds, String filePart, List extension, DbUpdateInfo dbUpdateInfo); //------------------------------------------------------------------- } diff --git a/SacsStandardBase/Base/Security/SaSecurityLink.cs b/SacsStandardBase/Base/Security/SaSecurityLink.cs index f46bfb1..a911c1b 100644 --- a/SacsStandardBase/Base/Security/SaSecurityLink.cs +++ b/SacsStandardBase/Base/Security/SaSecurityLink.cs @@ -53,7 +53,7 @@ namespace Sarand.Net.Standard.Base.Security // Data members. private readonly DataProperties data = new DataProperties(); // Construction. - public Data () + public Data() { Status = DefaultStatus; } @@ -89,7 +89,7 @@ namespace Sarand.Net.Standard.Base.Security set { CheckChanged(data.ApplicableTo, value); data.ApplicableTo = value; } } // Population. - internal void PopulateFrom (Data data) + internal void PopulateFrom(Data data) { ItemIdOwner = data.ItemIdOwner; ItemIdTarget = data.ItemIdTarget; @@ -99,7 +99,7 @@ namespace Sarand.Net.Standard.Base.Security ApplicableTo = data.ApplicableTo; base.PopulateFrom(data); } - public Data Clone () + public Data Clone() { Data data = new Data(); data.PopulateFrom(this); @@ -126,7 +126,7 @@ namespace Sarand.Net.Standard.Base.Security //------------------------------------------------------------------- // Construction. - public SaSecurityLink (SysId itemIdOwner, SysId itemIdTarget, SysId itemIdContext) : + public SaSecurityLink(SysId itemIdOwner, SysId itemIdTarget, SysId itemIdContext) : base() { base.SetData(data); @@ -147,7 +147,7 @@ namespace Sarand.Net.Standard.Base.Security public static SaStatus GrantedStatus { get { return SaStatus.Granted; } } public static SaStatus DeniedStatus { get { return SaStatus.Denied; } } public static List ValidStatuses { get { return new List(securityLinkStatuses); } } - public static DataValue.TriStateType GetStatusTriState (SaStatus status) + public static DataValue.TriStateType GetStatusTriState(SaStatus status) { switch (status) { @@ -163,8 +163,8 @@ namespace Sarand.Net.Standard.Base.Security //------------------------------------------------------------------- // Properties. - public Data GetData () { return data.Clone(); } - public void SetData (Data data) + public Data GetData() { return data.Clone(); } + public void SetData(Data data) { // Properties that cannot be changed if previously specified. if (SysId.IsValid(data.Id)) @@ -179,7 +179,7 @@ namespace Sarand.Net.Standard.Base.Security //------------------------------------------------------------------- // Properties. - public override bool ItemHasId { get { return false; } } + public override bool ItemHasId() { return false; } public SysId ItemIdOwner { get { return data.ItemIdOwner; } @@ -239,13 +239,13 @@ namespace Sarand.Net.Standard.Base.Security { //------------------------------------------------------------------- // Link owner. - public static bool ContaineOwnerItemId (this List links, SysId itemIdOwner) + public static bool ContaineOwnerItemId(this List links, SysId itemIdOwner) { if (!SysId.IsValid(itemIdOwner)) return false; SaSecurityLink secLink = links.Find(link => SysId.IsValid(link.ItemIdOwner) && link.ItemIdOwner.Equals(itemIdOwner)); return (secLink != null); } - public static List GetOwnerItemIds (this List links) + public static List GetOwnerItemIds(this List links) { List ownerItemIds = new List(); foreach (SaSecurityLink secLink in links) @@ -257,13 +257,13 @@ namespace Sarand.Net.Standard.Base.Security } //------------------------------------------------------------------- // Link target. - public static bool ContainsTargetItemId (this List links, SysId itemIdTarget) + public static bool ContainsTargetItemId(this List links, SysId itemIdTarget) { if (!SysId.IsValid(itemIdTarget)) return false; SaSecurityLink secLink = links.Find(link => SysId.IsValid(link.ItemIdTarget) && link.ItemIdTarget.Equals(itemIdTarget)); return (secLink != null); } - public static List GetTargetItemIds (this List links) + public static List GetTargetItemIds(this List links) { List targetItemIds = new List(); foreach (SaSecurityLink secLink in links) @@ -273,7 +273,7 @@ namespace Sarand.Net.Standard.Base.Security } return targetItemIds; } - public static SaStatus GetStatusByTargetItemId (this List links, SysId itemIdTarget) + public static SaStatus GetStatusByTargetItemId(this List links, SysId itemIdTarget) { if (!SysId.IsValid(itemIdTarget)) return SaStatus.Unknown; SaSecurityLink secLink = links.Find(link => SysId.IsValid(link.ItemIdTarget) && link.ItemIdTarget.Equals(itemIdTarget)); diff --git a/SacsStandardDbas/Dbas/CodeTypes/SaCodeTypeMgr_Dbas.cs b/SacsStandardDbas/Dbas/CodeTypes/SaCodeTypeMgr_Dbas.cs index 63dea6f..48faf1c 100644 --- a/SacsStandardDbas/Dbas/CodeTypes/SaCodeTypeMgr_Dbas.cs +++ b/SacsStandardDbas/Dbas/CodeTypes/SaCodeTypeMgr_Dbas.cs @@ -546,34 +546,34 @@ namespace Sarand.Net.Standard.Dbas.CodeTypes query.Tables.Add(TableName_CodeType, aliasCodeType); // Add columns as defined in query list. - if (columns.HasId((int)SaCodeType.Column.Id)) + if (columns.HasId(SaCodeType.Column.Id)) query.Columns.Add(SaCodeTypeDbDfn.GetColumnNameQual(SaCodeTypeDbDfn.ColumnIdx.SaCodeType_Id, aliasCodeType)); - if (columns.HasId((int)SaCodeType.Column.Code)) + if (columns.HasId(SaCodeType.Column.Code)) query.Columns.Add(SaCodeTypeDbDfn.GetColumnNameQual(SaCodeTypeDbDfn.ColumnIdx.SaCodeType_Code, aliasCodeType)); - if (columns.HasId((int)SaCodeType.Column.Name)) + if (columns.HasId(SaCodeType.Column.Name)) query.Columns.Add(SaCodeTypeDbDfn.GetColumnNameQual(SaCodeTypeDbDfn.ColumnIdx.SaCodeType_Name, aliasCodeType)); - if (columns.HasId((int)SaCodeType.Column.MaxCodeLen)) + if (columns.HasId(SaCodeType.Column.MaxCodeLen)) query.Columns.Add(SaCodeTypeDbDfn.GetColumnNameQual(SaCodeTypeDbDfn.ColumnIdx.SaCodeType_MaxCodeLen, aliasCodeType)); - if (columns.HasId((int)SaCodeType.Column.CodeFormat)) + if (columns.HasId(SaCodeType.Column.CodeFormat)) query.Columns.Add(SaCodeTypeDbDfn.GetColumnNameQual(SaCodeTypeDbDfn.ColumnIdx.SaCodeType_CodeFormat, aliasCodeType)); - if (columns.HasId((int)SaCodeType.Column.NextCode)) + if (columns.HasId(SaCodeType.Column.NextCode)) query.Columns.Add(SaCodeTypeDbDfn.GetColumnNameQual(SaCodeTypeDbDfn.ColumnIdx.SaCodeType_NextCode, aliasCodeType)); - if (columns.HasId((int)SaCodeType.Column.AutoAssignCode_Y) || columns.HasId((int)SaCodeType.Column.AutoAssignCode_Tick)) + if (columns.HasId(SaCodeType.Column.AutoAssignCode_Y) || columns.HasId(SaCodeType.Column.AutoAssignCode_Tick)) query.Columns.Add(SaCodeTypeDbDfn.GetColumnNameQual(SaCodeTypeDbDfn.ColumnIdx.SaCodeType_Flags, aliasCodeType)); - if (columns.HasId((int)SaCodeType.Column.Notes)) + if (columns.HasId(SaCodeType.Column.Notes)) query.Columns.Add(SaCodeTypeDbDfn.GetColumnNameQual(SaCodeTypeDbDfn.ColumnIdx.SaCodeType_Notes, aliasCodeType)); - if (columns.HasId((int)SaCodeType.Column.Flags)) + if (columns.HasId(SaCodeType.Column.Flags)) query.Columns.Add(SaCodeTypeDbDfn.GetColumnNameQual(SaCodeTypeDbDfn.ColumnIdx.SaCodeType_Flags, aliasCodeType)); - if (columns.HasId((int)SaCodeType.Column.Status) || columns.HasId((int)SaCodeType.Column.Status_Desc) || columns.HasId((int)SaCodeType.Column.Status_Ind)) + if (columns.HasId(SaCodeType.Column.Status) || columns.HasId(SaCodeType.Column.Status_Desc) || columns.HasId(SaCodeType.Column.Status_Ind)) query.Columns.Add(SaCodeTypeDbDfn.GetColumnNameQual(SaCodeTypeDbDfn.ColumnIdx.SaCodeType_Status, aliasCodeType)); - if (columns.HasId((int)SaCodeType.Column.CreateOn_Date)) + if (columns.HasId(SaCodeType.Column.CreateOn_Date)) query.Columns.Add(SaCodeTypeDbDfn.GetColumnNameQual(SaCodeTypeDbDfn.ColumnIdx.SaCodeType_CreateOn, aliasCodeType)); - if (columns.HasId((int)SaCodeType.Column.UpdateOn_Date)) + if (columns.HasId(SaCodeType.Column.UpdateOn_Date)) query.Columns.Add(SaCodeTypeDbDfn.GetColumnNameQual(SaCodeTypeDbDfn.ColumnIdx.SaCodeType_UpdateOn, aliasCodeType)); //--------------------------------------------------------------------- // Owner link count. - if (columns.HasId((int)SaCodeType.Column.Codes_Count)) + if (columns.HasId(SaCodeType.Column.Codes_Count)) { String alias = "CodTypCode"; DbQuery queryCode = new DbQuery(Database.DbmsType); @@ -1109,34 +1109,34 @@ namespace Sarand.Net.Standard.Dbas.CodeTypes // Construct query. DbQuery query = new DbQuery(Database.DbmsType); query.Tables.Add(TableName_Code, aliasCode); - if (columns.HasId((int)SaCode.Column.Id)) + if (columns.HasId(SaCode.Column.Id)) query.Columns.Add(SaCodeTypeDbDfn.GetColumnNameQual(SaCodeTypeDbDfn.ColumnIdx.SaCode_Id, aliasCode)); - if (columns.HasId((int)SaCode.Column.CodeTypeId)) + if (columns.HasId(SaCode.Column.CodeTypeId)) query.Columns.Add(SaCodeTypeDbDfn.GetColumnNameQual(SaCodeTypeDbDfn.ColumnIdx.SaCode_CodeTypeId, aliasCode)); - if (columns.HasId((int)SaCode.Column.Code)) + if (columns.HasId(SaCode.Column.Code)) query.Columns.Add(SaCodeTypeDbDfn.GetColumnNameQual(SaCodeTypeDbDfn.ColumnIdx.SaCode_Code, aliasCode)); - if (columns.HasId((int)SaCode.Column.Description)) + if (columns.HasId(SaCode.Column.Description)) query.Columns.Add(SaCodeTypeDbDfn.GetColumnNameQual(SaCodeTypeDbDfn.ColumnIdx.SaCode_Description, aliasCode)); - if (columns.HasId((int)SaCode.Column.Sequence)) + if (columns.HasId(SaCode.Column.Sequence)) query.Columns.Add(SaCodeTypeDbDfn.GetColumnNameQual(SaCodeTypeDbDfn.ColumnIdx.SaCode_Seq, aliasCode)); - if (columns.HasId((int)SaCode.Column.DataValue)) + if (columns.HasId(SaCode.Column.DataValue)) query.Columns.Add(SaCodeTypeDbDfn.GetColumnNameQual(SaCodeTypeDbDfn.ColumnIdx.SaCode_Data, aliasCode)); - if (columns.HasId((int)SaCode.Column.Flag1_Y) || columns.HasId((int)SaCode.Column.Flag1_Tick) || columns.HasId((int)SaCode.Column.Flag2_Y) || columns.HasId((int)SaCode.Column.Flag2_Tick)) + if (columns.HasId(SaCode.Column.Flag1_Y) || columns.HasId(SaCode.Column.Flag1_Tick) || columns.HasId(SaCode.Column.Flag2_Y) || columns.HasId(SaCode.Column.Flag2_Tick)) query.Columns.Add(SaCodeTypeDbDfn.GetColumnNameQual(SaCodeTypeDbDfn.ColumnIdx.SaCode_Flags, aliasCode)); - if (columns.HasId((int)SaCode.Column.Notes)) + if (columns.HasId(SaCode.Column.Notes)) query.Columns.Add(SaCodeTypeDbDfn.GetColumnNameQual(SaCodeTypeDbDfn.ColumnIdx.SaCode_Notes, aliasCode)); - if (columns.HasId((int)SaCode.Column.Flags)) + if (columns.HasId(SaCode.Column.Flags)) query.Columns.Add(SaCodeTypeDbDfn.GetColumnNameQual(SaCodeTypeDbDfn.ColumnIdx.SaCode_Flags, aliasCode)); - if (columns.HasId((int)SaCode.Column.Status) || columns.HasId((int)SaCode.Column.Status_Desc) || columns.HasId((int)SaCode.Column.Status_Ind)) + if (columns.HasId(SaCode.Column.Status) || columns.HasId(SaCode.Column.Status_Desc) || columns.HasId(SaCode.Column.Status_Ind)) query.Columns.Add(SaCodeTypeDbDfn.GetColumnNameQual(SaCodeTypeDbDfn.ColumnIdx.SaCode_Status, aliasCode)); - if (columns.HasId((int)SaCode.Column.CreateOn_Date)) + if (columns.HasId(SaCode.Column.CreateOn_Date)) query.Columns.Add(SaCodeTypeDbDfn.GetColumnNameQual(SaCodeTypeDbDfn.ColumnIdx.SaCode_CreateOn, aliasCode)); - if (columns.HasId((int)SaCode.Column.UpdateOn_Date)) + if (columns.HasId(SaCode.Column.UpdateOn_Date)) query.Columns.Add(SaCodeTypeDbDfn.GetColumnNameQual(SaCodeTypeDbDfn.ColumnIdx.SaCode_UpdateOn, aliasCode)); //--------------------------------------------------------------------- // Owner item. - if (columns.HasId((int)SaCode.Column.CodeType_Code) || columns.HasId((int)SaCode.Column.CodeType_Name)) + if (columns.HasId(SaCode.Column.CodeType_Code) || columns.HasId(SaCode.Column.CodeType_Name)) { DbQueryJoin joinItmOwn = new DbQueryJoin(DbJoinType.LeftOuter); joinItmOwn.Table = new StringPair(TableName_CodeType, aliasCode_CodeType); diff --git a/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas-InterfaceDataItems.cs b/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas-InterfaceDataItems.cs index 94c22ee..46814c5 100644 --- a/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas-InterfaceDataItems.cs +++ b/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas-InterfaceDataItems.cs @@ -552,23 +552,23 @@ namespace Sarand.Net.Standard.Dbas.Interfaces query.Tables.Add(TableName_InterfaceDataItem, aliasInterfaceDataItem); // Add columns as defined in query list. - if (columns.HasId((int)SaInterfaceDataItem.Column.Id)) + if (columns.HasId(SaInterfaceDataItem.Column.Id)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceDataItem_Id, aliasInterfaceDataItem)); - if (columns.HasId((int)SaInterfaceDataItem.Column.InterfaceId)) + if (columns.HasId(SaInterfaceDataItem.Column.InterfaceId)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceDataItem_InterfaceId, aliasInterfaceDataItem)); - if (columns.HasId((int)SaInterfaceDataItem.Column.Direction) || columns.HasId((int)SaInterfaceDataItem.Column.Direction_Desc)) + if (columns.HasId(SaInterfaceDataItem.Column.Direction) || columns.HasId(SaInterfaceDataItem.Column.Direction_Desc)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceDataItem_Direction, aliasInterfaceDataItem)); - if (columns.HasId((int)SaInterfaceDataItem.Column.ExternalReference)) + if (columns.HasId(SaInterfaceDataItem.Column.ExternalReference)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceDataItem_ExternalRef, aliasInterfaceDataItem)); - if (columns.HasId((int)SaInterfaceDataItem.Column.ItemType) || columns.HasId((int)SaInterfaceDataItem.Column.ItemType_Desc) || columns.HasId((int)SaInterfaceDataItem.Column.Item_Caption)) + if (columns.HasId(SaInterfaceDataItem.Column.ItemType) || columns.HasId(SaInterfaceDataItem.Column.ItemType_Desc) || columns.HasId(SaInterfaceDataItem.Column.Item_Caption)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceDataItem_ItemType, aliasInterfaceDataItem)); - if (columns.HasId((int)SaInterfaceDataItem.Column.ItemId) || columns.HasId((int)SaInterfaceDataItem.Column.Item_Caption)) + if (columns.HasId(SaInterfaceDataItem.Column.ItemId) || columns.HasId(SaInterfaceDataItem.Column.Item_Caption)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceDataItem_ItemId, aliasInterfaceDataItem)); - if (columns.HasId((int)SaInterfaceDataItem.Column.ProcessStatus)) + if (columns.HasId(SaInterfaceDataItem.Column.ProcessStatus)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceDataItem_ProcessStatus, aliasInterfaceDataItem)); - if (columns.HasId((int)SaInterfaceDataItem.Column.ProcessStatusBy) || columns.HasId((int)SaInterfaceDataItem.Column.ProcessStatusBy_Name)) + if (columns.HasId(SaInterfaceDataItem.Column.ProcessStatusBy) || columns.HasId(SaInterfaceDataItem.Column.ProcessStatusBy_Name)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceDataItem_ProcessStatusBy, aliasInterfaceDataItem)); - if (columns.HasId((int)SaInterfaceDataItem.Column.ProcessStatusAt) || columns.HasId((int)SaInterfaceDataItem.Column.ProcessStatusAt_Date) || columns.HasId((int)SaInterfaceDataItem.Column.ProcessStatusAt_Time)) + if (columns.HasId(SaInterfaceDataItem.Column.ProcessStatusAt) || columns.HasId(SaInterfaceDataItem.Column.ProcessStatusAt_Date) || columns.HasId(SaInterfaceDataItem.Column.ProcessStatusAt_Time)) { if (ColumnExists(SaInterfaceDbDfn.ColumnIdx.SaInterfaceDataItem_ProcessStatusAt)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceDataItem_ProcessStatusAt, aliasInterfaceDataItem)); @@ -576,11 +576,11 @@ namespace Sarand.Net.Standard.Dbas.Interfaces // Legacy column. query.Columns.Add(aliasInterfaceDataItem + ".ProcessStatusOn"); } - if (columns.HasId((int)SaInterfaceDataItem.Column.ItemStatus)) + if (columns.HasId(SaInterfaceDataItem.Column.ItemStatus)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceDataItem_ItemStatus, aliasInterfaceDataItem)); - if (columns.HasId((int)SaInterfaceDataItem.Column.ItemStatusBy) || columns.HasId((int)SaInterfaceDataItem.Column.ItemStatusBy_Name)) + if (columns.HasId(SaInterfaceDataItem.Column.ItemStatusBy) || columns.HasId(SaInterfaceDataItem.Column.ItemStatusBy_Name)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceDataItem_ItemStatusBy, aliasInterfaceDataItem)); - if (columns.HasId((int)SaInterfaceDataItem.Column.ItemStatusAt) || columns.HasId((int)SaInterfaceDataItem.Column.ItemStatusAt_Date) || columns.HasId((int)SaInterfaceDataItem.Column.ItemStatusAt_Time)) + if (columns.HasId(SaInterfaceDataItem.Column.ItemStatusAt) || columns.HasId(SaInterfaceDataItem.Column.ItemStatusAt_Date) || columns.HasId(SaInterfaceDataItem.Column.ItemStatusAt_Time)) { if (ColumnExists(SaInterfaceDbDfn.ColumnIdx.SaInterfaceDataItem_ItemStatusAt)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceDataItem_ItemStatusAt, aliasInterfaceDataItem)); @@ -588,15 +588,15 @@ namespace Sarand.Net.Standard.Dbas.Interfaces // Legacy column. query.Columns.Add(aliasInterfaceDataItem + ".ItemStatusOn"); } - if (columns.HasId((int)SaInterfaceDataItem.Column.Notes)) + if (columns.HasId(SaInterfaceDataItem.Column.Notes)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceDataItem_Notes, aliasInterfaceDataItem)); /* - if (columns.HasId((int)SaInterfaceDataItem.Column.Status) || columns.HasId((int)SaInterfaceDataItem.Column.Status_Desc) || columns.HasId((int)SaInterfaceDataItem.Column.Status_Ind)) + if (columns.HasId(SaInterfaceDataItem.Column.Status) || columns.HasId(SaInterfaceDataItem.Column.Status_Desc) || columns.HasId(SaInterfaceDataItem.Column.Status_Ind)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceDataItem_Status, aliasInterfaceDataItem)); */ - if (columns.HasId((int)SaInterfaceDataItem.Column.CreateOn_Date)) + if (columns.HasId(SaInterfaceDataItem.Column.CreateOn_Date)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceDataItem_CreateOn, aliasInterfaceDataItem)); - if (columns.HasId((int)SaInterfaceDataItem.Column.UpdateOn_Date)) + if (columns.HasId(SaInterfaceDataItem.Column.UpdateOn_Date)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceDataItem_UpdateOn, aliasInterfaceDataItem)); //--------------------------------------------------------------------- diff --git a/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas-InterfaceProcessMessages.cs b/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas-InterfaceProcessMessages.cs index 61aecf9..f4e7b78 100644 --- a/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas-InterfaceProcessMessages.cs +++ b/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas-InterfaceProcessMessages.cs @@ -438,31 +438,31 @@ namespace Sarand.Net.Standard.Dbas.Interfaces query.Tables.Add(TableName_InterfaceProcessMessage, aliasInterfaceProcessMessage); // Add columns as defined in query list. - if (columns.HasId((int)SaInterfaceProcessMessage.Column.Id)) + if (columns.HasId(SaInterfaceProcessMessage.Column.Id)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceProcessMessage_Id, aliasInterfaceProcessMessage)); - if (columns.HasId((int)SaInterfaceProcessMessage.Column.ProcessId)) + if (columns.HasId(SaInterfaceProcessMessage.Column.ProcessId)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceProcessMessage_ProcessId, aliasInterfaceProcessMessage)); - if (columns.HasId((int)SaInterfaceProcessMessage.Column.Level) || columns.HasId((int)SaInterfaceProcessMessage.Column.Level_Desc)) + if (columns.HasId(SaInterfaceProcessMessage.Column.Level) || columns.HasId(SaInterfaceProcessMessage.Column.Level_Desc)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceProcessMessage_MsgType, aliasInterfaceProcessMessage)); - if (columns.HasId((int)SaInterfaceProcessMessage.Column.Message)) + if (columns.HasId(SaInterfaceProcessMessage.Column.Message)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceProcessMessage_Msg, aliasInterfaceProcessMessage)); - if (columns.HasId((int)SaInterfaceProcessMessage.Column.Filename)) + if (columns.HasId(SaInterfaceProcessMessage.Column.Filename)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceProcessMessage_FileName, aliasInterfaceProcessMessage)); - if (columns.HasId((int)SaInterfaceProcessMessage.Column.LineNumber)) + if (columns.HasId(SaInterfaceProcessMessage.Column.LineNumber)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceProcessMessage_LineNumber, aliasInterfaceProcessMessage)); - if (columns.HasId((int)SaInterfaceProcessMessage.Column.ItemType) || columns.HasId((int)SaInterfaceProcessMessage.Column.ItemType_Desc) || columns.HasId((int)SaInterfaceProcessMessage.Column.Item_Caption)) + if (columns.HasId(SaInterfaceProcessMessage.Column.ItemType) || columns.HasId(SaInterfaceProcessMessage.Column.ItemType_Desc) || columns.HasId(SaInterfaceProcessMessage.Column.Item_Caption)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceProcessMessage_ItemType, aliasInterfaceProcessMessage)); - if (columns.HasId((int)SaInterfaceProcessMessage.Column.ItemId) || columns.HasId((int)SaInterfaceProcessMessage.Column.Item_Caption)) + if (columns.HasId(SaInterfaceProcessMessage.Column.ItemId) || columns.HasId(SaInterfaceProcessMessage.Column.Item_Caption)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceProcessMessage_ItemId, aliasInterfaceProcessMessage)); /* - if (columns.HasId((int)SaInterfaceProcessMessage.Column.Notes)) + if (columns.HasId(SaInterfaceProcessMessage.Column.Notes)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceProcessMessage_Notes, aliasInterfaceProcessMessage)); */ - if (columns.HasId((int)SaInterfaceProcessMessage.Column.Status) || columns.HasId((int)SaInterfaceProcessMessage.Column.Status_Desc) || columns.HasId((int)SaInterfaceProcessMessage.Column.Status_Ind)) + if (columns.HasId(SaInterfaceProcessMessage.Column.Status) || columns.HasId(SaInterfaceProcessMessage.Column.Status_Desc) || columns.HasId(SaInterfaceProcessMessage.Column.Status_Ind)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceProcessMessage_Status, aliasInterfaceProcessMessage)); - if (columns.HasId((int)SaInterfaceProcessMessage.Column.CreateOn_Date)) + if (columns.HasId(SaInterfaceProcessMessage.Column.CreateOn_Date)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceProcessMessage_CreateOn, aliasInterfaceProcessMessage)); - if (columns.HasId((int)SaInterfaceProcessMessage.Column.UpdateOn_Date)) + if (columns.HasId(SaInterfaceProcessMessage.Column.UpdateOn_Date)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceProcessMessage_UpdateOn, aliasInterfaceProcessMessage)); //--------------------------------------------------------------------- diff --git a/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas-InterfaceProcesses.cs b/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas-InterfaceProcesses.cs index bb246bd..5eff050 100644 --- a/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas-InterfaceProcesses.cs +++ b/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas-InterfaceProcesses.cs @@ -676,17 +676,17 @@ namespace Sarand.Net.Standard.Dbas.Interfaces query.Tables.Add(TableName_InterfaceProcess, aliasInterfaceProcess); // Add columns as defined in query list. - if (columns.HasId((int)SaInterfaceProcess.Column.Id)) + if (columns.HasId(SaInterfaceProcess.Column.Id)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceProcess_Id, aliasInterfaceProcess)); - if (columns.HasId((int)SaInterfaceProcess.Column.InterfaceId)) + if (columns.HasId(SaInterfaceProcess.Column.InterfaceId)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceProcess_InterfaceId, aliasInterfaceProcess)); - if (columns.HasId((int)SaInterfaceProcess.Column.ProcessDirection) || columns.HasId((int)SaInterfaceProcess.Column.ProcessDirection_Desc)) + if (columns.HasId(SaInterfaceProcess.Column.ProcessDirection) || columns.HasId(SaInterfaceProcess.Column.ProcessDirection_Desc)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceProcess_Direction, aliasInterfaceProcess)); - if (columns.HasId((int)SaInterfaceProcess.Column.ProcessReference)) + if (columns.HasId(SaInterfaceProcess.Column.ProcessReference)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceProcess_ProcRef, aliasInterfaceProcess)); - if (columns.HasId((int)SaInterfaceProcess.Column.ProcessSequence)) + if (columns.HasId(SaInterfaceProcess.Column.ProcessSequence)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceProcess_ProcSeq, aliasInterfaceProcess)); - if (columns.HasId((int)SaInterfaceProcess.Column.ProcessAt) || columns.HasId((int)SaInterfaceProcess.Column.ProcessAt_Date) || columns.HasId((int)SaInterfaceProcess.Column.ProcessAt_Time)) + if (columns.HasId(SaInterfaceProcess.Column.ProcessAt) || columns.HasId(SaInterfaceProcess.Column.ProcessAt_Date) || columns.HasId(SaInterfaceProcess.Column.ProcessAt_Time)) { if (ColumnExists(SaInterfaceDbDfn.ColumnIdx.SaInterfaceProcess_ProcessAt)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceProcess_ProcessAt, aliasInterfaceProcess)); @@ -697,7 +697,7 @@ namespace Sarand.Net.Standard.Dbas.Interfaces query.Columns.Add(aliasInterfaceProcess + ".ProcTime"); } } - if (columns.HasId((int)SaInterfaceProcess.Column.BatchAt) || columns.HasId((int)SaInterfaceProcess.Column.BatchAt_Date) || columns.HasId((int)SaInterfaceProcess.Column.BatchAt_Time)) + if (columns.HasId(SaInterfaceProcess.Column.BatchAt) || columns.HasId(SaInterfaceProcess.Column.BatchAt_Date) || columns.HasId(SaInterfaceProcess.Column.BatchAt_Time)) { if (ColumnExists(SaInterfaceDbDfn.ColumnIdx.SaInterfaceProcess_BatchAt)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceProcess_BatchAt, aliasInterfaceProcess)); @@ -708,31 +708,31 @@ namespace Sarand.Net.Standard.Dbas.Interfaces query.Columns.Add(aliasInterfaceProcess + ".BatchTime"); } } - if (columns.HasId((int)SaInterfaceProcess.Column.Elapsed_Secs) || columns.HasId((int)SaInterfaceProcess.Column.Elapsed_Fmt)) + if (columns.HasId(SaInterfaceProcess.Column.Elapsed_Secs) || columns.HasId(SaInterfaceProcess.Column.Elapsed_Fmt)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceProcess_ElapseSecs, aliasInterfaceProcess)); /* - if (columns.HasId((int)SaInterfaceProcess.Column.Notes)) + if (columns.HasId(SaInterfaceProcess.Column.Notes)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceProcess_Notes, aliasInterfaceProcess)); */ - if (columns.HasId((int)SaInterfaceProcess.Column.Status) || columns.HasId((int)SaInterfaceProcess.Column.Status_Desc) || columns.HasId((int)SaInterfaceProcess.Column.Status_Ind)) + if (columns.HasId(SaInterfaceProcess.Column.Status) || columns.HasId(SaInterfaceProcess.Column.Status_Desc) || columns.HasId(SaInterfaceProcess.Column.Status_Ind)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceProcess_Status, aliasInterfaceProcess)); - if (columns.HasId((int)SaInterfaceProcess.Column.CreateOn_Date)) + if (columns.HasId(SaInterfaceProcess.Column.CreateOn_Date)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceProcess_CreateOn, aliasInterfaceProcess)); - if (columns.HasId((int)SaInterfaceProcess.Column.UpdateOn_Date)) + if (columns.HasId(SaInterfaceProcess.Column.UpdateOn_Date)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceProcess_UpdateOn, aliasInterfaceProcess)); - if (columns.HasId((int)SaInterfaceProcess.Column.UpdateHost)) + if (columns.HasId(SaInterfaceProcess.Column.UpdateHost)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterfaceProcess_UpdateHost, aliasInterfaceProcess)); //--------------------------------------------------------------------- // Interface properties. bool hasInterfaceCols = - (columns.HasId((int)SaInterfaceProcess.Column.Interface_Context) || - columns.HasId((int)SaInterfaceProcess.Column.Interface_Category) || - columns.HasId((int)SaInterfaceProcess.Column.Interface_Category_Desc) || - columns.HasId((int)SaInterfaceProcess.Column.Interface_Type) || - columns.HasId((int)SaInterfaceProcess.Column.Interface_Type_Desc) || - columns.HasId((int)SaInterfaceProcess.Column.Interface_Code) || - columns.HasId((int)SaInterfaceProcess.Column.Interface_Caption)); + (columns.HasId(SaInterfaceProcess.Column.Interface_Context) || + columns.HasId(SaInterfaceProcess.Column.Interface_Category) || + columns.HasId(SaInterfaceProcess.Column.Interface_Category_Desc) || + columns.HasId(SaInterfaceProcess.Column.Interface_Type) || + columns.HasId(SaInterfaceProcess.Column.Interface_Type_Desc) || + columns.HasId(SaInterfaceProcess.Column.Interface_Code) || + columns.HasId(SaInterfaceProcess.Column.Interface_Caption)); if (hasInterfaceCols) { DbQueryJoin joinInt = new DbQueryJoin(DbJoinType.LeftOuter); @@ -751,7 +751,7 @@ namespace Sarand.Net.Standard.Dbas.Interfaces //--------------------------------------------------------------------- // Message count. - if (columns.HasId((int)SaInterfaceProcess.Column.Message_Count)) + if (columns.HasId(SaInterfaceProcess.Column.Message_Count)) { String alias = "IpMsg"; DbQuery queryProcess = new DbQuery(Database.DbmsType); @@ -763,7 +763,7 @@ namespace Sarand.Net.Standard.Dbas.Interfaces //--------------------------------------------------------------------- // Message status. - if (columns.HasId((int)SaInterfaceProcess.Column.Message_Status_Desc) || columns.HasId((int)SaInterfaceProcess.Column.Message_Status_Ind)) + if (columns.HasId(SaInterfaceProcess.Column.Message_Status_Desc) || columns.HasId(SaInterfaceProcess.Column.Message_Status_Ind)) { // Count messages by type: error, warning, other. String messageTypeFatal = MessageLevels.GetCodeForType(SaMessageLevel.Fatal); @@ -799,7 +799,7 @@ namespace Sarand.Net.Standard.Dbas.Interfaces //--------------------------------------------------------------------- // Data Item count. - if (columns.HasId((int)SaInterfaceProcess.Column.DataItem_Count)) + if (columns.HasId(SaInterfaceProcess.Column.DataItem_Count)) { String alias = "IpDatItm"; DbQuery queryDataItem = new DbQuery(Database.DbmsType); diff --git a/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas-Interfaces.cs b/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas-Interfaces.cs index 0178e62..e120f72 100644 --- a/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas-Interfaces.cs +++ b/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas-Interfaces.cs @@ -511,32 +511,32 @@ namespace Sarand.Net.Standard.Dbas.Interfaces query.Tables.Add(TableName_Interface, aliasInterface); // Add columns as defined in query list. - if (columns.HasId((int)SaInterface.Column.Id)) + if (columns.HasId(SaInterface.Column.Id)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterface_Id, aliasInterface)); - if (columns.HasId((int)SaInterface.Column.Context) || columns.HasId((int)SaInterface.Column.Type_Desc)) + if (columns.HasId(SaInterface.Column.Context) || columns.HasId(SaInterface.Column.Type_Desc)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterface_Context, aliasInterface)); - if (columns.HasId((int)SaInterface.Column.Category) || columns.HasId((int)SaInterface.Column.Category_Desc) || columns.HasId((int)SaInterface.Column.Type_Desc)) + if (columns.HasId(SaInterface.Column.Category) || columns.HasId(SaInterface.Column.Category_Desc) || columns.HasId(SaInterface.Column.Type_Desc)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterface_Category, aliasInterface)); - if (columns.HasId((int)SaInterface.Column.Type) || columns.HasId((int)SaInterface.Column.Type_Desc)) + if (columns.HasId(SaInterface.Column.Type) || columns.HasId(SaInterface.Column.Type_Desc)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterface_Type, aliasInterface)); - if (columns.HasId((int)SaInterface.Column.Code)) + if (columns.HasId(SaInterface.Column.Code)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterface_Code, aliasInterface)); - if (columns.HasId((int)SaInterface.Column.Caption)) + if (columns.HasId(SaInterface.Column.Caption)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterface_Caption, aliasInterface)); - if (columns.HasId((int)SaInterface.Column.Active_Y) || columns.HasId((int)SaInterface.Column.Active_TickCross) || columns.HasId((int)SaInterface.Column.Active_Ind)) + if (columns.HasId(SaInterface.Column.Active_Y) || columns.HasId(SaInterface.Column.Active_TickCross) || columns.HasId(SaInterface.Column.Active_Ind)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterface_Flags, aliasInterface)); - if (columns.HasId((int)SaInterface.Column.Notes)) + if (columns.HasId(SaInterface.Column.Notes)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterface_Notes, aliasInterface)); - if (columns.HasId((int)SaInterface.Column.Status) || columns.HasId((int)SaInterface.Column.Status_Desc) || columns.HasId((int)SaInterface.Column.Status_Ind)) + if (columns.HasId(SaInterface.Column.Status) || columns.HasId(SaInterface.Column.Status_Desc) || columns.HasId(SaInterface.Column.Status_Ind)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterface_Status, aliasInterface)); - if (columns.HasId((int)SaInterface.Column.CreateOn_Date)) + if (columns.HasId(SaInterface.Column.CreateOn_Date)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterface_CreateOn, aliasInterface)); - if (columns.HasId((int)SaInterface.Column.UpdateOn_Date)) + if (columns.HasId(SaInterface.Column.UpdateOn_Date)) query.Columns.Add(SaInterfaceDbDfn.GetColumnNameQual(SaInterfaceDbDfn.ColumnIdx.SaInterface_UpdateOn, aliasInterface)); //--------------------------------------------------------------------- // Process count. - if (columns.HasId((int)SaInterface.Column.Process_Count)) + if (columns.HasId(SaInterface.Column.Process_Count)) { String alias = "IntPrc"; DbQuery queryProcess = new DbQuery(Database.DbmsType); @@ -548,7 +548,7 @@ namespace Sarand.Net.Standard.Dbas.Interfaces //--------------------------------------------------------------------- // Data Item count. - if (columns.HasId((int)SaInterface.Column.DataItem_Count)) + if (columns.HasId(SaInterface.Column.DataItem_Count)) { String alias = "IntDatItm"; DbQuery queryDataItem = new DbQuery(Database.DbmsType); diff --git a/SacsStandardDbas/Dbas/ItemData/SaItemDataMgr_Dbas.cs b/SacsStandardDbas/Dbas/ItemData/SaItemDataMgr_Dbas.cs index e6e4bfd..7caf158 100644 --- a/SacsStandardDbas/Dbas/ItemData/SaItemDataMgr_Dbas.cs +++ b/SacsStandardDbas/Dbas/ItemData/SaItemDataMgr_Dbas.cs @@ -541,23 +541,23 @@ namespace Sarand.Net.Standard.Dbas.ItemData query.Tables.Add(SaItemDataDbDfn.GetTableName(SaItemDataDbDfn.TableIdx.SaItemData), aliasItemData); // Add columns as defined in query list. - if (columns.HasId((int)SaItemData.Column.Id)) + if (columns.HasId(SaItemData.Column.Id)) query.Columns.Add(SaItemDataDbDfn.GetColumnNameQual(SaItemDataDbDfn.ColumnIdx.SaItemData_Id, aliasItemData)); - if (columns.HasId((int)SaItemData.Column.ItemType) || columns.HasId((int)SaItemData.Column.ItemType_Desc)) + if (columns.HasId(SaItemData.Column.ItemType) || columns.HasId(SaItemData.Column.ItemType_Desc)) query.Columns.Add(SaItemDataDbDfn.GetColumnNameQual(SaItemDataDbDfn.ColumnIdx.SaItemData_ItemType, aliasItemData)); - if (columns.HasId((int)SaItemData.Column.ItemId)) + if (columns.HasId(SaItemData.Column.ItemId)) query.Columns.Add(SaItemDataDbDfn.GetColumnNameQual(SaItemDataDbDfn.ColumnIdx.SaItemData_ItemId, aliasItemData)); - if (columns.HasId((int)SaItemData.Column.DataType)) + if (columns.HasId(SaItemData.Column.DataType)) query.Columns.Add(SaItemDataDbDfn.GetColumnNameQual(SaItemDataDbDfn.ColumnIdx.SaItemData_DataType, aliasItemData)); - if (columns.HasId((int)SaItemData.Column.ItemData)) + if (columns.HasId(SaItemData.Column.ItemData)) query.Columns.Add(SaItemDataDbDfn.GetColumnNameQual(SaItemDataDbDfn.ColumnIdx.SaItemData_ItemData, aliasItemData)); - if (columns.HasId((int)SaItemData.Column.Notes)) + if (columns.HasId(SaItemData.Column.Notes)) query.Columns.Add(SaItemDataDbDfn.GetColumnNameQual(SaItemDataDbDfn.ColumnIdx.SaItemData_Notes, aliasItemData)); - if (columns.HasId((int)SaItemData.Column.Status) || columns.HasId((int)SaItemData.Column.Status_Desc) || columns.HasId((int)SaItemData.Column.Status_Ind)) + if (columns.HasId(SaItemData.Column.Status) || columns.HasId(SaItemData.Column.Status_Desc) || columns.HasId(SaItemData.Column.Status_Ind)) query.Columns.Add(SaItemDataDbDfn.GetColumnNameQual(SaItemDataDbDfn.ColumnIdx.SaItemData_Status, aliasItemData)); - if (columns.HasId((int)SaItemData.Column.CreateOn_Date)) + if (columns.HasId(SaItemData.Column.CreateOn_Date)) query.Columns.Add(SaItemDataDbDfn.GetColumnNameQual(SaItemDataDbDfn.ColumnIdx.SaItemData_CreateOn, aliasItemData)); - if (columns.HasId((int)SaItemData.Column.UpdateOn_Date)) + if (columns.HasId(SaItemData.Column.UpdateOn_Date)) query.Columns.Add(SaItemDataDbDfn.GetColumnNameQual(SaItemDataDbDfn.ColumnIdx.SaItemData_UpdateOn, aliasItemData)); //--------------------------------------------------------------------- diff --git a/SacsStandardDbas/Dbas/ItemDocs/SaItemDocConsole_Dbas.cs b/SacsStandardDbas/Dbas/ItemDocs/SaItemDocConsole_Dbas.cs index 46a2ac4..4be391d 100644 --- a/SacsStandardDbas/Dbas/ItemDocs/SaItemDocConsole_Dbas.cs +++ b/SacsStandardDbas/Dbas/ItemDocs/SaItemDocConsole_Dbas.cs @@ -152,18 +152,18 @@ namespace Sarand.Net.Standard.Dbas.ItemDocs return SetErrorState(itemDocMgr.ErrorStateMessage); return !HasErrorState(); } + public override bool ClearItemDocs(ItemId itemId, DbUpdateInfo dbUpdateInfo) + { + ClearErrorState(); + if (!itemDocMgr.ClearItemDocs(itemId, dbUpdateInfo)) + return SetErrorState(itemDocMgr.ErrorStateMessage); + return !HasErrorState(); + } public override bool ClearItemDocs(ItemId itemId, Category category, DbUpdateInfo dbUpdateInfo) { ClearErrorState(); - if (!ItemId.IsValid(itemId)) return SetErrorState("Item must be specified"); - SaItemDoc.Params prmItemDoc = new SaItemDoc.Params(); - prmItemDoc.ItemIdsIncluded.Add(itemId); - prmItemDoc.Category = category; - foreach (SaItemDoc itemDoc in itemDocMgr.GetItemDocList(prmItemDoc)) - { - if (!itemDocMgr.DeleteItemDoc(itemDoc, dbUpdateInfo)) - return SetErrorState(itemDocMgr.ErrorStateMessage); - } + if (!itemDocMgr.ClearItemDocs(itemId, category, dbUpdateInfo)) + return SetErrorState(itemDocMgr.ErrorStateMessage); return !HasErrorState(); } diff --git a/SacsStandardDbas/Dbas/ItemDocs/SaItemDocMgr_Dbas.cs b/SacsStandardDbas/Dbas/ItemDocs/SaItemDocMgr_Dbas.cs index 7707bc7..1d6b7e5 100644 --- a/SacsStandardDbas/Dbas/ItemDocs/SaItemDocMgr_Dbas.cs +++ b/SacsStandardDbas/Dbas/ItemDocs/SaItemDocMgr_Dbas.cs @@ -577,31 +577,31 @@ namespace Sarand.Net.Standard.Dbas.ItemDocs query.Tables.Add(SaItemDocsDbDfn.GetTableName(SaItemDocsDbDfn.TableIdx.SaItemDoc), aliasItemDoc); // Add columns as defined in query list. - if (columns.HasId((int)SaItemDoc.Column.Id)) + if (columns.HasId(SaItemDoc.Column.Id)) query.Columns.Add(SaItemDocsDbDfn.GetColumnNameQual(SaItemDocsDbDfn.ColumnIdx.SaItemDoc_Id, aliasItemDoc)); - if (columns.HasId((int)SaItemDoc.Column.ItemType) || columns.HasId((int)SaItemDoc.Column.ItemType_Desc)) + if (columns.HasId(SaItemDoc.Column.ItemType) || columns.HasId(SaItemDoc.Column.ItemType_Desc)) query.Columns.Add(SaItemDocsDbDfn.GetColumnNameQual(SaItemDocsDbDfn.ColumnIdx.SaItemDoc_ItemType, aliasItemDoc)); - if (columns.HasId((int)SaItemDoc.Column.ItemId)) + if (columns.HasId(SaItemDoc.Column.ItemId)) query.Columns.Add(SaItemDocsDbDfn.GetColumnNameQual(SaItemDocsDbDfn.ColumnIdx.SaItemDoc_ItemId, aliasItemDoc)); - if (columns.HasId((int)SaItemDoc.Column.Category) || columns.HasId((int)SaItemDoc.Column.Category_Desc)) + if (columns.HasId(SaItemDoc.Column.Category) || columns.HasId(SaItemDoc.Column.Category_Desc)) query.Columns.Add(SaItemDocsDbDfn.GetColumnNameQual(SaItemDocsDbDfn.ColumnIdx.SaItemDoc_Category, aliasItemDoc)); - if (columns.HasId((int)SaItemDoc.Column.DocType) || columns.HasId((int)SaItemDoc.Column.DocType_Desc)) + if (columns.HasId(SaItemDoc.Column.DocType) || columns.HasId(SaItemDoc.Column.DocType_Desc)) query.Columns.Add(SaItemDocsDbDfn.GetColumnNameQual(SaItemDocsDbDfn.ColumnIdx.SaItemDoc_Type, aliasItemDoc)); - if (columns.HasId((int)SaItemDoc.Column.DescBrief)) + if (columns.HasId(SaItemDoc.Column.DescBrief)) query.Columns.Add(SaItemDocsDbDfn.GetColumnNameQual(SaItemDocsDbDfn.ColumnIdx.SaItemDoc_DescBrief, aliasItemDoc)); - if (columns.HasId((int)SaItemDoc.Column.Folder)) + if (columns.HasId(SaItemDoc.Column.Folder)) query.Columns.Add(SaItemDocsDbDfn.GetColumnNameQual(SaItemDocsDbDfn.ColumnIdx.SaItemDoc_Folder, aliasItemDoc)); - if (columns.HasId((int)SaItemDoc.Column.Filename)) + if (columns.HasId(SaItemDoc.Column.Filename)) query.Columns.Add(SaItemDocsDbDfn.GetColumnNameQual(SaItemDocsDbDfn.ColumnIdx.SaItemDoc_Filename, aliasItemDoc)); - if (columns.HasId((int)SaItemDoc.Column.MimeType)) + if (columns.HasId(SaItemDoc.Column.MimeType)) query.Columns.Add(SaItemDocsDbDfn.GetColumnNameQual(SaItemDocsDbDfn.ColumnIdx.SaItemDoc_MimeType, aliasItemDoc)); - if (columns.HasId((int)SaItemDoc.Column.Notes)) + if (columns.HasId(SaItemDoc.Column.Notes)) query.Columns.Add(SaItemDocsDbDfn.GetColumnNameQual(SaItemDocsDbDfn.ColumnIdx.SaItemDoc_Notes, aliasItemDoc)); - if (columns.HasId((int)SaItemDoc.Column.Status) || columns.HasId((int)SaItemDoc.Column.Status_Desc) || columns.HasId((int)SaItemDoc.Column.Status_Ind)) + if (columns.HasId(SaItemDoc.Column.Status) || columns.HasId(SaItemDoc.Column.Status_Desc) || columns.HasId(SaItemDoc.Column.Status_Ind)) query.Columns.Add(SaItemDocsDbDfn.GetColumnNameQual(SaItemDocsDbDfn.ColumnIdx.SaItemDoc_Status, aliasItemDoc)); - if (columns.HasId((int)SaItemDoc.Column.CreateOn_Date)) + if (columns.HasId(SaItemDoc.Column.CreateOn_Date)) query.Columns.Add(SaItemDocsDbDfn.GetColumnNameQual(SaItemDocsDbDfn.ColumnIdx.SaItemDoc_CreateOn, aliasItemDoc)); - if (columns.HasId((int)SaItemDoc.Column.UpdateOn_Date)) + if (columns.HasId(SaItemDoc.Column.UpdateOn_Date)) query.Columns.Add(SaItemDocsDbDfn.GetColumnNameQual(SaItemDocsDbDfn.ColumnIdx.SaItemDoc_UpdateOn, aliasItemDoc)); //--------------------------------------------------------------------- diff --git a/SacsStandardDbas/Dbas/ItemOptions/SaItemOptionMgr_Dbas.cs b/SacsStandardDbas/Dbas/ItemOptions/SaItemOptionMgr_Dbas.cs index ee79598..118619d 100644 --- a/SacsStandardDbas/Dbas/ItemOptions/SaItemOptionMgr_Dbas.cs +++ b/SacsStandardDbas/Dbas/ItemOptions/SaItemOptionMgr_Dbas.cs @@ -529,23 +529,23 @@ namespace Sarand.Net.Standard.Dbas.ItemOptions query.Tables.Add(SaItemOptionDbDfn.GetTableName(SaItemOptionDbDfn.TableIdx.SaItemOption), aliasItemOption); // Add columns as defined in query list. - if (columns.HasId((int)SaItemOption.Column.ItemType) || columns.HasId((int)SaItemOption.Column.ItemType_Desc)) + if (columns.HasId(SaItemOption.Column.ItemType) || columns.HasId(SaItemOption.Column.ItemType_Desc)) query.Columns.Add(SaItemOptionDbDfn.GetColumnNameQual(SaItemOptionDbDfn.ColumnIdx.SaItemOption_ItemType, aliasItemOption)); - if (columns.HasId((int)SaItemOption.Column.ItemId)) + if (columns.HasId(SaItemOption.Column.ItemId)) query.Columns.Add(SaItemOptionDbDfn.GetColumnNameQual(SaItemOptionDbDfn.ColumnIdx.SaItemOption_ItemId, aliasItemOption)); - if (columns.HasId((int)SaItemOption.Column.Name) || columns.HasId((int)SaItemOption.Column.Name)) + if (columns.HasId(SaItemOption.Column.Name) || columns.HasId(SaItemOption.Column.Name)) query.Columns.Add(SaItemOptionDbDfn.GetColumnNameQual(SaItemOptionDbDfn.ColumnIdx.SaItemOption_Name, aliasItemOption)); - if (columns.HasId((int)SaItemOption.Column.Context) || columns.HasId((int)SaItemOption.Column.Context)) + if (columns.HasId(SaItemOption.Column.Context) || columns.HasId(SaItemOption.Column.Context)) query.Columns.Add(SaItemOptionDbDfn.GetColumnNameQual(SaItemOptionDbDfn.ColumnIdx.SaItemOption_Context, aliasItemOption)); - if (columns.HasId((int)SaItemOption.Column.Value) || columns.HasId((int)SaItemOption.Column.Value_Display)) + if (columns.HasId(SaItemOption.Column.Value) || columns.HasId(SaItemOption.Column.Value_Display)) query.Columns.Add(SaItemOptionDbDfn.GetColumnNameQual(SaItemOptionDbDfn.ColumnIdx.SaItemOption_Value, aliasItemOption)); - if (columns.HasId((int)SaItemOption.Column.Notes)) + if (columns.HasId(SaItemOption.Column.Notes)) query.Columns.Add(SaItemOptionDbDfn.GetColumnNameQual(SaItemOptionDbDfn.ColumnIdx.SaItemOption_Notes, aliasItemOption)); - if (columns.HasId((int)SaItemOption.Column.Status) || columns.HasId((int)SaItemOption.Column.Status_Desc) || columns.HasId((int)SaItemOption.Column.Status_Ind)) + if (columns.HasId(SaItemOption.Column.Status) || columns.HasId(SaItemOption.Column.Status_Desc) || columns.HasId(SaItemOption.Column.Status_Ind)) query.Columns.Add(SaItemOptionDbDfn.GetColumnNameQual(SaItemOptionDbDfn.ColumnIdx.SaItemOption_Status, aliasItemOption)); - if (columns.HasId((int)SaItemOption.Column.CreateOn_Date)) + if (columns.HasId(SaItemOption.Column.CreateOn_Date)) query.Columns.Add(SaItemOptionDbDfn.GetColumnNameQual(SaItemOptionDbDfn.ColumnIdx.SaItemOption_CreateOn, aliasItemOption)); - if (columns.HasId((int)SaItemOption.Column.UpdateOn_Date)) + if (columns.HasId(SaItemOption.Column.UpdateOn_Date)) query.Columns.Add(SaItemOptionDbDfn.GetColumnNameQual(SaItemOptionDbDfn.ColumnIdx.SaItemOption_UpdateOn, aliasItemOption)); //--------------------------------------------------------------------- diff --git a/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-Language.cs b/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-Language.cs index 0046d21..b2a67c0 100644 --- a/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-Language.cs +++ b/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-Language.cs @@ -478,29 +478,29 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData query.Tables.Add(ReferenceDataConsole.TableName_Language, aliasLanguage); // Language Propertiees - add columns as defined in query list. - if (columns.HasId((int)SaLanguage.Column.Id)) + if (columns.HasId(SaLanguage.Column.Id)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Language_Id, aliasLanguage)); - if (columns.HasId((int)SaLanguage.Column.Code)) + if (columns.HasId(SaLanguage.Column.Code)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Language_Code, aliasLanguage)); - if (columns.HasId((int)SaLanguage.Column.Name)) + if (columns.HasId(SaLanguage.Column.Name)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Language_Name, aliasLanguage)); - if (columns.HasId((int)SaLanguage.Column.LanguageIdPrimary)) + if (columns.HasId(SaLanguage.Column.LanguageIdPrimary)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Language_Primary, aliasLanguage)); - if (columns.HasId((int)SaLanguage.Column.Unicode)) + if (columns.HasId(SaLanguage.Column.Unicode)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Language_Unicode, aliasLanguage)); - if (columns.HasId((int)SaLanguage.Column.Translation)) + if (columns.HasId(SaLanguage.Column.Translation)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Language_Translation, aliasLanguage)); //Common Properties. /* - if (columns.HasId((int)SaLanguage.Column.Notes)) + if (columns.HasId(SaLanguage.Column.Notes)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Language_Notes, aliasLanguage)); - if (columns.HasId((int)SaLanguage.Column.Status) || columns.HasId((int)SaLanguage.Column.Status_Desc) || columns.HasId((int)SaLanguage.Column.Status_Ind)) + if (columns.HasId(SaLanguage.Column.Status) || columns.HasId(SaLanguage.Column.Status_Desc) || columns.HasId(SaLanguage.Column.Status_Ind)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Language_Status, aliasLanguage)); */ - if (columns.HasId((int)SaLanguage.Column.CreateOn_Date)) + if (columns.HasId(SaLanguage.Column.CreateOn_Date)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Language_CreateOn, aliasLanguage)); - if (columns.HasId((int)SaLanguage.Column.UpdateOn_Date)) + if (columns.HasId(SaLanguage.Column.UpdateOn_Date)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Language_UpdateOn, aliasLanguage)); //--------------------------------------------------------------------- diff --git a/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-Region.cs b/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-Region.cs index 233a9f1..5002cbd 100644 --- a/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-Region.cs +++ b/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-Region.cs @@ -455,23 +455,23 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData query.Tables.Add(ReferenceDataConsole.TableName_Region, aliasRegion); // Region Properties - add columns as defined in query list. - if (columns.HasId((int)SaRegion.Column.Id)) + if (columns.HasId(SaRegion.Column.Id)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Region_Id, aliasRegion)); - if (columns.HasId((int)SaRegion.Column.Type)) + if (columns.HasId(SaRegion.Column.Type)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Region_Type, aliasRegion)); - if (columns.HasId((int)SaRegion.Column.Name)) + if (columns.HasId(SaRegion.Column.Name)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Region_Name, aliasRegion)); - if (columns.HasId((int)SaRegion.Column.Parent)) + if (columns.HasId(SaRegion.Column.Parent)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Region_Parent, aliasRegion)); // Common Properties - if (columns.HasId((int)SaRegion.Column.Notes)) + if (columns.HasId(SaRegion.Column.Notes)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Region_Notes, aliasRegion)); - if (columns.HasId((int)SaRegion.Column.Status) || columns.HasId((int)SaRegion.Column.Status_Desc) || columns.HasId((int)SaRegion.Column.Status_Ind)) + if (columns.HasId(SaRegion.Column.Status) || columns.HasId(SaRegion.Column.Status_Desc) || columns.HasId(SaRegion.Column.Status_Ind)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Region_Status, aliasRegion)); - if (columns.HasId((int)SaRegion.Column.CreateOn_Date)) + if (columns.HasId(SaRegion.Column.CreateOn_Date)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Region_CreateOn, aliasRegion)); - if (columns.HasId((int)SaRegion.Column.UpdateOn_Date)) + if (columns.HasId(SaRegion.Column.UpdateOn_Date)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.Region_UpdateOn, aliasRegion)); //--------------------------------------------------------------------- diff --git a/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-TaxCode.cs b/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-TaxCode.cs index 56c243b..52a699e 100644 --- a/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-TaxCode.cs +++ b/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-TaxCode.cs @@ -497,37 +497,37 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData query.Tables.Add(ReferenceDataConsole.TableName_TaxCode, aliasTaxCode); // TaxCode Properties - add columns as defined in query list. - if (columns.HasId((int)SaTaxCode.Column.Id)) + if (columns.HasId(SaTaxCode.Column.Id)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.TaxCode_Id, aliasTaxCode)); - if (columns.HasId((int)SaTaxCode.Column.Code)) + if (columns.HasId(SaTaxCode.Column.Code)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.TaxCode_Code, aliasTaxCode)); - if (columns.HasId((int)SaTaxCode.Column.CodeAlt1)) + if (columns.HasId(SaTaxCode.Column.CodeAlt1)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.TaxCode_CodeAlt1, aliasTaxCode)); - if (columns.HasId((int)SaTaxCode.Column.CodeAlt2)) + if (columns.HasId(SaTaxCode.Column.CodeAlt2)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.TaxCode_CodeAlt2, aliasTaxCode)); - if (columns.HasId((int)SaTaxCode.Column.Description)) + if (columns.HasId(SaTaxCode.Column.Description)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.TaxCode_Description, aliasTaxCode)); - if (columns.HasId((int)SaTaxCode.Column.RegionId)) + if (columns.HasId(SaTaxCode.Column.RegionId)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.TaxCode_RegionId, aliasTaxCode)); - if (columns.HasId((int)SaTaxCode.Column.EffectFrom)) + if (columns.HasId(SaTaxCode.Column.EffectFrom)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.TaxCode_EffectFrom, aliasTaxCode)); - if (columns.HasId((int)SaTaxCode.Column.EffectTo)) + if (columns.HasId(SaTaxCode.Column.EffectTo)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.TaxCode_EffectTo, aliasTaxCode)); - if (columns.HasId((int)SaTaxCode.Column.TaxRate)) + if (columns.HasId(SaTaxCode.Column.TaxRate)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.TaxCode_TaxRate, aliasTaxCode)); - if (columns.HasId((int)SaTaxCode.Column.TaxRatePrev)) + if (columns.HasId(SaTaxCode.Column.TaxRatePrev)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.TaxCode_TaxRatePrev, aliasTaxCode)); - if (columns.HasId((int)SaTaxCode.Column.TaxCodeIdLink)) + if (columns.HasId(SaTaxCode.Column.TaxCodeIdLink)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.TaxCode_TaxCodeIdLink, aliasTaxCode)); // Common Properties. - if (columns.HasId((int)SaTaxCode.Column.Notes)) + if (columns.HasId(SaTaxCode.Column.Notes)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.TaxCode_Notes, aliasTaxCode)); - if (columns.HasId((int)SaTaxCode.Column.Status) || columns.HasId((int)SaTaxCode.Column.Status_Desc) || columns.HasId((int)SaTaxCode.Column.Status_Ind)) + if (columns.HasId(SaTaxCode.Column.Status) || columns.HasId(SaTaxCode.Column.Status_Desc) || columns.HasId(SaTaxCode.Column.Status_Ind)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.TaxCode_Status, aliasTaxCode)); - if (columns.HasId((int)SaTaxCode.Column.CreateOn_Date)) + if (columns.HasId(SaTaxCode.Column.CreateOn_Date)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.TaxCode_CreateOn, aliasTaxCode)); - if (columns.HasId((int)SaTaxCode.Column.UpdateOn_Date)) + if (columns.HasId(SaTaxCode.Column.UpdateOn_Date)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.TaxCode_UpdateOn, aliasTaxCode)); //--------------------------------------------------------------------- diff --git a/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-UnitMeasure.cs b/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-UnitMeasure.cs index f81e247..d2e720d 100644 --- a/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-UnitMeasure.cs +++ b/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-UnitMeasure.cs @@ -498,41 +498,41 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData query.Tables.Add(ReferenceDataConsole.TableName_UnitMeasure, aliasUnitMeasure); // UnitMeasure Properties - add columns as defined in query list. - if (columns.HasId((int)SaUnitMeasure.Column.Id)) + if (columns.HasId(SaUnitMeasure.Column.Id)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.UnitMeasure_Id, aliasUnitMeasure)); - if (columns.HasId((int)SaUnitMeasure.Column.Category)) + if (columns.HasId(SaUnitMeasure.Column.Category)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.UnitMeasure_Category, aliasUnitMeasure)); - if (columns.HasId((int)SaUnitMeasure.Column.UnitType)) + if (columns.HasId(SaUnitMeasure.Column.UnitType)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.UnitMeasure_UnitType, aliasUnitMeasure)); - if (columns.HasId((int)SaUnitMeasure.Column.Code)) + if (columns.HasId(SaUnitMeasure.Column.Code)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.UnitMeasure_Code, aliasUnitMeasure)); - if (columns.HasId((int)SaUnitMeasure.Column.Abbr)) + if (columns.HasId(SaUnitMeasure.Column.Abbr)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.UnitMeasure_Abbr, aliasUnitMeasure)); - if (columns.HasId((int)SaUnitMeasure.Column.Single)) + if (columns.HasId(SaUnitMeasure.Column.Single)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.UnitMeasure_Single, aliasUnitMeasure)); - if (columns.HasId((int)SaUnitMeasure.Column.Multiple)) + if (columns.HasId(SaUnitMeasure.Column.Multiple)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.UnitMeasure_Multiple, aliasUnitMeasure)); - if (columns.HasId((int)SaUnitMeasure.Column.EquivalencyValue)) + if (columns.HasId(SaUnitMeasure.Column.EquivalencyValue)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.UnitMeasure_EquValue, aliasUnitMeasure)); - if (columns.HasId((int)SaUnitMeasure.Column.UomIdEquivalency)) + if (columns.HasId(SaUnitMeasure.Column.UomIdEquivalency)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.UnitMeasure_UomIdEqu, aliasUnitMeasure)); - if (columns.HasId((int)SaUnitMeasure.Column.EquivalencyAlgorythm)) + if (columns.HasId(SaUnitMeasure.Column.EquivalencyAlgorythm)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.UnitMeasure_EquAlgorythm, aliasUnitMeasure)); - if (columns.HasId((int)SaUnitMeasure.Column.UomIdRef1)) + if (columns.HasId(SaUnitMeasure.Column.UomIdRef1)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.UnitMeasure_UomIdRef1, aliasUnitMeasure)); - if (columns.HasId((int)SaUnitMeasure.Column.UomIdRef2)) + if (columns.HasId(SaUnitMeasure.Column.UomIdRef2)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.UnitMeasure_UomIdRef2, aliasUnitMeasure)); - if (columns.HasId((int)SaUnitMeasure.Column.UomIdRef3)) + if (columns.HasId(SaUnitMeasure.Column.UomIdRef3)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.UnitMeasure_UomIdRef3, aliasUnitMeasure)); // Common Properties. - if (columns.HasId((int)SaUnitMeasure.Column.Notes)) + if (columns.HasId(SaUnitMeasure.Column.Notes)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.UnitMeasure_Notes, aliasUnitMeasure)); - if (columns.HasId((int)SaUnitMeasure.Column.Status) || columns.HasId((int)SaUnitMeasure.Column.Status_Desc) || columns.HasId((int)SaUnitMeasure.Column.Status_Ind)) + if (columns.HasId(SaUnitMeasure.Column.Status) || columns.HasId(SaUnitMeasure.Column.Status_Desc) || columns.HasId(SaUnitMeasure.Column.Status_Ind)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.UnitMeasure_Status, aliasUnitMeasure)); - if (columns.HasId((int)SaUnitMeasure.Column.CreateOn_Date)) + if (columns.HasId(SaUnitMeasure.Column.CreateOn_Date)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.UnitMeasure_CreateOn, aliasUnitMeasure)); - if (columns.HasId((int)SaUnitMeasure.Column.UpdateOn_Date)) + if (columns.HasId(SaUnitMeasure.Column.UpdateOn_Date)) query.Columns.Add(SaReferenceDataDbDfn.GetColumnNameQual(SaReferenceDataDbDfn.ColumnIdx.UnitMeasure_UpdateOn, aliasUnitMeasure)); //--------------------------------------------------------------------- diff --git a/SacsStandardDbas/Dbas/Security/SaSecurityMgr_Dbas-SecurityItem.cs b/SacsStandardDbas/Dbas/Security/SaSecurityMgr_Dbas-SecurityItem.cs index 1322ba7..6fc0b58 100644 --- a/SacsStandardDbas/Dbas/Security/SaSecurityMgr_Dbas-SecurityItem.cs +++ b/SacsStandardDbas/Dbas/Security/SaSecurityMgr_Dbas-SecurityItem.cs @@ -575,30 +575,30 @@ namespace Sarand.Net.Standard.Dbas.Security query.Tables.Add(TableName_SecItem, aliasSecurityItem); // Add columns as defined in query list. - if (columns.HasId((int)SaSecurityItem.Column.Id)) + if (columns.HasId(SaSecurityItem.Column.Id)) query.Columns.Add(SaSecurityDbDfn.GetColumnNameQual(SaSecurityDbDfn.ColumnIdx.SaSecItem_Id, aliasSecurityItem)); - if (columns.HasId((int)SaSecurityItem.Column.ItemType) || columns.HasId((int)SaSecurityItem.Column.ItemType_Desc)) + if (columns.HasId(SaSecurityItem.Column.ItemType) || columns.HasId(SaSecurityItem.Column.ItemType_Desc)) query.Columns.Add(SaSecurityDbDfn.GetColumnNameQual(SaSecurityDbDfn.ColumnIdx.SaSecItem_Type, aliasSecurityItem)); - if (columns.HasId((int)SaSecurityItem.Column.Code)) + if (columns.HasId(SaSecurityItem.Column.Code)) query.Columns.Add(SaSecurityDbDfn.GetColumnNameQual(SaSecurityDbDfn.ColumnIdx.SaSecItem_Code, aliasSecurityItem)); - if (columns.HasId((int)SaSecurityItem.Column.Description)) + if (columns.HasId(SaSecurityItem.Column.Description)) query.Columns.Add(SaSecurityDbDfn.GetColumnNameQual(SaSecurityDbDfn.ColumnIdx.SaSecItem_Description, aliasSecurityItem)); - if (columns.HasId((int)SaSecurityItem.Column.Location)) + if (columns.HasId(SaSecurityItem.Column.Location)) query.Columns.Add(SaSecurityDbDfn.GetColumnNameQual(SaSecurityDbDfn.ColumnIdx.SaSecItem_Location, aliasSecurityItem)); - if (columns.HasId((int)SaSecurityItem.Column.LastLogin_Date)) + if (columns.HasId(SaSecurityItem.Column.LastLogin_Date)) query.Columns.Add(SaSecurityDbDfn.GetColumnNameQual(SaSecurityDbDfn.ColumnIdx.SaSecItem_LastLogin, aliasSecurityItem)); - if (columns.HasId((int)SaSecurityItem.Column.Notes)) + if (columns.HasId(SaSecurityItem.Column.Notes)) query.Columns.Add(SaSecurityDbDfn.GetColumnNameQual(SaSecurityDbDfn.ColumnIdx.SaSecItem_Notes, aliasSecurityItem)); - if (columns.HasId((int)SaSecurityItem.Column.Status) || columns.HasId((int)SaSecurityItem.Column.Status_Desc) || columns.HasId((int)SaSecurityItem.Column.Status_Ind)) + if (columns.HasId(SaSecurityItem.Column.Status) || columns.HasId(SaSecurityItem.Column.Status_Desc) || columns.HasId(SaSecurityItem.Column.Status_Ind)) query.Columns.Add(SaSecurityDbDfn.GetColumnNameQual(SaSecurityDbDfn.ColumnIdx.SaSecItem_Status, aliasSecurityItem)); - if (columns.HasId((int)SaSecurityItem.Column.CreateOn_Date)) + if (columns.HasId(SaSecurityItem.Column.CreateOn_Date)) query.Columns.Add(SaSecurityDbDfn.GetColumnNameQual(SaSecurityDbDfn.ColumnIdx.SaSecItem_CreateOn, aliasSecurityItem)); - if (columns.HasId((int)SaSecurityItem.Column.UpdateOn_Date)) + if (columns.HasId(SaSecurityItem.Column.UpdateOn_Date)) query.Columns.Add(SaSecurityDbDfn.GetColumnNameQual(SaSecurityDbDfn.ColumnIdx.SaSecItem_UpdateOn, aliasSecurityItem)); //--------------------------------------------------------------------- // Owner link count. - if (columns.HasId((int)SaSecurityItem.Column.OwnerLinkCount)) + if (columns.HasId(SaSecurityItem.Column.OwnerLinkCount)) { String aliasSecLink = "SecLnk"; DbQuery querySecLink = new DbQuery(Database.DbmsType); @@ -610,7 +610,7 @@ namespace Sarand.Net.Standard.Dbas.Security //--------------------------------------------------------------------- // Target link count. - if (columns.HasId((int)SaSecurityItem.Column.TargetLinkCount)) + if (columns.HasId(SaSecurityItem.Column.TargetLinkCount)) { String aliasSecLink = "SecLnk"; DbQuery querySecLink = new DbQuery(Database.DbmsType); @@ -622,7 +622,7 @@ namespace Sarand.Net.Standard.Dbas.Security //--------------------------------------------------------------------- // Target link count - Groups. - if (columns.HasId((int)SaSecurityItem.Column.TargetLinkCount_Groups)) + if (columns.HasId(SaSecurityItem.Column.TargetLinkCount_Groups)) { // TODO Users 'own' Group items - should be otehr way around! String aliasSecLink = "SecLnk"; @@ -639,7 +639,7 @@ namespace Sarand.Net.Standard.Dbas.Security //--------------------------------------------------------------------- // Target link count - Rights. - if (columns.HasId((int)SaSecurityItem.Column.OwnerLinkCount_Rights)) + if (columns.HasId(SaSecurityItem.Column.OwnerLinkCount_Rights)) { String aliasSecLink = "SecLnk"; String aliasSecLink_Item = "SecItmItm"; diff --git a/SacsStandardDbas/Dbas/Security/SaSecurityMgr_Dbas-SecurityLink.cs b/SacsStandardDbas/Dbas/Security/SaSecurityMgr_Dbas-SecurityLink.cs index 1c37b60..3e61d20 100644 --- a/SacsStandardDbas/Dbas/Security/SaSecurityMgr_Dbas-SecurityLink.cs +++ b/SacsStandardDbas/Dbas/Security/SaSecurityMgr_Dbas-SecurityLink.cs @@ -448,28 +448,28 @@ namespace Sarand.Net.Standard.Dbas.Security // Construct query. DbQuery query = new DbQuery(Database.DbmsType); query.Tables.Add(TableName_SecLink, aliasSecurityLink); - if (columns.HasId((int)SaSecurityLink.Column.ItemIdOwner)) + if (columns.HasId(SaSecurityLink.Column.ItemIdOwner)) query.Columns.Add(SaSecurityDbDfn.GetColumnNameQual(SaSecurityDbDfn.ColumnIdx.SaSecLink_ItemOwner, aliasSecurityLink)); - if (columns.HasId((int)SaSecurityLink.Column.ItemIdTarget)) + if (columns.HasId(SaSecurityLink.Column.ItemIdTarget)) query.Columns.Add(SaSecurityDbDfn.GetColumnNameQual(SaSecurityDbDfn.ColumnIdx.SaSecLink_ItemTarget, aliasSecurityLink)); - if (columns.HasId((int)SaSecurityLink.Column.ItemIdContext) || columns.HasId((int)SaSecurityLink.Column.ItemContext_Desc)) + if (columns.HasId(SaSecurityLink.Column.ItemIdContext) || columns.HasId(SaSecurityLink.Column.ItemContext_Desc)) query.Columns.Add(SaSecurityDbDfn.GetColumnNameQual(SaSecurityDbDfn.ColumnIdx.SaSecLink_ItemContext, aliasSecurityLink)); - if (columns.HasId((int)SaSecurityLink.Column.DaysApplicable)) + if (columns.HasId(SaSecurityLink.Column.DaysApplicable)) query.Columns.Add(SaSecurityDbDfn.GetColumnNameQual(SaSecurityDbDfn.ColumnIdx.SaSecLink_DayApplic, aliasSecurityLink)); - if (columns.HasId((int)SaSecurityLink.Column.DateApplicableFrom)) + if (columns.HasId(SaSecurityLink.Column.DateApplicableFrom)) query.Columns.Add(SaSecurityDbDfn.GetColumnNameQual(SaSecurityDbDfn.ColumnIdx.SaSecLink_DateApplicFrom, aliasSecurityLink)); - if (columns.HasId((int)SaSecurityLink.Column.DateApplicableTo)) + if (columns.HasId(SaSecurityLink.Column.DateApplicableTo)) query.Columns.Add(SaSecurityDbDfn.GetColumnNameQual(SaSecurityDbDfn.ColumnIdx.SaSecLink_DateApplicTo, aliasSecurityLink)); - if (columns.HasId((int)SaSecurityLink.Column.Status) || columns.HasId((int)SaSecurityLink.Column.Status_Desc) || columns.HasId((int)SaSecurityLink.Column.Status_Ind) || columns.HasId((int)SaSecurityLink.Column.Granted_Y) || columns.HasId((int)SaSecurityLink.Column.Denied_X)) + if (columns.HasId(SaSecurityLink.Column.Status) || columns.HasId(SaSecurityLink.Column.Status_Desc) || columns.HasId(SaSecurityLink.Column.Status_Ind) || columns.HasId(SaSecurityLink.Column.Granted_Y) || columns.HasId(SaSecurityLink.Column.Denied_X)) query.Columns.Add(SaSecurityDbDfn.GetColumnNameQual(SaSecurityDbDfn.ColumnIdx.SaSecLink_Status, aliasSecurityLink)); - if (columns.HasId((int)SaSecurityLink.Column.CreateOn_Date)) + if (columns.HasId(SaSecurityLink.Column.CreateOn_Date)) query.Columns.Add(SaSecurityDbDfn.GetColumnNameQual(SaSecurityDbDfn.ColumnIdx.SaSecLink_CreateOn, aliasSecurityLink)); - if (columns.HasId((int)SaSecurityLink.Column.UpdateOn_Date)) + if (columns.HasId(SaSecurityLink.Column.UpdateOn_Date)) query.Columns.Add(SaSecurityDbDfn.GetColumnNameQual(SaSecurityDbDfn.ColumnIdx.SaSecLink_UpdateOn, aliasSecurityLink)); //--------------------------------------------------------------------- // Owner item. - if (columns.HasId((int)SaSecurityLink.Column.ItemOwner_Code) || columns.HasId((int)SaSecurityLink.Column.ItemOwner_Desc)) + if (columns.HasId(SaSecurityLink.Column.ItemOwner_Code) || columns.HasId(SaSecurityLink.Column.ItemOwner_Desc)) { String aliasItemOwner = "aItmOwn"; DbQueryJoin joinItmOwn = new DbQueryJoin(DbJoinType.LeftOuter); @@ -481,7 +481,7 @@ namespace Sarand.Net.Standard.Dbas.Security //--------------------------------------------------------------------- // Target item. - if (columns.HasId((int)SaSecurityLink.Column.ItemTarget_Code) || columns.HasId((int)SaSecurityLink.Column.ItemTarget_Desc)) + if (columns.HasId(SaSecurityLink.Column.ItemTarget_Code) || columns.HasId(SaSecurityLink.Column.ItemTarget_Desc)) { String aliasItemTarget = "aItmTgt"; DbQueryJoin joinItmTgt = new DbQueryJoin(DbJoinType.LeftOuter); diff --git a/SacsStandardDbas/Dbas/UpdateLog/SaUpdateLogMgr_Dbas.cs b/SacsStandardDbas/Dbas/UpdateLog/SaUpdateLogMgr_Dbas.cs index bb7814e..57a60dc 100644 --- a/SacsStandardDbas/Dbas/UpdateLog/SaUpdateLogMgr_Dbas.cs +++ b/SacsStandardDbas/Dbas/UpdateLog/SaUpdateLogMgr_Dbas.cs @@ -610,27 +610,27 @@ namespace Sarand.Net.Standard.Dbas.UpdateLog query.Tables.Add(SaUpdateLogDbDfn.GetTableName(SaUpdateLogDbDfn.TableIdx.SaAttrUpdate), aliasUpdateLog); // Add columns as defined in query list. - if (columns.HasId((int)SaUpdateLogEntry.Column.ItemType) || columns.HasId((int)SaUpdateLogEntry.Column.ItemType_Desc)) + if (columns.HasId(SaUpdateLogEntry.Column.ItemType) || columns.HasId(SaUpdateLogEntry.Column.ItemType_Desc)) query.Columns.Add(SaUpdateLogDbDfn.GetColumnNameQual(SaUpdateLogDbDfn.ColumnIdx.SaAttrUpdate_ItemType, aliasUpdateLog)); - if (columns.HasId((int)SaUpdateLogEntry.Column.ItemId)) + if (columns.HasId(SaUpdateLogEntry.Column.ItemId)) query.Columns.Add(SaUpdateLogDbDfn.GetColumnNameQual(SaUpdateLogDbDfn.ColumnIdx.SaAttrUpdate_ItemId, aliasUpdateLog)); - if (columns.HasId((int)SaUpdateLogEntry.Column.Attribute) || columns.HasId((int)SaUpdateLogEntry.Column.DataBefore) || columns.HasId((int)SaUpdateLogEntry.Column.DataAfter)) + if (columns.HasId(SaUpdateLogEntry.Column.Attribute) || columns.HasId(SaUpdateLogEntry.Column.DataBefore) || columns.HasId(SaUpdateLogEntry.Column.DataAfter)) query.Columns.Add(SaUpdateLogDbDfn.GetColumnNameQual(SaUpdateLogDbDfn.ColumnIdx.SaAttrUpdate_Attribute, aliasUpdateLog)); - if (columns.HasId((int)SaUpdateLogEntry.Column.Logged) || columns.HasId((int)SaUpdateLogEntry.Column.Logged_Date) || columns.HasId((int)SaUpdateLogEntry.Column.Logged_Time)) + if (columns.HasId(SaUpdateLogEntry.Column.Logged) || columns.HasId(SaUpdateLogEntry.Column.Logged_Date) || columns.HasId(SaUpdateLogEntry.Column.Logged_Time)) query.Columns.Add(SaUpdateLogDbDfn.GetColumnNameQual(SaUpdateLogDbDfn.ColumnIdx.SaAttrUpdate_Logged, aliasUpdateLog)); - if (columns.HasId((int)SaUpdateLogEntry.Column.DataBefore)) + if (columns.HasId(SaUpdateLogEntry.Column.DataBefore)) query.Columns.Add(SaUpdateLogDbDfn.GetColumnNameQual(SaUpdateLogDbDfn.ColumnIdx.SaAttrUpdate_DataBefore, aliasUpdateLog)); - if (columns.HasId((int)SaUpdateLogEntry.Column.DataAfter)) + if (columns.HasId(SaUpdateLogEntry.Column.DataAfter)) query.Columns.Add(SaUpdateLogDbDfn.GetColumnNameQual(SaUpdateLogDbDfn.ColumnIdx.SaAttrUpdate_DataAfter, aliasUpdateLog)); - if (columns.HasId((int)SaUpdateLogEntry.Column.Notes)) + if (columns.HasId(SaUpdateLogEntry.Column.Notes)) query.Columns.Add(SaUpdateLogDbDfn.GetColumnNameQual(SaUpdateLogDbDfn.ColumnIdx.SaAttrUpdate_Notes, aliasUpdateLog)); - if (columns.HasId((int)SaUpdateLogEntry.Column.Status) || columns.HasId((int)SaUpdateLogEntry.Column.Status_Desc) || columns.HasId((int)SaUpdateLogEntry.Column.Status_Ind)) + if (columns.HasId(SaUpdateLogEntry.Column.Status) || columns.HasId(SaUpdateLogEntry.Column.Status_Desc) || columns.HasId(SaUpdateLogEntry.Column.Status_Ind)) query.Columns.Add(SaUpdateLogDbDfn.GetColumnNameQual(SaUpdateLogDbDfn.ColumnIdx.SaAttrUpdate_Status, aliasUpdateLog)); - if (columns.HasId((int)SaUpdateLogEntry.Column.CreateOn_Date)) + if (columns.HasId(SaUpdateLogEntry.Column.CreateOn_Date)) query.Columns.Add(SaUpdateLogDbDfn.GetColumnNameQual(SaUpdateLogDbDfn.ColumnIdx.SaAttrUpdate_CreateOn, aliasUpdateLog)); - if (columns.HasId((int)SaUpdateLogEntry.Column.CreateBy) || columns.HasId((int)SaUpdateLogEntry.Column.CreateBy_Name)) + if (columns.HasId(SaUpdateLogEntry.Column.CreateBy) || columns.HasId(SaUpdateLogEntry.Column.CreateBy_Name)) query.Columns.Add(SaUpdateLogDbDfn.GetColumnNameQual(SaUpdateLogDbDfn.ColumnIdx.SaAttrUpdate_CreateBy, aliasUpdateLog)); - if (columns.HasId((int)SaUpdateLogEntry.Column.UpdateOn_Date)) + if (columns.HasId(SaUpdateLogEntry.Column.UpdateOn_Date)) query.Columns.Add(SaUpdateLogDbDfn.GetColumnNameQual(SaUpdateLogDbDfn.ColumnIdx.SaAttrUpdate_UpdateOn, aliasUpdateLog)); //---------------------------------------------------------------------