C2025-023 Bringing branch up to date to resolve merge conflicts

This commit is contained in:
2025-06-20 14:33:58 -04:00
parent c45dbf1dac
commit a55ce75e2e
58 changed files with 1360 additions and 688 deletions

View File

@@ -16,6 +16,7 @@ namespace VEPROMS.CSLA.Library
#region Public Properties
public bool UserSetting_OpenTabs_Remember { get; protected set; } = false;
public bool UserSetting_OpenTabs_AutoOpen { get; protected set; } = true;
public bool UserSetting_MSWord_Summary_Prompt { get; protected set; } = true;
#endregion
@@ -31,7 +32,7 @@ namespace VEPROMS.CSLA.Library
using (SqlCommand cm = cn.CreateCommand())
{
cm.CommandType = CommandType.Text;
cm.CommandText = "Select RememberOpenTabs, AutoOpenTabs FROM Users where UserID = @UID";
cm.CommandText = "Select RememberOpenTabs, AutoOpenTabs, MSWordSummaryPrompt FROM Users where UserID = @UID";
cm.Parameters.AddWithValue("@UID", _userid);
cm.CommandTimeout = Database.DefaultTimeout;
using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
@@ -40,6 +41,7 @@ namespace VEPROMS.CSLA.Library
{
UserSetting_OpenTabs_Remember = (bool) dr.GetValue("RememberOpenTabs");
UserSetting_OpenTabs_AutoOpen = (bool) dr.GetValue("AutoOpenTabs");
UserSetting_MSWord_Summary_Prompt = (bool) dr.GetValue("MSWordSummaryPrompt");
}
}
}
@@ -84,6 +86,33 @@ namespace VEPROMS.CSLA.Library
throw new DbCslaException("UserSettings_SetUserSettings", ex);
}
}
public void SetUserSetting_MSWord_Summary_Prompt(bool prompt)
{
try
{
using (SqlConnection cn = Database.VEPROMS_SqlConnection)
{
using (SqlCommand cm = cn.CreateCommand())
{
cm.CommandType = CommandType.StoredProcedure;
cm.CommandText = "vesp_UpdateUserSettingMSWordSummaryPrompt";
cm.Parameters.AddWithValue("@UID", _userid);
UserSetting_MSWord_Summary_Prompt = prompt;
cm.Parameters.AddWithValue("@Prompt", prompt);
cm.CommandTimeout = Database.DefaultTimeout;
cm.ExecuteNonQuery();
}
}
}
catch (Exception ex)
{
Database.LogException("UserSettings_SetUserSettings", ex);
throw new DbCslaException("UserSettings_SetUserSettings", ex);
}
}
#endregion
}