Merge pull request 'C2026-014 Set Changebar date with multi-unit' (#766) from C2026-014 into Development

good for testing

PROMS/VEPROMS User Interface/dlgApproveProcedure.cs

@@ -1478,19 +1478,34 @@ namespace VEPROMS
 		{
 			ProcedureConfig pc = procedureInfo.MyConfig as ProcedureConfig;
 			if (pc == null) return;
+
             pc.SelectedSlave = selectedSlave;
 			pc.Print_Rev = revNumber;
 			//AppRevDate Change
 			pc.Print_RevDate = revDate.ToString("MM/dd/yyyy");
-			pc.Print_ChangeBarDate = dts.ToString("MM/dd/yyyy HH:mm:ss");
+			pc.Print_ChangeBarDate = dts.ToString("MM/dd/yyyy HH:mm:ss");  //this is needed to set the changebar date for an indeividual unit also
 			using (Item itm = Item.Get(procedureInfo.ItemID))
 			{
 				itm.MyContent.Config = pc.ToString();
 				//itm.DTS = dts;
 				itm.UserID = Volian.Base.Library.VlnSettings.UserID;
 				itm.Save();
-			}
 
+				//C2026-015 set overall change bar date
+				if (selectedSlave > 0)
+				{
+					pc.SelectedSlave = 0;
+					pc.Print_Rev = revNumber;
+					pc.Print_RevDate = revDate.ToString("MM/dd/yyyy");
+					pc.Print_ChangeBarDate = dts.ToString("MM/dd/yyyy HH:mm:ss");  //this is needed to set the changebar date for an indeividual unit also
+					using (Item itm2 = Item.Get(procedureInfo.ItemID))
+					{
+						itm2.MyContent.Config = pc.ToString();
+						itm2.UserID = Volian.Base.Library.VlnSettings.UserID;
+						itm2.Save();
+					}
+				}
+			}
 		}
 	}
 	public class RevType

PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.cs

@@ -68,8 +68,26 @@ namespace VEPROMS
 			MyProcConfig.Print_ChangeBarDate = dateTimeInput1.Value.ToString("MM/dd/yyyy HH:mm:ss");// ("MM/dd/yyyy HH:mm:ss");
 
             //CSM - C2026-010 - Add Audit Record for Change Bar Audit History
-            ChangeBarAuditHistory.AddAudit(MyProcInfo.ItemID, $"Set ChangeBars set to ({ dateTimeInput1.Value.ToString("MM/dd/yyyy HH:mm:ss")}) by ({ VlnSettings.UserID}) on ({DateTime.Now})", DateTime.Now, VlnSettings.UserID, 0);
+            ChangeBarAuditHistory.AddAudit(MyProcInfo.ItemID, $"Set ChangeBars set to ({dateTimeInput1.Value.ToString("MM/dd/yyyy HH:mm:ss")}) by ({VlnSettings.UserID}) on ({DateTime.Now})", DateTime.Now, VlnSettings.UserID, 0);
 
+            //CSM C2026-014 if multi-unit, set for each unit
+            System.Data.DataTable dt = RevisionData.GetRevisionDataByUnit(MyProcInfo.ItemID);
+            if (RevisionData.HasUnits(dt))
+            {
+                //Change the ChangeBarDate for each unit
+                foreach (DataRow r in dt.Rows)
+                {
+                    if (!r.IsNull("UnitID"))
+                    {
+                        MyProcConfig.SelectedSlave = Convert.ToInt32(r["UnitID"]);
+                        MyProcConfig.Print_ChangeBarDate = dateTimeInput1.Value.ToString("MM/dd/yyyy HH:mm:ss");
+
+                        //CSM - C2026-010 - Add Audit Record for Change Bar Audit History
+                        ChangeBarAuditHistory.AddAudit(MyProcInfo.ItemID, $"Set ChangeBars set to ({dateTimeInput1.Value.ToString("MM/dd/yyyy HH:mm:ss")}) by ({VlnSettings.UserID}) on ({DateTime.Now}) for (Unit {r["UnitName"]})", DateTime.Now, VlnSettings.UserID, MyProcConfig.SelectedSlave);
+                    }
+                }
+                MyProcConfig.SelectedSlave = 0;
+            }
         }
 
 
@@ -107,9 +125,12 @@ namespace VEPROMS
 				StringBuilder sb = new StringBuilder();
 				sb.Append($"     The Procedure Viewer Change Bar Date will be set to ({maxDTS}).");
                 foreach (DataRow r in dt.Rows)
+                {
+                    if (!r.IsNull("UnitID"))
                     {
                         sb.Append($"\r\n     The Change Bar Date for Unit ({r["UnitName"]}) will be set to ({Convert.ToDateTime(r["DTS"]):MM/dd/yyyy HH:mm:ss}).");
                     }
+                }
 
                 sb.Append("\r\n     Any Change Bars for Units not listed above will use the Overall/Procedure Viewer Change Bar Date (as these Units have no approvals).");
 
