Merge pull request 'B2024-012' (#242) from Vogtle3&4 into Development

format only change

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/DlgPrintProcedure.cs

@@ -59,6 +59,13 @@ namespace VEPROMS
 			get { return _Automatic; }
 			set { _Automatic = value; }
 		}
+		private int _prtSectID = -1;
+		public int PrtSectID
+		{
+			get { return _prtSectID; }
+			set { _prtSectID = value; }
+		}
+
 
 		// C2018-033 Used to turn off using the date/time PDF file prefix and suffix when doing batch file autmatic baseline print testing (frmVEPROMS.cs RunAutomatic())
 		//           This is needed so the the automatic baselines can compare results from different runs of PROMS
@@ -768,7 +775,7 @@ namespace VEPROMS
 							// B2021-102 put in the using for better memory management
 							using (frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNumAndDate, waterMarkText, cbxDebug.Checked, cbxOrPgBrk.Checked,
 								cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, myPDFPath, cbd, txbPDFName.Text, new Point(Left, Bottom - 50),
-								swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, true, tbBlankPage.Text, _MergedPfd, watermarkColor))//;//C2018-009 print PROMS version
+								swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, true, tbBlankPage.Text, _MergedPfd, watermarkColor, PrtSectID))//;//C2018-009 print PROMS version
 							{
 								frmStatus.CloseWhenDone = true;
 								Application.DoEvents();
@@ -849,8 +856,9 @@ namespace VEPROMS
 						// B2016-249 Output Procedure to folder associated with Parent Child
 						using (frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNumAndDate, waterMarkText, cbxDebug.Checked,
 							cbxOrPgBrk.Checked, cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, GetMultiunitPDFPath(), cbd, txbPDFName.Text,
-							new Point(Left, Bottom - 50), swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, true, tbBlankPage.Text, _MergedPfd, watermarkColor)) // ;//C2018-009 print PROMS version
+							new Point(Left, Bottom - 50), swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, true, tbBlankPage.Text, _MergedPfd, watermarkColor, PrtSectID)) // ;//C2018-009 print PROMS version
 						{
+							frmStatus.PrtSectID = PrtSectID;
 							frmStatus.CloseWhenDone = true;
 							Application.DoEvents();
 							frmStatus.CancelStop = true;
@@ -1001,7 +1009,7 @@ namespace VEPROMS
 			// B2018-124 use text of watermark form drop down list instead of enum value
 			using (frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNumAndDate, waterMarkText, cbxDebug.Checked, cbxOrPgBrk.Checked,
 				cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, GetMultiunitPDFPath(), cbd, txbPDFName.Text, new Point(Left, Bottom - 50),
-				swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, false, tbBlankPage.Text, _MergedPfd, watermarkColor))//; //C2018-009 print PROMS version
+				swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, false, tbBlankPage.Text, _MergedPfd, watermarkColor, PrtSectID))//; //C2018-009 print PROMS version
 			{
 				frmStatus.MakePlaceKeeper = swtbtnGeneratePlacekeeper.Value;
 				frmStatus.MakeContinuousActionSummary = cbxGenerateConActSum.Checked;

PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs

@@ -44,8 +44,21 @@ 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: AssemblyFileVersion("2.1.2311.3014")]
+[assembly: AssemblyVersion("2.1.2402.2213")]
+[assembly: AssemblyFileVersion("2.1.2402.2213")]
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 

PROMS/VEPROMS User Interface/frmPDFStatusForm.cs

@@ -91,7 +91,13 @@ namespace VEPROMS
 			get { return _DidAll; }
 			set { _DidAll = value; }
 		}
