Merge branch 'Development' into C2026-008

good for testing

PROMS/VEPROMS User Interface/frmBatchRefresh.cs

@@ -1066,7 +1066,27 @@ namespace VEPROMS
 					ROFstInfo.UpdateRoFst(roFstInfo.MyRODb, dv, roFstInfo, DoProgressBarRefresh);
 					roFstInfo = dq.DocVersionAssociations[0].MyROFst;
 				}
-				roFstInfo.ROTableUpdate += new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate);
+                else if (!dv.ROfstLastCompleted && origfstid == roFstInfo.ROFstID)
+                {
+                    //Handle issue where load failed without completing update
+                    //previous RO FST did not load, get last loaded ID
+					//if none, use -1 which will check all ROs in the Working Draft
+                    string cfg = dv.DocVersionAssociations[0].Config;
+                    AssociationConfig ac = new AssociationConfig((cfg == null || cfg.Length == 0) ? "<Config />" : cfg);
+                    if (dv.DocVersionAssociations[0]?.MyROFst != null)
+                    {
+                        if (!int.TryParse(ac.ROUpdate_PrevROFSTID, out origfstid))
+                        {
+                            origfstid = -1;
+                        }
+                    }
+                    else
+                    {
+                        origfstid = -1;
+                    }
+                }
+
+                roFstInfo.ROTableUpdate += new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate);
                 ROFstInfo.RefreshROFstAtItemLevel(DocVersionInfo.Get(dv.VersionID), DoProgressBarRefresh, txtProcess, roFstInfo, origfstid, roFstInfo.ROFstID);
                 roFstInfo.ROTableUpdate -= new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate);
 			}

PROMS/VEPROMS User Interface/frmVersionsProperties.cs

@@ -1539,8 +1539,27 @@ namespace VEPROMS
 					ROFstInfo.UpdateRoFst(SelectedROFst.MyRODb, dv, SelectedROFst, DoProgressBarRefresh);
 					SelectedROFst = null; // set to null to force getting the updated ROfst
 				}
+                else if (!dv.ROfstLastCompleted && origfstid == SelectedROFst.ROFstID)
+                {
+                    //Handle issue where load failed without completing update
+                    //previous RO FST did not load, get last loaded ID
+                    //if none, use -1 which will check all ROs in the Working Draft
+                    string cfg = dv.DocVersionAssociations[0].Config;
+                    AssociationConfig ac = new AssociationConfig((cfg == null || cfg.Length == 0) ? "<Config />" : cfg);
+                    if (dv.DocVersionAssociations[0]?.MyROFst != null)
+                    {
+                        if (!int.TryParse(ac.ROUpdate_PrevROFSTID, out origfstid))
+                        {
+                            origfstid = -1;
+                        }
+                    }
+                    else
+                    {
+                        origfstid = -1;
+                    }
+                }
 
-				ContentInfo.StaticContentInfoChange += ContentInfo_StaticContentInfoChange; // write changes to a text file
+                ContentInfo.StaticContentInfoChange += ContentInfo_StaticContentInfoChange; // write changes to a text file
 				SelectedROFst.ROTableUpdate += new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate);
 
 				ROFstInfo.RefreshROFstAtItemLevel(DocVersionInfo.Get(dv.VersionID), DoProgressBarRefresh, null, SelectedROFst, origfstid, SelectedROFst.ROFstID);

PROMS/VEPROMS.CSLA.Library/Config/AssocConfig.cs

@@ -124,9 +124,26 @@ namespace VEPROMS.CSLA.Library
 				_Xp["ROUpdate", "LoadingFigures"] = value; // save selected value
 			}
 		}
