B2026-088 Refresh Issue with Refreshing Step Numbers After an inserted Step

Format only change.  Good for testing

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -1499,7 +1499,7 @@ namespace VEPROMS
 						}
 					}
 				}
-				else if (tc.MyEditItem != null && displayRO.MyROFST != null && tc.MyEditItem.MyItemInfo.MyDocVersion.DocVersionAssociations[0].ROFstID != displayRO.MyROFST.ROFstID)
+				else if (displayRO.MyROFST != null && tc?.MyEditItem?.MyItemInfo?.MyDocVersion?.DocVersionAssociations != null && tc.MyEditItem.MyItemInfo.MyDocVersion.DocVersionAssociations.Count > 0 && tc.MyEditItem.MyItemInfo.MyDocVersion.DocVersionAssociations[0].ROFstID != displayRO.MyROFST.ROFstID)
 				{
                     SelectedROFst = tc.MyEditItem.MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst;
 				}
@@ -2426,9 +2426,10 @@ namespace VEPROMS
 					//            when Word procedure tabs are restored.
 					// C2026-053 leaving this flag in her for now should we decide to trouble-shoot reopening of Word tabs later on.
 					tc.LoadingSavedProcTabs = true; // we check for this flag in DSOTabPanel.cs when opening Word sections
+					EditItem LastEditItem = null; //to hold last edit item. Needed in case last tab is a Word Section
 					foreach (DataRow TabState in DisPlayTabState.Rows)
 					{
-						int _ItemID = (int)TabState["ItemID"];
+                        int _ItemID = (int)TabState["ItemID"];
 						ItemInfo _Procedure = ItemInfo.Get(_ItemID);
 						// C2026-053 Open procedure tab but only if it's NOT a Word section
 						//           Needed to disable opening saved Word sections - at least for now.
@@ -2439,18 +2440,29 @@ namespace VEPROMS
 						// SelectedStepTabPanel needs to be set so the print buttons on the ribbon will work.
 						SelectedStepTabPanel = tc.MyEditItem.MyStepPanel.MyStepTabPanel;
 
-						//CSM B2024-090 - if last displaytab item,
+						LastEditItem = tc.MyEditItem; //set last tab index
-						//select the steptab panel for it
+                        if ((DisPlayTabState.Rows.IndexOf(TabState) == DisPlayTabState.Rows.Count - 1))
-						//and set the EditItem for Find/Replace
-						//otherwise will cause PROMS to crash if Find clicked before a Tab is given Focus
-						if ((DisPlayTabState.Rows.IndexOf(TabState) == DisPlayTabState.Rows.Count - 1))
 						{
 							SelectedStepTabPanel.Select();
-							dlgFindReplace.MyEditItem = tc.MyEditItem;
+                        }
-							SpellChecker.MyEditItem = tc.MyEditItem;   //B2025-043 Remember Tabs is not setting the EditItem for the active window causing a PROMS crash when Spell Check
+                    }
-						}
+                    //CSM B2024-090 - if last displaytab item,
-					}
+                    //select the steptab panel for it
-					tc.LoadingSavedProcTabs = false;
+                    //and set the EditItem for Find/Replace
+                    //otherwise will cause PROMS to crash if Find clicked before a Tab is given Focus
+                    if (LastEditItem != null)
+                    {
+                        dlgFindReplace.MyEditItem = LastEditItem;
+                        SpellChecker.MyEditItem = LastEditItem;   //B2025-043 Remember Tabs is not setting the EditItem for the active window causing a PROMS crash when Spell Check
+
+                        //B2026-090 Populate Step Properties Panel when PROMS restores saved display tabs
+                        LastEditItem.MyStepPanel.BringToFront();
+                        LastEditItem.MyStepPanel.Select();
+                        Application.DoEvents();
+                        tc_ItemSelectedChanged(this, new ItemSelectedChangedEventArgs(tc.MyEditItem));
+                    }
+
+                    tc.LoadingSavedProcTabs = false;
 				}
 			}
 		}

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

@@ -2153,7 +2153,28 @@ namespace VEPROMS.CSLA.Library
 				return GetNext();
 			}
 		}