-		public frmPDFStatusForm(ItemInfo myItem, string rev, string watermark, bool debugOutput, bool origPgBrk, bool openPDF, bool overWrite, string pdfPath, ChangeBarDefinition cbd, string pdfFile, Point newLocation, bool insertBlankPages, bool allOrAuto, string prefix, bool saveLinks, int removeTrailingHardReturnsAndManualPageBreaks, bool showPROMSVer, bool didAll, string blankPageText, MergedPdf mergedPdf, string watermarkColor)
+		private int _prtSectID = -1;
+		public int PrtSectID
+		{
+			get { return _prtSectID; }
+			set { _prtSectID = value; }
+		}
+		public frmPDFStatusForm(ItemInfo myItem, string rev, string watermark, bool debugOutput, bool origPgBrk, bool openPDF, bool overWrite, string pdfPath, ChangeBarDefinition cbd, string pdfFile, Point newLocation, bool insertBlankPages, bool allOrAuto, string prefix, bool saveLinks, int removeTrailingHardReturnsAndManualPageBreaks, bool showPROMSVer, bool didAll, string blankPageText, MergedPdf mergedPdf, string watermarkColor, int PrtSectID = -1)
 		{
 			// B2021-088 moved this if/else from CreatePDF() so that the Approval logic will have access to this logic
 			ProcedureInfo MyProcedure = myItem as ProcedureInfo;
@@ -116,6 +122,7 @@ namespace VEPROMS
 			Prefix = prefix;
 			OpenPDF = openPDF;
 			DidAll = didAll;
+			_prtSectID = PrtSectID;
 
 			InitializeComponent();
 
@@ -276,7 +283,7 @@ namespace VEPROMS
 					cachePartInfo = PartInfo.CacheList;
 				}
 
-				_PdfFile = MyPromsPrinter.Print(PDFPath, MakePlaceKeeper, MakeContinuousActionSummary, MakeTimeCriticalActionSummary);
+				_PdfFile = MyPromsPrinter.Print(PDFPath, MakePlaceKeeper, MakeContinuousActionSummary, MakeTimeCriticalActionSummary, PrtSectID);
 
 				ProfileTimer.Pop(profileDepth);
 

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)]
 
@@ -514,6 +515,7 @@ namespace VEPROMS
 			ItemInfo.ItemDeleted += new ItemInfoEvent(RefreshDisplayHistory);
 
 			tv.PrintProcedure += new vlnTreeViewEvent(tv_PrintProcedure);
+			tv.PrintSection += new vlnTreeViewEvent(tv_PrintSection);
 			tv.QPrintProcedure += new vlnTreeViewEvent(tv_QPrintProcedure);
 			tv.PrintAllProcedures += new vlnTreeViewEvent(tv_PrintAllProcedures);
 			tv.ApproveProcedure += new vlnTreeViewEvent(tv_ApproveProcedure);
@@ -1189,6 +1191,45 @@ namespace VEPROMS
 
 		}
 
+		void tv_PrintSection(object sender, vlnTreeEventArgs args)  // Quick Print right click menu on Procedure name.
+		{
+			try
+			{
+				//args.Node.Parent.
+				SectionInfo si2 = (args.Node as VETreeNode).VEObject as SectionInfo;
+				int _prtSectID = si2.ItemID;
+
+				if (si2 == null) return;
+
+				tc.SaveCurrentEditItem(si2.MyProcedure);
+
+				si2.MyDocVersion.DocVersionConfig.SelectedSlave = args.UnitIndex;
+
+				using (DlgPrintProcedure prnDlg = new DlgPrintProcedure(si2.MyProcedure))
+				{
+					prnDlg.PrtSectID = _prtSectID;
+					prnDlg.SelectedSlave = args.UnitIndex;
+					prnDlg.MySessionInfo = MySessionInfo;
+					prnDlg.SetupForProcedure();  // Setup filename
+					prnDlg.ShowDialog(this);  // Create Print report
+
+					si2.MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
+				}
+			}
+			catch (Exception ex)
+			{
+				StringBuilder sb = new StringBuilder();
+
+				sb.AppendLine("Could not create PDF Print");
+				sb.AppendLine();
+				MessageBox.Show(sb.ToString(), "Error when creating PDF Print", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+
+				_MyLog.Warn("Failed to create PDF print", ex);
+			}
+
+		}
+
+
 		void tv_CreateContinuousActionSummary(object sender, vlnTreeEventArgs args)
 		{
 			DialogResult dr = System.Windows.Forms.DialogResult.Yes;
@@ -4932,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/ItemExt.cs

@@ -665,11 +665,13 @@ namespace VEPROMS.CSLA.Library
 						{
 							TranFixCount++;
 							itemInfo.MyContent.FixTransitionText(traninfo, itemInfo, "Reason for Change:  Transition to Non-Editable Step");
-							Content content = Content.Get(itemInfo.MyContent.ContentID);
+							using (Content content = Content.Get(itemInfo.MyContent.ContentID)) //B2024-006 free up content memory when done
+							{
 								content.FixTransitionText(traninfo, true);
 								content.Save();
 							}
  						}
+					}
 
 					if (!forceConvertToText)
 					{
@@ -682,13 +684,15 @@ namespace VEPROMS.CSLA.Library
 									forceConvertToText = true;
 									TranFixCount++;
 									itemInfo.MyContent.FixTransitionText(traninfo, itemInfo, "Reason for Change:  Transition to External Procedure using Internal Format");
-									Content content = Content.Get(itemInfo.MyContent.ContentID);
+									using (Content content = Content.Get(itemInfo.MyContent.ContentID)) //B2024-006 free up content memory when done
+									{
 										content.FixTransitionText(traninfo, true);
 										content.Save();
 									}
  								}
 							}
 						}