-		#endregion // ROUpdate
-		#region ToString
-		public override string ToString()
+
+        [Category("RO Update")]
+        [DisplayName("Previous ROFSTID")]
+        [RefreshProperties(RefreshProperties.All)]
+        [Description("Previous ROFSTID")]
+        public string ROUpdate_PrevROFSTID
+        {
+            get
+            {
+                string s = _Xp["ROUpdate", "PrevROFSTID"];// get the saved value
+                return s;
+            }
+            set
+            {
+                _Xp["ROUpdate", "PrevROFSTID"] = value; // save selected value
+            }
+        }
+        #endregion // ROUpdate
+        #region ToString
+        public override string ToString()
 		{
 			string s = _Xp.ToString();
 			if (s == "<Config/>" || s == "<Config></config>") return string.Empty;

PROMS/VEPROMS.CSLA.Library/Extension/AuditExt.cs

@@ -88,9 +88,9 @@ namespace VEPROMS.CSLA.Library
 		}
 		public override string ToString()
 		{
-			string itemTitle = Regex.Replace(this.Path, "^..+?\\u0007", "");
+            string itemTitle = Regex.Replace(this.Path, "^..+?\\u0007", "");
 			itemTitle = itemTitle.Replace("\x11", itemTitle[0] == '\x11' ? "" : " - ").Replace("\\u8209?", "-").Replace(@"\u9586?",@"\");
-			return string.Format("{4} item {0} by {1} on {2} @ {3}", this.ActionWhat, this.UserID, this.ActionWhen == DateTime.MinValue ? this.DTS.ToShortDateString() : this.ActionWhen.ToShortDateString(), this.ActionWhen == DateTime.MinValue ? this.DTS.ToShortTimeString() : this.ActionWhen.ToShortTimeString(), itemTitle);
+			return string.Format("{4} item {0} by {1} on {2} @ {3}", this.ActionWhat, this.UserID, this.ActionWhen == DateTime.MinValue ? this.DTS.ToShortDateString() : this.ActionWhen.ToShortDateString(), this.ActionWhen == DateTime.MinValue ? this.DTS.ToString("HH:mm:ss") : this.ActionWhen.ToString("HH:mm:ss"), itemTitle);
 			//return string.Format("{0} by {1} on {2}", this.DeleteStatus == 0 ? "Changed" : "Deleted", this.UserID, this.DTS.ToString("MM/dd/yyyy @ HH:mm:ss"));
 			//return string.Format("{0} - {1} {2}", this.UserID, this.DTS, this.DeleteStatus == 0 ? "" : "Deleted");
 		}
@@ -102,7 +102,7 @@ namespace VEPROMS.CSLA.Library
 				who = string.Format(" by {0}", this.UserID);
 			if (this.DTS != DateTime.Parse("1/1/1980"))
 				when = string.Format(" on {0}", this.DTS.ToString("MM/dd/yyyy @ HH:mm:ss"));
-			return string.Format("{0}{1}{2}", this.ActionWhat, who, when);
+            return string.Format("{0}{1}{2}", this.ActionWhat, who, when);
 		}
 	}
 
@@ -177,7 +177,7 @@ namespace VEPROMS.CSLA.Library
 
 		public override string ToString()
       {
-				return string.Format("{0}{1} deleted by {2} on {3} @ {4}", this.Level == 0 ? "Previous " : this.Level == 1 ? "Next " : "", this.ItemType, this.UserID, this.DTS.ToShortDateString(), this.DTS.ToShortTimeString());
+				return string.Format("{0}{1} deleted by {2} on {3}", this.Level == 0 ? "Previous " : this.Level == 1 ? "Next " : "", this.ItemType, this.UserID, this.DTS.ToString("MM/dd/yyyy @ HH:mm:ss"));
 //				return string.Format("Deleted by {0} on {1} @ {2}", this.UserID, this.DTS.ToShortDateString(), this.DTS.ToShortTimeString());
 //				return string.Format("(ItemID: {4}, DeleteID: {5}, {0} by {1} on {2} Level: {3}", this.DeleteStatus == 0 ? "Changed" : "Deleted", this.UserID, this.DTS.ToString("MM/dd/yyyy @ HH:mm:ss"), Level.ToString(), this.ItemID.ToString(), this.DeleteStatus.ToString());
 //            return string.Format("Level: {3}, {0} - {1} {2}", this.UserID, this.DTS, this.DeleteStatus == 0 ? "" : "Deleted", this.Level.ToString());

PROMS/VEPROMS.CSLA.Library/Extension/ROFSTExt.cs

@@ -267,6 +267,14 @@ namespace VEPROMS.CSLA.Library
                 }
             }
 