-		private static void ResetOrdinal(int itemID)	
+
+        //B2026-088 Refresh Issue with Refreshing Step Numbers After an inserted Step
+        public void ResetOrdinalandPrevious(ItemInfo prevItm)
+        {
+            MyPrevious = prevItm;
+            _Ordinal = null;
+            _TagsSetup = false;
+            ConvertListToDictionary();
+            if (_CacheByPrimaryKey.ContainsKey(ItemID.ToString()))
+            {
+                ItemInfo[] items = _CacheByPrimaryKey[ItemID.ToString()].ToArray();
+                foreach (ItemInfo item in items)
+                {
+                    item.MyPrevious = prevItm;
+                    item._Ordinal = null;
+                    item._TagsSetup = false;
+                }    
+            }
+            OnOrdinalChange(ItemID); // After _Ordinal reset trigger event
+        }
+
+        private static void ResetOrdinal(int itemID)	
 		{
 			ConvertListToDictionary();
 			string key = itemID.ToString();

PROMS/Volian.Controls.Library/DisplaySearch.cs

@@ -3192,7 +3192,7 @@ namespace Volian.Controls.Library
 								{
 									int itemID = int.Parse(nd.Attributes.GetNamedItem("id").InnerText);
 									ItemInfo ii = ItemInfo.Get(itemID);
-									if (ii.SearchAnnotationText == null && ii.ItemAnnotations != null) ii.SearchAnnotationText = AnnotationInfo.Get(ii.ItemAnnotations[0].AnnotationID).SearchText;
+									if (ii.SearchAnnotationText == null && ii.ItemAnnotations != null && ii.ItemAnnotations.Count > 0) ii.SearchAnnotationText = AnnotationInfo.Get(ii.ItemAnnotations[0].AnnotationID).SearchText;
 									SearchResults.AddItemInfo(ii);
 								}
 								lbSrchResults.DataSource = SearchResults;
@@ -3214,7 +3214,7 @@ namespace Volian.Controls.Library
 									int itemID = int.Parse(nd.Attributes.GetNamedItem("id").InnerText);
 									ItemInfo ii = ItemInfo.Get(itemID);
 									// B2020-107: The following was needed to set the Step Path result type for annotations
-									if (ii.SearchAnnotationText == null && ii.ItemAnnotations != null)
+									if (ii.SearchAnnotationText == null && ii.ItemAnnotations != null && ii.ItemAnnotations.Count > 0)
 									{
 										ii.SearchAnnotationText = AnnotationInfo.Get(ii.ItemAnnotations[0].AnnotationID).SearchText;
 										ii.SearchAnnotationID = ii.ItemAnnotations[0].AnnotationID;
@@ -3245,7 +3245,7 @@ namespace Volian.Controls.Library
 								{
 									int itemID = int.Parse(nd.Attributes.GetNamedItem("id").InnerText);
 									ItemInfo ii = ItemInfo.Get(itemID);
-									if (ii.SearchAnnotationText == null && ii.ItemAnnotations != null) ii.SearchAnnotationText = AnnotationInfo.Get(ii.ItemAnnotations[0].AnnotationID).SearchText;
+									if (ii.SearchAnnotationText == null && ii.ItemAnnotations != null && ii.ItemAnnotations.Count > 0) ii.SearchAnnotationText = AnnotationInfo.Get(ii.ItemAnnotations[0].AnnotationID).SearchText;
 									SearchResults.AddItemInfo(ii);
 								}
 								lbSrchResultsIncTrans.DataSource = SearchResults;

PROMS/Volian.Controls.Library/EditItem.cs

@@ -1259,7 +1259,20 @@ namespace Volian.Controls.Library
 				default: // Need debug
 					break;
 			}
-			if (updateStatus)
+
+            //B2026-088 Refresh Issue with Refreshing Step Numbers After an inserted Step
+            EditItem tmp = this;
+            while (tmp.MyNextEditItem != null)
+            {
+				ItemInfo prevIInfo = tmp.MyItemInfo;
+				tmp = tmp.MyNextEditItem;
+                tmp.MyItemInfo.ResetOrdinalandPrevious(prevIInfo);
+				tmp.RefreshOrdinal();
+            }
+
+            Application.DoEvents();
+
+            if (updateStatus)
 				MyStepPanel.SelectedEditItem = newEditItem;//Update Screen
 		}
 		protected static int _WatchThis = 1;
@@ -3663,6 +3676,8 @@ namespace Volian.Controls.Library
 			TabLeft = 20;
 			if (!itemInfo.IsStep)  // C2025-036 reduce un-needed processing - this will prevent duplicat calls that generate step tabs when loading a procedure
 				SetupHeader(itemInfo);
+			//B2026-093  move the setting of MyStepPanel to fix null reference error when the Alarm Point Table is first setup for the editor view
+			MyStepPanel = myStepPanel;
 			SetupAlarmTableView(itemInfo); // C2021-018 display alarm point table information in the step editor (if the format flag is set)
 			this.Paint -= new PaintEventHandler(EditItem_Paint);
 			this.Paint += new PaintEventHandler(EditItem_Paint);
@@ -3707,7 +3722,6 @@ namespace Volian.Controls.Library
 				if (myStepPanel.MyFont != null) ContentFont = TabFont = myStepPanel.MyFont;
 			}
 			if (expand) ShowExpanded();
-			MyStepPanel = myStepPanel;
 			if (itemInfo != null && !myStepPanel._LookupEditItems.ContainsKey(itemInfo.ItemID)) myStepPanel._LookupEditItems.Add(itemInfo.ItemID, this);
 			_MyChildRelation = myChildRelation;
 			if (myParentEditItem != null) RNOLevel = myParentEditItem.RNOLevel;

PROMS/Volian.Controls.Library/StepTabRibbon.cs

@@ -3512,10 +3512,24 @@ namespace Volian.Controls.Library
 					}
  					break;
 				case "InsRNO":
-					displayMenu = ((actable & E_AccStep.AddingRNO) > 0) && btnCMInsRNO.Enabled;
+                    //B2026-086 Have Shortcut Keys for adding a RNO auto-work instead of having to press a button after shortcut key
+                    displayMenu = false;
 					LetUserKnowIfTheyCannotAdd(actable, E_AccStep.AddingRNO,"RNO"); // B2018-014 Inform user that they cannot add the specified step type
-					_ContextMenuBar.SetContextMenuEx(_MyStepRTB, btnCMInsRNO);
+					
-					break;
+					if (((actable & E_AccStep.AddingRNO) > 0) && btnCMInsRNO.Enabled)
+					{
+						try
+						{ 
+							btnCMInsRNO.SubItems["cmbtnRNOType"].RaiseClick(); 
+						}
+						catch
+						{ 
+							_ContextMenuBar.SetContextMenuEx(_MyStepRTB, btnCMInsRNO);
+                            displayMenu = true;
+                        }
+					}
+
+                    break;
 				case "InsSubStps":
 					displayMenu = ((actable & E_AccStep.AddingSub) > 0) && btnCMInsSubStps.Enabled;
 					LetUserKnowIfTheyCannotAdd(actable, E_AccStep.AddingSub,"Sub-step"); // B2018-014 Inform user that they cannot add the specified step type