+					}
 
 					if (!forceConvertToText)
 					{
@@ -701,13 +705,15 @@ namespace VEPROMS.CSLA.Library
 									forceConvertToText = true;
 									TranFixCount++;
 									itemInfo.MyContent.FixTransitionText(traninfo, itemInfo, "Reason for Change:  Transition to Outside Procedure using Internal Format");
-									Content content = Content.Get(itemInfo.MyContent.ContentID);
+									using (Content content = Content.Get(itemInfo.MyContent.ContentID)) //B2024-006 free up content memory when done
+									{
 										content.FixTransitionText(traninfo, true);
 										content.Save();
 									}
 								}
 							}
 						}
+					}
 
 					if (!forceConvertToText)
 					{
@@ -719,7 +725,8 @@ namespace VEPROMS.CSLA.Library
 						if (newText != oldText || newValue == "?")
 						{
 							TranFixCount++;
-							Content content = Content.Get(itemInfo.MyContent.ContentID);
+							using (Content content = Content.Get(itemInfo.MyContent.ContentID)) //B2024-006 free up content memory when done
+							{
 								content.FixTransitionText(traninfo);
 								content.Save();
 							}
@@ -727,6 +734,7 @@ namespace VEPROMS.CSLA.Library
 					}
 				}
 			}
+		}
 
 		// // B2018-002 - Invalid Transitions - Method to check for invalid transitions and convert them to text
 		public static bool ConvertInvalidTransitionsToText(ItemInfo itemInfo)
@@ -966,7 +974,8 @@ namespace VEPROMS.CSLA.Library
 						{
 							//ShowDifference(oldText, newText); // debug - display in Visual Studio Output window
 							ROFixCount++;
-							Content content = Content.Get(itemInfo.MyContent.ContentID);
+							using (Content content = Content.Get(itemInfo.MyContent.ContentID)) //B2024-006 free up content memory when done
+							{
 								if (roval == "?")
 								{
 									oldText = content.ConvertROToText(rousage, roval, roch.type, origROFst);
@@ -989,6 +998,7 @@ namespace VEPROMS.CSLA.Library
 					}
 				}
 			}
+		}
 		//C2022-028 check the RO link text - compare with RO Usage information, annotate RO links that are bad
 		internal static void MyCheckROLinks(ItemInfo itemInfo)
 		{

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

@@ -597,6 +597,13 @@ namespace VEPROMS.CSLA.Library
 				//if (_RevisionInfoList != null)
 				//  return _RevisionInfoList;
 				RevisionInfoList tmp = DataPortal.Fetch<RevisionInfoList>(new ItemUnitCriteria(itemID, unitID));
+
+				foreach (var x in tmp)
+				{
+					x.LatestVersion.ApprovedXML = x.RevisionID.ToString();
+					x.LatestVersion.PDF = Encoding.ASCII.GetBytes(x.RevisionID.ToString());
+					x.LatestVersion.SummaryPDF = Encoding.ASCII.GetBytes(x.RevisionID.ToString());
+				}
 				RevisionInfo.AddList(tmp);
 				tmp.AddEvents();
 				//_RevisionInfoList = tmp;

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/VEPROMS.CSLA.Library/Generated/VersionInfo.cs

@@ -153,6 +153,10 @@ namespace VEPROMS.CSLA.Library
 				CanReadProperty("PDF", true);
 				return _PDF;
 			}
+			set
+			{
+				_PDF = value;
+			}
 		}
 		private byte[] _SummaryPDF;
 		public byte[] SummaryPDF
@@ -163,6 +167,10 @@ namespace VEPROMS.CSLA.Library
 				CanReadProperty("SummaryPDF", true);
 				return _SummaryPDF;
 			}
+			set
+			{
+				_SummaryPDF = value;
+			}
 		}
 		private string _ApprovedXML;
 		public string ApprovedXML
