diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 0654c0d9..39ee1400 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -229,8 +229,6 @@ namespace VEPROMS UpdateFormats(parameter.Substring(4)); else if (parameter.ToUpper().StartsWith("/UF")) UpdateFormats(null); - else if (parameter.ToUpper().StartsWith("/ODV=")) - tv.OverrideDocVersionID = int.Parse(parameter.Substring(5, parameter.Length - 5)); } VETreeNode tn = VETreeNode.GetFolder(1); tv.Nodes.Add(tn); diff --git a/PROMS/VEPROMS User Interface/frmVersionsProperties.cs b/PROMS/VEPROMS User Interface/frmVersionsProperties.cs index 0ba0c266..a1207c18 100644 --- a/PROMS/VEPROMS User Interface/frmVersionsProperties.cs +++ b/PROMS/VEPROMS User Interface/frmVersionsProperties.cs @@ -849,7 +849,7 @@ namespace VEPROMS } Cursor = Cursors.WaitCursor; SelectedROFst.ROTableUpdate += new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate); - ROFst newrofst = ROFstInfo.UpdateRoFst(rdi, dva, _DocVersionConfig.MyDocVersion, SelectedROFst, null); + ROFst newrofst = ROFstInfo.UpdateRoFst(rdi, dva, _DocVersionConfig.MyDocVersion, SelectedROFst); SelectedROFst.ROTableUpdate -= new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate); ppBtnUpRoVals.Enabled = _DocVersionConfig.MyDocVersion.NewerRoFst; Cursor = Cursors.Default; diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ROFSTExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ROFSTExt.cs index e8a86f57..5e1ebe73 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ROFSTExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ROFSTExt.cs @@ -278,7 +278,7 @@ namespace VEPROMS.CSLA.Library /// the current one. /// /// ROFst: Returns the created rofst object - public static ROFst UpdateRoFst(RODbInfo rdi, DocVersionAssociation dva, DocVersion docver, ROFstInfo origROFst, DocVersionInfo odv) + public static ROFst UpdateRoFst(RODbInfo rdi, DocVersionAssociation dva, DocVersion docver, ROFstInfo origROFst) { DirectoryInfo di = new DirectoryInfo(rdi.FolderPath); string rofstfilepath = rdi.FolderPath + @"\ro.fst"; @@ -291,7 +291,7 @@ namespace VEPROMS.CSLA.Library { docver.DocVersionAssociations[0].MyROFst = rofst; docver.Save(); - UpdateROValuesText(origROFst, rofst, DocVersionInfo.Get(docver.VersionID), odv); + UpdateROValuesText(origROFst, rofst, DocVersionInfo.Get(docver.VersionID)); return rofst; } @@ -331,7 +331,7 @@ namespace VEPROMS.CSLA.Library } // Now update the usages: compare old to new rofsts and update usages accordingly, i.e. modified // values, deleted ros, etc. - UpdateROValuesText(origROFst, rofst, DocVersionInfo.Get(docver.VersionID), odv); + UpdateROValuesText(origROFst, rofst, DocVersionInfo.Get(docver.VersionID)); return rofst; } } @@ -357,16 +357,12 @@ namespace VEPROMS.CSLA.Library } return sb.ToString(); } - private static void UpdateROValuesText(ROFstInfo origROFstInfo, ROFst newROFst, DocVersionInfo dvi, DocVersionInfo odv) + private static void UpdateROValuesText(ROFstInfo origROFstInfo, ROFst newROFst, DocVersionInfo dvi) { string versionList = dvi.VersionID.ToString(); //DateTime dtStart = DateTime.Now; //DateTime dtLast = DateTime.Now; - ROFSTLookup origLU; - if(odv != null) - origLU = new ROFSTLookup(origROFstInfo, odv); - else - origLU = new ROFSTLookup(origROFstInfo, dvi); + ROFSTLookup origLU = new ROFSTLookup(origROFstInfo, dvi); //dtLast = ShowDuration(dtLast, "origLU"); ROFSTLookup newLU = new ROFSTLookup(newROFst, dvi); //dtLast = ShowDuration(dtLast, "newLU"); diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index f9cd30b1..1ae0dc92 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -1747,7 +1747,7 @@ namespace Volian.Controls.Library using (DocVersion dv = DocVersion.Get(MyDVI.VersionID)) { roFstInfo.ROTableUpdate += new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate); - ROFst newrofst = ROFstInfo.UpdateRoFst(roFstInfo.MyRODb, dv.DocVersionAssociations[0], dv, roFstInfo, null); + ROFst newrofst = ROFstInfo.UpdateRoFst(roFstInfo.MyRODb, dv.DocVersionAssociations[0], dv, roFstInfo); roFstInfo.ROTableUpdate -= new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate); StepPanelTabDisplayEventArgs args = new StepPanelTabDisplayEventArgs("DisplayROUpdateROFST"); MyEditItem.MyStepPanel.OnTabDisplay(sender, args); diff --git a/PROMS/Volian.Controls.Library/vlnTreeView.cs b/PROMS/Volian.Controls.Library/vlnTreeView.cs index f63f5dd3..28dae2c7 100644 --- a/PROMS/Volian.Controls.Library/vlnTreeView.cs +++ b/PROMS/Volian.Controls.Library/vlnTreeView.cs @@ -317,12 +317,6 @@ namespace Volian.Controls.Library #endregion public partial class vlnTreeView : TreeView { - private int _OverrideDocVersionID = 0; - public int OverrideDocVersionID - { - get { return _OverrideDocVersionID; } - set { _OverrideDocVersionID = value; } - } private SessionInfo _MySessionInfo; public SessionInfo MySessionInfo { @@ -1299,7 +1293,7 @@ namespace Volian.Controls.Library using (DocVersion dv = DocVersion.Get(MyDVI.VersionID)) { roFstInfo.ROTableUpdate += new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate); - ROFst newrofst = ROFstInfo.UpdateRoFst(roFstInfo.MyRODb, dv.DocVersionAssociations[0], dv, roFstInfo, OverrideDocVersionID > 0 ? DocVersionInfo.Get(OverrideDocVersionID) : null); + ROFst newrofst = ROFstInfo.UpdateRoFst(roFstInfo.MyRODb, dv.DocVersionAssociations[0], dv, roFstInfo); roFstInfo.ROTableUpdate -= new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate); StepPanelTabDisplayEventArgs args = new StepPanelTabDisplayEventArgs("DisplayROUpdateROFST"); }