Merge branch 'Development' of https://git.volian.com/Volian/SourceCode into Development

format only change

PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/roRichTextBox.cs

@@ -32,7 +32,7 @@ namespace ctlXMLEditLib
 		public void InsertSymbol( int symbcode)
 		{
 			int position = this.SelectionStart;
-			string sym = string.Format(symbcode < 256 ? "\'{0:X2}" : @"\u{0}", symbcode);
+			string sym = symbcode < 256 ? ((char)symbcode).ToString() : string.Format(@"\u{0}", symbcode);
 			this.SelectedRtf = RtfPrefixForSymbols + sym + @"}";
 			Select(position, -1);
 			Select(position + 1, 0);

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -637,7 +637,9 @@ namespace VEPROMS
                     DisplayTabItem dti = GetTabContainingProcedure(pi.ItemID);
 					if (dti != null)
 					{
-						if (!dti.MyStepTabPanel.MyStepPanel.ContainsFocus)
+                        _ = ItemInfo.ResetProcedure(pi.ItemID, true);
+
+                        if (!dti.MyStepTabPanel.MyStepPanel.ContainsFocus)
 							dti.MyStepTabPanel.MyStepPanel.Focus();
 
 						foreach (EditItem eitm in dti.MyStepTabPanel.MyStepPanel.Controls.OfType<EditItem>())

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

@@ -3849,7 +3849,7 @@ namespace VEPROMS.CSLA.Library
         // When This occurs, it will cause a 
         // "ThreadException ... Collection was modified; enumeration operation may not execute.”
         // **********************
-        public static ProcedureInfo ResetProcedure(int procID)
+        public static ProcedureInfo ResetProcedure(int procID, bool resetindisplaytab = false)
 		{
 			// The following lines reload the procedure info cache
 			ProcedureInfo newproc = ProcedureInfo.Get(procID, true);
@@ -3867,24 +3867,28 @@ namespace VEPROMS.CSLA.Library
 			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++)
+			if (!resetindisplaytab)
 			{
-				ResetParts(itemIDs[index]);
-			}
-
-			//reset the procedure config for all items attached to current procedure
+                //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<ItemInfo> pconfigrefresh_items = _CacheByPrimaryKey.Values.ToList().SelectMany(y => y).Where(t => t?.MyProcedure?.ItemID == procID).Distinct().ToList();
+                //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 < pconfigrefresh_items.Count; index++)
-            {
-				pconfigrefresh_items[index].MyProcedure = newproc;
+                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