@@ -173,6 +181,10 @@ namespace VEPROMS.CSLA.Library
 				CanReadProperty("ApprovedXML", true);
 				return _ApprovedXML;
 			}
+			set
+			{
+				_ApprovedXML = value;
+			}
 		}
 		private DateTime _DTS = new DateTime();
 		public DateTime DTS

PROMS/Volian.Controls.Library/DisplayTransition.cs

@@ -208,7 +208,7 @@ namespace Volian.Controls.Library
 			// set other procedure related private variables.  
 			vlnTreeComboSetsFillIn(_CurrentProcedure);
 			cbTranProcsFillIn(_CurrentProcedure);
-			if (_CurrentProcedure.Sections != null)
+			if (_CurrentProcedure.Sections != null && secitm != null)
 			{
 				// if the selected format is using section default, initialize with the section default (find it),
 				// otherwise use current section item.
@@ -987,6 +987,7 @@ namespace Volian.Controls.Library
 			if (prcitm.Sections != null)
 			{
 				foreach (SectionInfo sio in prcitm.Sections)
+				
 				{
 					SectionConfig sc = sio.MyConfig as SectionConfig;
 					if (sc != null && sc.Section_OriginalSteps == "Y")
@@ -1115,6 +1116,8 @@ namespace Volian.Controls.Library
 				this.superToolTipDispTran.SetSuperTooltip(this.listBoxTranFmt, new DevComponents.DotNetBar.SuperTooltipInfo("", "", 
 					"This is where transition types are selected.  This also defines how the transition will look in the text.",
 					null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+			// B2024-007 color of transition panel was not toggling properly
+			groupPanelTranFmt.Style.BackColor = !HasDefault && NeedsDefault ? Color.Red : Color.Orange;
 			//btnTranSave.Enabled = allowSave;
 			//if (CurTrans != null && selii != null)
 			//{

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

@@ -506,6 +506,11 @@ namespace Volian.Controls.Library
 		{
 			if (QPrintProcedure != null) QPrintProcedure(sender, args);
 		}
+		public event vlnTreeViewEvent PrintSection;
+		private void OnPrintSection(object sender, vlnTreeEventArgs args)
+		{
+			if (PrintSection != null) PrintSection(sender, args);
+		}
 		public event vlnTreeViewEvent PrintAllProcedures;
 		private void OnPrintAllProcedures(object sender, vlnTreeEventArgs args)
 		{
@@ -837,6 +842,7 @@ namespace Volian.Controls.Library
 								MenuItem mitcas = new MenuItem("Create Time Critical Action Summary"); //F2022-024 added menu option
 								MenuItem mip = new MenuItem("Print");
 								MenuItem miqp = new MenuItem("Quick Print");
+								//MenuItem mips = new MenuItem("Print Section");
 								MenuItem mia = new MenuItem("Approve");
 								int k = 0;
 								foreach (string s in pri.MyDocVersion.UnitNames)
@@ -850,6 +856,9 @@ namespace Volian.Controls.Library
 									MenuItem mqp = miqp.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
 									mqp.Enabled = procAppl;
 									mqp.Tag = k;
+									//MenuItem mps = mips.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
+									//mps.Enabled = procAppl;
+									//mps.Tag = k;
 									MenuItem ma = mia.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
 									ma.Enabled = procAppl;
 									ma.Tag = k;
@@ -864,6 +873,7 @@ namespace Volian.Controls.Library
 								cm.MenuItems.Add(mitcas);
 								cm.MenuItems.Add(mip); 
 								cm.MenuItems.Add(miqp);
+								//cm.MenuItems.Add(mips);
 								AddShowChangeBarsAfterMenuItem(cm.MenuItems, pri);
 								cm.MenuItems.Add(mia);
 								AddApprovedRevisionsMultiUnit(cm.MenuItems, pri);
@@ -874,6 +884,7 @@ namespace Volian.Controls.Library
 								cm.MenuItems.Add("Create Time Critical Action Summary", new EventHandler(mi_Click));
 								cm.MenuItems.Add("Print", new EventHandler(mi_Click));
 								cm.MenuItems.Add("Quick Print", new EventHandler(mi_Click));
+								//cm.MenuItems.Add("Print Section", new EventHandler(mi_Click));
 								//MenuItem miqp = new MenuItem("Print");
 								AddShowChangeBarsAfterMenuItem(cm.MenuItems, pri);
 								cm.MenuItems.Add("Approve", new EventHandler(mi_Click));
@@ -945,6 +956,25 @@ namespace Volian.Controls.Library
 									SectionConfig sc = si.MyConfig as SectionConfig;
 									if (!si.IsEnhancedSection && (si.Sections == null || si.Sections.Count == 0 || (meta && sc != null && si.Sections != null && si.Sections.Count > 0 && sc.SubSection_Edit == "Y")))
 										cm.MenuItems.Add("New Step", new EventHandler(mi_Click));
+
+									//ProcedureInfo pri = tn as SectionInfo;
+									SectionInfo si2 = (tn as VETreeNode).VEObject as SectionInfo;
+									if (si2.MyDocVersion.MultiUnitCount > 1)
+									{
+										MenuItem mps = new MenuItem("Print Section");
+										int k = 0;
+										foreach (string s in si2.MyDocVersion.UnitNames)
+										{
+											k++;
+											MenuItem mp = mps.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
+											mp.Tag = k;
+										}
+										cm.MenuItems.Add(mps);
+									}
+									else
+									{
+										cm.MenuItems.Add("Print Section", new EventHandler(mi_Click));
+									}
 								}
 							}
 						}
@@ -962,7 +992,13 @@ namespace Volian.Controls.Library
 					}
 					#endregion
 					//_MyLog.WarnFormat("Context Menu 2 - {0}", GC.GetTotalMemory(true));
-
+					//#region Print_Section
+					//if (!tn.IsExpanded && tn.VEObject as SectionInfo != null)
+					//{
+					//	SectionInfo si = tn.VEObject as SectionInfo;
+					//	if (si.IsStepSection) cm.MenuItems.Add("Print Section", new EventHandler(mi_Click));
+					//}
+					//#endregion
 					#region Menu_Open
 					if (!tn.IsExpanded && tn.VEObject as SectionInfo != null)
 					{
@@ -1000,6 +1036,10 @@ namespace Volian.Controls.Library
 						// require clearing of all enhanced config data or mapping it to existing data (quite complicated)
 						if ((ui.IsAdministrator() || ui.IsSetAdministrator(i.MyProcedure.MyDocVersion) || ui.IsWriter(i.MyProcedure.MyDocVersion)) && (!i.IsEnhancedStep && !i.IsEnhancedProcedure && !i.IsEnhancedSection && !i.IsRtfRaw && !i.IsFigure))
 							cm.MenuItems.Add("Copy", new EventHandler(mi_Click));
+						if (i.HasWordContent)
+						{
+							cm.MenuItems.Add("Print Section", new EventHandler(mi_Click));
+						}
 					}
 					#endregion
 					//_MyLog.WarnFormat("Context Menu 4 - {0}", GC.GetTotalMemory(true));
@@ -1269,25 +1309,26 @@ namespace Volian.Controls.Library
 					if (ri.LatestVersion.PDF != null)
 					{
 						MenuItem mirp = mir.MenuItems.Add("View Procedure");
-						mirp.Tag = ri;
+						mirp.Tag = ri.RevisionID;
 						mirp.Click += new EventHandler(MultiUnitApprovedRevision_Click);
 					}
 					if (ri.LatestVersion.SummaryPDF != null)
 					{
 						MenuItem mirs = mir.MenuItems.Add("View Summary of Changes");
-						mirs.Tag = ri;
+						mirs.Tag = ri.RevisionID;
 						mirs.Click += new EventHandler(MultiUnitSummaryOfChanges_Click);
 					}
 					if (ri.LatestVersion.ApprovedXML != null && ri.LatestVersion.ApprovedXML != "")
 					{
 						MenuItem miri = mir.MenuItems.Add("Create Procedure to Import");
-						miri.Tag = ri;
+						miri.Tag = ri.RevisionID;
 						miri.Click += new EventHandler(ImportProcedure_Click);
 					}
 
 					//end added jcb 20111031
 					mv.Tag = lastApprovedRevisionID;
 				}
+				ril = null;
 			}
 		}
     public void AddNewNode(IVEDrillDownReadOnly o)
