diff --git a/PROMS/VEPROMS User Interface/frmVersionsProperties.cs b/PROMS/VEPROMS User Interface/frmVersionsProperties.cs index 3d81f250..66419b0c 100644 --- a/PROMS/VEPROMS User Interface/frmVersionsProperties.cs +++ b/PROMS/VEPROMS User Interface/frmVersionsProperties.cs @@ -1101,19 +1101,20 @@ namespace VEPROMS MessageBox.Show("No existing ro.fst in path " + rdi.FolderPath + ". Check for invalid path", "No existing RO.FST"); //B2017-125 added title to messagebox break; } - FileInfo fiRofst = new FileInfo(rofstPath); - if (SelectedROFst.DTS == fiRofst.LastWriteTimeUtc) - { - FinalProgressBarMessage = "RO.FST up to date"; - MessageBox.Show("ro.fst files are same for path " + rdi.FolderPath + ", import of that ro.fst will not be done", "RO.FST up to date"); //B2017-125 added title to messagebox - break; - } - if (SelectedROFst.DTS > fiRofst.LastWriteTimeUtc) - { - FinalProgressBarMessage = "RO.FST is older"; - MessageBox.Show("Cannot copy older ro.fst from " + rdi.FolderPath + ", import of that ro.fst will not be done", "RO.FST is older"); //B2017-125 added title to messagebox - break; - } + // B2017-130 code no longer needed. Was checking the DTS but always was different by miliseconds + //FileInfo fiRofst = new FileInfo(rofstPath); + //if (SelectedROFst.DTS == fiRofst.LastWriteTimeUtc) + //{ + // FinalProgressBarMessage = "RO.FST up to date"; + // MessageBox.Show("ro.fst files are same for path " + rdi.FolderPath + ", import of that ro.fst will not be done", "RO.FST up to date"); //B2017-125 added title to messagebox + // break; + //} + //if (SelectedROFst.DTS > fiRofst.LastWriteTimeUtc) + //{ + // FinalProgressBarMessage = "RO.FST is older"; + // MessageBox.Show("Cannot copy older ro.fst from " + rdi.FolderPath + ", import of that ro.fst will not be done", "RO.FST is older"); //B2017-125 added title to messagebox + // break; + //} Cursor = Cursors.WaitCursor; swROUpdate = new System.IO.StreamWriter(ROFstInfo.ROUpdateResultsPath(_DocVersionConfig.MyDocVersion.MyDocVersionInfo)); // RO changes placed in file in the Documents\VEPROMS folder ContentInfo.StaticContentInfoChange += ContentInfo_StaticContentInfoChange; // write changes to a text file diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index 668f7d6d..28981456 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -2927,19 +2927,20 @@ namespace Volian.Controls.Library MessageBox.Show("No existing ro.fst in path " + roFstInfo.MyRODb.FolderPath + ". Check for invalid path", "No existing RO.FST"); //B2017-125 added title to messagebox return; } - FileInfo fiRofst = new FileInfo(rofstPath); - if (roFstInfo.DTS == fiRofst.LastWriteTimeUtc) - { - FinalProgressBarMessage = "RO.FST up to date"; - MessageBox.Show("ro.fst files are same for path " + roFstInfo.MyRODb.FolderPath + ", import of that ro.fst will not be done", "RO.FST up to date"); //B2017-125 added title to messagebox - return; - } - if (roFstInfo.DTS > fiRofst.LastWriteTimeUtc) - { - FinalProgressBarMessage = "RO.FST is older"; - MessageBox.Show("Cannot copy older ro.fst from " + roFstInfo.MyRODb.FolderPath + ", import of that ro.fst will not be done", "RO.FST is older"); //B2017-125 added title to messagebox - return; - } + // B2017-130 code no longer needed. Was checking the DTS but always was different by miliseconds + //FileInfo fiRofst = new FileInfo(rofstPath); + //if (roFstInfo.DTS == fiRofst.LastWriteTimeUtc) + //{ + // FinalProgressBarMessage = "RO.FST up to date"; + // MessageBox.Show("ro.fst files are same for path " + roFstInfo.MyRODb.FolderPath + ", import of that ro.fst will not be done", "RO.FST up to date"); //B2017-125 added title to messagebox + // return; + //} + //if (roFstInfo.DTS > fiRofst.LastWriteTimeUtc) + //{ + // FinalProgressBarMessage = "RO.FST is older"; + // MessageBox.Show("Cannot copy older ro.fst from " + roFstInfo.MyRODb.FolderPath + ", import of that ro.fst will not be done", "RO.FST is older"); //B2017-125 added title to messagebox + // return; + //} Cursor = Cursors.WaitCursor; using (DocVersion dv = DocVersion.Get(Mydvi.VersionID))