From c5b790bbb0c2f166e7dc6fb9678d75aaca74e068 Mon Sep 17 00:00:00 2001 From: Rich Date: Thu, 3 May 2012 21:45:49 +0000 Subject: [PATCH] Upgrade Settings from previous revision Save config changes once --- .../Properties/Settings.Designer.cs | 12 +++++++ .../Properties/Settings.settings | 3 ++ PROMS/VEPROMS User Interface/frmVEPROMS.cs | 6 ++++ PROMS/Volian.Controls.Library/DisplayTags.cs | 36 +++++++++---------- PROMS/Volian.Controls.Library/EditItem.cs | 2 ++ 5 files changed, 41 insertions(+), 18 deletions(-) diff --git a/PROMS/VEPROMS User Interface/Properties/Settings.Designer.cs b/PROMS/VEPROMS User Interface/Properties/Settings.Designer.cs index f3fb3a90..88d8abca 100644 --- a/PROMS/VEPROMS User Interface/Properties/Settings.Designer.cs +++ b/PROMS/VEPROMS User Interface/Properties/Settings.Designer.cs @@ -315,5 +315,17 @@ namespace VEPROMS.Properties { this["SMTPUser"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool UpdateSettings { + get { + return ((bool)(this["UpdateSettings"])); + } + set { + this["UpdateSettings"] = value; + } + } } } diff --git a/PROMS/VEPROMS User Interface/Properties/Settings.settings b/PROMS/VEPROMS User Interface/Properties/Settings.settings index 0a36cae7..25ef57ed 100644 --- a/PROMS/VEPROMS User Interface/Properties/Settings.settings +++ b/PROMS/VEPROMS User Interface/Properties/Settings.settings @@ -77,5 +77,8 @@ + + True + \ No newline at end of file diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index ad5392ad..2de00f23 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -111,6 +111,12 @@ namespace VEPROMS #endregion public frmVEPROMS() { + if (Properties.Settings.Default.UpdateSettings) + { + Properties.Settings.Default.Upgrade(); + Properties.Settings.Default.UpdateSettings = false; + Properties.Settings.Default.Save(); + } // cleanup from previous run: Volian.Base.Library.TmpFile.RemoveAllTmps(); diff --git a/PROMS/Volian.Controls.Library/DisplayTags.cs b/PROMS/Volian.Controls.Library/DisplayTags.cs index 3254c587..657c83b6 100644 --- a/PROMS/Volian.Controls.Library/DisplayTags.cs +++ b/PROMS/Volian.Controls.Library/DisplayTags.cs @@ -355,12 +355,12 @@ namespace Volian.Controls.Library { StepConfig sc = CurItemInfo.MyConfig as StepConfig; sc.Step_CBOverride = "On"; - using (Content cnt = Content.Get(CurItemInfo.MyContent.ContentID)) - { - cnt.DTS = DateTime.Now; - cnt.UserID = Volian.Base.Library.VlnSettings.UserID; - cnt.Save(); - } + //using (Content cnt = Content.Get(CurItemInfo.MyContent.ContentID)) + //{ + // cnt.DTS = DateTime.Now; + // cnt.UserID = Volian.Base.Library.VlnSettings.UserID; + // cnt.Save(); + //} } } private void rbChgBarOvrRideOff_CheckedChanged(object sender, EventArgs e) @@ -373,12 +373,12 @@ namespace Volian.Controls.Library { StepConfig sc = CurItemInfo.MyConfig as StepConfig; sc.Step_CBOverride = "Off"; - using (Content cnt = Content.Get(CurItemInfo.MyContent.ContentID)) - { - cnt.DTS = CurItemInfo.MyProcedure.DTS; - cnt.UserID = CurItemInfo.MyProcedure.UserID; - cnt.Save(); - } + //using (Content cnt = Content.Get(CurItemInfo.MyContent.ContentID)) + //{ + // cnt.DTS = CurItemInfo.MyProcedure.DTS; + // cnt.UserID = CurItemInfo.MyProcedure.UserID; + // cnt.Save(); + //} } } private void cmbCheckoff_SelectedIndexChanged(object sender, EventArgs e) @@ -389,12 +389,12 @@ namespace Volian.Controls.Library int indx = cmbCheckoff.SelectedIndex; StepConfig sc = CurItemInfo.MyConfig as StepConfig; sc.Step_CheckOffIndex = indx; - using (Content cnt = Content.Get(CurItemInfo.MyContent.ContentID)) - { - cnt.DTS = CurItemInfo.MyProcedure.DTS; - cnt.UserID = CurItemInfo.MyProcedure.UserID; - cnt.Save(); - } + //using (Content cnt = Content.Get(CurItemInfo.MyContent.ContentID)) + //{ + // cnt.DTS = CurItemInfo.MyProcedure.DTS; + // cnt.UserID = CurItemInfo.MyProcedure.UserID; + // cnt.Save(); + //} } #endregion } diff --git a/PROMS/Volian.Controls.Library/EditItem.cs b/PROMS/Volian.Controls.Library/EditItem.cs index 0f2d73aa..118961ff 100644 --- a/PROMS/Volian.Controls.Library/EditItem.cs +++ b/PROMS/Volian.Controls.Library/EditItem.cs @@ -2294,6 +2294,8 @@ namespace Volian.Controls.Library using (Item itm = MyItemInfo.Get()) { itm.MyContent.Config = MyItemInfo.MyConfig.ToString(); + itm.MyContent.DTS = DateTime.Now; + itm.MyContent.UserID = Volian.Base.Library.VlnSettings.UserID; itm.Save(); } MyItemInfo.MyConfig.IsDirty = false;