Merge pull request 'B2025-065 When Printing a Word Section containing XY Plot ROs - when there is a title on the XY Plot, only the first line is indented.' (#677) from B2025-065 into Development

good for testing phase

PROMS/VEPROMS User Interface/dlgApproveProcedure.cs

@@ -13,6 +13,8 @@ using System.Text.RegularExpressions;
 using System.Globalization;
 using DevComponents.DotNetBar;
 using JR.Utils.GUI.Forms;
+using Volian.Controls.Library;
+using System.Linq;
 
 namespace VEPROMS
 {
@@ -1321,6 +1323,26 @@ namespace VEPROMS
 
 					// Clear the change bar override for this procedure:
 					pi.ClearChangeBarOverrides();
+
+					//B2019-140 Change bars do not get refreshed when approval is run.
+					ProcedureInfo newproc = ItemInfo.ResetProcedure(pi.ItemID);
+
+					//// Refresh the StepPanel for the current Procedure
+					//// so change bars update
+					//// on any open StepPanel
+					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>())
+							eitm.ChangeBar = eitm.MyItemInfo.HasChangeBar;
+					}
+
+					//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 User Interface/frmVEPROMS.cs

@@ -589,6 +589,25 @@ namespace VEPROMS
 			}
 		}
 
+		//B2019-140 Change bars do not get refreshed when approval is run.
+		// Get the displaytab containing the procedure
+		// if none exists, return null
+		public DisplayTabItem GetTabContainingProcedure(int procid) => tc?.MyBar?.Items?.OfType<DisplayTabItem>().FirstOrDefault(x => x.MyItemInfo?.ItemID == procid);
+        // Refresh Node in Tree
+        //  Used for when Change Bar Updates as part of approval.
+        public void RefreshProcedureNode(ProcedureInfo itm)
+        {
+			VETreeNode tn = tv.FindNode(itm, tv.Nodes);
+			var tmp = (ProcedureInfo)tn?.VEObject;
+			if (tmp != null)
+            {
+                tmp.ChangeBarDate = itm.ChangeBarDate;
+				tmp.MyConfig = itm.MyConfig;
+            }
+
+            tn?.RefreshNode();
+        }
+
         void tv_SelectDateToStartChangeBars(object sender, vlnTreeEventArgs args)
 		{
 			ProcedureInfo pi = (args.Node as VETreeNode).VEObject as ProcedureInfo;
@@ -606,6 +625,23 @@ namespace VEPROMS
 					itm.MyContent.Config = pc.ToString();
 					itm.UserID = Volian.Base.Library.VlnSettings.UserID;
 					itm.Save();
+
+					//B2019-140 Change bars do not get refreshed when approval is run.
+					// Reset a Procedure and sub items in the cache
+					ProcedureInfo newproc = ItemInfo.ResetProcedure(pi.ItemID);
+
+					//// Refresh the StepPanel for the current Procedure
+					//// so change bars update
+					//// on any open StepPanel
+					DisplayTabItem dti = 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>())
+							eitm.ChangeBar = eitm.MyItemInfo.HasChangeBar;
+					}
 				}
 			}
 		}
@@ -2497,7 +2533,7 @@ namespace VEPROMS
 			//and set checkboxes based on what they are set to
 			UserSettings usersettings = new UserSettings(VlnSettings.UserID);
 
