From 5e50408548d7e372436eb6bac0d41b60172fd9d3 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 11 Aug 2022 18:24:04 +0000 Subject: [PATCH] F2022-024 added check box on the Tag - step panel to include step/sub-step on Time Critical Action Summary report --- .../DisplayTags.Designer.cs | 115 +++++++++++------- PROMS/Volian.Controls.Library/DisplayTags.cs | 23 +++- 2 files changed, 91 insertions(+), 47 deletions(-) diff --git a/PROMS/Volian.Controls.Library/DisplayTags.Designer.cs b/PROMS/Volian.Controls.Library/DisplayTags.Designer.cs index 71d8851a..f666a8a6 100644 --- a/PROMS/Volian.Controls.Library/DisplayTags.Designer.cs +++ b/PROMS/Volian.Controls.Library/DisplayTags.Designer.cs @@ -46,6 +46,8 @@ namespace Volian.Controls.Library this.superTooltipTags = new DevComponents.DotNetBar.SuperTooltip(); this.cbPlaceKeeperCont = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.cbPlaceKeeper = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.cbIncludeInTOC = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.cbTCAS = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.groupPanelIncludeOn = new DevComponents.DotNetBar.Controls.GroupPanel(); this.groupPanelWcnTrnResp = new DevComponents.DotNetBar.Controls.GroupPanel(); this.tbRespons = new System.Windows.Forms.TextBox(); @@ -57,7 +59,6 @@ namespace Volian.Controls.Library this.tbFSWd = new System.Windows.Forms.TextBox(); this.lblFSHt = new System.Windows.Forms.Label(); this.lblFSWidth = new System.Windows.Forms.Label(); - this.cbIncludeInTOC = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.groupPanelPaginate.SuspendLayout(); this.groupPanelCheckoff.SuspendLayout(); this.groupPanelChgBar.SuspendLayout(); @@ -78,7 +79,7 @@ namespace Volian.Controls.Library this.groupPanelPaginate.DisabledBackColor = System.Drawing.Color.Empty; this.groupPanelPaginate.Dock = System.Windows.Forms.DockStyle.Top; this.groupPanelPaginate.Location = new System.Drawing.Point(0, 330); - this.groupPanelPaginate.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.groupPanelPaginate.Margin = new System.Windows.Forms.Padding(2); this.groupPanelPaginate.Name = "groupPanelPaginate"; this.groupPanelPaginate.Size = new System.Drawing.Size(202, 58); // @@ -120,7 +121,7 @@ namespace Volian.Controls.Library // this.cbPrefPageBreak.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.cbPrefPageBreak.Location = new System.Drawing.Point(3, 19); - this.cbPrefPageBreak.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.cbPrefPageBreak.Margin = new System.Windows.Forms.Padding(2); this.cbPrefPageBreak.Name = "cbPrefPageBreak"; this.cbPrefPageBreak.Size = new System.Drawing.Size(195, 15); this.superTooltipTags.SetSuperTooltip(this.cbPrefPageBreak, new DevComponents.DotNetBar.SuperTooltipInfo("Preferred Page Break for Supplemental Info", "", "When set, starts this step at the top of a page.\r\n\r\nkeyboard command: ", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); @@ -331,7 +332,7 @@ namespace Volian.Controls.Library this.groupPanelChgStepType.DisabledBackColor = System.Drawing.Color.Empty; this.groupPanelChgStepType.Dock = System.Windows.Forms.DockStyle.Top; this.groupPanelChgStepType.Location = new System.Drawing.Point(0, 0); - this.groupPanelChgStepType.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.groupPanelChgStepType.Margin = new System.Windows.Forms.Padding(2); this.groupPanelChgStepType.Name = "groupPanelChgStepType"; this.groupPanelChgStepType.Size = new System.Drawing.Size(202, 145); // @@ -376,7 +377,7 @@ namespace Volian.Controls.Library this.lblNoTypeChgReason.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblNoTypeChgReason.ForeColor = System.Drawing.Color.Red; this.lblNoTypeChgReason.Location = new System.Drawing.Point(2, 28); - this.lblNoTypeChgReason.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.lblNoTypeChgReason.Margin = new System.Windows.Forms.Padding(2); this.lblNoTypeChgReason.Name = "lblNoTypeChgReason"; this.lblNoTypeChgReason.Size = new System.Drawing.Size(194, 96); this.lblNoTypeChgReason.TabIndex = 5; @@ -386,7 +387,7 @@ namespace Volian.Controls.Library this.cbChgAll.AutoSize = true; this.cbChgAll.BackColor = System.Drawing.Color.Transparent; this.cbChgAll.Location = new System.Drawing.Point(2, 6); - this.cbChgAll.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.cbChgAll.Margin = new System.Windows.Forms.Padding(2); this.cbChgAll.Name = "cbChgAll"; this.cbChgAll.Size = new System.Drawing.Size(119, 17); this.superTooltipTags.SetSuperTooltip(this.cbChgAll, new DevComponents.DotNetBar.SuperTooltipInfo("Change Step Type - All At Level", "", "When checked, all steps at the level of current step will have their step type ch" + @@ -401,7 +402,7 @@ namespace Volian.Controls.Library | System.Windows.Forms.AnchorStyles.Right))); this.listBoxStepTypes.FormattingEnabled = true; this.listBoxStepTypes.Location = new System.Drawing.Point(2, 28); - this.listBoxStepTypes.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.listBoxStepTypes.Margin = new System.Windows.Forms.Padding(2); this.listBoxStepTypes.Name = "listBoxStepTypes"; this.listBoxStepTypes.Size = new System.Drawing.Size(194, 95); this.superTooltipTags.SetSuperTooltip(this.listBoxStepTypes, new DevComponents.DotNetBar.SuperTooltipInfo("Possible Step Types", "", "This list allows change of type showing all selections of any possible step type " + @@ -422,8 +423,8 @@ namespace Volian.Controls.Library // // this.cbPlaceKeeperCont.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbPlaceKeeperCont.Location = new System.Drawing.Point(3, 39); - this.cbPlaceKeeperCont.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.cbPlaceKeeperCont.Location = new System.Drawing.Point(3, 58); + this.cbPlaceKeeperCont.Margin = new System.Windows.Forms.Padding(2); this.cbPlaceKeeperCont.Name = "cbPlaceKeeperCont"; this.cbPlaceKeeperCont.Size = new System.Drawing.Size(158, 15); this.superTooltipTags.SetSuperTooltip(this.cbPlaceKeeperCont, new DevComponents.DotNetBar.SuperTooltipInfo("Placekeeper Continuous Action", "", "Include this on the Placekeeper marked as a Continuous Action\r\n\r\nkeyboard command" + @@ -440,8 +441,8 @@ namespace Volian.Controls.Library // // this.cbPlaceKeeper.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbPlaceKeeper.Location = new System.Drawing.Point(3, 20); - this.cbPlaceKeeper.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.cbPlaceKeeper.Location = new System.Drawing.Point(3, 39); + this.cbPlaceKeeper.Margin = new System.Windows.Forms.Padding(2); this.cbPlaceKeeper.Name = "cbPlaceKeeper"; this.cbPlaceKeeper.Size = new System.Drawing.Size(84, 15); this.superTooltipTags.SetSuperTooltip(this.cbPlaceKeeper, new DevComponents.DotNetBar.SuperTooltipInfo("Placekeeper", "", "Include this on the Placekeeper\r\n\r\nkeyboard command: ", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); @@ -449,11 +450,48 @@ namespace Volian.Controls.Library this.cbPlaceKeeper.Text = "Placekeeper"; this.cbPlaceKeeper.CheckedChanged += new System.EventHandler(this.cbPlacekeeper_CheckedChanged); // + // cbIncludeInTOC + // + this.cbIncludeInTOC.AutoSize = true; + this.cbIncludeInTOC.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.cbIncludeInTOC.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbIncludeInTOC.Location = new System.Drawing.Point(2, 78); + this.cbIncludeInTOC.Margin = new System.Windows.Forms.Padding(2); + this.cbIncludeInTOC.Name = "cbIncludeInTOC"; + this.cbIncludeInTOC.Size = new System.Drawing.Size(109, 15); + this.cbIncludeInTOC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.superTooltipTags.SetSuperTooltip(this.cbIncludeInTOC, new DevComponents.DotNetBar.SuperTooltipInfo("High Level Step in TOC", "", "Include this in the auto generated Table of Contents.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + this.cbIncludeInTOC.TabIndex = 2; + this.cbIncludeInTOC.Text = "Table of Contents"; + this.cbIncludeInTOC.CheckedChanged += new System.EventHandler(this.cbIncludeInTOC_CheckedChanged); + // + // cbTCAS + // + this.cbTCAS.AutoSize = true; + this.cbTCAS.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.cbTCAS.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbTCAS.Location = new System.Drawing.Point(3, 20); + this.cbTCAS.Margin = new System.Windows.Forms.Padding(2); + this.cbTCAS.Name = "cbTCAS"; + this.cbTCAS.Size = new System.Drawing.Size(167, 15); + this.superTooltipTags.SetSuperTooltip(this.cbTCAS, new DevComponents.DotNetBar.SuperTooltipInfo("Continuous Action Summary", "", "Include this in the Continuous Action Summary section\r\n\r\nkeyboard command: ", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + this.cbTCAS.TabIndex = 3; + this.cbTCAS.Text = "Time Critical Action Summary"; + this.cbTCAS.CheckedChanged += new System.EventHandler(this.cbTCAS_CheckedChanged); + // // groupPanelIncludeOn // this.groupPanelIncludeOn.BackColor = System.Drawing.Color.Transparent; this.groupPanelIncludeOn.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanelIncludeOn.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.groupPanelIncludeOn.Controls.Add(this.cbTCAS); this.groupPanelIncludeOn.Controls.Add(this.cbIncludeInTOC); this.groupPanelIncludeOn.Controls.Add(this.cbPlaceKeeperCont); this.groupPanelIncludeOn.Controls.Add(this.cbPlaceKeeper); @@ -461,9 +499,9 @@ namespace Volian.Controls.Library this.groupPanelIncludeOn.DisabledBackColor = System.Drawing.Color.Empty; this.groupPanelIncludeOn.Dock = System.Windows.Forms.DockStyle.Top; this.groupPanelIncludeOn.Location = new System.Drawing.Point(0, 388); - this.groupPanelIncludeOn.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.groupPanelIncludeOn.Margin = new System.Windows.Forms.Padding(2); this.groupPanelIncludeOn.Name = "groupPanelIncludeOn"; - this.groupPanelIncludeOn.Size = new System.Drawing.Size(202, 94); + this.groupPanelIncludeOn.Size = new System.Drawing.Size(202, 121); // // // @@ -503,7 +541,7 @@ namespace Volian.Controls.Library this.groupPanelWcnTrnResp.Controls.Add(this.tbRespons); this.groupPanelWcnTrnResp.DisabledBackColor = System.Drawing.Color.Empty; this.groupPanelWcnTrnResp.Dock = System.Windows.Forms.DockStyle.Top; - this.groupPanelWcnTrnResp.Location = new System.Drawing.Point(0, 482); + this.groupPanelWcnTrnResp.Location = new System.Drawing.Point(0, 509); this.groupPanelWcnTrnResp.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.groupPanelWcnTrnResp.Name = "groupPanelWcnTrnResp"; this.groupPanelWcnTrnResp.Size = new System.Drawing.Size(202, 138); @@ -562,8 +600,8 @@ namespace Volian.Controls.Library this.groupPanelFigSize.Controls.Add(this.lblFSWidth); this.groupPanelFigSize.DisabledBackColor = System.Drawing.Color.Empty; this.groupPanelFigSize.Dock = System.Windows.Forms.DockStyle.Top; - this.groupPanelFigSize.Location = new System.Drawing.Point(0, 620); - this.groupPanelFigSize.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.groupPanelFigSize.Location = new System.Drawing.Point(0, 647); + this.groupPanelFigSize.Margin = new System.Windows.Forms.Padding(2); this.groupPanelFigSize.Name = "groupPanelFigSize"; this.groupPanelFigSize.Size = new System.Drawing.Size(202, 135); // @@ -600,7 +638,7 @@ namespace Volian.Controls.Library // btnFSrestore // this.btnFSrestore.Location = new System.Drawing.Point(112, 27); - this.btnFSrestore.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnFSrestore.Margin = new System.Windows.Forms.Padding(2); this.btnFSrestore.Name = "btnFSrestore"; this.btnFSrestore.Size = new System.Drawing.Size(54, 26); this.btnFSrestore.TabIndex = 6; @@ -611,7 +649,7 @@ namespace Volian.Controls.Library // trBarFS // this.trBarFS.Location = new System.Drawing.Point(11, 58); - this.trBarFS.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.trBarFS.Margin = new System.Windows.Forms.Padding(2); this.trBarFS.Maximum = 700; this.trBarFS.Minimum = 50; this.trBarFS.Name = "trBarFS"; @@ -623,7 +661,7 @@ namespace Volian.Controls.Library // btnFsSav // this.btnFsSav.Location = new System.Drawing.Point(112, 2); - this.btnFsSav.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnFsSav.Margin = new System.Windows.Forms.Padding(2); this.btnFsSav.Name = "btnFsSav"; this.btnFsSav.Size = new System.Drawing.Size(46, 20); this.btnFsSav.TabIndex = 4; @@ -635,7 +673,7 @@ namespace Volian.Controls.Library // this.tbFSHt.Enabled = false; this.tbFSHt.Location = new System.Drawing.Point(42, 27); - this.tbFSHt.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tbFSHt.Margin = new System.Windows.Forms.Padding(2); this.tbFSHt.Name = "tbFSHt"; this.tbFSHt.Size = new System.Drawing.Size(60, 20); this.tbFSHt.TabIndex = 3; @@ -643,7 +681,7 @@ namespace Volian.Controls.Library // tbFSWd // this.tbFSWd.Location = new System.Drawing.Point(42, 4); - this.tbFSWd.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tbFSWd.Margin = new System.Windows.Forms.Padding(2); this.tbFSWd.Name = "tbFSWd"; this.tbFSWd.Size = new System.Drawing.Size(60, 20); this.tbFSWd.TabIndex = 2; @@ -669,22 +707,6 @@ namespace Volian.Controls.Library this.lblFSWidth.TabIndex = 0; this.lblFSWidth.Text = "Width"; // - // cbIncludeTOC - // - this.cbIncludeInTOC.AutoSize = true; - this.cbIncludeInTOC.BackColor = System.Drawing.Color.Transparent; - this.cbIncludeInTOC.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbIncludeInTOC.Location = new System.Drawing.Point(2, 59); - this.cbIncludeInTOC.Margin = new System.Windows.Forms.Padding(2); - this.cbIncludeInTOC.Name = "cbIncludeTOC"; - this.cbIncludeInTOC.Size = new System.Drawing.Size(166, 15); - this.cbIncludeInTOC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.superTooltipTags.SetSuperTooltip(this.cbIncludeInTOC, new DevComponents.DotNetBar.SuperTooltipInfo("High Level Step in TOC", "", "Include this in the auto generated Table of Contents.", - null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); - this.cbIncludeInTOC.TabIndex = 2; - this.cbIncludeInTOC.Text = "Table of Contents"; - this.cbIncludeInTOC.CheckedChanged += new System.EventHandler(this.cbIncludeInTOC_CheckedChanged); - // // DisplayTags // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -696,7 +718,7 @@ namespace Volian.Controls.Library this.Controls.Add(this.groupPanelChgBar); this.Controls.Add(this.groupPanelCheckoff); this.Controls.Add(this.groupPanelChgStepType); - this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.Margin = new System.Windows.Forms.Padding(2); this.Name = "DisplayTags"; this.Size = new System.Drawing.Size(202, 802); this.groupPanelPaginate.ResumeLayout(false); @@ -749,5 +771,6 @@ namespace Volian.Controls.Library private System.Windows.Forms.Button btnFSrestore; private DevComponents.DotNetBar.Controls.CheckBoxX cbPrefPageBreak; private DevComponents.DotNetBar.Controls.CheckBoxX cbIncludeInTOC; + private DevComponents.DotNetBar.Controls.CheckBoxX cbTCAS; } } diff --git a/PROMS/Volian.Controls.Library/DisplayTags.cs b/PROMS/Volian.Controls.Library/DisplayTags.cs index c0f42563..24cc2830 100644 --- a/PROMS/Volian.Controls.Library/DisplayTags.cs +++ b/PROMS/Volian.Controls.Library/DisplayTags.cs @@ -113,7 +113,10 @@ namespace Volian.Controls.Library cbPlaceKeeper.Enabled = false; cbPlaceKeeperCont.Enabled = false; cbIncludeInTOC.Enabled = false; + cbCAS.Checked = false; + cbTCAS.Checked = false; cbCAS.Enabled = false; + cbTCAS.Enabled = false; //txbxAltConActSumText.Enabled = false; rbChgBarOff.Enabled = false; rbChgBarOn.Enabled = false; @@ -275,11 +278,15 @@ namespace Volian.Controls.Library //if ((fmtdata.ProcData.CheckOffData.CheckOffList == null || fmtdata.ProcData.CheckOffData.CheckOffList.Count == 0) || // fmtdata.ProcData.CheckOffData.Menu=="Signoff") // cmbCheckoff.Enabled = false; - cbCAS.Enabled = !CurItemInfo.IsFigure && !CurItemInfo.IsRtfRaw; + cbCAS.Enabled = (!CurItemInfo.IsFigure && !CurItemInfo.IsRtfRaw); + cbTCAS.Enabled = (!CurItemInfo.IsFigure && !CurItemInfo.IsRtfRaw); //F2022-024 Time Critical Action Summary if (((CurItemInfo.ActiveFormat.PlantFormat.FormatData.PurchaseOptions.Value & E_PurchaseOptions.EnhancedBackgrounds) == E_PurchaseOptions.EnhancedBackgrounds) || ((CurItemInfo.ActiveFormat.PlantFormat.FormatData.PurchaseOptions.Value & E_PurchaseOptions.EnhancedDeviations) == E_PurchaseOptions.EnhancedDeviations)) { + cbCAS.Checked = false; + cbTCAS.Checked = false; // F2022-024 ensure the check box is not checked on a Time Critical Action Background step cbCAS.Enabled = false; + cbTCAS.Enabled = false; cbPageBreak.Enabled = false; cbPlaceKeeper.Enabled = false; cbPlaceKeeperCont.Enabled = false; @@ -288,6 +295,7 @@ namespace Volian.Controls.Library { if (CurItemInfo.IsHigh)cbPageBreak.Checked = false; // Page Break is set to false cbCAS.Checked = CurItemInfo.IncludeOnContActSum; // set based on step type format flag + cbTCAS.Checked = CurItemInfo.IncludeOnTimeCriticalActionSum; // set based on step type format flag cbPlaceKeeper.Checked = false; cbPlaceKeeperCont.Checked = false; } @@ -300,6 +308,8 @@ namespace Volian.Controls.Library cbPlaceKeeperCont.Checked = (sc.Step_Placekeeper == "C"); // step is included on Placekeeper and marked as continuous action (Calvert Cliffs) // set the Continuous Action Summary check box to the saved setting in the config or, if nothing in config, set to format flag setting cbCAS.Checked = (sc.Step_CAS != null) ? sc.Step_CAS == "True" : CurItemInfo.IncludeOnContActSum; + // Set the Time Critical Action Summary check box - if nothing in config set to false + cbTCAS.Checked = (sc.Step_TCAS != null) ? sc.Step_TCAS == "True" : CurItemInfo.IncludeOnTimeCriticalActionSum; //// if alternative continuous action text is saved in the config, then show it and check the checkbox //if (sc.Step_AlternateContActSumText != null && sc.Step_AlternateContActSumText != "") //{ @@ -545,6 +555,16 @@ namespace Volian.Controls.Library sc.Step_CAS = (cbCAS.Checked) ? "True" : "False"; MyEditItem.ChangeBarForConfigItemChange = true; } + private void cbTCAS_CheckedChanged(object sender, EventArgs e) + { + if (_Initalizing) return; + MyEditItem.SaveContents(); + StepConfig sc = CurItemInfo.MyConfig as StepConfig; + if (sc == null) return; + MyEditItem.ChangeBarForConfigItemChange = false; + sc.Step_TCAS = (cbTCAS.Checked) ? "True" : "False"; + MyEditItem.ChangeBarForConfigItemChange = true; + } private void cbPlacekeeper_CheckedChanged(object sender, EventArgs e) { if (_Initalizing) return; @@ -872,6 +892,7 @@ namespace Volian.Controls.Library MyEditItem.ChangeBarForConfigItemChange = true; } + //private void txbxAltConActSumText_Leave(object sender, EventArgs e) //{ // // User left Atlernate Continuous Action Text field. If text changed, then prompt