@@ -1379,7 +1420,8 @@ namespace Volian.Controls.Library
 
 		void ImportProcedure_Click(object sender, EventArgs e)
 		{
-			RevisionInfo ri = (sender as MenuItem).Tag as RevisionInfo;
+			//RevisionInfo ri = (sender as MenuItem).Tag as RevisionInfo;
+			RevisionInfo ri = RevisionInfo.Get(int.Parse((sender as MenuItem).Tag.ToString()));
 			RevisionConfig rc = ri.MyConfig as RevisionConfig;
 			// bug fix:  B2016-183 - add the child's name (ex Unit 1) to the export file name for Parent/Child procedures.
 			int applIdx = rc.Applicability_Index;
@@ -1419,7 +1461,8 @@ namespace Volian.Controls.Library
 			bool superceded = false;
 			MenuItem mi = sender as MenuItem;
 			if (mi == null) return;
-			RevisionInfo ri = mi.Tag as RevisionInfo;
+			//RevisionInfo ri = mi.Tag as RevisionInfo;
+			RevisionInfo ri = RevisionInfo.Get(int.Parse(mi.Tag.ToString()));
 			{
 				MenuItem mip = mi.Parent as MenuItem;
 				//B2021-086 Added the check for the last revision stage is an Approved stage
@@ -1445,7 +1488,8 @@ namespace Volian.Controls.Library
 		{
 			MenuItem mi = sender as MenuItem;
 			if (mi == null) return;
-			RevisionInfo ri = mi.Tag as RevisionInfo;
+			//RevisionInfo ri = mi.Tag as RevisionInfo;
+			RevisionInfo ri = RevisionInfo.Get(int.Parse(mi.Tag.ToString()));
 			ItemInfo ii = ItemInfo.Get(ri.ItemID);
 			ii.MyDocVersion.DocVersionConfig.SelectedSlave = ri.MyConfig.Applicability_Index;
 			vlnTreeViewPdfArgs args = new vlnTreeViewPdfArgs(Volian.Base.Library.TmpFile.CreateFileName(ProcedureInfo.Get(ri.ItemID).PDFNumber + " Summary of Changes"), ri.LatestVersion.SummaryPDF, "");
@@ -1747,6 +1791,9 @@ namespace Volian.Controls.Library
 				case "Quick Print":
 					OnQPrintProcedure(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0, mi.Text, (int)mi.Tag));
 					break;
+				case "Print Section":
+					OnPrintSection(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0, mi.Text, (int)mi.Tag));
+					break;
 				case "Print All Procedures for":
 					OnPrintAllProcedures(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0,mi.Text,(int)mi.Tag));
 					break;
