Merge remote-tracking branch 'origin/Development' into C2024-002

PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs

@@ -746,7 +746,7 @@ namespace RODBInterface
 					string csufx = string.Format("_PCCHILD{0}", pcChildIdx);
 					//applicValues += ",";
 					XmlNode cn = elmnode.SelectSingleNode(parentName + csufx);
-					if (cn == null)
+					if (cn == null || cn.InnerText.Length == 0) // B2024-004 use Parent value if Child text length is zero
 						applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, parentValue); // use parent value as default
 					else
 					{

PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs

@@ -473,7 +473,7 @@ namespace ctlXMLEditLib
 				nd = node.SelectSingleNode(str);
 				// if not found with just the string, search the tree.
 				if (nd==null)nd = node.SelectSingleNode("*/"+str);
-				if (nd == null) 
+				if (nd == null || nd.InnerText.Length==0) // B2024-004 use Parent value if Child text length is zero
 					GetDefaultParentValue(hwnd, node, str); // C2021-026 Parent/Child Field has no value so use parent's value
 				else
 				{	

PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs

@@ -44,8 +44,18 @@ using System.Runtime.InteropServices;
 //      Revision DHH (day - no leading zero, two digit hour - military time
 //
 // ********* REMEMBER TO CHECK THE AssemblyConfiguration SETTING (ABOVE) ********
-[assembly: AssemblyVersion("2.1.2311.3014")]
+[assembly: AssemblyVersion("2.1.2402.616")]
-[assembly: AssemblyFileVersion("2.1.2311.3014")]
+[assembly: AssemblyFileVersion("2.1.2402.616")]
+
+
+
+
+
+
+
+
+
+
 
 
 

PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs

@@ -36,6 +36,8 @@ namespace VEPROMS
 			this.btnShortCuts = new DevComponents.DotNetBar.ButtonItem();
 			this.btnHelpVWeb = new DevComponents.DotNetBar.ButtonItem();
 			this.btnSendErrorLog = new DevComponents.DotNetBar.ButtonItem();
+			this.btnShowErrFld = new DevComponents.DotNetBar.ButtonItem();
+			this.btnShowPrtFld = new DevComponents.DotNetBar.ButtonItem();
 			this.btnHelpAbout = new DevComponents.DotNetBar.ButtonItem();
 			this.office2007StartButton1 = new DevComponents.DotNetBar.Office2007StartButton();
 			this.itemContainer1 = new DevComponents.DotNetBar.ItemContainer();
@@ -210,7 +212,9 @@ namespace VEPROMS
 			this.btnShortCuts,
 			this.btnHelpVWeb,
 			this.btnSendErrorLog,
-            this.btnHelpAbout});
+			this.btnShowErrFld,
+			this.btnShowPrtFld,
+			this.btnHelpAbout}); ;
 			this.btnHelp.Text = "Help";
 			// 
 			// btnHelpManual
@@ -244,6 +248,24 @@ namespace VEPROMS
 			this.btnSendErrorLog.Text = "Send Error Log";
 			this.btnSendErrorLog.Click += new System.EventHandler(this.btnSendErrorLog_Click);
 			// 
+			// btnShowErrFld
+			//
+			//this.btnShowErrFld.Image = global::VEPROMS.Properties.Resources.GoToParentFolderHS;
+			this.btnShowErrFld.Image = ((System.Drawing.Image)(resources.GetObject("btnShowErrFld.Image")));
+			this.btnShowErrFld.Name = "btnShowErrFld";
+			this.btnShowErrFld.Text = "Open Log Folder";
+			this.btnShowErrFld.Click += new System.EventHandler(this.btnShowErrFld_Click);
+			// 
+			// btnShowPrtFld
+			//
+			//this.btnShowPrtFld.Image = global::VEPROMS.Properties.Resources.GoToParentFolderHS;
+			this.btnShowPrtFld.Image = ((System.Drawing.Image)(resources.GetObject("btnShowPrtFld.Image")));
+			this.btnShowPrtFld.Name = "btnShowPrtFld";
+			this.btnShowPrtFld.Text = "Open Default Print Folder";
+			this.btnShowPrtFld.Click += new System.EventHandler(this.btnShowPrtFld_Click);
+			// 
+			// 
+			// 
 			// btnHelpAbout
 			// 
 			this.btnHelpAbout.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
@@ -1733,6 +1755,8 @@ namespace VEPROMS
 		private DevComponents.DotNetBar.TabItem infotabFoldoutMaint;
 		private Volian.Controls.Library.DisplayFoldoutMaint displayFoldoutMaint;
 		private DevComponents.DotNetBar.ButtonItem btnSendErrorLog;
+		private DevComponents.DotNetBar.ButtonItem btnShowErrFld;
+		private DevComponents.DotNetBar.ButtonItem btnShowPrtFld;
 		private DevComponents.DotNetBar.TabControlPanel tabControlPanel3;
 		private DevComponents.DotNetBar.TabItem toosTabReports;
 		private Volian.Controls.Library.DisplayReports displayReports;

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -21,6 +21,7 @@ using DescriptiveEnum;
 using Volian.Base.Library;
 using Volian.Print.Library;
 using JR.Utils.GUI.Forms;
+using System.Diagnostics;
 
 [assembly: log4net.Config.XmlConfigurator(Watch = true)]
 
@@ -4972,6 +4973,26 @@ namespace VEPROMS
 			}
 		}
 
