Merge pull request 'B2026-009 For Vogtle Units 3&4, fixed bug where a double asterisk was place next to a continuous action RNO on the edit screen and printed with the CAS box shifted to the left.' (#697) from B2026-009_VogtleCAS into Development

Looks Good. Ready for QA!

PROMS/VEPROMS User Interface/dlgManageSecurity.cs

@@ -333,6 +333,7 @@ namespace VEPROMS
 			User u = User.MakeUser("[Enter New UserID]", "", "", "", "", "", "", "", "", "", "", DateTime.Now, "");
 			frmManageUser frm = new frmManageUser("add");
 			frm.MyUser = u;
+			frm.Text = "Enter New UserID";   //C2026-002 Change Title bar on Add/Edit User
 			if (frm.ShowDialog(this) == DialogResult.OK)
 			{
 				u = frm.MyUser;

PROMS/VEPROMS User Interface/frmManageUser.cs

@@ -20,7 +20,27 @@ namespace VEPROMS
 				_MyUser = value;
 				SimpleUser su = new SimpleUser(_MyUser);
 				pgUser.SelectedObject = su;
-				this.Text = string.Format("{0} ({1} {2}) Information",su.UserID,su.FirstName,su.LastName);
+
+				//C2026-002 Change Title bar on Add/Edit User
+				string tmp;
+                if (!string.IsNullOrEmpty(su.FirstName) && !string.IsNullOrEmpty(su.LastName))
+                {
+                    tmp = $"{su.UserID} ({su.FirstName} {su.LastName}) Information";
+                }
+                else if (!string.IsNullOrEmpty(su.LastName))
+                {
+                    tmp = $"{su.UserID} ({su.LastName}) Information";
+                }
+                else if (!string.IsNullOrEmpty(su.FirstName))
+                {
+                    tmp = $"{su.UserID} ({su.FirstName}) Information";
+                }
+                else
+                {
+                    tmp = $"{su.UserID} Information";
+                }
+
+                this.Text = tmp;
 			}
 		}
 		private string _Mode;

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

@@ -4749,13 +4749,20 @@ namespace VEPROMS.CSLA.Library
 						if (ActiveFormat.MyStepSectionLayoutData.AddContActTagToHighLevelRNOWhenIncludedOnCAS &&
 							IsInRNO && !MyParent.IsInRNO && FormatStepData.TabData.CASPrintMacro != null)
 						{
-							StepConfig sc = MyConfig as StepConfig;
-							if (sc != null && sc.Step_CAS == "True")
+							// B2026-009 needed to make sure parent wasn't a continuous action step type
+							//           the ExcludeFromContActSum is set to False for continuous action
+							//           step types and True for all others
+							StepConfig psc = MyParent.MyConfig as StepConfig;
+							if (MyParent.FormatStepData.ExcludeFromContActSum && psc != null && psc.Step_CAS != "True")
 							{
-								if (FormatStepData.TabData.CASPrintMacro != null)
-									_MyTab.Text = FormatStepData.TabData.CASPrintMacro + _MyTab.Text;
-								if (FormatStepData.TabData.CASEditTag != null)
-									_MyTab.CleanText = FormatStepData.TabData.CASEditTag + _MyTab.CleanText;
+								StepConfig sc = MyConfig as StepConfig;
+								if (sc != null && sc.Step_CAS == "True")
+								{
+									if (FormatStepData.TabData.CASPrintMacro != null)
+										_MyTab.Text = FormatStepData.TabData.CASPrintMacro + _MyTab.Text;
+									if (FormatStepData.TabData.CASEditTag != null)
+										_MyTab.CleanText = FormatStepData.TabData.CASEditTag + _MyTab.CleanText;
+								}
 							}
 						}
 						_MyTab.RNOTabWidthAdjust = ((ItemInfo)ActiveParent).FormatStepData.TabData.RNOAdjustTabSize ?? 0;