@@ -1880,6 +1927,10 @@ namespace Volian.Controls.Library
 			}
 			switch (mi.Text)
 			{
+				case "Print Section":
+					VETreeNode tn2 = SelectedNode as VETreeNode;
+					OnPrintSection(this, new vlnTreeEventArgs(tn2 as VETreeNode, null, 0));
+					break;
 				case "Open":
 					OpenNode();
 					break;

PROMS/Volian.Print.Library/PromsPrinter.cs

@@ -179,6 +179,12 @@ namespace Volian.Print.Library
 			get { return _PDFFile; }
 			set { _PDFFile = value; }
 		}
+		private int _prtSectID = -1;
+		public int PrtSectID
+		{
+			get { return _prtSectID; }
+			set { _prtSectID = value; }
+		}
 		private bool _DebugOutput;
 		public bool DebugOutput
 		{
@@ -317,7 +323,7 @@ namespace Volian.Print.Library
 			set { _MergedPdf = value; }
 		}
 		public PromsPrinter(ItemInfo myItem, string rev, string watermark, bool debugOutput, bool origPgBrk, string backgroundFolder, bool openPDF, bool overWrite,
-			ChangeBarDefinition cbd, String pdfFile, bool insertBlankPages, bool batchPrint, string prefix, bool saveLinks, int removeTrailngHardReturnsAndManualPageBreaks, string blankPageText, bool didAll, MergedPdf mergedPdf, string watermarkColor)
+			ChangeBarDefinition cbd, String pdfFile, bool insertBlankPages, bool batchPrint, string prefix, bool saveLinks, int removeTrailngHardReturnsAndManualPageBreaks, string blankPageText, bool didAll, MergedPdf mergedPdf, string watermarkColor, int PrtSectID = -1)
 		{
 			Prefix = prefix; // RHM20150506 Multiline ItemID TextBox
 			_MyItem = myItem;
@@ -342,6 +348,7 @@ namespace Volian.Print.Library
 			_DidAll = didAll;
 			_MergeNotIncluded = false;
 			_MergedPdf = mergedPdf;
+			_prtSectID = PrtSectID;
 			//_MyReaderHelper.LoadTree(myItem);
 		}
 		// Pass 1 PDF Name