-			if (DisPlayTabState.Rows.Count > 0 && (usersettings.UserSetting_OpenTabs_AutoOpen || !usersettings.UserSetting_OpenTabs_Remember))
+			if (!Settings.Default.SeparateWindows && DisPlayTabState.Rows.Count > 0 && (usersettings.UserSetting_OpenTabs_AutoOpen || !usersettings.UserSetting_OpenTabs_Remember))
 			{
 				//will open tabs by default / ask by default
 				DialogResult result = DialogResult.Yes;
@@ -5344,6 +5380,8 @@ namespace VEPROMS
 		private void btnUpdateFormat_Click(object sender, EventArgs e)
 		{
             UpdateFormats(null);
+			//C2025-060 When format is updated in PROMS, auto-update the format cache so it doesn't require exiting PROMS and going back in.
+			RefreshFormats(sender, null);
 		}
 
 		private void UpdateFormats(string mypath)

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

@@ -1363,9 +1363,14 @@ namespace VEPROMS.CSLA.Library
 								// An X/Y Plot RO type might have text preceding the Plot Commands
 								int pstart = roValue.IndexOf("<<G"); //  find the starting Plot Command
 
+								//B2025-065 When Printing a Word Section containing XY Plot ROs - when there is a title on the XY Plot, only the first line is indented.
+								//get x-offset
+								float fx1 = (float)MyApp.ActiveDocument.Range(sel.Start, sel.Start).get_Information(LBWdInformation.wdHorizontalPositionRelativeToPage);
+								fx1 -= (float)MyApp.ActiveDocument.Range(0, 0).get_Information(LBWdInformation.wdHorizontalPositionRelativeToPage);
+
 								// B2017-217 Added logic so that underscores are not converted to underline
 								// C2018-003 fixed use of getting the active section
-								AddPrecedingText(sel, roValue.Substring(0, pstart), 0.0F, (sect.ActiveSection != null) ? sect.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.ConvertUnderscoreToUnderline : false);// replace the RO token with what's in front of the X/Y Plot
+								AddPrecedingText(sel, roValue.Substring(0, pstart), fx1, (sect.ActiveSection != null) ? sect.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.ConvertUnderscoreToUnderline : false);// replace the RO token with what's in front of the X/Y Plot
 								roValue = roValue.Substring(pstart); // set rovalue to the start of the plot commands
 
 								pngFile = VlnSettings.TemporaryFolder + @"\XYPlot1.png"; //@"C:\Temp\XYPlot1.png";
@@ -1386,6 +1391,10 @@ namespace VEPROMS.CSLA.Library
 
 								float yAdjust = sel.Font.Size;
 								float yyy = yAdjust + y + plotRect.Y;
+
+								//B2025-065 When Printing a Word Section containing XY Plot ROs - when there is a title on the XY Plot, only the first line is indented.
+								xxx += fx1; //shift by x-offset
+
 								LBShape shape = myDoc.Shapes.AddPicture(pngFile, xxx, yyy, sel.Range);
 
 								try

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

@@ -3819,6 +3819,51 @@ namespace VEPROMS.CSLA.Library
 			_Tables = null;
 			_SupInfos = null;
 		}
+
+		//B2019-140 Change bars do not get refreshed when approval is run.
+		// Reset a Procedure and sub items in the cache
+		public static ProcedureInfo ResetProcedure(int procID)
+		{
+			// The following lines reload the procedure info cache
+			ProcedureInfo newproc = ProcedureInfo.Get(procID, true);
+			newproc.RefreshConfig();
+
+            //the following is needed to force the ProcedureConfig to reload
+			#pragma warning disable S1656 // Variables should not be self-assigned
+            newproc.MyConfig = newproc.MyConfig;
+			#pragma warning restore S1656 // Variables should not be self-assigned
+
+            //reload the Content Cache for the procedure
+            ContentInfo.Refresh(Content.Get(newproc.MyContent.ContentID, true));
+
+			// The following line actually reloads the item info cache
+			ItemInfo newprocitem = Get(procID, true);
+			newprocitem.RefreshConfig();
+
+			//Reload all the child/sub items
+#pragma warning disable S2971 // LINQ expressions should be simplified - need initial ToList to force enumeration
+			//otherwise will get a "Collection was modified; enumeration operation may not execute" error
+			List<int> itemIDs = _CacheByPrimaryKey.Values.ToList().SelectMany(y => y).Where(t => t?.ActiveParent != null && (t.ActiveParent is ItemInfo) && t.MyProcedure.ItemID == procID).Select(x => (x.ActiveParent as ItemInfo).ItemID).Distinct().ToList();
+#pragma warning restore S2971 // LINQ expressions should be simplified
+            for (int index = 0; index < itemIDs.Count; index++)
+			{
+				ResetParts(itemIDs[index]);
+			}
+
+			//reset the procedure config for all items attached to current procedure
+#pragma warning disable S2971 // LINQ expressions should be simplified - need initial ToList to force enumeration
+			//otherwise will get a "Collection was modified; enumeration operation may not execute" error
+			List<ItemInfo> pconfigrefresh_items = _CacheByPrimaryKey.Values.ToList().SelectMany(y => y).Where(t => t?.MyProcedure?.ItemID == procID).Distinct().ToList();
+#pragma warning restore S2971 // LINQ expressions should be simplified
+			for (int index = 0; index < pconfigrefresh_items.Count; index++)
+            {
+				pconfigrefresh_items[index].MyProcedure = newproc;
+            }
+
+            //return the changed procedure info
+            return newproc;
+		}
+
 		private ItemInfoList _Procedures;
 		public ItemInfoList Procedures
 		{ get { return Lookup(E_FromType.Procedure, ref _Procedures); } }

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