+		private void btnShowErrFld_Click(object sender, EventArgs e)
+		{
+			string path = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
+			path = path + @"\Documents\VEPROMS";
+			if (Directory.Exists(path))
+			{
+				Process.Start("explorer.exe", path);
+			}
+		}
+
+		private void btnShowPrtFld_Click(object sender, EventArgs e)
+		{
+			string path = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
+			path = path + @"\AppData\Local\Temp\VEPROMS";
+			if (Directory.Exists(path))
+			{
+				Process.Start("explorer.exe", path);
+			}
+		}
+
 		private void btnHelpManual_Click(object sender, EventArgs e)
 		{
 			// C2019-024 Display the PROMS User Manual when user click on the option in the Help drop down menu

PROMS/VEPROMS User Interface/frmVEPROMS.resx

@@ -170,6 +170,18 @@
         rkJggg==
 </value>
   </data>
+  <data name="btnShowErrFld.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+      iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAANUlEQVR4nGNgoBR8ahL8jw1/bBTooMiAT8Qa8gmPAUQZ8n+Z3n9KMMOoAf9Hw0CPCmEw4AAA71z+QhwwNhoAAAAASUVORK5CYII=
+    </value>
+  </data>
+
+  <data name="btnShowPrtFld.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+      iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAANUlEQVR4nGNgoBR8ahL8jw1/bBTooMiAT8Qa8gmPAUQZ8n+Z3n9KMMOoAf9Hw0CPCmEw4AAA71z+QhwwNhoAAAAASUVORK5CYII=
+    </value>
+  </data>
+  
   <data name="btnHelpAbout.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6

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

@@ -1545,6 +1545,9 @@ namespace VEPROMS.CSLA.Library
 		{
 			//if (tb._FromItem.MyContent.InList(5322)) Console.WriteLine("Here");
 			string str1 = TranGetSectionNumber(tb._ToItem);
+			// F2024-008 added flag to title case the section number in transitions
+			if (tb._FormatData.TransData.Cap1stCharTransSectionNumber)
+				str1 = CapFirstLetterOnly(str1, 0);
 			if(!tb._ToItem.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert) return str1;
 			List<ItemInfo> FromSections = GetSections(tb._FromItem.ActiveSection);
 			List<ItemInfo> ToSections = GetSections(tb._ToItem.ActiveSection);
@@ -1615,6 +1618,9 @@ namespace VEPROMS.CSLA.Library
 			sectionTitle = (tb._FormatData.TransData.CapsTransitionsSection ? sectionTitle.ToUpper().Replace(@"\U", @"\u") :
 					tb._FormatData.TransData.Cap1stCharTransSection ? CapFirstLetterOnly(sectionTitle, 0) :
 					sectionTitle);
+				// F2024-008 Added flag to surround the section title with parenthesis in transitions
+				if (tb._FormatData.TransData.ParensAroundSectionTitle)
+					sectionTitle = string.Format("({0})", sectionTitle);
 				// B2017-236 Replace embedded returns with spaces and trim the spaces from the end of the section title.
 				return TrimSectionTitle(sectionTitle);
 			}

PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs

@@ -7103,6 +7103,7 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _Cap1stCharTrans, "@Cap1stCharTrans");
 			}
 		}
+		// Title Case section title
 		private LazyLoad<bool> _Cap1stCharTransSection;
 		public bool Cap1stCharTransSection
 		{
@@ -7111,6 +7112,24 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _Cap1stCharTransSection, "@Cap1stCharTransSection");
 			}
 		}
+		// Title Case section number
+		private LazyLoad<bool> _Cap1stCharTransSectionNumber;
+		public bool Cap1stCharTransSectionNumber
+		{
+			get
+			{
+				return LazyLoad(ref _Cap1stCharTransSectionNumber, "@Cap1stCharTransSectionNumber");
+			}
+		}
+		// Parens around section title
+		private LazyLoad<bool> _ParensAroundSectionTitle;
+		public bool ParensAroundSectionTitle
+		{
+			get
+			{
+				return LazyLoad(ref _ParensAroundSectionTitle, "@ParensAroundSectionTitle");
+			}
+		}
 		private LazyLoad<bool> _UseTransitionModifier;
 		public bool UseTransitionModifier
 		{

PROMS/Volian.Controls.Library/StepTabRibbon.cs

@@ -3395,6 +3395,8 @@ namespace Volian.Controls.Library
 				Cursor = Cursors.Default;
 				return;
 			}
+			// B2024-002:  Save any changes to the database so that updating of ROs has current data:
+			MyEditItem.SaveContents();
 			using (DocVersion dv = DocVersion.Get(Mydvi.VersionID))
 			{
 				swROUpdate = new System.IO.StreamWriter(ROFstInfo.ROUpdateResultsPath(Mydvi));

PROMS/Volian.Print.Library/VlnSvgPageHelper.cs

@@ -1846,6 +1846,8 @@ i = 0;
 					float coverlinelen = ((ctlen == 0) ? (int)section.ActiveFormat.PlantFormat.FormatData.ProcData.TitleLength : ctlen) * (float)pageItem.Font.CPI / 12;
 					string title1 = section.MyProcedure.MyContent.Text;
 					if (section.ActiveFormat.PlantFormat.FormatData.ProcData.CapitalizeTitle) title1 = title1.ToUpper();
+					// F2024-012 copied this line from above (processing COVERPROCTITLE)  to resolve unit designators in the procedure title
+					if (title1.ToUpper().Contains(@"<U")) title1 = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(section.MyDocVersion, title1);
 					plstr = SplitCoverTitle(svgGroup, pageItem, title1, (int)coverlinelen, token, plstr);//, rowAdj);
 					break;
 				case "{TITLE&UNIT}":