@@ -361,10 +368,11 @@ namespace Volian.Print.Library
 		// B2019-152: MergedLandscapePages is a dictionary whose key is the pdf file name & values are all of the page numbers
 		//  in that pdf that should have landscaped page numbers.  These are added when the page is finished (onEndPage)
 		public static Dictionary<string, List<int>> MergedLandscapePages = null;
-		public string Print(string pdfFolder, bool makePlacekeeper, bool makeContinuousActionSummary, bool makeTimeCriticalActionSummary)
+		public string Print(string pdfFolder, bool makePlacekeeper, bool makeContinuousActionSummary, bool makeTimeCriticalActionSummary, int PrtSectID = -1)
 		{
 			if (_MyItem is ProcedureInfo)
 			{
+				_prtSectID = PrtSectID;
 				ProcedureConfig pcfg = (ProcedureConfig)(_MyItem as ProcedureInfo).MyConfig;
 				if (DidAll && pcfg.Print_NotInMergeAll)     // will be merging a pdf, so don't print this procedure if user set that on procedure propertures
 				{
@@ -798,6 +806,8 @@ namespace Volian.Print.Library
 			{
 				int cnt = 0;
 				foreach (SectionInfo mySection in myProcedure.Sections)
+				{
+					if (PrtSectID == -1 || (PrtSectID > -1 && mySection.ItemID == PrtSectID))
 					{
 						if (!mySection.MyDocStyle.IsStepSection && !mySection.IsAutoTOCSection)
 						{
@@ -816,6 +826,7 @@ namespace Volian.Print.Library
 						}
 					}
 				}
+			}
 			OnStatusChanged("Print " + myProcedure.DisplayNumber, PromsPrinterStatusType.Start);
 			string outputFileName = pdfFolder + "\\" + Prefix + PDFFile; // RHM20150506 Multiline ItemID TextBox
 
@@ -941,6 +952,8 @@ namespace Volian.Print.Library
 				if (clr != null && clr != "") WatermarkOverrideColor = clr.ToUpper().Contains("DEFAULT") ? "BLUE" : clr;
 			}
 			foreach (SectionInfo mySection in myProcedure.Sections)
+			{
+				if(PrtSectID == -1 || (PrtSectID > -1 && mySection.ItemID == PrtSectID) )
 				{ 
 						// B2020-115 Calculate maximum available space on a page for figures
 						vlnParagraph.hMax = ((float)mySection.MyDocStyle.Layout.PageLength);
@@ -968,7 +981,7 @@ namespace Volian.Print.Library
 							hlsItemId = mySection.Steps[0].ItemID;
 							hlsText = mySection.Steps[0].DisplayText; // save the High level step text for use in the page list
 						}
-					cb.PdfWriter.PageEvent = _MyHelper = new VlnSvgPageHelper(mySection, this, hlsText, hlsItemId);
+						cb.PdfWriter.PageEvent = _MyHelper = new VlnSvgPageHelper(mySection, this, hlsText, hlsItemId, PrtSectID);
 						_MyHelper.AllowAllWatermarks = AllowAllWatermarks;
 						_MyHelper.MyPdfWriter = cb.PdfWriter;
 						_MyHelper.CreatingFoldoutPage = doingFoldout;
@@ -1127,6 +1140,7 @@ namespace Volian.Print.Library
 					}
 					_MyHelper.PrintedSectionPage = 0;
 				}
+			}
 			if (_MyHelper != null && _MyHelper.BackgroundFile != null)
 			{
 				_MyHelper.MySvg = null;
@@ -1569,6 +1583,8 @@ namespace Volian.Print.Library
 				Volian.Base.Library.BaselineMetaFile.WriteLine("TOC Ystart {0} LeftMar {1} ScNmPos {2} ScTtlPos {3} ScPgPos {4}", yPageStart, leftMargin, secNumPos, secTitlePos, secPagePos);
 				bool inGroup = false;
 				foreach (SectionInfo mySection in ii.Sections)
+				{
+					if (PrtSectID == -1 || (PrtSectID > -1 && mySection.ItemID == PrtSectID))
 					{
 						sectCnt++;
 						SectionConfig sc = mySection.MyConfig as SectionConfig;
@@ -1838,6 +1854,7 @@ namespace Volian.Print.Library
 						}
 					}
 				}