@@ -4341,6 +4341,16 @@ public LeftJustifyList(XmlNodeList xmlNodeList) : base(xmlNodeList) { }
 				return LazyLoad(ref _IncludeSectionNumAndTitle, "@IncludeSectionNumAndTitle");
 			}
 		}
+
+		//F2025-038 default (in base format) is True. The lable "SECTION" will precede the section number an title
+		private LazyLoad<bool> _IncludeSectionLabel;
+		public bool IncludeSectionLabel
+		{
+			get
+			{
+				return LazyLoad(ref _IncludeSectionLabel, "@IncludeSectionLabel");
+			}
+		}
 		// the font and font styles to use for the continuous action summary
 		private VE_Font _Font;
 		public VE_Font Font

PROMS/Volian.Controls.Library/StepTabRibbon.cs

@@ -1667,6 +1667,7 @@ namespace Volian.Controls.Library
 							}
 						}
 						Clipboard.Clear();
+
 						Clipboard.SetDataObject(myDO); // this saves the cleaned up information to the Windows clipboard
 					}
 					iData = Clipboard.GetDataObject();

PROMS/Volian.Print.Library/ContActionSum.cs

@@ -49,7 +49,7 @@ namespace Volian.Print.Library
 			{
 				if (myContAct.MyChildren.Count > 0)
 					if (myContAct.MyParagraph.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.AccSectionData.ContinuousActionSummaryData.IncludeSectionNumAndTitle) // only print the section title if it has Continuous Action Steps
-						AddSectionHeader(myContAct.MyParagraph.MyItemInfo.DisplayNumber, myContAct.MyParagraph.MyItemInfo.FormattedDisplayText);
+						AddSectionHeader(myContAct.MyParagraph.MyItemInfo.DisplayNumber, myContAct.MyParagraph.MyItemInfo.FormattedDisplayText, myContAct.MyParagraph.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.AccSectionData.ContinuousActionSummaryData.IncludeSectionLabel);
 				foreach (pkParagraph pgh in myContAct.MyChildren) // within each section...
 				{
 					ItemInfo hlsii = GetHLSii(pgh.MyParagraph.MyItemInfo);
@@ -175,7 +175,7 @@ namespace Volian.Print.Library
 			WriteCell("DONE", true, true);
 			WriteCell("PAGE", true, false);
 		}
-		private void AddSectionHeader(string number, string title)
+		private void AddSectionHeader(string number, string title, bool IncludeSectionLabel)
 		{
 			if (!_FirstSection)
 			{
@@ -187,7 +187,10 @@ namespace Volian.Print.Library
 			_FirstSection = false;
 			Advance(2);
 			SetIndent(0, 0);
-			WriteCell("SECTION " + number, true, false);
+			if (IncludeSectionLabel) 
+				WriteCell("SECTION " + number, true, false);
+			else
+				WriteCell(number, true, false); // F2025-038 don't include the word SECTION  before number and title
 			WriteCell("   " + title, false, true);
 			Advance();
 		}

PROMS/Volian.Print.Library/vlnParagraph.cs

@@ -6456,8 +6456,11 @@ namespace Volian.Print.Library
 					{
 						if (itemInfo.MyDocStyle.AlignHLSTabWithSect || itemInfo.FormatStepData.AlignHLSTabWithSectOvride)
 						{
+							float orgXOffset = MyTab.XOffset;
 							myTab.XOffset = (float)itemInfo.MyDocStyle.Layout.LeftMargin + (float)formatInfo.PlantFormat.FormatData.SectData.SectionHeader.Pos;
 							XOffset = myTab.XOffset + myTab.Width;
+							// F2025-040 Adjust the Cont Act box position around HLS number
+							if (myTab.MyMacro != null) myTab.MyMacro.XOffset += (MyTab.XOffset - orgXOffset);
 						}
 						else
 						{