Merge branch 'Development' into B2026-019

format only change

PROMS/VEPROMS User Interface/dlgApproveProcedure.cs

@@ -1337,24 +1337,37 @@ namespace VEPROMS
                     pi.ClearChangeBarOverrides();
 
 					//B2019-140 Change bars do not get refreshed when approval is run.
-					ProcedureInfo newproc = ItemInfo.ResetProcedure(pi.ItemID);
+					ProcedureInfo newproc;
 
-					//// Refresh the StepPanel for the current Procedure
+                    //// Refresh the StepPanel for the current Procedure
-					//// so change bars update
+                    //// so change bars update
-					//// on any open StepPanel
+                    //// on any open StepPanel
-					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>())
-							eitm.ChangeBar = eitm.MyItemInfo.HasChangeBar;
+                        {
-					}
+                            eitm.ChangeBar = eitm.MyItemInfo.HasChangeBar;
+                        }
 
-					//since in a separate form, need to update the tree view
+                        dti.MyStepTabPanel.MyStepTabRibbon.RefreshProcedure();
-					//so "Showing Change Bars" Content Menu Item is correct
+                        Application.DoEvents();
-					MyFrmVEPROMS.RefreshProcedureNode(newproc);
+                        newproc = ProcedureInfo.Get(pi.ItemID);
+
+                    }
+					else
+					{
+                        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 User Interface/frmVEPROMS.cs

@@ -626,22 +626,33 @@ namespace VEPROMS
 					itm.UserID = Volian.Base.Library.VlnSettings.UserID;
 					itm.Save();
 
-					//B2019-140 Change bars do not get refreshed when approval is run.
+                    //B2019-140 Change bars do not get refreshed when approval is run.
-					// Reset a Procedure and sub items in the cache
+                    // 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
+					
+                    //B2026-019 Attempt to prevent an Access Error by utilizing a different Refresh if a Procedure is Open
+                    DisplayTabItem dti = GetTabContainingProcedure(pi.ItemID);
+					if (dti != null)
+					{
+                        _ = ItemInfo.ResetProcedure(pi.ItemID, true);
 
-					//// 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();
+							dti.MyStepTabPanel.MyStepPanel.Focus();
 
 						foreach (EditItem eitm in dti.MyStepTabPanel.MyStepPanel.Controls.OfType<EditItem>())
+						{
 							eitm.ChangeBar = eitm.MyItemInfo.HasChangeBar;
+						}
+
+						dti.MyStepTabPanel.MyStepTabRibbon.RefreshProcedure();
 					}
+					else
+					{
+                        _ = ItemInfo.ResetProcedure(pi.ItemID);
+                    }
 				}
 			}
 		}

PROMS/VEPROMS User Interface/frmVersionsProperties.cs

@@ -1113,13 +1113,34 @@ namespace VEPROMS
 			if (_Apples == null)
 			{
 				_Apples = new List<MiniConfig>();
-			}
+            }
-			_Apples.Add(cfg);
+
+            //B2026-017 Use Pre-typed in information when adding New Applicability
+            if (_Apples.Count == 0)
+            {
+                cfg.ID = textBox1.Text;
+                if (!string.IsNullOrEmpty(textBox2.Text))
+                {
+                    cfg.Name = textBox2.Text;
+                }
+                cfg.Number = textBox3.Text;
+                cfg.Text = textBox4.Text;
+                cfg.OtherID = textBox8.Text;
+                cfg.OtherName = textBox9.Text;
+                cfg.OtherNumber = textBox10.Text;
+                cfg.OtherText = textBox11.Text;
+                cfg.ProcedureNumber = textBox5.Text;
+                cfg.SetID = textBox6.Text;
+                cfg.SetName = textBox7.Text;
+            }
+            _Apples.Add(cfg);
 
 			bsApples.DataSource = null;
 			bsApples.DataSource = _Apples;
