C2026-037 Change History Deleted Items to 24-hour clock

good for testing

PROMS/VEPROMS User Interface/dlgApproveProcedure.cs

@@ -1343,31 +1343,23 @@ namespace VEPROMS
                     //// so change bars update
                     //// on any open StepPanel
 
-                    //B2026-019 Attempt to prevent an Access Error by utilizing a different Refresh if a Procedure is Open
+                    newproc = ItemInfo.ResetProcedure(pi.ItemID);
-                    DisplayTabItem dti = MyFrmVEPROMS.GetTabContainingProcedure(pi.ItemID);
+
+					//B2026-019 Attempt to prevent an Access Error by utilizing a different Refresh if a Procedure is Open
+					DisplayTabItem dti = MyFrmVEPROMS.GetTabContainingProcedure(pi.ItemID);
 					if (dti != null)
 					{
 						if (!dti.MyStepTabPanel.MyStepPanel.ContainsFocus)
 							dti.MyStepTabPanel.MyStepPanel.Focus();
 
-						foreach (EditItem eitm in dti.MyStepTabPanel.MyStepPanel.Controls.OfType<EditItem>())
+						dti.MyStepTabPanel.MyStepTabRibbon.RefreshProcedure();
-                        {
+						Application.DoEvents();
-                            eitm.ChangeBar = eitm.MyItemInfo.HasChangeBar;
-                        }
 
-                        dti.MyStepTabPanel.MyStepTabRibbon.RefreshProcedure();
+					}
-                        Application.DoEvents();
-                        newproc = ProcedureInfo.Get(pi.ItemID);
 
-                    }
+					//since in a separate form, need to update the tree view
-					else
+					//so "Showing Change Bars" Content Menu Item is correct
-					{
+					MyFrmVEPROMS.RefreshProcedureNode(newproc);
-                        newproc = ItemInfo.ResetProcedure(pi.ItemID);
-                    }
-
-						//since in a separate form, need to update the tree view
-						//so "Showing Change Bars" Content Menu Item is correct
-						MyFrmVEPROMS.RefreshProcedureNode(newproc);
 				}
 				else
 					UpdateProcedureConfig(pi, ap.RevNumber, ap.RevDate, myDTS, selectedSlave);

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/Volian.Controls.Library/AnnotationDetails.cs

@@ -1,16 +1,17 @@
+using JR.Utils.GUI.Forms;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
 using System.Data;
+using System.Diagnostics;
+using System.Drawing;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Windows.Forms;
+using System.Xml;
 using VEPROMS.CSLA.Library;
 using Volian.Base.Library;
 using Volian.Pipe.Library;
-using System.Xml;
-using System.Diagnostics;
-using JR.Utils.GUI.Forms;
 
 namespace Volian.Controls.Library
 {
@@ -220,7 +221,10 @@ namespace Volian.Controls.Library
 			{
 				if (!DesignMode) // B2019-043 need to check if we are just saving changes to the user interface
 				{
-					rtxbComment.Text = value;
+					if (value != null)
+					{
+						rtxbComment.Text = Regex.Replace(value, @"\\u([0-9]{1,4})\?", m => Convert.ToChar(int.Parse(m.Groups[1].Value)).ToString());
+					}
 					if (rtxbComment.Text != string.Empty)
 						rtxbComment.SelectionStart = rtxbComment.TextLength; // position cursor to end of text
 				}