+            // pop up a message window telling the user the RO Update has completed and how many ROs were updated		
+            // If we are updating RO from the Admin Tools (from the V button) and we are updating more than on procedure set, then just append the "RO Update Complete" text		
+            // To the MessageList.  Once completed will all procedure sets, Admin Tools will display one message box with all the results in it.		
+            if (MessageList == null)
+                FlexibleMessageBox.Show(fixedROs == 0 ? "No ROs Required Updating" : string.Format("{0} ROs Updated for {1}", fixedROs, dvi.MyFolder.Name), "RO Update Complete");
+            else
+                MessageList.AppendLine((fixedROs == 0 ? "No ROs Required Updating for " : string.Format("{0} ROs Updated for ", fixedROs)) + dvi.MyFolder.Name);
+
             return fixedROs;
         }
 
@@ -320,7 +328,9 @@ namespace VEPROMS.CSLA.Library
 		{
 			if (myProgressBarRefresh != null) myProgressBarRefresh(0, 100, "Starting Update");
 
-			DirectoryInfo di = new DirectoryInfo(rdi.FolderPath);
+			int origFSTid = origROFst.ROFstID;
+
+            DirectoryInfo di = new DirectoryInfo(rdi.FolderPath);
 			string rofstfilepath = rdi.FolderPath + @"\ro.fst";
 			FileStream fsIn = new FileStream(rofstfilepath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
 			FileInfo rofstFI = new FileInfo(rofstfilepath);
@@ -346,8 +356,9 @@ namespace VEPROMS.CSLA.Library
 
 				docver.DocVersionAssociations[0].MyROFst = rofst;
 				SetAssociationLastCompleted(docver, string.Empty);
+                SetPrevFSTID(docver, origFSTid);   // //C2026-008 Re-Architect RO.FST to include RO Modification date/time
 
-				return rofst;
+                return rofst;
 			}
 
 			// Read in the rofst & make the rofst record.
@@ -369,7 +380,10 @@ namespace VEPROMS.CSLA.Library
 				// Keep a list of ROIDs for Images that have changed.
 				List<string> MyChangedFigureROIDs = UpdateROFigures(rdi, myProgressBarRefresh, rofst, rodb, myLookup, docver);
 
-				return rofst;
+                //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+                SetPrevFSTID(docver, origFSTid);
+
+                return rofst;
 			}
 		}
 
@@ -469,8 +483,22 @@ namespace VEPROMS.CSLA.Library
 			docver.Save();
 		}
 
-		// Place the status of loading the RO Figures when updating RO Values
-		private static void SetAssociationROFiguresLoading(DocVersion docver, string value)
+        //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+        // Place the previous ROFSTID in the config in case network error or computer crashes while updating RO Values
+        private static void SetPrevFSTID(DocVersion docver, int value)
+        {
+            if (docver.DocVersionAssociations[0]?.MyROFst != null && value != -1)
+            {
+                string cfg = docver.DocVersionAssociations[0].Config;
+				AssociationConfig ac = new AssociationConfig((cfg == null || cfg.Length == 0) ? "<Config />" : cfg);
+                ac.ROUpdate_PrevROFSTID = value.ToString();
+				docver.DocVersionAssociations[0].Config = ac.ToString();
+				docver.Save();
+            }
+        }
+
+        // Place the status of loading the RO Figures when updating RO Values
+        private static void SetAssociationROFiguresLoading(DocVersion docver, string value)
 		{
 			string cfg = docver.DocVersionAssociations[0].Config;
 
@@ -903,10 +931,10 @@ namespace VEPROMS.CSLA.Library
 			}
 		}
 