@@ -121,12 +142,14 @@ namespace VEPROMS
                     //Change the ChangeBarDate for each unit
                     foreach (DataRow r in dt.Rows)
 					{
+                        if (!r.IsNull("UnitID"))
+                        {
                             MyProcConfig.SelectedSlave = Convert.ToInt32(r["UnitID"]);
                             MyProcConfig.Print_ChangeBarDate = Convert.ToDateTime(r["DTS"]).ToString("MM / dd / yyyy HH: mm: ss");
 
                             //CSM - C2026-010 - Add Audit Record for Change Bar Audit History
                             ChangeBarAuditHistory.AddAudit(MyProcInfo.ItemID, $"Reset ChangeBars performed by ({VlnSettings.UserID}) on ({DateTime.Now}). ChangeBars reset to show since last approval ({Convert.ToDateTime(r["DTS"]):MM/dd/yyyy HH:mm:ss}) for (Unit {r["UnitName"]})", DateTime.Now, VlnSettings.UserID, MyProcConfig.SelectedSlave);
-
+                        }
                     }
                     MyProcConfig.SelectedSlave = 0;
                     DialogResult = DialogResult.OK;

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -11,6 +11,7 @@ using System.IO;
 using System.Configuration;
 using System.Reflection;
 using VEPROMS.CSLA.Library;
+//using Csla;
 using DevComponents;
 using DevComponents.DotNetBar;
 using DevComponents.DotNetBar.Rendering;

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

@@ -4054,7 +4054,7 @@ namespace VEPROMS.CSLA.Library
 				// date). Print_ViewableAfterChangeBarDate was created to get only that user specified date, if it exists.  If it does exist, we compare
 				// that with the Content datetime, otherwise we proceed as before.
 				DateTime? viewableStartingDateTime = (MyProcedure.MyConfig as ProcedureConfig).Print_ViewableStartingChangeBarDate;
-				if (viewableStartingDateTime != null && viewableStartingDateTime > MyProcedure.ChangeBarDate)
+				if (viewableStartingDateTime != null && viewableStartingDateTime > MyProcedure.ChangeBarDate && (MyProcedure.MyConfig as ProcedureConfig).SelectedSlave == 0)
 					return (MyContent.DTS > viewableStartingDateTime);
 				return (MyContent.DTS > MyProcedure.ChangeBarDate);
 			}
@@ -6215,6 +6215,11 @@ namespace VEPROMS.CSLA.Library
 			if (!SectionHasCheckOffs()) return null;
 			int stpCoIndx = CheckOffIndex();		// this step has a checkoff defined
 			if (stpCoIndx == -1) return null;
+            //B2026-040 - Signoff/Checkoffs not printing unless set to Section Default
+            if (stpCoIndx > 1)
+            {
+                return ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffList[stpCoIndx];        // DO override of CheckOffList[]	
+            }
 
             int sectCoIndx = SectionDefaultCheckOffIndex();  // no checkoff on step, see if there is a section default.
 			if (sectCoIndx == -1) return null;

PROMS/Volian.Controls.Library/DisplayApplicability.Designer.cs

@@ -49,7 +49,7 @@ namespace Volian.Controls.Library
 			this.btnApplicabilitychg.Size = new System.Drawing.Size(80, 22);
 			this.btnApplicabilitychg.Margin = new System.Windows.Forms.Padding(2);
 			this.btnApplicabilitychg.RightToLeft = System.Windows.Forms.RightToLeft.No;
-			this.superTooltip1.SetSuperTooltip(this.btnApplicabilitychg, new DevComponents.DotNetBar.SuperTooltipInfo("Change applicability settings - All At Level", "", "When clicked, all sub-steps at that level of the current step will be set to the selected applicability.  Note that this button is disabled when on a RNO step type but enabled for sub-step under it.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+			this.superTooltip1.SetSuperTooltip(this.btnApplicabilitychg, new DevComponents.DotNetBar.SuperTooltipInfo("Change applicability settings - All At Level", "", "When clicked, all steps at that level of the current step will be set to the selected applicability.  Note that this button is disabled when on a RNO step type but enabled for sub-step under it.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
 			this.btnApplicabilitychg.TabIndex = 0;
 			this.btnApplicabilitychg.Text = "Set All at Level";
 			this.btnApplicabilitychg.ColorTable = DevComponents.DotNetBar.eButtonColor.BlueOrb;
@@ -175,3 +175,4 @@ namespace Volian.Controls.Library
 
 	}
 }
+

PROMS/Volian.Controls.Library/DisplayApplicability.cs

@@ -42,7 +42,7 @@ namespace Volian.Controls.Library
 						names.Add(dcfg.Unit_Name);
 					}
 					dcfg.SelectedSlave = 0;
-//					string[] names = dcfg.Unit_Name.Split(',');
+					//					string[] names = dcfg.Unit_Name.Split(',');
 					int apple = -1;
 					if(_MyDisplayTabItem.MyStepTabPanel != null)
 						apple = _MyDisplayTabItem.MyStepTabPanel.MyStepPanel.ApplDisplayMode;
@@ -69,14 +69,6 @@ namespace Volian.Controls.Library
 					{
 						MyItemInfo = _MyDisplayTabItem.MyItemInfo;
 					}
-					if (MyItemInfo.IsRNOPart == true)
-					{
-						btnApplicabilitychg.Enabled = false;
-					}
-					else
-					{
-						btnApplicabilitychg.Enabled = true;
-					}
 				}
 			}
 		}
@@ -516,3 +508,4 @@ namespace Volian.Controls.Library
 		}
 	}
 }
+