diff --git a/SacsStandardAccounts/Accounts/QuickBooks/Base/SaQuickBooksDataItem.cs b/SacsStandardAccounts/Accounts/QuickBooks/Base/SaQuickBooksDataItem.cs index dcb2c6f..7f0d1a7 100644 --- a/SacsStandardAccounts/Accounts/QuickBooks/Base/SaQuickBooksDataItem.cs +++ b/SacsStandardAccounts/Accounts/QuickBooks/Base/SaQuickBooksDataItem.cs @@ -171,7 +171,7 @@ namespace Sarand.Net.Standard.Accounts.QuickBooks.Base // Only 1 item expected. if (item1 != null) item1.Dispose(); item1 = null; if (item2 != null) item2.Dispose(); item2 = null; - SetErrorState(SacsItemMgr.Msg_MultipleItemsFound); + SetErrorState(ErrorMessage.MultipleItemsFound); } return item1; } diff --git a/SacsStandardBase/Base/Bus/SaErrorStateItem.cs b/SacsStandardBase/Base/Bus/SaErrorStateItem.cs index 5c8279e..9c50c0d 100644 --- a/SacsStandardBase/Base/Bus/SaErrorStateItem.cs +++ b/SacsStandardBase/Base/Bus/SaErrorStateItem.cs @@ -11,11 +11,19 @@ namespace Sarand.Net.Standard.Base.Bus // Definitions. public enum ErrorMessage { + // Database. + DatabaseNotAvailable, + DatabaseQueryException, // Item validation. ItemNotSpecified, - ValiditemId, + ValidItemId, InvalidItemId, + ItemIdNotSpecified, + ItemTypeNotSpecified, + InvalidItemSpecified, + MultipleItemsFound, // Common properties. + InvalidDate, InvalidStatus, } @@ -85,23 +93,38 @@ namespace Sarand.Net.Standard.Base.Bus // Error state population. protected bool SetErrorState(ErrorMessage errorMessage) { - String message = errorMessage.ToString(); + return SetErrorState(GetErrorMessage(errorMessage)); + } + + //------------------------------------------------------------------- + protected String GetErrorMessage(ErrorMessage errorMessage) + { switch (errorMessage) { + case ErrorMessage.DatabaseNotAvailable: + return "Database is not available"; + case ErrorMessage.DatabaseQueryException: + return "Database query exception"; case ErrorMessage.ItemNotSpecified: - message = "Item not specified."; - break; - case ErrorMessage.ValiditemId: - message = "Item has a valid id."; - break; + return "Item not specified"; + case ErrorMessage.ValidItemId: + return "Item has a valid id"; case ErrorMessage.InvalidItemId: - message = "Invalid item id."; - break; + return "Invalid item id"; + case ErrorMessage.ItemIdNotSpecified: + return "Item Id must be specified"; + case ErrorMessage.ItemTypeNotSpecified: + return "Item type must be specified"; + case ErrorMessage.InvalidItemSpecified: + return "Invalid item specified"; + case ErrorMessage.MultipleItemsFound: + return "Multiple items found"; + case ErrorMessage.InvalidDate: + return "Invalid date"; case ErrorMessage.InvalidStatus: - message = "Invalid status."; - break; + return "Invalid status"; } - return SetErrorState(message); + return errorMessage.ToString(); } //------------------------------------------------------------------- diff --git a/SacsStandardBase/Base/Bus/SacsItemMgr.cs b/SacsStandardBase/Base/Bus/SacsItemMgr.cs index d55f09b..0483e6b 100644 --- a/SacsStandardBase/Base/Bus/SacsItemMgr.cs +++ b/SacsStandardBase/Base/Bus/SacsItemMgr.cs @@ -16,13 +16,6 @@ namespace Sarand.Net.Standard.Base.Bus //------------------------------------------------------------------- // Data members. - public const String Msg_DatabaseNotAvailable = "Database is not available"; - public const String Msg_DatabaseQueryException = "Database query exception"; - public const String Msg_ItemNotSpecified = "Item not specified"; - public const String Msg_ItemIdNotSpecified = "Item Id must be specified"; - public const String Msg_ItemTypeNotSpecified = "Item type must be specified"; - public const String Msg_InvalidItemSpecified = "Invalid item specified"; - public const String Msg_MultipleItemsFound = "Multiple items found"; //------------------------------------------------------------------- // Static initialisation. diff --git a/SacsStandardBase/Base/Core/ColumnDfn.cs b/SacsStandardBase/Base/Core/ColumnDfn.cs index f4297a2..8d499f6 100644 --- a/SacsStandardBase/Base/Core/ColumnDfn.cs +++ b/SacsStandardBase/Base/Core/ColumnDfn.cs @@ -122,6 +122,9 @@ namespace Sarand.Net.Standard.Base.Core public String SortDataName { get; set; } = String.Empty; public bool SortAscending { get; set; } = true; + // Property setters that can be chained with construction. + public ColumnDfn SetSortDescending() { SortAscending = false; return this; } + //------------------------------------------------------------------- // Population. public void Set @@ -140,7 +143,7 @@ namespace Sarand.Net.Standard.Base.Core //------------------------------------------------------------------- // Formatting. - public String FormatValue (NamedValue.Map values) + public String FormatValue(NamedValue.Map values) { String value = String.Empty; if (DataName.IsEmpty()) return value; @@ -148,7 +151,7 @@ namespace Sarand.Net.Standard.Base.Core if (dataValue == null || !dataValue.IsValid()) return value; return FormatValue(dataValue); } - public String FormatValue (DataValue dataValue) + public String FormatValue(DataValue dataValue) { String value = String.Empty; if (dataValue == null || !dataValue.IsValid()) return value; @@ -286,28 +289,28 @@ namespace Sarand.Net.Standard.Base.Core // C o n t a i n s //------------------------------------------------------------------- /// Determine whether list contains column with Id matching specified enum value (integer comparison). - public static bool HasId (this List values, T id) where T : struct, IConvertible + public static bool HasId(this List values, T id) where T : struct, IConvertible { if (!(id is Enum)) throw new ArgumentException("HasId parameter must be an enumerated type. Type supplied: " + id.GetType().Name); return values.HasId((int)(id as IConvertible)); } /// Determine whether list contains column with Id matching specified integer value. - public static bool HasId (this List values, int id) + public static bool HasId(this List values, int id) { foreach (var column in values) if (column.Id == id) return true; return false; } /// Determine whether list contains column with Db Column matching specified enum value (integer comparison). - public static bool HasDbColumn (this List values, T id) where T : struct, IConvertible + public static bool HasDbColumn(this List values, T id) where T : struct, IConvertible { if (!(id is Enum)) throw new ArgumentException("HasDbColumn parameter must be an enumerated type. Type supplied: " + id.GetType().Name); return values.HasDbColumn((int)(id as IConvertible)); } /// Determine whether list contains column with Db Column matching specified integer value. - public static bool HasDbColumn (this List values, int dbColumn) + public static bool HasDbColumn(this List values, int dbColumn) { foreach (var column in values) if (column.DbColumn == dbColumn) return true; @@ -316,19 +319,19 @@ namespace Sarand.Net.Standard.Base.Core //------------------------------------------------------------------- // Columns in list. - public static int GetPosForId (this List values, T id) where T : struct, IConvertible + public static int GetPosForId(this List values, T id) where T : struct, IConvertible { if (!(id is Enum)) throw new ArgumentException("HasId parameter must be an enumerated type. Type supplied: " + id.GetType().Name); return values.GetPosForId((int)(id as IConvertible)); } - public static int GetPosForId (this List values, int id) + public static int GetPosForId(this List values, int id) { for (int pos = 0; pos < values.Count; pos++) if (values[pos].Id == id) return pos + 1; return 0; } - public static List GetColumnsWithNonZeroWidth (this List values) + public static List GetColumnsWithNonZeroWidth(this List values) { return values.FindAll(item => item.Width > 0); } @@ -338,7 +341,7 @@ namespace Sarand.Net.Standard.Base.Core //------------------------------------------------------------------- // Combined width of all columns. /// Get the width of all non-zero width columns separated by the specified spacing - public static int GetFullWidth (this List values, int columnSpacing) + public static int GetFullWidth(this List values, int columnSpacing) { List columnsNonZeroWidth = values.GetColumnsWithNonZeroWidth(); if (columnsNonZeroWidth.Count < 1) return 0; @@ -349,7 +352,7 @@ namespace Sarand.Net.Standard.Base.Core } // Column widths are adjusted to keep their relative width constant. /// Expand/contract non-zero width columns to fill the specified width with the specified space in between each. - public static bool FillWidth (this List values, long width, int columnSpacing) + public static bool FillWidth(this List values, long width, int columnSpacing) { List columnsNonZeroWidth = values.GetColumnsWithNonZeroWidth(); if (columnsNonZeroWidth.Count < 1) return false; @@ -361,7 +364,7 @@ namespace Sarand.Net.Standard.Base.Core return true; } /// Calculate the left position for each non-zero width column with the specified spacing. - public static int[] GetColumnLeftPositions (this List values, int leftPosition, int columnSpacing) + public static int[] GetColumnLeftPositions(this List values, int leftPosition, int columnSpacing) { List columnsNonZeroWidth = values.GetColumnsWithNonZeroWidth(); if (columnsNonZeroWidth.Count < 1) return new int[0]; @@ -379,7 +382,7 @@ namespace Sarand.Net.Standard.Base.Core /// Calculate the horizontal print position for each non-zero width column with the specified spacing. /// NB Print position will take alignment (left/centre/right) into consideration. /// - public static int[] GetColumnPrintPositions (this List values, int leftPosition, int columnSpacing) + public static int[] GetColumnPrintPositions(this List values, int leftPosition, int columnSpacing) { List columnsNonZeroWidth = values.GetColumnsWithNonZeroWidth(); if (columnsNonZeroWidth.Count < 1) return new int[0]; @@ -403,7 +406,7 @@ namespace Sarand.Net.Standard.Base.Core // E x t r a c t C o n t e n t s //------------------------------------------------------------------- /// Compile list of captions from the columns. - public static List GetCaptions (this List values) + public static List GetCaptions(this List values) { List captions = new List(); foreach (ColumnDfn column in values) @@ -414,7 +417,7 @@ namespace Sarand.Net.Standard.Base.Core /// Convert column list to strings representing sort columns. /// NB Column name is populated as DataName and may not be the same as used in a database query in all cases. /// - public static List GetSortColumns (this List values) + public static List GetSortColumns(this List values) { List sortColumns = new List(); foreach (ColumnDfn column in values) diff --git a/SacsStandardBase/Base/ItemData/SaItemDataMgr.cs b/SacsStandardBase/Base/ItemData/SaItemDataMgr.cs index f38bd19..651c91c 100644 --- a/SacsStandardBase/Base/ItemData/SaItemDataMgr.cs +++ b/SacsStandardBase/Base/ItemData/SaItemDataMgr.cs @@ -66,12 +66,12 @@ namespace Sarand.Net.Standard.Base.ItemData if ((int)itemDataData.ItemId.Type < 1) { errField.ItemType = SacsHierarchyItem.ValidValue.Invalid; - return SetErrorState(Msg_ItemTypeNotSpecified); + return SetErrorState(ErrorMessage.ItemTypeNotSpecified); } if (!SysId.IsValid(itemDataData.ItemId.Id)) { errField.ItemId = SacsHierarchyItem.ValidValue.Invalid; - return SetErrorState(Msg_ItemIdNotSpecified); + return SetErrorState(ErrorMessage.ItemIdNotSpecified); } if (!IsValidValue(itemDataData.DataType, "Data type", (long)SaItemDataDbDfn.GetColTextLen(SaItemDataDbDfn.ColumnIdx.SaItemData_DataType), true)) { diff --git a/SacsStandardBase/Base/ItemDocs/SaItemDocMgr.cs b/SacsStandardBase/Base/ItemDocs/SaItemDocMgr.cs index 85aca6c..ee4599d 100644 --- a/SacsStandardBase/Base/ItemDocs/SaItemDocMgr.cs +++ b/SacsStandardBase/Base/ItemDocs/SaItemDocMgr.cs @@ -64,12 +64,12 @@ namespace Sarand.Net.Standard.Base.ItemDocs if ((int)itemDocData.ItemId.Type < 1) { errField.ItemType = SacsHierarchyItem.ValidValue.Invalid; - return SetErrorState(Msg_ItemTypeNotSpecified); + return SetErrorState(ErrorMessage.ItemTypeNotSpecified); } if (!SysId.IsValid(itemDocData.ItemId.Id)) { errField.ItemId = SacsHierarchyItem.ValidValue.Invalid; - return SetErrorState(Msg_ItemIdNotSpecified); + return SetErrorState(ErrorMessage.ItemIdNotSpecified); } if ((int)itemDocData.Category < 1) { diff --git a/SacsStandardBase/Base/ItemOptions/SaItemOptionMgr.cs b/SacsStandardBase/Base/ItemOptions/SaItemOptionMgr.cs index a725599..35dd2b8 100644 --- a/SacsStandardBase/Base/ItemOptions/SaItemOptionMgr.cs +++ b/SacsStandardBase/Base/ItemOptions/SaItemOptionMgr.cs @@ -68,12 +68,12 @@ namespace Sarand.Net.Standard.Base.ItemOptions if ((int)itemOptionData.ItemId.Type < 1) { errField.ItemType = SacsHierarchyItem.ValidValue.Invalid; - return SetErrorState(Msg_ItemTypeNotSpecified); + return SetErrorState(ErrorMessage.ItemTypeNotSpecified); } if (!SysId.IsValid(itemOptionData.ItemId.Id)) { errField.ItemId = SacsHierarchyItem.ValidValue.Invalid; - return SetErrorState(Msg_ItemIdNotSpecified); + return SetErrorState(ErrorMessage.ItemIdNotSpecified); } if (!IsValidValue(itemOptionData.Name, "name", (long)SaItemOptionDbDfn.GetColTextLen(SaItemOptionDbDfn.ColumnIdx.SaItemOption_Name), true)) { diff --git a/SacsStandardBase/Base/ReferenceData/SaReferenceDataMgr_Currency.cs b/SacsStandardBase/Base/ReferenceData/SaReferenceDataMgr_Currency.cs index 2cab8df..d9766be 100644 --- a/SacsStandardBase/Base/ReferenceData/SaReferenceDataMgr_Currency.cs +++ b/SacsStandardBase/Base/ReferenceData/SaReferenceDataMgr_Currency.cs @@ -86,7 +86,7 @@ namespace Sarand.Net.Standard.Base.ReferenceData public virtual bool CurrencyCanBeDeleted(SaCurrency currency) { ClearErrorState(); - if (currency == null) return SetErrorState(Msg_ItemNotSpecified); + if (currency == null) return SetErrorState(ErrorMessage.InvalidStatus); if (currency.HasDependentCurrencies()) return SetErrorState("Has dependent currencies"); return true; } diff --git a/SacsStandardBase/Base/ReferenceData/SaReferenceDataMgr_Language.cs b/SacsStandardBase/Base/ReferenceData/SaReferenceDataMgr_Language.cs index 8f0f464..e37b5e0 100644 --- a/SacsStandardBase/Base/ReferenceData/SaReferenceDataMgr_Language.cs +++ b/SacsStandardBase/Base/ReferenceData/SaReferenceDataMgr_Language.cs @@ -75,7 +75,7 @@ namespace Sarand.Net.Standard.Base.ReferenceData public virtual bool LanguageCanBeDeleted(SaLanguage language) { ClearErrorState(); - if (language == null) return SetErrorState(Msg_ItemNotSpecified); + if (language == null) return SetErrorState(ErrorMessage.InvalidStatus); if (language.HasDependentLanguages()) return SetErrorState("Has dependent languages"); return true; } diff --git a/SacsStandardBase/Base/ReferenceData/SaReferenceDataMgr_Region.cs b/SacsStandardBase/Base/ReferenceData/SaReferenceDataMgr_Region.cs index 44597b3..8b104f4 100644 --- a/SacsStandardBase/Base/ReferenceData/SaReferenceDataMgr_Region.cs +++ b/SacsStandardBase/Base/ReferenceData/SaReferenceDataMgr_Region.cs @@ -97,7 +97,7 @@ namespace Sarand.Net.Standard.Base.ReferenceData public virtual bool RegionCanBeDeleted(SaRegion region) { ClearErrorState(); - if (region == null) return SetErrorState(Msg_ItemNotSpecified); + if (region == null) return SetErrorState(ErrorMessage.InvalidStatus); if (region.HasDependentRegions()) return SetErrorState("Has dependent regions"); if (region.HasDependentCurrencies()) return SetErrorState("Has dependent currencies"); if (region.HasDependentTaxCodes()) return SetErrorState("Has dependent tax codes"); diff --git a/SacsStandardBase/Base/UpdateLog/SaUpdateLogMgr.cs b/SacsStandardBase/Base/UpdateLog/SaUpdateLogMgr.cs index 899159e..fd941b5 100644 --- a/SacsStandardBase/Base/UpdateLog/SaUpdateLogMgr.cs +++ b/SacsStandardBase/Base/UpdateLog/SaUpdateLogMgr.cs @@ -59,12 +59,12 @@ namespace Sarand.Net.Standard.Base.UpdateLog if ((int)logEntryData.ItemId.Type < 1) { errField.ItemType = SacsHierarchyItem.ValidValue.Invalid; - return SetErrorState(Msg_ItemTypeNotSpecified); + return SetErrorState(ErrorMessage.ItemTypeNotSpecified); } if (!SysId.IsValid(logEntryData.ItemId.Id)) { errField.ItemId = SacsHierarchyItem.ValidValue.Invalid; - return SetErrorState(Msg_ItemIdNotSpecified); + return SetErrorState(ErrorMessage.ItemIdNotSpecified); } if (!IsValidValue(logEntryData.Attribute, "attribute", (long)SaUpdateLogDbDfn.GetColTextLen(SaUpdateLogDbDfn.ColumnIdx.SaAttrUpdate_Attribute), true)) { diff --git a/SacsStandardDbas/Dbas/CodeTypes/SaCodeTypeMgr_Dbas.cs b/SacsStandardDbas/Dbas/CodeTypes/SaCodeTypeMgr_Dbas.cs index 7d5894f..36acf8f 100644 --- a/SacsStandardDbas/Dbas/CodeTypes/SaCodeTypeMgr_Dbas.cs +++ b/SacsStandardDbas/Dbas/CodeTypes/SaCodeTypeMgr_Dbas.cs @@ -112,7 +112,7 @@ namespace Sarand.Net.Standard.Dbas.CodeTypes } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } } @@ -151,7 +151,7 @@ namespace Sarand.Net.Standard.Dbas.CodeTypes { ClearErrorState(); if (!IsValidCodeType(codeType)) return false; - if (SysId.IsValid(codeType.Id)) return SetErrorState(ErrorMessage.ValiditemId); + if (SysId.IsValid(codeType.Id)) return SetErrorState(ErrorMessage.ValidItemId); using (var dbConnection = Database.CreateConnection()) using (var dbCommand = dbConnection.CreateCommand()) { @@ -492,7 +492,7 @@ namespace Sarand.Net.Standard.Dbas.CodeTypes } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } } @@ -517,7 +517,7 @@ namespace Sarand.Net.Standard.Dbas.CodeTypes } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } } @@ -649,7 +649,7 @@ namespace Sarand.Net.Standard.Dbas.CodeTypes } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } } @@ -692,7 +692,7 @@ namespace Sarand.Net.Standard.Dbas.CodeTypes { ClearErrorState(); if (!IsValidCode(code)) return false; - if (SysId.IsValid(code.Id)) return SetErrorState(ErrorMessage.ValiditemId); + if (SysId.IsValid(code.Id)) return SetErrorState(ErrorMessage.ValidItemId); using (var dbConnection = Database.CreateConnection()) using (var dbCommand = dbConnection.CreateCommand()) { @@ -1058,7 +1058,7 @@ namespace Sarand.Net.Standard.Dbas.CodeTypes } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } } @@ -1084,7 +1084,7 @@ namespace Sarand.Net.Standard.Dbas.CodeTypes } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } } diff --git a/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas-InterfaceDataItems.cs b/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas-InterfaceDataItems.cs index 4066784..596d695 100644 --- a/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas-InterfaceDataItems.cs +++ b/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas-InterfaceDataItems.cs @@ -71,7 +71,7 @@ namespace Sarand.Net.Standard.Dbas.Interfaces } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } } @@ -99,7 +99,7 @@ namespace Sarand.Net.Standard.Dbas.Interfaces { ClearErrorState(); if (!IsValidInterfaceDataItem(interfaceProcessDataItem)) return false; - if (SysId.IsValid(interfaceProcessDataItem.Id)) return SetErrorState(ErrorMessage.ValiditemId); + if (SysId.IsValid(interfaceProcessDataItem.Id)) return SetErrorState(ErrorMessage.ValidItemId); using (var dbConnection = Database.CreateConnection()) using (var dbCommand = dbConnection.CreateCommand()) { @@ -533,7 +533,7 @@ namespace Sarand.Net.Standard.Dbas.Interfaces } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } } diff --git a/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas-InterfaceProcessMessages.cs b/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas-InterfaceProcessMessages.cs index 70cf625..41085a6 100644 --- a/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas-InterfaceProcessMessages.cs +++ b/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas-InterfaceProcessMessages.cs @@ -72,7 +72,7 @@ namespace Sarand.Net.Standard.Dbas.Interfaces } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } } @@ -100,7 +100,7 @@ namespace Sarand.Net.Standard.Dbas.Interfaces { ClearErrorState(); if (!IsValidInterfaceProcessMessage(interfaceProcessMessage)) return false; - if (SysId.IsValid(interfaceProcessMessage.Id)) return SetErrorState(ErrorMessage.ValiditemId); + if (SysId.IsValid(interfaceProcessMessage.Id)) return SetErrorState(ErrorMessage.ValidItemId); using (var dbConnection = Database.CreateConnection()) using (var dbCommand = dbConnection.CreateCommand()) { @@ -419,7 +419,7 @@ namespace Sarand.Net.Standard.Dbas.Interfaces } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } } diff --git a/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas-InterfaceProcesses.cs b/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas-InterfaceProcesses.cs index ade5079..39a8d00 100644 --- a/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas-InterfaceProcesses.cs +++ b/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas-InterfaceProcesses.cs @@ -93,7 +93,7 @@ namespace Sarand.Net.Standard.Dbas.Interfaces } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } } @@ -121,7 +121,7 @@ namespace Sarand.Net.Standard.Dbas.Interfaces { ClearErrorState(); if (!IsValidInterfaceProcess(interfaceProcess)) return false; - if (SysId.IsValid(interfaceProcess.Id)) return SetErrorState(ErrorMessage.ValiditemId); + if (SysId.IsValid(interfaceProcess.Id)) return SetErrorState(ErrorMessage.ValidItemId); using (var dbConnection = Database.CreateConnection()) using (var dbCommand = dbConnection.CreateCommand()) { @@ -657,7 +657,7 @@ namespace Sarand.Net.Standard.Dbas.Interfaces } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } } diff --git a/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas-Interfaces.cs b/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas-Interfaces.cs index 59728b6..eed06e4 100644 --- a/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas-Interfaces.cs +++ b/SacsStandardDbas/Dbas/Interfaces/SaInterfaceMgr_Dbas-Interfaces.cs @@ -104,7 +104,7 @@ namespace Sarand.Net.Standard.Dbas.Interfaces } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } } @@ -138,7 +138,7 @@ namespace Sarand.Net.Standard.Dbas.Interfaces { ClearErrorState(); if (!IsValidInterface(interfaceObj)) return false; - if (SysId.IsValid(interfaceObj.Id)) return SetErrorState(ErrorMessage.ValiditemId); + if (SysId.IsValid(interfaceObj.Id)) return SetErrorState(ErrorMessage.ValidItemId); using (var dbConnection = Database.CreateConnection()) using (var dbCommand = dbConnection.CreateCommand()) { @@ -492,7 +492,7 @@ namespace Sarand.Net.Standard.Dbas.Interfaces } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } } diff --git a/SacsStandardDbas/Dbas/ItemData/SaItemDataMgr_Dbas.cs b/SacsStandardDbas/Dbas/ItemData/SaItemDataMgr_Dbas.cs index f34553c..16b34c8 100644 --- a/SacsStandardDbas/Dbas/ItemData/SaItemDataMgr_Dbas.cs +++ b/SacsStandardDbas/Dbas/ItemData/SaItemDataMgr_Dbas.cs @@ -158,7 +158,7 @@ namespace Sarand.Net.Standard.Dbas.ItemData } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } } @@ -180,7 +180,7 @@ namespace Sarand.Net.Standard.Dbas.ItemData { ClearErrorState(); if (!IsValidItemData(itemData)) return false; - if (SysId.IsValid(itemData.Id)) return SetErrorState(ErrorMessage.ValiditemId); + if (SysId.IsValid(itemData.Id)) return SetErrorState(ErrorMessage.ValidItemId); using (var dbConnection = Database.CreateConnection()) using (var dbCommand = dbConnection.CreateCommand()) { @@ -260,7 +260,7 @@ namespace Sarand.Net.Standard.Dbas.ItemData public override bool ClearItemData(ItemId itemId, DbUpdateInfo dbUpdateInfo) { ClearErrorState(); - if (!ItemId.IsValid(itemId)) return SetErrorState(Msg_ItemIdNotSpecified); + if (!ItemId.IsValid(itemId)) return SetErrorState(ErrorMessage.ItemIdNotSpecified); String colItemType = SaItemDataDbDfn.GetColumnName(SaItemDataDbDfn.ColumnIdx.SaItemData_ItemType); String colItemId = SaItemDataDbDfn.GetColumnName(SaItemDataDbDfn.ColumnIdx.SaItemData_ItemId); String query = "Delete From " + TableName_ItemData + " WHERE " + colItemType + "=" + itemId.Type.ToString() + " AND " + colItemId + "=" + SysId.ToString(itemId.Id); @@ -272,7 +272,7 @@ namespace Sarand.Net.Standard.Dbas.ItemData public override bool ClearItemData(ItemId itemId, String dataType, DbUpdateInfo dbUpdateInfo) { ClearErrorState(); - if (!ItemId.IsValid(itemId)) return SetErrorState(Msg_ItemIdNotSpecified); + if (!ItemId.IsValid(itemId)) return SetErrorState(ErrorMessage.ItemIdNotSpecified); if (StringUtil.IsEmpty(dataType)) return SetErrorState("Data type must be specified"); String colItemType = SaItemDataDbDfn.GetColumnName(SaItemDataDbDfn.ColumnIdx.SaItemData_ItemType); String colItemId = SaItemDataDbDfn.GetColumnName(SaItemDataDbDfn.ColumnIdx.SaItemData_ItemId); @@ -522,7 +522,7 @@ namespace Sarand.Net.Standard.Dbas.ItemData } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } } diff --git a/SacsStandardDbas/Dbas/ItemDocs/SaItemDocMgr_Dbas.cs b/SacsStandardDbas/Dbas/ItemDocs/SaItemDocMgr_Dbas.cs index 9e38a6b..ceabac0 100644 --- a/SacsStandardDbas/Dbas/ItemDocs/SaItemDocMgr_Dbas.cs +++ b/SacsStandardDbas/Dbas/ItemDocs/SaItemDocMgr_Dbas.cs @@ -136,7 +136,7 @@ namespace Sarand.Net.Standard.Dbas.ItemDocs } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } } @@ -158,7 +158,7 @@ namespace Sarand.Net.Standard.Dbas.ItemDocs { ClearErrorState(); if (!IsValidItemDoc(itemDoc)) return false; - if (SysId.IsValid(itemDoc.Id)) return SetErrorState(ErrorMessage.ValiditemId); + if (SysId.IsValid(itemDoc.Id)) return SetErrorState(ErrorMessage.ValidItemId); using (var dbConnection = Database.CreateConnection()) using (var dbCommand = dbConnection.CreateCommand()) { @@ -238,7 +238,7 @@ namespace Sarand.Net.Standard.Dbas.ItemDocs public override bool ClearItemDocs (ItemId itemId, DbUpdateInfo dbUpdateInfo) { ClearErrorState(); - if (!ItemId.IsValid(itemId)) return SetErrorState(Msg_ItemIdNotSpecified); + if (!ItemId.IsValid(itemId)) return SetErrorState(ErrorMessage.ItemIdNotSpecified); String colItemType = SaItemDocsDbDfn.GetColumnName(SaItemDocsDbDfn.ColumnIdx.SaItemDoc_ItemType); String colItemId = SaItemDocsDbDfn.GetColumnName(SaItemDocsDbDfn.ColumnIdx.SaItemDoc_ItemId); String query = "Delete From "+TableName_ItemDoc+" WHERE "+colItemType+"="+itemId.Type.ToString()+" AND "+colItemId+"="+SysId.ToString(itemId.Id); @@ -250,7 +250,7 @@ namespace Sarand.Net.Standard.Dbas.ItemDocs public override bool ClearItemDocs (ItemId itemId, SaItemDocConsole.Category category, DbUpdateInfo dbUpdateInfo) { ClearErrorState(); - if (!ItemId.IsValid(itemId)) return SetErrorState(Msg_ItemIdNotSpecified); + if (!ItemId.IsValid(itemId)) return SetErrorState(ErrorMessage.ItemIdNotSpecified); if ((int)category < 1) return SetErrorState("Category must be specified"); String colItemType = SaItemDocsDbDfn.GetColumnName(SaItemDocsDbDfn.ColumnIdx.SaItemDoc_ItemType); String colItemId = SaItemDocsDbDfn.GetColumnName(SaItemDocsDbDfn.ColumnIdx.SaItemDoc_ItemId); @@ -558,7 +558,7 @@ namespace Sarand.Net.Standard.Dbas.ItemDocs } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } } diff --git a/SacsStandardDbas/Dbas/ItemOptions/SaItemOptionMgr_Dbas.cs b/SacsStandardDbas/Dbas/ItemOptions/SaItemOptionMgr_Dbas.cs index 1c3ff50..46ec93c 100644 --- a/SacsStandardDbas/Dbas/ItemOptions/SaItemOptionMgr_Dbas.cs +++ b/SacsStandardDbas/Dbas/ItemOptions/SaItemOptionMgr_Dbas.cs @@ -123,7 +123,7 @@ namespace Sarand.Net.Standard.Dbas.ItemOptions } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } } @@ -240,7 +240,7 @@ namespace Sarand.Net.Standard.Dbas.ItemOptions public override bool ClearItemOptionsForItem (ItemId itemId, DbUpdateInfo dbUpdateInfo) { ClearErrorState(); - if (!ItemId.IsValid(itemId)) return SetErrorState(Msg_ItemIdNotSpecified); + if (!ItemId.IsValid(itemId)) return SetErrorState(ErrorMessage.ItemIdNotSpecified); String colItemType = SaItemOptionDbDfn.GetColumnName(SaItemOptionDbDfn.ColumnIdx.SaItemOption_ItemType); String colItemId = SaItemOptionDbDfn.GetColumnName(SaItemOptionDbDfn.ColumnIdx.SaItemOption_ItemId); String query = "Delete From "+TableName_ItemOption+" WHERE "+colItemType+"="+itemId.Type.ToString()+" AND "+colItemId+"="+SysId.ToString(itemId.Id); @@ -510,7 +510,7 @@ namespace Sarand.Net.Standard.Dbas.ItemOptions } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } } diff --git a/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-Currency.cs b/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-Currency.cs index 0d4f474..c691e3b 100644 --- a/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-Currency.cs +++ b/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-Currency.cs @@ -68,7 +68,7 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData if (count == 0) return null; if (count != 1) { - SetErrorState(Msg_MultipleItemsFound); + SetErrorState(ErrorMessage.MultipleItemsFound); return null; } SaCurrency currency = null; @@ -85,7 +85,7 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } } @@ -119,7 +119,7 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData { ClearErrorState(); if (!IsValidCurrency(currency)) return false; - if (SysId.IsValid(currency.Id)) return SetErrorState(ErrorMessage.ValiditemId); + if (SysId.IsValid(currency.Id)) return SetErrorState(ErrorMessage.ValidItemId); using (var dbConnection = Database.CreateConnection()) using (var dbCommand = dbConnection.CreateCommand()) { @@ -450,7 +450,7 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } } diff --git a/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-Language.cs b/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-Language.cs index c75cdb6..4a004b1 100644 --- a/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-Language.cs +++ b/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-Language.cs @@ -68,7 +68,7 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData if (count == 0) return null; if (count != 1) { - SetErrorState(Msg_MultipleItemsFound); + SetErrorState(ErrorMessage.MultipleItemsFound); return null; } SaLanguage language = null; @@ -85,7 +85,7 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } } @@ -119,7 +119,7 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData { ClearErrorState(); if (!IsValidLanguage(language)) return false; - if (SysId.IsValid(language.Id)) return SetErrorState(ErrorMessage.ValiditemId); + if (SysId.IsValid(language.Id)) return SetErrorState(ErrorMessage.ValidItemId); using (var dbConnection = Database.CreateConnection()) using (var dbCommand = dbConnection.CreateCommand()) { @@ -459,7 +459,7 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } } diff --git a/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-Region.cs b/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-Region.cs index 9ffdbc6..2d78c5b 100644 --- a/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-Region.cs +++ b/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-Region.cs @@ -68,7 +68,7 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData if (count == 0) return null; if (count != 1) { - SetErrorState(Msg_MultipleItemsFound); + SetErrorState(ErrorMessage.MultipleItemsFound); return null; } SaRegion region = null; @@ -85,7 +85,7 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } } @@ -119,7 +119,7 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData { ClearErrorState(); if (!IsValidRegion(region)) return false; - if (SysId.IsValid(region.Id)) return SetErrorState(ErrorMessage.ValiditemId); + if (SysId.IsValid(region.Id)) return SetErrorState(ErrorMessage.ValidItemId); using (var dbConnection = Database.CreateConnection()) using (var dbCommand = dbConnection.CreateCommand()) { @@ -436,7 +436,7 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } } diff --git a/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-TaxCode.cs b/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-TaxCode.cs index 0467810..4b6a1fe 100644 --- a/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-TaxCode.cs +++ b/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-TaxCode.cs @@ -68,7 +68,7 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData if (count == 0) return null; if (count != 1) { - SetErrorState(Msg_MultipleItemsFound); + SetErrorState(ErrorMessage.MultipleItemsFound); return null; } SaTaxCode taxCode = null; @@ -85,7 +85,7 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } } @@ -119,7 +119,7 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData { ClearErrorState(); if (!IsValidTaxCode(taxCode)) return false; - if (SysId.IsValid(taxCode.Id)) return SetErrorState(ErrorMessage.ValiditemId); + if (SysId.IsValid(taxCode.Id)) return SetErrorState(ErrorMessage.ValidItemId); using (var dbConnection = Database.CreateConnection()) using (var dbCommand = dbConnection.CreateCommand()) { @@ -478,7 +478,7 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } } diff --git a/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-UnitMeasure.cs b/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-UnitMeasure.cs index 121f325..dc08826 100644 --- a/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-UnitMeasure.cs +++ b/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-UnitMeasure.cs @@ -68,7 +68,7 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData if (count == 0) return null; if (count != 1) { - SetErrorState(Msg_MultipleItemsFound); + SetErrorState(ErrorMessage.MultipleItemsFound); return null; } SaUnitMeasure unitMeasure = null; @@ -85,7 +85,7 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } } @@ -119,7 +119,7 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData { ClearErrorState(); if (!IsValidUnitMeasure(unitMeasure)) return false; - if (SysId.IsValid(unitMeasure.Id)) return SetErrorState(ErrorMessage.ValiditemId); + if (SysId.IsValid(unitMeasure.Id)) return SetErrorState(ErrorMessage.ValidItemId); using (var dbConnection = Database.CreateConnection()) using (var dbCommand = dbConnection.CreateCommand()) { @@ -479,7 +479,7 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } } diff --git a/SacsStandardDbas/Dbas/Security/SaSecurityConsole_Dbas.cs b/SacsStandardDbas/Dbas/Security/SaSecurityConsole_Dbas.cs index 8282a23..ab7f120 100644 --- a/SacsStandardDbas/Dbas/Security/SaSecurityConsole_Dbas.cs +++ b/SacsStandardDbas/Dbas/Security/SaSecurityConsole_Dbas.cs @@ -460,7 +460,7 @@ namespace Sarand.Net.Standard.Dbas.Security ClearErrorState(); if (!SysId.IsValid(itemId)) { - SetErrorState(SacsItemMgr.Msg_ItemIdNotSpecified); + SetErrorState(ErrorMessage.ItemIdNotSpecified); return ""; } @@ -492,7 +492,7 @@ namespace Sarand.Net.Standard.Dbas.Security ClearErrorState(); if (!SysId.IsValid(itemId)) { - SetErrorState(SacsItemMgr.Msg_ItemIdNotSpecified); + SetErrorState(SacsItemMgr.ErrorMessage.ItemIdNotSpecified); return ""; } diff --git a/SacsStandardDbas/Dbas/Security/SaSecurityMgr_Dbas-SecurityItem.cs b/SacsStandardDbas/Dbas/Security/SaSecurityMgr_Dbas-SecurityItem.cs index 79d3ef1..4a5f4b3 100644 --- a/SacsStandardDbas/Dbas/Security/SaSecurityMgr_Dbas-SecurityItem.cs +++ b/SacsStandardDbas/Dbas/Security/SaSecurityMgr_Dbas-SecurityItem.cs @@ -100,7 +100,7 @@ namespace Sarand.Net.Standard.Dbas.Security } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } } @@ -176,7 +176,7 @@ namespace Sarand.Net.Standard.Dbas.Security { ClearErrorState(); if (!IsValidSecurityItem(securityItem)) return false; - if (SysId.IsValid(securityItem.Id)) return SetErrorState(ErrorMessage.ValiditemId); + if (SysId.IsValid(securityItem.Id)) return SetErrorState(ErrorMessage.ValidItemId); using (var dbConnection = Database.CreateConnection()) using (var dbCommand = dbConnection.CreateCommand()) { @@ -570,7 +570,7 @@ namespace Sarand.Net.Standard.Dbas.Security } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } } diff --git a/SacsStandardDbas/Dbas/Security/SaSecurityMgr_Dbas-SecurityLink.cs b/SacsStandardDbas/Dbas/Security/SaSecurityMgr_Dbas-SecurityLink.cs index 147dedf..249208b 100644 --- a/SacsStandardDbas/Dbas/Security/SaSecurityMgr_Dbas-SecurityLink.cs +++ b/SacsStandardDbas/Dbas/Security/SaSecurityMgr_Dbas-SecurityLink.cs @@ -57,7 +57,7 @@ namespace Sarand.Net.Standard.Dbas.Security } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } } @@ -431,7 +431,7 @@ namespace Sarand.Net.Standard.Dbas.Security } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } } diff --git a/SacsStandardDbas/Dbas/UpdateLog/SaUpdateLogMgr_Dbas.cs b/SacsStandardDbas/Dbas/UpdateLog/SaUpdateLogMgr_Dbas.cs index 0479b5c..cb572f8 100644 --- a/SacsStandardDbas/Dbas/UpdateLog/SaUpdateLogMgr_Dbas.cs +++ b/SacsStandardDbas/Dbas/UpdateLog/SaUpdateLogMgr_Dbas.cs @@ -99,7 +99,7 @@ namespace Sarand.Net.Standard.Dbas.UpdateLog } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } } @@ -321,7 +321,7 @@ namespace Sarand.Net.Standard.Dbas.UpdateLog public override bool ClearLogEntriesForItem (ItemId itemId, DbUpdateInfo dbUpdateInfo) { ClearErrorState(); - if (!ItemId.IsValid(itemId)) return SetErrorState(Msg_ItemIdNotSpecified); + if (!ItemId.IsValid(itemId)) return SetErrorState(ErrorMessage.ItemIdNotSpecified); String colItemType = SaUpdateLogDbDfn.GetColumnName(SaUpdateLogDbDfn.ColumnIdx.SaAttrUpdate_ItemType); String colItemId = SaUpdateLogDbDfn.GetColumnName(SaUpdateLogDbDfn.ColumnIdx.SaAttrUpdate_ItemId); String query = "Delete From "+TableName_UpdateLog+" WHERE "+colItemType+"="+itemId.Type.ToString()+" AND "+colItemId+"="+SysId.ToString(itemId.Id); @@ -591,7 +591,7 @@ namespace Sarand.Net.Standard.Dbas.UpdateLog } catch (Exception exc) { - SetErrorState(Msg_DatabaseQueryException); + SetErrorState(ErrorMessage.DatabaseQueryException); SaLogger.Warn($"{SysUtil.Fn}\n\tQuery: {dbCommand.CommandText}\n\t{ExceptionUtil.GetErrorStateMessage(exc)}"); } }