diff --git a/PROMS/Volian.Controls.Library/DisplayTabItem.cs b/PROMS/Volian.Controls.Library/DisplayTabItem.cs index 6df2576b..e5b46690 100644 --- a/PROMS/Volian.Controls.Library/DisplayTabItem.cs +++ b/PROMS/Volian.Controls.Library/DisplayTabItem.cs @@ -254,9 +254,15 @@ namespace Volian.Controls.Library MyStepTabPanel.MyStepPanel.VwMode = E_ViewMode.View; //added by jcb 20130718 to support disabling create pdf button when multiunit until user selects a unit if (dvi.MultiUnitCount > 1) + { this.MyStepTabPanel.MyStepTabRibbon.btnPdfCreate.Enabled = false; + this.MyStepTabPanel.MyStepTabRibbon.btnCASCreate.Enabled = false; + } else + { this.MyStepTabPanel.MyStepTabRibbon.btnPdfCreate.Enabled = true; + this.MyStepTabPanel.MyStepTabRibbon.btnCASCreate.Enabled = true; + } //end added by jcb 20130718 } void _MyItemInfo_Changed(object sender) diff --git a/PROMS/Volian.Controls.Library/DisplayTags.Designer.cs b/PROMS/Volian.Controls.Library/DisplayTags.Designer.cs index 88f7e8c8..9c6193ec 100644 --- a/PROMS/Volian.Controls.Library/DisplayTags.Designer.cs +++ b/PROMS/Volian.Controls.Library/DisplayTags.Designer.cs @@ -62,11 +62,12 @@ namespace Volian.Controls.Library this.groupPanelPaginate.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanelPaginate.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanelPaginate.Controls.Add(this.cbPageBreak); + 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(172, 58); + this.groupPanelPaginate.Size = new System.Drawing.Size(202, 58); // // // @@ -106,7 +107,7 @@ namespace Volian.Controls.Library // this.cbPageBreak.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.cbPageBreak.Location = new System.Drawing.Point(3, 11); - this.cbPageBreak.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.cbPageBreak.Margin = new System.Windows.Forms.Padding(2); this.cbPageBreak.Name = "cbPageBreak"; this.cbPageBreak.Size = new System.Drawing.Size(122, 15); this.superTooltipTags.SetSuperTooltip(this.cbPageBreak, new DevComponents.DotNetBar.SuperTooltipInfo("Manual Page Break", "", "When set, starts this step at the top of a page.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); @@ -122,8 +123,8 @@ namespace Volian.Controls.Library // // this.cbCAS.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbCAS.Location = new System.Drawing.Point(3, 14); - this.cbCAS.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.cbCAS.Location = new System.Drawing.Point(3, 9); + this.cbCAS.Margin = new System.Windows.Forms.Padding(2); this.cbCAS.Name = "cbCAS"; this.cbCAS.Size = new System.Drawing.Size(162, 15); this.superTooltipTags.SetSuperTooltip(this.cbCAS, new DevComponents.DotNetBar.SuperTooltipInfo("Continuous Action Summary", "", "Include this in the Continuous Action Summary section", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); @@ -141,9 +142,9 @@ namespace Volian.Controls.Library this.cmbCheckoff.FormattingEnabled = true; this.cmbCheckoff.ItemHeight = 17; this.cmbCheckoff.Location = new System.Drawing.Point(3, 17); - this.cmbCheckoff.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.cmbCheckoff.Margin = new System.Windows.Forms.Padding(2); this.cmbCheckoff.Name = "cmbCheckoff"; - this.cmbCheckoff.Size = new System.Drawing.Size(164, 23); + this.cmbCheckoff.Size = new System.Drawing.Size(194, 23); this.cmbCheckoff.TabIndex = 0; this.cmbCheckoff.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cmbCheckoff.WatermarkText = "select signoff / checkoff"; @@ -154,11 +155,12 @@ namespace Volian.Controls.Library this.groupPanelCheckoff.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanelCheckoff.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanelCheckoff.Controls.Add(this.cmbCheckoff); + this.groupPanelCheckoff.DisabledBackColor = System.Drawing.Color.Empty; this.groupPanelCheckoff.Dock = System.Windows.Forms.DockStyle.Top; this.groupPanelCheckoff.Location = new System.Drawing.Point(0, 145); - this.groupPanelCheckoff.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.groupPanelCheckoff.Margin = new System.Windows.Forms.Padding(2); this.groupPanelCheckoff.Name = "groupPanelCheckoff"; - this.groupPanelCheckoff.Size = new System.Drawing.Size(172, 77); + this.groupPanelCheckoff.Size = new System.Drawing.Size(202, 77); // // // @@ -200,11 +202,12 @@ namespace Volian.Controls.Library this.groupPanelChgBar.Controls.Add(this.lblChgId); this.groupPanelChgBar.Controls.Add(this.rbChgBarOff); this.groupPanelChgBar.Controls.Add(this.rbChgBarOn); + this.groupPanelChgBar.DisabledBackColor = System.Drawing.Color.Empty; this.groupPanelChgBar.Dock = System.Windows.Forms.DockStyle.Top; this.groupPanelChgBar.Location = new System.Drawing.Point(0, 222); - this.groupPanelChgBar.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.groupPanelChgBar.Margin = new System.Windows.Forms.Padding(2); this.groupPanelChgBar.Name = "groupPanelChgBar"; - this.groupPanelChgBar.Size = new System.Drawing.Size(172, 108); + this.groupPanelChgBar.Size = new System.Drawing.Size(202, 108); // // // @@ -239,7 +242,7 @@ namespace Volian.Controls.Library // tbChgID // this.tbChgID.Location = new System.Drawing.Point(0, 67); - this.tbChgID.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tbChgID.Margin = new System.Windows.Forms.Padding(2); this.tbChgID.Name = "tbChgID"; this.tbChgID.Size = new System.Drawing.Size(81, 20); this.tbChgID.TabIndex = 4; @@ -259,7 +262,7 @@ namespace Volian.Controls.Library // this.rbChgBarOff.AutoSize = true; this.rbChgBarOff.Location = new System.Drawing.Point(0, 26); - this.rbChgBarOff.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.rbChgBarOff.Margin = new System.Windows.Forms.Padding(2); this.rbChgBarOff.Name = "rbChgBarOff"; this.rbChgBarOff.Size = new System.Drawing.Size(45, 17); this.superTooltipTags.SetSuperTooltip(this.rbChgBarOff, new DevComponents.DotNetBar.SuperTooltipInfo("Change Bar OFF", "", "Turn change bar off. Note that \'OVERRIDE\' will turn off a change bar even though" + @@ -274,7 +277,7 @@ namespace Volian.Controls.Library // this.rbChgBarOn.AutoSize = true; this.rbChgBarOn.Location = new System.Drawing.Point(0, 4); - this.rbChgBarOn.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.rbChgBarOn.Margin = new System.Windows.Forms.Padding(2); this.rbChgBarOn.Name = "rbChgBarOn"; this.rbChgBarOn.Size = new System.Drawing.Size(41, 17); this.superTooltipTags.SetSuperTooltip(this.rbChgBarOn, new DevComponents.DotNetBar.SuperTooltipInfo("Change Bar ON", "", "Add a change bar on this step", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); @@ -292,11 +295,12 @@ namespace Volian.Controls.Library this.groupPanelChgStepType.Controls.Add(this.lblNoTypeChgReason); this.groupPanelChgStepType.Controls.Add(this.cbChgAll); this.groupPanelChgStepType.Controls.Add(this.listBoxStepTypes); + 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(172, 145); + this.groupPanelChgStepType.Size = new System.Drawing.Size(202, 145); // // // @@ -339,9 +343,9 @@ 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(164, 96); + this.lblNoTypeChgReason.Size = new System.Drawing.Size(194, 96); this.lblNoTypeChgReason.TabIndex = 5; // // cbChgAll @@ -349,7 +353,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" + @@ -364,9 +368,9 @@ 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(164, 95); + 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 " + "for the current step.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.listBoxStepTypes.TabIndex = 3; @@ -374,6 +378,7 @@ namespace Volian.Controls.Library // // superTooltipTags // + this.superTooltipTags.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray); this.superTooltipTags.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; // // groupPanelIncludeOn @@ -384,11 +389,12 @@ namespace Volian.Controls.Library this.groupPanelIncludeOn.Controls.Add(this.cbPlaceKeeperCont); this.groupPanelIncludeOn.Controls.Add(this.cbPlaceKeeper); this.groupPanelIncludeOn.Controls.Add(this.cbCAS); + 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(172, 94); + this.groupPanelIncludeOn.Size = new System.Drawing.Size(202, 94); // // // @@ -428,7 +434,7 @@ namespace Volian.Controls.Library // // this.cbPlaceKeeperCont.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbPlaceKeeperCont.Location = new System.Drawing.Point(3, 52); + this.cbPlaceKeeperCont.Location = new System.Drawing.Point(3, 47); this.cbPlaceKeeperCont.Margin = new System.Windows.Forms.Padding(2); this.cbPlaceKeeperCont.Name = "cbPlaceKeeperCont"; this.cbPlaceKeeperCont.Size = new System.Drawing.Size(158, 15); @@ -444,8 +450,8 @@ namespace Volian.Controls.Library // // this.cbPlaceKeeper.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbPlaceKeeper.Location = new System.Drawing.Point(3, 33); - this.cbPlaceKeeper.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.cbPlaceKeeper.Location = new System.Drawing.Point(3, 28); + this.cbPlaceKeeper.Margin = new System.Windows.Forms.Padding(2); this.cbPlaceKeeper.Name = "cbPlaceKeeper"; this.cbPlaceKeeper.Size = new System.Drawing.Size(84, 15); this.cbPlaceKeeper.TabIndex = 1; @@ -458,11 +464,12 @@ namespace Volian.Controls.Library this.groupPanelWcnTrnResp.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanelWcnTrnResp.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; 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, 569); + this.groupPanelWcnTrnResp.Location = new System.Drawing.Point(0, 482); this.groupPanelWcnTrnResp.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.groupPanelWcnTrnResp.Name = "groupPanelWcnTrnResp"; - this.groupPanelWcnTrnResp.Size = new System.Drawing.Size(229, 138); + this.groupPanelWcnTrnResp.Size = new System.Drawing.Size(202, 138); // // // @@ -514,9 +521,9 @@ 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(172, 512); + this.Size = new System.Drawing.Size(202, 802); this.groupPanelPaginate.ResumeLayout(false); this.groupPanelPaginate.PerformLayout(); this.groupPanelCheckoff.ResumeLayout(false); @@ -529,7 +536,6 @@ namespace Volian.Controls.Library this.groupPanelWcnTrnResp.ResumeLayout(false); this.groupPanelWcnTrnResp.PerformLayout(); this.ResumeLayout(false); - this.PerformLayout(); } diff --git a/PROMS/Volian.Controls.Library/DisplayTags.cs b/PROMS/Volian.Controls.Library/DisplayTags.cs index c14ccd82..6b9586d6 100644 --- a/PROMS/Volian.Controls.Library/DisplayTags.cs +++ b/PROMS/Volian.Controls.Library/DisplayTags.cs @@ -107,6 +107,7 @@ namespace Volian.Controls.Library cbPlaceKeeper.Enabled = false; cbPlaceKeeperCont.Enabled = false; cbCAS.Enabled = false; + //txbxAltConActSumText.Enabled = false; rbChgBarOff.Enabled = false; rbChgBarOn.Enabled = false; listBoxStepTypes.Items.Clear(); @@ -174,20 +175,27 @@ namespace Volian.Controls.Library // fmtdata.ProcData.CheckOffData.Menu=="Signoff") // cmbCheckoff.Enabled = false; - if (sc == null) // if there is no config data, Page Break and CAS check boxes are false + if (sc == null) // if there is no config data ... { - if (CurItemInfo.IsHigh)cbPageBreak.Checked = false; - cbCAS.Checked = false; + if (CurItemInfo.IsHigh)cbPageBreak.Checked = false; // Page Break is set to false + cbCAS.Checked = CurItemInfo.IncludeOnContActSum; // set based on step type format flag cbPlaceKeeper.Checked = false; cbPlaceKeeperCont.Checked = false; } else // otherwise, get data from config { if (CurItemInfo.IsHigh) - cbPageBreak.Checked = sc.Step_NewManualPagebreak; - cbPlaceKeeper.Checked = (sc.Step_Placekeeper == "Y"); - cbPlaceKeeperCont.Checked = (sc.Step_Placekeeper == "C"); - cbCAS.Checked = sc.Step_CAS; + cbPageBreak.Checked = sc.Step_NewManualPagebreak; // High Level Step has a manual page break + cbPlaceKeeper.Checked = (sc.Step_Placekeeper == "Y"); // step text to be included on PlaceKeeper (Calvert Cliffs) + 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; + //// 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 != "") + //{ + // txbxAltConActSumText.Text = sc.Step_AlternateContActSumText; + // cbCAS.Checked = true; + //} } bool _checkoffsAllowed = true; if (fmtdata.ProcData.CheckOffData.CheckoffOnSubStepsOnly) @@ -345,7 +353,7 @@ namespace Volian.Controls.Library MyEditItem.SaveContents(); StepConfig sc = CurItemInfo.MyConfig as StepConfig; if (sc == null) return; - sc.Step_CAS = cbCAS.Checked; + sc.Step_CAS = (cbCAS.Checked) ? "True" : "False"; } private void cbPlacekeeper_CheckedChanged(object sender, EventArgs e) { @@ -523,5 +531,26 @@ namespace Volian.Controls.Library } } #endregion + + //private void txbxAltConActSumText_Leave(object sender, EventArgs e) + //{ + // // User left Atlernate Continuous Action Text field. If text changed, then prompt + // // to see if save should occur. + // StepConfig sc = CurItemInfo.MyConfig as StepConfig; + // if (sc == null) return; + // bool bothEmpty = (sc.Step_AlternateContActSumText == null || sc.Step_AlternateContActSumText == "") && (txbxAltConActSumText.Text == null || txbxAltConActSumText.Text == ""); + // if (!bothEmpty && sc.Step_AlternateContActSumText != txbxAltConActSumText.Text) + // { + // if (MessageBox.Show(this, "Do you want to save the Alternate Continuous Action Text?", "Confirm Save", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + // { + // MyEditItem.SaveContents(); + // sc.Step_AlternateContActSumText = txbxAltConActSumText.Text; // this actually saves the config + // } + // else + // txbxAltConActSumText.Text = sc.Step_AlternateContActSumText; + // } + + //} + } } diff --git a/PROMS/Volian.Controls.Library/DisplayTags.resx b/PROMS/Volian.Controls.Library/DisplayTags.resx index 83b9a5e7..24c8db42 100644 --- a/PROMS/Volian.Controls.Library/DisplayTags.resx +++ b/PROMS/Volian.Controls.Library/DisplayTags.resx @@ -120,4 +120,7 @@ 17, 17 + + 36 + \ No newline at end of file