-			lbApplicabilities.SelectedItem = cfg;
+            lbApplicabilities.SelectedItem = cfg;
-		}
+			lbApplicabilities_SelectedIndexChanged(sender, e);
+
+        }
 		
 		private bool ApplicIsUsed(MiniConfig cfg) // B2017-230 - don't allow user to remove an applicability that is being used (specified)
 		{

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

@@ -2291,7 +2291,7 @@ OnPropertyChanged("Default_BkColor");
 		public void RemoveSlave(int index)
 		{
 			XmlNode dd = _Xp.XmlContents.SelectSingleNode("//Slave[@index='" + index.ToString() + "']");
-			dd.ParentNode.RemoveChild(dd);
+			dd?.ParentNode?.RemoveChild(dd);
 		}
 		public int MaxSlaveIndex
 		{

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

@@ -3839,9 +3839,17 @@ namespace VEPROMS.CSLA.Library
 			_SupInfos = null;
 		}
 
-		//B2019-140 Change bars do not get refreshed when approval is run.
+        //B2019-140 Change bars do not get refreshed when approval is run.
-		// Reset a Procedure and sub items in the cache
+        // Reset a Procedure and sub items in the cache
-		public static ProcedureInfo ResetProcedure(int procID)
+        // **********************
+        // Be carefull calling this when the Procedure is Open
+        // When the Procedure is Open - use StepTabRibbon.RefreshProcedure(); instead
+        // When a Procedure is open and you try to refresh it,
+        // events can fire behind the scenes - causing data to try to be accessed while you are trying to refresh it
+        // When This occurs, it will cause a 
+        // "ThreadException ... Collection was modified; enumeration operation may not execute.”
+        // **********************
+        public static ProcedureInfo ResetProcedure(int procID, bool resetindisplaytab = false)
 		{
 			// The following lines reload the procedure info cache
 			ProcedureInfo newproc = ProcedureInfo.Get(procID, true);
@@ -3859,24 +3867,28 @@ namespace VEPROMS.CSLA.Library
 			ItemInfo newprocitem = Get(procID, true);
 			newprocitem.RefreshConfig();
 
-			//Reload all the child/sub items
+			if (!resetindisplaytab)
-#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]);
+                //Reload all the child/sub items
-			}
-
-			//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
+                //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();
+                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 < pconfigrefresh_items.Count; index++)
+                for (int index = 0; index < itemIDs.Count; index++)
-            {
+                {
-				pconfigrefresh_items[index].MyProcedure = newproc;
+                    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

PROMS/Volian.Controls.Library/DisplayApplicability.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
 using System.Drawing;
+using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 using VEPROMS.CSLA.Library;
@@ -225,8 +226,8 @@ namespace Volian.Controls.Library
 			//	return internal and external for the procedure level)
 			if ((!MyItemInfo.IsProcedure && invalidTrans.Count == 0) || IsProcWithNoExternalTrans(MyItemInfo, invalidTrans))
 			{
-				// C2021 - 027: Procedure level PC/PC
+                // C2021 - 027: Procedure level PC/PC
-				if (MyItemInfo.IsProcedure && MyItemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.ProcAppl)
+                if (MyItemInfo.IsProcedure && MyItemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.ProcAppl)
 				{
 					ProcedureConfig sc = MyItemInfo.MyConfig as ProcedureConfig;
 					sc.MasterSlave_Applicability = Volian.Base.Library.BigNum.MakeBigNum(MyApplicability);
@@ -284,26 +285,56 @@ namespace Volian.Controls.Library
 			Volian.Base.Library.BigNum MasterSlave_ApplicabilityTmp;
 			StepConfig sc = MyItemInfo.MyConfig as StepConfig;
 			MasterSlave_ApplicabilityTmp = sc.MasterSlave_Applicability;
+            StringBuilder sb = new StringBuilder();
 
-			ItemInfo startitm = MyItemInfo.FirstSibling;
+
+            ItemInfo startitm = MyItemInfo.FirstSibling;
 			while (startitm != null)
 			{
-				StepConfig sc2 = startitm.MyConfig as StepConfig;
+
-				using (Content cnt = Content.Get(startitm.MyContent.ContentID))
+                // C2026-023: Check for Transitions when setting Applicability to all for a level
-				{
+                List<InvalidTransition> invalidTrans = WillTransitionsBeValidCommand.Execute(startitm.ItemID, MasterSlave_ApplicabilityTmp.ToString());
-					sc2.MasterSlave_Applicability = (MasterSlave_ApplicabilityTmp);
+                if (IsProcWithNoExternalTrans(startitm, invalidTrans))
-					cnt.Config = sc2.ToString();
+                {
-					cnt.Save();
+                    StepConfig sc2 = startitm.MyConfig as StepConfig;
+                    using (Content cnt = Content.Get(startitm.MyContent.ContentID))
+                    {
+                        sc2.MasterSlave_Applicability = (MasterSlave_ApplicabilityTmp);
+                        cnt.Config = sc2.ToString();
+                        cnt.Save();
+                    }
 				}
+                else
+                {
+					if (sb.Length == 0)
+					{
+                        sb.AppendLine("The applicability for some Step(s) cannot be changed due to transition links.");
+                        sb.AppendLine("Applicability settings for these steps will return to original settings when OK is selected.");
+                        sb.AppendLine("Changing the applicability for would invalidate a transition in the following steps:");
+                        sb.AppendLine();
+                    }
+
+                    foreach (InvalidTransition inv in invalidTrans.Where(x => !x.TgtStep.StartsWith(x.SrcStep)))
+                    {
+                        sb.AppendLine(string.Format("{0} : From {1} to {2}.", startitm.MyTab.CleanTextNoSymbols.Trim(), inv.TgtStep, inv.SrcStep));
+                    }
+
+                    invalidTrans.Clear();
+                }
+
 				startitm = startitm.GetNext();
 			}
 
 			_MyDisplayTabItem.MyStepTabPanel.MyStepTabRibbon.RefreshProcedure();
 
-		}
+            if (sb.Length > 0)
+				FlexibleMessageBox.Show(sb.ToString(), "Transitions Affected By Applicability Change");
 
-		// B2021-149: for procedure, only consider external transitions as invalid
+
-		private bool IsProcWithNoExternalTrans(ItemInfo ii, List<InvalidTransition> invalidTrans)
+        }
+
+        // B2021-149: for procedure, only consider external transitions as invalid
+        private bool IsProcWithNoExternalTrans(ItemInfo ii, List<InvalidTransition> invalidTrans)
 		{
 			if (invalidTrans.Count == 0) return true;
 			foreach (InvalidTransition iT in invalidTrans)

PROMS/Volian.Controls.Library/EditItem.cs

@@ -4162,8 +4162,11 @@ namespace Volian.Controls.Library
 		}
 		void MyConfig_PropertyChanged(object sender, PropertyChangedEventArgs e)
 		{
-			SaveConfig();
+            //B2026-024 Change bars should not show when updating Applicability.
-		}
+            if (e.PropertyName == "MasterSlave_Applicability") ChangeBarForConfigItemChange = false;
+            SaveConfig();
+            if (e.PropertyName == "MasterSlave_Applicability") ChangeBarForConfigItemChange = true;
+        }
 		public void SaveConfig()
 		{
 			if (!MyItemInfo.MyConfig.IsDirty) return;

PROMS/Volian.Controls.Library/StepTabRibbon.cs

@@ -1668,7 +1668,17 @@ namespace Volian.Controls.Library
 						}
 						Clipboard.Clear();
 
-						Clipboard.SetDataObject(myDO); // this saves the cleaned up information to the Windows clipboard
+						//Try to update the data object to persist beyond PROMS life
+						//if can't, log it and use old method of scoping clipboard to PROMS life
+						try
+						{
+							Clipboard.SetDataObject(myDO, true); // this saves the cleaned up information to the Windows clipboard		
+						}
+						catch (Exception ex)
+						{
+                            _MyLog.Warn($"Error Setting Clipboard Object to Persist beyond PROMS. Clipboard will be scoped to PROMS. Error:{ex.Message}");
+							Clipboard.SetDataObject(myDO); // this saves the cleaned up information to the Windows clipboard
+						}
 					}
 					iData = Clipboard.GetDataObject();
 					bool noEquationData = true;