-		#endregion
-	}
+        #endregion
+    }
 
-	public class ROFstInfoROTableUpdateEventArgs
+    public class ROFstInfoROTableUpdateEventArgs
 	{
 		private string _ROText;
 		public string ROText
@@ -1056,5 +1084,5 @@ namespace VEPROMS.CSLA.Library
 			this.RaiseListChangedEvents = true;
 		}
 
-	}
+    }
 }

PROMS/Volian.Controls.Library/StepTabRibbon.cs

@@ -3567,6 +3567,26 @@ namespace Volian.Controls.Library
 					ROFstInfo.UpdateRoFst(roFstInfo.MyRODb, dv, roFstInfo, DoProgressBarRefresh);
 					roFstInfo = Mydvi.DocVersionAssociations[0].MyROFst;
 				}
+                else if (!dv.ROfstLastCompleted && origfstid == roFstInfo.ROFstID)
+                {
+                    //Handle issue where load failed without completing update
+                    //previous RO FST did not load, get last loaded ID
+                    //if none, use -1 which will check all ROs in the Working Draft
+                    string cfg = dv.DocVersionAssociations[0].Config;
+                    AssociationConfig ac = new AssociationConfig((cfg == null || cfg.Length == 0) ? "<Config />" : cfg);
+					if (dv.DocVersionAssociations[0]?.MyROFst != null)
+                    {
+                        if (!int.TryParse(ac.ROUpdate_PrevROFSTID, out origfstid))
+                        {
+                            origfstid = -1;
+                        }
+                    }
+                    else
+                    {
+                        origfstid = -1;
+                    }
+                }
+
 				roFstInfo.ROTableUpdate += new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate);
 				ContentInfo.StaticContentInfoChange += ContentInfo_StaticContentInfoChange; // write changes to a text file
 				ROFstInfo.RefreshROFstAtItemLevel(DocVersionInfo.Get(dv.VersionID), DoProgressBarRefresh, null, roFstInfo, origfstid, roFstInfo.ROFstID);         

PROMS/Volian.Controls.Library/vlnTreeView.cs

@@ -2479,7 +2479,27 @@ namespace Volian.Controls.Library
 					ROFstInfo.UpdateRoFst(roFstInfo.MyRODb, dv, roFstInfo, DoProgressBarRefresh);
 					roFstInfo = MyDVI.DocVersionAssociations[0].MyROFst;
 				}
-				roFstInfo.ROTableUpdate += new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate);
+                else if (!dv.ROfstLastCompleted && origfstid == roFstInfo.ROFstID)
+                {
+                    //Handle issue where load failed without completing update
+                    //previous RO FST did not load, get last loaded ID
+                    //if none, use -1 which will check all ROs in the Working Draft
+                    string cfg = dv.DocVersionAssociations[0].Config;
+                    AssociationConfig ac = new AssociationConfig((cfg == null || cfg.Length == 0) ? "<Config />" : cfg);
+                    if (dv.DocVersionAssociations[0]?.MyROFst != null)
+                    {
+                        if (!int.TryParse(ac.ROUpdate_PrevROFSTID, out origfstid))
+                        {
+                            origfstid = -1;
+                        }
+                    }
+                    else
+                    {
+                        origfstid = -1;
+                    }
+                }
+
+                roFstInfo.ROTableUpdate += new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate);
 				ContentInfo.StaticContentInfoChange += ContentInfo_StaticContentInfoChange; // write changes to a text file
                 ROFstInfo.RefreshROFstAtItemLevel(DocVersionInfo.Get(dv.VersionID), DoProgressBarRefresh, null, roFstInfo, origfstid, roFstInfo.ROFstID);
                 swROUpdate.Close();