+			}
 			return yLocation;
 		}
 		// C2021-015: Barakah High Level Steps in Table of Contents
@@ -2338,7 +2355,7 @@ namespace Volian.Print.Library
 			iTextSharp.text.Rectangle pageSize = PDFPageSize.UsePaperSize(MyItem.ActiveFormat.PlantFormat.FormatData.PDFPageSize.PaperSize); // C2020-002 paper size is now set in the format files
 			PdfContentByte cb = OpenDoc(ref SupInfoPdfName, pageSize);
 			if (cb == null) return;
-			VlnSvgPageHelper myPageHelper = new VlnSvgPageHelper(vlnParagraph.MyItemInfo as SectionInfo, this, null, 0);
+			VlnSvgPageHelper myPageHelper = new VlnSvgPageHelper(vlnParagraph.MyItemInfo as SectionInfo, this, null, 0, _prtSectID);
 			cb.PdfWriter.PageEvent = myPageHelper;
 			myPageHelper.AllowAllWatermarks = AllowAllWatermarks;
 			myPageHelper.MyPdfWriter = cb.PdfWriter;
@@ -2925,6 +2942,8 @@ namespace Volian.Print.Library
 		{
 			if (ii.Sections == null) return;        // B2021-067 crash on null reference
 			foreach (SectionInfo si in ii.Sections)
+			{
+				if (MyPromsPrinter.PrtSectID == -1 || (MyPromsPrinter.PrtSectID > -1 && si.ItemID == MyPromsPrinter.PrtSectID))
 				{
 				if (si.IsStepSection)
 					{
@@ -2969,6 +2988,7 @@ namespace Volian.Print.Library
 				} 
 			}
 		}
+	}
 	//public class PrintTimer
 	//{
 	//  private DateTime _StartTime = DateTime.Now;

PROMS/Volian.Print.Library/VlnSvgPageHelper.cs

@@ -85,6 +85,12 @@ namespace Volian.Print.Library
 			get { return _TopMessage; }
 			set { _TopMessage = value; }
 		}
+		private int _prtSectID = -1;
+		public int PrtSectID
+		{
+			get { return _prtSectID; }
+			set { _prtSectID = value; }
+		}
 		private List<vlnText> _TopMessageRs=new List<vlnText>();			// Added if there are 2 messages, in AER AND RNO (for BGE)
 		public List<vlnText> TopMessageRs
 		{
@@ -867,12 +873,15 @@ i = 0;
 			set
 			{
 				_MySection = value;
-				MySectionTitle = ((_MySection.DisplayNumber ?? string.Empty)==string.Empty ? string.Empty : _MySection.DisplayNumber + " - ") + _MySection.DisplayText;
+				MySectionTitle = ((_MySection.DisplayNumber ?? string.Empty) == string.Empty ? string.Empty : _MySection.DisplayNumber + " - ") + _MySection.DisplayText;
 				bool forceLoadSvg = false;
 				if (value.SectionConfig.Section_Pagination == SectionConfig.SectionPagination.Separate && value.MyDocStyle.ResetFirstPageOnSection)
 					DidFirstPageDocStyle = false;
 				if (DidFirstPageDocStyle)
 					forceLoadSvg = SetDocStyleAndValues();    // this method also gets the SVG (the 'else' part of this)
+				if (_prtSectID > -1) { 
+					forceLoadSvg = true;
+				}
 				Volian.Svg.Library.Svg sectSvg = BuildSvg(_MySection, forceLoadSvg);
 				if (sectSvg != null) MySvg = sectSvg;
 				_YTopMargin = null;
@@ -1031,9 +1040,10 @@ i = 0;
 			set { _MyPromsPrinter = value; }
 		}
 		private int _MyRomanPage = 1;
-		public VlnSvgPageHelper(VEPROMS.CSLA.Library.SectionInfo mySection, PromsPrinter myPromsPrinter, string hlsText, int hlsItemId)
+		public VlnSvgPageHelper(VEPROMS.CSLA.Library.SectionInfo mySection, PromsPrinter myPromsPrinter, string hlsText, int hlsItemId, int PrtSectID)
 			: base()
 		{
+			_prtSectID = PrtSectID;
 			HLSText = hlsText;
 			HasHLSTextId = hlsItemId;
 			MyPromsPrinter = myPromsPrinter;
@@ -1836,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}":