From fafaf62b6d85efc0967b7fe964f29abd9623b435 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 31 Aug 2018 18:28:17 +0000 Subject: [PATCH] =?UTF-8?q?B2016-057=20Don=E2=80=99t=20enable=20the=20Appr?= =?UTF-8?q?ove=20button=20if=20there=20are=20rev=20numbers=20that=20need?= =?UTF-8?q?=20fixed,=20C2018-008=20Redesigned=20of=20the=20user=20interfac?= =?UTF-8?q?e=20to=20make=20less=20confusing,=20C2018-025=20We=20were=20not?= =?UTF-8?q?=20checking=20for=20more=20than=20one=20procedure=20with=20the?= =?UTF-8?q?=20same=20procedure=20number=20when=20generating=20the=20consis?= =?UTF-8?q?tency=20check=20procedure=20list.=20C2018-026=20Added=20a=20men?= =?UTF-8?q?u=20option=20off=20of=20the=20Versions=20tree=20node=20menu,=20?= =?UTF-8?q?to=20view=20the=20notes=20added=20when=20the=20approval=20or=20?= =?UTF-8?q?workflow=20stage=20was=20done?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dlgApproveProcedure.Designer.cs | 532 ++++++++++-------- .../dlgApproveProcedure.cs | 268 ++++----- .../dlgApproveProcedure.resx | 55 +- PROMS/Volian.Controls.Library/vlnTreeView.cs | 22 + 4 files changed, 492 insertions(+), 385 deletions(-) diff --git a/PROMS/VEPROMS User Interface/dlgApproveProcedure.Designer.cs b/PROMS/VEPROMS User Interface/dlgApproveProcedure.Designer.cs index 6e546987..147aa85c 100644 --- a/PROMS/VEPROMS User Interface/dlgApproveProcedure.Designer.cs +++ b/PROMS/VEPROMS User Interface/dlgApproveProcedure.Designer.cs @@ -33,15 +33,14 @@ namespace VEPROMS this.approvalInfoBindingSource = new System.Windows.Forms.BindingSource(this.components); this.stageInfoBindingSource = new System.Windows.Forms.BindingSource(this.components); this.revTypeBindingSource = new System.Windows.Forms.BindingSource(this.components); - this.chkViewPDF = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.pnlApprove = new System.Windows.Forms.Panel(); + this.pnlApprove = new DevComponents.DotNetBar.PanelEx(); + this.swtbtSetAllRevDates = new DevComponents.DotNetBar.Controls.SwitchButton(); + this.swtbtViewPDF = new DevComponents.DotNetBar.Controls.SwitchButton(); + this.lblSetAllRevDates = new DevComponents.DotNetBar.LabelX(); + this.lblViewPDF = new DevComponents.DotNetBar.LabelX(); this.btnIncrement = new DevComponents.DotNetBar.ButtonX(); - this.chkSetAllDates = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.btnModifyList = new DevComponents.DotNetBar.ButtonX(); this.fgProcs = new C1.Win.C1FlexGrid.C1FlexGrid(); this.approvalProcedureBindingSource = new System.Windows.Forms.BindingSource(this.components); - this.chkCascade2 = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.btnCheck2 = new DevComponents.DotNetBar.ButtonX(); this.ssMsg2 = new System.Windows.Forms.StatusStrip(); this.tsslMsg2 = new System.Windows.Forms.ToolStripStatusLabel(); this.tsslStatus = new System.Windows.Forms.ToolStripStatusLabel(); @@ -50,12 +49,12 @@ namespace VEPROMS this.labelX14 = new DevComponents.DotNetBar.LabelX(); this.txtRevisionNotes2 = new DevComponents.DotNetBar.Controls.TextBoxX(); this.labelX16 = new DevComponents.DotNetBar.LabelX(); - this.cmbRevisionType2 = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.cmbRevisionStage2 = new DevComponents.DotNetBar.Controls.ComboBoxEx(); - this.labelX17 = new DevComponents.DotNetBar.LabelX(); - this.pnlSelect = new System.Windows.Forms.Panel(); + this.pnlSelect = new DevComponents.DotNetBar.PanelEx(); + this.labelX2 = new DevComponents.DotNetBar.LabelX(); this.lblPhase = new DevComponents.DotNetBar.LabelX(); - this.chkCascadeMore = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.labelX1 = new DevComponents.DotNetBar.LabelX(); + this.swtbtCascade = new DevComponents.DotNetBar.Controls.SwitchButton(); this.btnReportMore = new DevComponents.DotNetBar.ButtonX(); this.pbMore = new System.Windows.Forms.ProgressBar(); this.btnCheckMore = new DevComponents.DotNetBar.ButtonX(); @@ -63,10 +62,10 @@ namespace VEPROMS this.btnAll = new DevComponents.DotNetBar.ButtonX(); this.clbMore = new System.Windows.Forms.CheckedListBox(); this.btnOkay = new DevComponents.DotNetBar.ButtonX(); - this.btnCancelMore = new DevComponents.DotNetBar.ButtonX(); this.lblMore = new DevComponents.DotNetBar.LabelX(); this.sttMore = new DevComponents.DotNetBar.SuperTooltip(); - this.pnlRogue = new System.Windows.Forms.Panel(); + this.expAddProcConChk = new DevComponents.DotNetBar.ExpandablePanel(); + this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); ((System.ComponentModel.ISupportInitialize)(this.approvalInfoBindingSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.stageInfoBindingSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.revTypeBindingSource)).BeginInit(); @@ -75,6 +74,7 @@ namespace VEPROMS ((System.ComponentModel.ISupportInitialize)(this.approvalProcedureBindingSource)).BeginInit(); this.ssMsg2.SuspendLayout(); this.pnlSelect.SuspendLayout(); + this.expAddProcConChk.SuspendLayout(); this.SuspendLayout(); // // approvalInfoBindingSource @@ -90,87 +90,116 @@ namespace VEPROMS // this.revTypeBindingSource.DataSource = typeof(VEPROMS.RevType); // - // chkViewPDF - // - // - // - // - this.chkViewPDF.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.chkViewPDF.DataBindings.Add(new System.Windows.Forms.Binding("Checked", this.approvalInfoBindingSource, "ViewPDF", true)); - this.chkViewPDF.Location = new System.Drawing.Point(279, 150); - this.chkViewPDF.Name = "chkViewPDF"; - this.chkViewPDF.Size = new System.Drawing.Size(76, 23); - this.chkViewPDF.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.chkViewPDF.TabIndex = 19; - this.chkViewPDF.Text = "View PDFs"; - // // pnlApprove // + this.pnlApprove.CanvasColor = System.Drawing.SystemColors.Control; + this.pnlApprove.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.pnlApprove.Controls.Add(this.swtbtSetAllRevDates); + this.pnlApprove.Controls.Add(this.swtbtViewPDF); + this.pnlApprove.Controls.Add(this.lblSetAllRevDates); + this.pnlApprove.Controls.Add(this.lblViewPDF); this.pnlApprove.Controls.Add(this.btnIncrement); - this.pnlApprove.Controls.Add(this.chkSetAllDates); - this.pnlApprove.Controls.Add(this.btnModifyList); this.pnlApprove.Controls.Add(this.fgProcs); - this.pnlApprove.Controls.Add(this.chkCascade2); - this.pnlApprove.Controls.Add(this.btnCheck2); this.pnlApprove.Controls.Add(this.ssMsg2); this.pnlApprove.Controls.Add(this.btnApprove2); - this.pnlApprove.Controls.Add(this.chkViewPDF); this.pnlApprove.Controls.Add(this.btnCancel2); this.pnlApprove.Controls.Add(this.labelX14); this.pnlApprove.Controls.Add(this.txtRevisionNotes2); this.pnlApprove.Controls.Add(this.labelX16); - this.pnlApprove.Controls.Add(this.cmbRevisionType2); this.pnlApprove.Controls.Add(this.cmbRevisionStage2); - this.pnlApprove.Controls.Add(this.labelX17); - this.pnlApprove.Dock = System.Windows.Forms.DockStyle.Left; - this.pnlApprove.Location = new System.Drawing.Point(522, 0); + this.pnlApprove.DisabledBackColor = System.Drawing.Color.Empty; + this.pnlApprove.Dock = System.Windows.Forms.DockStyle.Fill; + this.pnlApprove.Location = new System.Drawing.Point(0, 0); this.pnlApprove.Name = "pnlApprove"; - this.pnlApprove.Size = new System.Drawing.Size(450, 574); + this.pnlApprove.Size = new System.Drawing.Size(465, 620); + this.pnlApprove.Style.Alignment = System.Drawing.StringAlignment.Center; + this.pnlApprove.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.pnlApprove.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.pnlApprove.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.pnlApprove.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.pnlApprove.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.pnlApprove.Style.GradientAngle = 90; this.pnlApprove.TabIndex = 23; - this.pnlApprove.LocationChanged += new System.EventHandler(this.Panel_LocationChanged); + // + // swtbtSetAllRevDates + // + this.swtbtSetAllRevDates.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + // + // + // + this.swtbtSetAllRevDates.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.swtbtSetAllRevDates.Location = new System.Drawing.Point(386, 136); + this.swtbtSetAllRevDates.Name = "swtbtSetAllRevDates"; + this.swtbtSetAllRevDates.Size = new System.Drawing.Size(63, 22); + this.swtbtSetAllRevDates.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.sttMore.SetSuperTooltip(this.swtbtSetAllRevDates, new DevComponents.DotNetBar.SuperTooltipInfo("Set All Rev Dates", "", resources.GetString("swtbtSetAllRevDates.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(190, 150))); + this.swtbtSetAllRevDates.TabIndex = 35; + // + // swtbtViewPDF + // + this.swtbtViewPDF.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + // + // + // + this.swtbtViewPDF.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.swtbtViewPDF.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.approvalInfoBindingSource, "ViewPDF", true)); + this.swtbtViewPDF.Location = new System.Drawing.Point(88, 591); + this.swtbtViewPDF.Name = "swtbtViewPDF"; + this.swtbtViewPDF.Size = new System.Drawing.Size(60, 22); + this.swtbtViewPDF.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.sttMore.SetSuperTooltip(this.swtbtViewPDF, new DevComponents.DotNetBar.SuperTooltipInfo("View PDF", "", "When switched ON, the resulting PDF from doing the selected Revision Stage will b" + + "e displayed in your default PDF view.\r\n\r\nNote this option is available when only" + + " one procedure is to be processed.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(190, 140))); + this.swtbtViewPDF.TabIndex = 35; + // + // lblSetAllRevDates + // + this.lblSetAllRevDates.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + // + // + // + this.lblSetAllRevDates.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.lblSetAllRevDates.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblSetAllRevDates.Location = new System.Drawing.Point(273, 135); + this.lblSetAllRevDates.Name = "lblSetAllRevDates"; + this.lblSetAllRevDates.Size = new System.Drawing.Size(107, 23); + this.sttMore.SetSuperTooltip(this.lblSetAllRevDates, new DevComponents.DotNetBar.SuperTooltipInfo("Set All Rev Dates", "", resources.GetString("lblSetAllRevDates.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(190, 150))); + this.lblSetAllRevDates.TabIndex = 34; + this.lblSetAllRevDates.Text = "Set All Rev Dates"; + // + // lblViewPDF + // + this.lblViewPDF.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + // + // + // + this.lblViewPDF.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.lblViewPDF.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblViewPDF.Location = new System.Drawing.Point(14, 590); + this.lblViewPDF.Name = "lblViewPDF"; + this.lblViewPDF.Size = new System.Drawing.Size(70, 23); + this.sttMore.SetSuperTooltip(this.lblViewPDF, new DevComponents.DotNetBar.SuperTooltipInfo("View PDF", "", "When switched ON, the resulting PDF from doing the selected Revision Stage will b" + + "e displayed in your default PDF view.\r\n\r\nNote this option is available when only" + + " one procedure is to be processed.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(190, 140))); + this.lblViewPDF.TabIndex = 34; + this.lblViewPDF.Text = "View PDF"; // // btnIncrement // this.btnIncrement.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnIncrement.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnIncrement.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnIncrement.DataBindings.Add(new System.Windows.Forms.Binding("Enabled", this.approvalInfoBindingSource, "CanApprove", true)); this.btnIncrement.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnIncrement.Location = new System.Drawing.Point(11, 121); + this.btnIncrement.Location = new System.Drawing.Point(13, 133); this.btnIncrement.Name = "btnIncrement"; - this.btnIncrement.Size = new System.Drawing.Size(90, 23); + this.btnIncrement.Size = new System.Drawing.Size(135, 25); this.btnIncrement.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.sttMore.SetSuperTooltip(this.btnIncrement, new DevComponents.DotNetBar.SuperTooltipInfo("Increment Rev Numbers", "", "This will increment the revision number in all of the procedures listed below.\r\n\r" + + "\nNote that the revison number must end in a number or letter.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.btnIncrement.TabIndex = 33; - this.btnIncrement.Text = "Increment All"; + this.btnIncrement.Text = "Increment Rev Numbers"; this.btnIncrement.Click += new System.EventHandler(this.btnIncrement_Click); // - // chkSetAllDates - // - // - // - // - this.chkSetAllDates.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.chkSetAllDates.Location = new System.Drawing.Point(11, 150); - this.chkSetAllDates.Name = "chkSetAllDates"; - this.chkSetAllDates.Size = new System.Drawing.Size(100, 23); - this.chkSetAllDates.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.chkSetAllDates.TabIndex = 32; - this.chkSetAllDates.Text = "Set All Dates"; - // - // btnModifyList - // - this.btnModifyList.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnModifyList.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnModifyList.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnModifyList.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnModifyList.Location = new System.Drawing.Point(11, 179); - this.btnModifyList.Name = "btnModifyList"; - this.btnModifyList.Size = new System.Drawing.Size(128, 23); - this.btnModifyList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnModifyList.TabIndex = 31; - this.btnModifyList.Text = "Change Selection"; - this.btnModifyList.Click += new System.EventHandler(this.btnModifyList_Click); - // // fgProcs // this.fgProcs.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -181,56 +210,34 @@ namespace VEPROMS this.fgProcs.DataSource = this.approvalProcedureBindingSource; this.fgProcs.ExtendLastCol = true; this.fgProcs.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.fgProcs.Location = new System.Drawing.Point(11, 208); + this.fgProcs.Location = new System.Drawing.Point(11, 165); this.fgProcs.Name = "fgProcs"; this.fgProcs.Rows.Count = 1; this.fgProcs.Rows.DefaultSize = 19; this.fgProcs.SelectionMode = C1.Win.C1FlexGrid.SelectionModeEnum.Cell; - this.fgProcs.Size = new System.Drawing.Size(425, 341); + this.fgProcs.Size = new System.Drawing.Size(440, 397); this.fgProcs.TabIndex = 30; this.fgProcs.AfterEdit += new C1.Win.C1FlexGrid.RowColEventHandler(this.fgProcs_AfterEdit); this.fgProcs.ComboCloseUp += new C1.Win.C1FlexGrid.RowColEventHandler(this.fgProcs_AfterEdit); + this.fgProcs.AfterDataRefresh += new System.ComponentModel.ListChangedEventHandler(this.fgProcs_AfterDataRefresh); // // approvalProcedureBindingSource // this.approvalProcedureBindingSource.DataSource = typeof(VEPROMS.ApprovalProcedure); // - // chkCascade2 - // - // - // - // - this.chkCascade2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.chkCascade2.Location = new System.Drawing.Point(147, 150); - this.chkCascade2.Name = "chkCascade2"; - this.chkCascade2.Size = new System.Drawing.Size(76, 23); - this.chkCascade2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.chkCascade2.TabIndex = 26; - this.chkCascade2.Text = "Cascade"; - this.chkCascade2.CheckedChanged += new System.EventHandler(this.CascadeChecksUpdated); - // - // btnCheck2 - // - this.btnCheck2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnCheck2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnCheck2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnCheck2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnCheck2.Location = new System.Drawing.Point(147, 179); - this.btnCheck2.Name = "btnCheck2"; - this.btnCheck2.Size = new System.Drawing.Size(127, 23); - this.btnCheck2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnCheck2.TabIndex = 23; - this.btnCheck2.Text = "Consistency Check"; - this.btnCheck2.Click += new System.EventHandler(this.btnCheck_Click); - // // ssMsg2 // + this.ssMsg2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.ssMsg2.AutoSize = false; + this.ssMsg2.BackColor = System.Drawing.Color.Transparent; + this.ssMsg2.Dock = System.Windows.Forms.DockStyle.None; this.ssMsg2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.tsslMsg2, this.tsslStatus}); - this.ssMsg2.Location = new System.Drawing.Point(0, 552); + this.ssMsg2.Location = new System.Drawing.Point(11, 561); this.ssMsg2.Name = "ssMsg2"; - this.ssMsg2.Size = new System.Drawing.Size(450, 22); + this.ssMsg2.Size = new System.Drawing.Size(440, 22); + this.ssMsg2.SizingGrip = false; this.ssMsg2.TabIndex = 22; // // tsslMsg2 @@ -246,31 +253,35 @@ namespace VEPROMS // btnApprove2 // this.btnApprove2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnApprove2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnApprove2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btnApprove2.BackColor = System.Drawing.Color.Green; this.btnApprove2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnApprove2.DataBindings.Add(new System.Windows.Forms.Binding("Enabled", this.approvalInfoBindingSource, "CanApprove", true)); this.btnApprove2.DialogResult = System.Windows.Forms.DialogResult.OK; this.btnApprove2.Enabled = false; this.btnApprove2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnApprove2.Location = new System.Drawing.Point(280, 179); + this.btnApprove2.Location = new System.Drawing.Point(242, 586); this.btnApprove2.Name = "btnApprove2"; - this.btnApprove2.Size = new System.Drawing.Size(75, 23); + this.btnApprove2.Size = new System.Drawing.Size(138, 27); this.btnApprove2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.sttMore.SetSuperTooltip(this.btnApprove2, new DevComponents.DotNetBar.SuperTooltipInfo("Do Revision Stage", "", "This will generate a PDF reflecting the selected Revision Stage on all procedures" + + " listed above.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(150, 80))); this.btnApprove2.TabIndex = 14; - this.btnApprove2.Text = "Approve"; + this.btnApprove2.Text = "Do Revision Stage"; this.btnApprove2.Click += new System.EventHandler(this.btnApprove_Click); // // btnCancel2 // this.btnCancel2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnCancel2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnCancel2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnCancel2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnCancel2.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.btnCancel2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnCancel2.Location = new System.Drawing.Point(361, 179); + this.btnCancel2.Location = new System.Drawing.Point(392, 590); this.btnCancel2.Name = "btnCancel2"; - this.btnCancel2.Size = new System.Drawing.Size(75, 23); + this.btnCancel2.Size = new System.Drawing.Size(59, 23); this.btnCancel2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.sttMore.SetSuperTooltip(this.btnCancel2, new DevComponents.DotNetBar.SuperTooltipInfo("Cancel", "", "Close the Approve dialog without performing the selected Revision Stage.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.btnCancel2.TabIndex = 13; this.btnCancel2.Text = "Cancel"; // @@ -281,9 +292,10 @@ namespace VEPROMS // // this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX14.Location = new System.Drawing.Point(21, 64); + this.labelX14.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelX14.Location = new System.Drawing.Point(11, 40); this.labelX14.Name = "labelX14"; - this.labelX14.Size = new System.Drawing.Size(80, 15); + this.labelX14.Size = new System.Drawing.Size(94, 17); this.labelX14.TabIndex = 18; this.labelX14.Text = "Revision Notes:"; // @@ -298,10 +310,10 @@ namespace VEPROMS this.txtRevisionNotes2.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.txtRevisionNotes2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.approvalInfoBindingSource, "RevNote", true)); this.txtRevisionNotes2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtRevisionNotes2.Location = new System.Drawing.Point(107, 64); + this.txtRevisionNotes2.Location = new System.Drawing.Point(107, 43); this.txtRevisionNotes2.Multiline = true; this.txtRevisionNotes2.Name = "txtRevisionNotes2"; - this.txtRevisionNotes2.Size = new System.Drawing.Size(327, 80); + this.txtRevisionNotes2.Size = new System.Drawing.Size(342, 80); this.txtRevisionNotes2.TabIndex = 17; // // labelX16 @@ -311,31 +323,14 @@ namespace VEPROMS // // this.labelX16.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX16.Location = new System.Drawing.Point(21, 38); + this.labelX16.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelX16.Location = new System.Drawing.Point(11, 12); this.labelX16.Name = "labelX16"; - this.labelX16.Size = new System.Drawing.Size(80, 15); + this.labelX16.Size = new System.Drawing.Size(94, 17); + this.sttMore.SetSuperTooltip(this.labelX16, new DevComponents.DotNetBar.SuperTooltipInfo("Revision Stage", "", resources.GetString("labelX16.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(190, 160))); this.labelX16.TabIndex = 16; this.labelX16.Text = "Revision Stage:"; // - // cmbRevisionType2 - // - this.cmbRevisionType2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.cmbRevisionType2.DataSource = this.revTypeBindingSource; - this.cmbRevisionType2.DisplayMember = "TypeName"; - this.cmbRevisionType2.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.cmbRevisionType2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmbRevisionType2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cmbRevisionType2.FormattingEnabled = true; - this.cmbRevisionType2.ItemHeight = 14; - this.cmbRevisionType2.Location = new System.Drawing.Point(107, 12); - this.cmbRevisionType2.Name = "cmbRevisionType2"; - this.cmbRevisionType2.Size = new System.Drawing.Size(327, 20); - this.cmbRevisionType2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.cmbRevisionType2.TabIndex = 11; - this.cmbRevisionType2.ValueMember = "TypeID"; - this.cmbRevisionType2.SelectedIndexChanged += new System.EventHandler(this.cmbRevisionType_SelectedIndexChanged); - // // cmbRevisionStage2 // this.cmbRevisionStage2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) @@ -347,31 +342,21 @@ namespace VEPROMS this.cmbRevisionStage2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cmbRevisionStage2.FormattingEnabled = true; this.cmbRevisionStage2.ItemHeight = 14; - this.cmbRevisionStage2.Location = new System.Drawing.Point(107, 38); + this.cmbRevisionStage2.Location = new System.Drawing.Point(107, 12); this.cmbRevisionStage2.Name = "cmbRevisionStage2"; - this.cmbRevisionStage2.Size = new System.Drawing.Size(327, 20); + this.cmbRevisionStage2.Size = new System.Drawing.Size(342, 20); this.cmbRevisionStage2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.sttMore.SetSuperTooltip(this.cmbRevisionStage2, new DevComponents.DotNetBar.SuperTooltipInfo("Revision Stage", "", resources.GetString("cmbRevisionStage2.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(190, 160))); this.cmbRevisionStage2.TabIndex = 15; this.cmbRevisionStage2.ValueMember = "StageID"; this.cmbRevisionStage2.SelectedIndexChanged += new System.EventHandler(this.cmbRevisionStage_SelectedIndexChanged); // - // labelX17 - // - this.labelX17.AutoSize = true; - // - // - // - this.labelX17.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX17.Location = new System.Drawing.Point(21, 12); - this.labelX17.Name = "labelX17"; - this.labelX17.Size = new System.Drawing.Size(75, 15); - this.labelX17.TabIndex = 10; - this.labelX17.Text = "Revision Type:"; - // // pnlSelect // + this.pnlSelect.Controls.Add(this.labelX2); this.pnlSelect.Controls.Add(this.lblPhase); - this.pnlSelect.Controls.Add(this.chkCascadeMore); + this.pnlSelect.Controls.Add(this.labelX1); + this.pnlSelect.Controls.Add(this.swtbtCascade); this.pnlSelect.Controls.Add(this.btnReportMore); this.pnlSelect.Controls.Add(this.pbMore); this.pnlSelect.Controls.Add(this.btnCheckMore); @@ -379,55 +364,88 @@ namespace VEPROMS this.pnlSelect.Controls.Add(this.btnAll); this.pnlSelect.Controls.Add(this.clbMore); this.pnlSelect.Controls.Add(this.btnOkay); - this.pnlSelect.Controls.Add(this.btnCancelMore); this.pnlSelect.Controls.Add(this.lblMore); - this.pnlSelect.Dock = System.Windows.Forms.DockStyle.Left; - this.pnlSelect.Location = new System.Drawing.Point(72, 0); + this.pnlSelect.DisabledBackColor = System.Drawing.Color.Empty; + this.pnlSelect.Dock = System.Windows.Forms.DockStyle.Fill; + this.pnlSelect.Location = new System.Drawing.Point(0, 26); this.pnlSelect.Name = "pnlSelect"; - this.pnlSelect.Size = new System.Drawing.Size(450, 574); + this.pnlSelect.Size = new System.Drawing.Size(447, 594); this.pnlSelect.TabIndex = 24; - this.pnlSelect.LocationChanged += new System.EventHandler(this.Panel_LocationChanged); + // + // labelX2 + // + this.labelX2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.labelX2.AutoSize = true; + // + // + // + this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX2.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelX2.Location = new System.Drawing.Point(143, 39); + this.labelX2.Name = "labelX2"; + this.labelX2.Size = new System.Drawing.Size(166, 19); + this.labelX2.TabIndex = 36; + this.labelX2.Text = "Consistency Scan Count"; + this.labelX2.Visible = false; // // lblPhase // - this.lblPhase.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); // // // this.lblPhase.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.lblPhase.Font = new System.Drawing.Font("Microsoft Sans Serif", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblPhase.Location = new System.Drawing.Point(300, 20); + this.lblPhase.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblPhase.Location = new System.Drawing.Point(315, 37); this.lblPhase.Name = "lblPhase"; - this.lblPhase.Size = new System.Drawing.Size(35, 38); - this.lblPhase.TabIndex = 32; - this.lblPhase.TextAlignment = System.Drawing.StringAlignment.Center; + this.lblPhase.Size = new System.Drawing.Size(31, 23); + this.lblPhase.TabIndex = 35; + this.lblPhase.Text = "0"; + this.lblPhase.Visible = false; // - // chkCascadeMore - // - this.chkCascadeMore.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + // labelX1 // // // - this.chkCascadeMore.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.chkCascadeMore.Location = new System.Drawing.Point(131, 510); - this.chkCascadeMore.Name = "chkCascadeMore"; - this.chkCascadeMore.Size = new System.Drawing.Size(89, 23); - this.chkCascadeMore.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.chkCascadeMore.TabIndex = 31; - this.chkCascadeMore.Text = "Cascade"; - this.chkCascadeMore.CheckedChanged += new System.EventHandler(this.CascadeChecksUpdated); + // + this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelX1.Location = new System.Drawing.Point(15, 13); + this.labelX1.Name = "labelX1"; + this.labelX1.Size = new System.Drawing.Size(79, 23); + this.sttMore.SetSuperTooltip(this.labelX1, new DevComponents.DotNetBar.SuperTooltipInfo("Auto Select", "", "When turned on, procedures that could be affected by the completion of the select" + + "ed Revision Stage, will automatically be selected during the Consistancy Check.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(195, 95))); + this.labelX1.TabIndex = 34; + this.labelX1.Text = "Auto Select"; + // + // swtbtCascade + // + // + // + // + this.swtbtCascade.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.swtbtCascade.Location = new System.Drawing.Point(100, 14); + this.swtbtCascade.Name = "swtbtCascade"; + this.swtbtCascade.Size = new System.Drawing.Size(66, 22); + this.swtbtCascade.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.sttMore.SetSuperTooltip(this.swtbtCascade, new DevComponents.DotNetBar.SuperTooltipInfo("Auto Select", "", "When turned on, procedures that could be affected by the completion of the select" + + "ed Revision Stage, will automatically be selected during the Consistancy Check.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(195, 95))); + this.swtbtCascade.TabIndex = 33; + this.swtbtCascade.ValueChanged += new System.EventHandler(this.swtbtCascade_ValueChanged); // // btnReportMore // this.btnReportMore.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnReportMore.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnReportMore.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnReportMore.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnReportMore.Enabled = false; this.btnReportMore.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnReportMore.Location = new System.Drawing.Point(15, 539); + this.btnReportMore.Location = new System.Drawing.Point(15, 564); this.btnReportMore.Name = "btnReportMore"; - this.btnReportMore.Size = new System.Drawing.Size(110, 23); + this.btnReportMore.Size = new System.Drawing.Size(77, 23); this.btnReportMore.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.sttMore.SetSuperTooltip(this.btnReportMore, new DevComponents.DotNetBar.SuperTooltipInfo("View Report", "", "This will generate a report based on the results of the Consitancy Check. It wil" + + "l show the procedures that are selected and the ones that should be selected.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(195, 100))); this.btnReportMore.TabIndex = 30; this.btnReportMore.Text = "View Report"; this.btnReportMore.Click += new System.EventHandler(this.btnReportMore_Click); @@ -436,25 +454,26 @@ namespace VEPROMS // this.pbMore.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.pbMore.Location = new System.Drawing.Point(15, 35); + this.pbMore.Location = new System.Drawing.Point(24, 536); this.pbMore.Name = "pbMore"; - this.pbMore.Size = new System.Drawing.Size(279, 23); + this.pbMore.Size = new System.Drawing.Size(420, 15); this.pbMore.TabIndex = 29; this.pbMore.Visible = false; // // btnCheckMore // this.btnCheckMore.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnCheckMore.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnCheckMore.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnCheckMore.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnCheckMore.Enabled = false; - this.btnCheckMore.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnCheckMore.Location = new System.Drawing.Point(131, 539); + this.btnCheckMore.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnCheckMore.Location = new System.Drawing.Point(163, 557); this.btnCheckMore.Name = "btnCheckMore"; - this.btnCheckMore.Size = new System.Drawing.Size(145, 23); + this.btnCheckMore.Size = new System.Drawing.Size(156, 30); this.btnCheckMore.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.sttMore.SetSuperTooltip(this.btnCheckMore, new DevComponents.DotNetBar.SuperTooltipInfo("Run Consistency Check", "", resources.GetString("btnCheckMore.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.btnCheckMore.TabIndex = 28; - this.btnCheckMore.Text = "Consistency Check"; + this.btnCheckMore.Text = "Run Consistency Check"; this.btnCheckMore.Click += new System.EventHandler(this.btnCheckMore_Click); // // btnClear @@ -463,10 +482,11 @@ namespace VEPROMS this.btnClear.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnClear.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnClear.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnClear.Location = new System.Drawing.Point(341, 38); + this.btnClear.Location = new System.Drawing.Point(363, 39); this.btnClear.Name = "btnClear"; - this.btnClear.Size = new System.Drawing.Size(97, 23); + this.btnClear.Size = new System.Drawing.Size(72, 23); this.btnClear.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.sttMore.SetSuperTooltip(this.btnClear, new DevComponents.DotNetBar.SuperTooltipInfo("Clear All", "", "This will un-select all of the procedures in the list below.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.btnClear.TabIndex = 27; this.btnClear.Text = "Clear All"; this.btnClear.Click += new System.EventHandler(this.btnClear_Click); @@ -477,10 +497,11 @@ namespace VEPROMS this.btnAll.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnAll.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnAll.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnAll.Location = new System.Drawing.Point(341, 12); + this.btnAll.Location = new System.Drawing.Point(363, 13); this.btnAll.Name = "btnAll"; - this.btnAll.Size = new System.Drawing.Size(97, 23); + this.btnAll.Size = new System.Drawing.Size(72, 23); this.btnAll.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.sttMore.SetSuperTooltip(this.btnAll, new DevComponents.DotNetBar.SuperTooltipInfo("Select All", "", "This will select all the procedures in the list below", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(115, 67))); this.btnAll.TabIndex = 26; this.btnAll.Text = "Select All"; this.btnAll.Click += new System.EventHandler(this.btnAll_Click); @@ -493,9 +514,9 @@ namespace VEPROMS this.clbMore.CheckOnClick = true; this.clbMore.FormattingEnabled = true; this.clbMore.HorizontalScrollbar = true; - this.clbMore.Location = new System.Drawing.Point(15, 68); + this.clbMore.Location = new System.Drawing.Point(24, 68); this.clbMore.Name = "clbMore"; - this.clbMore.Size = new System.Drawing.Size(423, 439); + this.clbMore.Size = new System.Drawing.Size(420, 468); this.sttMore.SetSuperTooltip(this.clbMore, new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Lemon)); this.clbMore.TabIndex = 25; this.clbMore.ItemCheck += new System.Windows.Forms.ItemCheckEventHandler(this.clbMore_ItemCheck); @@ -504,32 +525,19 @@ namespace VEPROMS // btnOkay // this.btnOkay.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnOkay.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnOkay.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnOkay.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnOkay.Enabled = false; this.btnOkay.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnOkay.Location = new System.Drawing.Point(282, 539); + this.btnOkay.Location = new System.Drawing.Point(378, 564); this.btnOkay.Name = "btnOkay"; - this.btnOkay.Size = new System.Drawing.Size(75, 23); + this.btnOkay.Size = new System.Drawing.Size(57, 23); this.btnOkay.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.sttMore.SetSuperTooltip(this.btnOkay, new DevComponents.DotNetBar.SuperTooltipInfo("OK", "", resources.GetString("btnOkay.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 160))); this.btnOkay.TabIndex = 14; this.btnOkay.Text = "OK"; this.btnOkay.Click += new System.EventHandler(this.btnOkay_Click); // - // btnCancelMore - // - this.btnCancelMore.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnCancelMore.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnCancelMore.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnCancelMore.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnCancelMore.Location = new System.Drawing.Point(363, 539); - this.btnCancelMore.Name = "btnCancelMore"; - this.btnCancelMore.Size = new System.Drawing.Size(75, 23); - this.btnCancelMore.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnCancelMore.TabIndex = 13; - this.btnCancelMore.Text = "Cancel"; - this.btnCancelMore.Click += new System.EventHandler(this.btnCancelMore_Click); - // // lblMore // this.lblMore.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) @@ -539,11 +547,11 @@ namespace VEPROMS // // this.lblMore.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.lblMore.Location = new System.Drawing.Point(15, 12); + this.lblMore.Location = new System.Drawing.Point(15, 47); this.lblMore.Name = "lblMore"; - this.lblMore.Size = new System.Drawing.Size(148, 15); + this.lblMore.Size = new System.Drawing.Size(80, 16); this.lblMore.TabIndex = 10; - this.lblMore.Text = "Select Procedures to Approve"; + this.lblMore.Text = "Procedure List"; // // sttMore // @@ -552,23 +560,85 @@ namespace VEPROMS this.sttMore.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.sttMore.PositionBelowControl = false; // - // pnlRogue + // expAddProcConChk // - this.pnlRogue.Dock = System.Windows.Forms.DockStyle.Left; - this.pnlRogue.Location = new System.Drawing.Point(0, 0); - this.pnlRogue.Name = "pnlRogue"; - this.pnlRogue.Size = new System.Drawing.Size(72, 574); - this.pnlRogue.TabIndex = 25; + this.expAddProcConChk.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.expAddProcConChk.CanvasColor = System.Drawing.SystemColors.Control; + this.expAddProcConChk.CollapseDirection = DevComponents.DotNetBar.eCollapseDirection.LeftToRight; + this.expAddProcConChk.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.expAddProcConChk.Controls.Add(this.pnlSelect); + this.expAddProcConChk.DisabledBackColor = System.Drawing.Color.Empty; + this.expAddProcConChk.Dock = System.Windows.Forms.DockStyle.Right; + this.expAddProcConChk.ExpandOnTitleClick = true; + this.expAddProcConChk.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.expAddProcConChk.HideControlsWhenCollapsed = true; + this.expAddProcConChk.Location = new System.Drawing.Point(475, 0); + this.expAddProcConChk.Name = "expAddProcConChk"; + this.expAddProcConChk.Size = new System.Drawing.Size(447, 620); + this.expAddProcConChk.Style.Alignment = System.Drawing.StringAlignment.Center; + this.expAddProcConChk.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.expAddProcConChk.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.expAddProcConChk.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.expAddProcConChk.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; + this.expAddProcConChk.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; + this.expAddProcConChk.Style.GradientAngle = 90; + this.sttMore.SetSuperTooltip(this.expAddProcConChk, new DevComponents.DotNetBar.SuperTooltipInfo("Procedure List", "", "Will open a panel allowing you to:\r\n- add procedures to the list for the Revisio" + + "n Stage\r\n- perform a Consistency check on the selcted procedures", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 70))); + this.expAddProcConChk.TabIndex = 24; + this.expAddProcConChk.TitleStyle.Alignment = System.Drawing.StringAlignment.Center; + this.expAddProcConChk.TitleStyle.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.expAddProcConChk.TitleStyle.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.expAddProcConChk.TitleStyle.Border = DevComponents.DotNetBar.eBorderType.RaisedInner; + this.expAddProcConChk.TitleStyle.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.expAddProcConChk.TitleStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.expAddProcConChk.TitleStyle.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.expAddProcConChk.TitleStyle.GradientAngle = 90; + this.expAddProcConChk.TitleText = "Procedure List"; + this.expAddProcConChk.ExpandedChanging += new DevComponents.DotNetBar.ExpandChangeEventHandler(this.expAddProcConChk_ExpandedChanging); + this.expAddProcConChk.ExpandedChanged += new DevComponents.DotNetBar.ExpandChangeEventHandler(this.expAddProcConChk_ExpandedChanged); + // + // expandableSplitter1 + // + this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207))))); + this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.expandableSplitter1.Dock = System.Windows.Forms.DockStyle.Right; + this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207))))); + this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; + this.expandableSplitter1.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.expandableSplitter1.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; + this.expandableSplitter1.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255))))); + this.expandableSplitter1.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; + this.expandableSplitter1.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(151)))), ((int)(((byte)(61))))); + this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(184)))), ((int)(((byte)(94))))); + this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; + this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; + this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207))))); + this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; + this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207))))); + this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255))))); + this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; + this.expandableSplitter1.Location = new System.Drawing.Point(465, 0); + this.expandableSplitter1.Name = "expandableSplitter1"; + this.expandableSplitter1.Size = new System.Drawing.Size(10, 620); + this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; + this.expandableSplitter1.TabIndex = 38; + this.expandableSplitter1.TabStop = false; // // dlgApproveProcedure // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1029, 574); + this.ClientSize = new System.Drawing.Size(922, 620); this.Controls.Add(this.pnlApprove); - this.Controls.Add(this.pnlSelect); - this.Controls.Add(this.pnlRogue); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Controls.Add(this.expandableSplitter1); + this.Controls.Add(this.expAddProcConChk); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "dlgApproveProcedure"; @@ -585,6 +655,7 @@ namespace VEPROMS this.ssMsg2.PerformLayout(); this.pnlSelect.ResumeLayout(false); this.pnlSelect.PerformLayout(); + this.expAddProcConChk.ResumeLayout(false); this.ResumeLayout(false); } @@ -592,8 +663,7 @@ namespace VEPROMS #endregion private System.Windows.Forms.BindingSource stageInfoBindingSource; - private DevComponents.DotNetBar.Controls.CheckBoxX chkViewPDF; - private System.Windows.Forms.Panel pnlApprove; + private DevComponents.DotNetBar.PanelEx pnlApprove; private System.Windows.Forms.StatusStrip ssMsg2; private System.Windows.Forms.ToolStripStatusLabel tsslMsg2; private DevComponents.DotNetBar.ButtonX btnApprove2; @@ -601,16 +671,11 @@ namespace VEPROMS private DevComponents.DotNetBar.LabelX labelX14; private DevComponents.DotNetBar.Controls.TextBoxX txtRevisionNotes2; private DevComponents.DotNetBar.LabelX labelX16; - private DevComponents.DotNetBar.Controls.ComboBoxEx cmbRevisionType2; private DevComponents.DotNetBar.Controls.ComboBoxEx cmbRevisionStage2; - private DevComponents.DotNetBar.LabelX labelX17; private System.Windows.Forms.BindingSource approvalInfoBindingSource; private System.Windows.Forms.BindingSource revTypeBindingSource; - private DevComponents.DotNetBar.ButtonX btnCheck2; - private System.Windows.Forms.Panel pnlSelect; + private DevComponents.DotNetBar.PanelEx pnlSelect; private System.Windows.Forms.CheckedListBox clbMore; - private DevComponents.DotNetBar.ButtonX btnOkay; - private DevComponents.DotNetBar.ButtonX btnCancelMore; private DevComponents.DotNetBar.LabelX lblMore; private DevComponents.DotNetBar.ButtonX btnClear; private DevComponents.DotNetBar.ButtonX btnAll; @@ -618,15 +683,20 @@ namespace VEPROMS private DevComponents.DotNetBar.ButtonX btnCheckMore; private System.Windows.Forms.ProgressBar pbMore; private DevComponents.DotNetBar.ButtonX btnReportMore; - private DevComponents.DotNetBar.Controls.CheckBoxX chkCascade2; - private DevComponents.DotNetBar.Controls.CheckBoxX chkCascadeMore; - private DevComponents.DotNetBar.LabelX lblPhase; private System.Windows.Forms.BindingSource approvalProcedureBindingSource; - private System.Windows.Forms.Panel pnlRogue; - private DevComponents.DotNetBar.ButtonX btnModifyList; - private DevComponents.DotNetBar.Controls.CheckBoxX chkSetAllDates; private DevComponents.DotNetBar.ButtonX btnIncrement; private C1.Win.C1FlexGrid.C1FlexGrid fgProcs; private System.Windows.Forms.ToolStripStatusLabel tsslStatus; + private DevComponents.DotNetBar.ButtonX btnOkay; + private DevComponents.DotNetBar.Controls.SwitchButton swtbtSetAllRevDates; + private DevComponents.DotNetBar.Controls.SwitchButton swtbtViewPDF; + private DevComponents.DotNetBar.LabelX lblSetAllRevDates; + private DevComponents.DotNetBar.LabelX lblViewPDF; + private DevComponents.DotNetBar.LabelX labelX1; + private DevComponents.DotNetBar.Controls.SwitchButton swtbtCascade; + private DevComponents.DotNetBar.ExpandablePanel expAddProcConChk; + private DevComponents.DotNetBar.LabelX lblPhase; + private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter1; + private DevComponents.DotNetBar.LabelX labelX2; } -} \ No newline at end of file +} diff --git a/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs b/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs index a0a5d9c1..0da1a8a0 100644 --- a/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs +++ b/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs @@ -50,7 +50,6 @@ namespace VEPROMS } } private ApprovalInfo _MyApproval; - private bool _CheckForMore = false; private DocVersionInfo _MyDocVersion; frmVEPROMS _MyFrmVEPROMS = null; public frmVEPROMS MyFrmVEPROMS @@ -58,7 +57,8 @@ namespace VEPROMS get { return _MyFrmVEPROMS; } set { _MyFrmVEPROMS = value; } } - public dlgApproveProcedure(DocVersionInfo myDocVersion, frmVEPROMS myFrmVEPROMS) + private bool _initializing = false; // C2018-008 redesign of user interface + public dlgApproveProcedure(DocVersionInfo myDocVersion, frmVEPROMS myFrmVEPROMS) // approve all procedures { MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing _MyApproval = new ApprovalInfo(myFrmVEPROMS);// Save frmVEPROMS for Import to shutoff SessionPing @@ -75,13 +75,13 @@ namespace VEPROMS _MyApproval.AddProcedure(pi); } SetupMyApproval(); - //pnlApprove.LocationChanged += new EventHandler(Panel_LocationChanged); - //pnlSelect.LocationChanged += new EventHandler(Panel_LocationChanged); - pnlApprove.SendToBack(); - this.Width = pnlApprove.Width + this.Width - this.ClientSize.Width; + // C2018-008 redesign of user interface + _initializing = true; + expAddProcConChk.Expanded = false; + InitializePanelApprove(); + InitializePanelSelect(); + _initializing = false; // C2018-006: Disable Consistency Check and Cascade buttons when doing a Approve All - chkCascade2.Enabled = false; - btnCheck2.Enabled = false; } private void FlexGridAddEvents() @@ -161,33 +161,8 @@ namespace VEPROMS { Console.WriteLine("fgProcs_ChangeEdit"); } - void Panel_LocationChanged(object sender, EventArgs e) - { - if (pnlApprove.Location.X == 0 && pnlSelect.Location.X == 0) - return; - if (pnlApprove.Location.X == 0) - { - chkViewPDF.Visible = false; - chkSetAllDates.Visible = true; - if (_MyApproval.MyProcedures.Count == 1) - { - this.Text = "Approve " + _MyApproval.MyProcedures[0].ProcInfo.DisplayNumber; - chkViewPDF.Visible = true; - chkSetAllDates.Visible = false; - } - else if (_MyApproval.MyProcedures.Count == _MyDocVersion.Procedures.Count) - this.Text = "Approve All Procedures"; - else - this.Text = "Approve Selected Procedures"; - InitializePanelApprove(); - } - if (pnlSelect.Location.X == 0) - { - this.Text = "Select Procedures To Approve"; - InitializePanelSelect(); - } - } - private void InitializePanelSelect() + + private bool InitializePanelSelect() { if (clbMore.Items.Count == 0) { @@ -195,6 +170,7 @@ namespace VEPROMS { OwnerInfo oi = OwnerInfo.GetByItemID(pi.ItemID, CheckOutType.Procedure); pi.MyDocVersion.DocVersionConfig.SelectedSlave = _MyDocVersion.DocVersionConfig.SelectedSlave; + if (clbMore.Items.Contains(pi.DisplayNumber)) return false; // C2018-025 cannot load list of procedure - duplicate proc numbers // B2018-083: check for null MySessionInfo. if (oi != null && MySessionInfo != null && oi.SessionID != MySessionInfo.SessionID) { @@ -211,9 +187,31 @@ namespace VEPROMS ProcedureInfo pi = GetProcedureInfoByKey(clbMore.Items[i].ToString()); clbMore.SetItemChecked(i, _MyApproval.ProcedureExists(pi)); } + lblMore.Text = string.Format("{0} Procedures, {1} Selected", clbMore.Items.Count, clbMore.CheckedItems.Count); + return true; + } + + // C2018-008 redesign of user interface + private void setupLablesAndSwitches() + { + swtbtViewPDF.Value = false; + swtbtViewPDF.Enabled = false; + lblViewPDF.Enabled = false; + if (_MyApproval.MyProcedures.Count == 1) + { + this.Text = "Approve " + _MyApproval.MyProcedures[0].ProcInfo.DisplayNumber; + swtbtViewPDF.Value = false; + swtbtViewPDF.Enabled = true; + lblViewPDF.Enabled = true; + } + else if (_MyApproval.MyProcedures.Count == _MyDocVersion.Procedures.Count) + this.Text = "Approve All Procedures"; + else + this.Text = "Approve Selected Procedures"; } private void InitializePanelApprove() { + setupLablesAndSwitches(); // C2018-008 redesign of user interface SetupMyApproval(); } private Dictionary tmpProcedures = new Dictionary(); @@ -226,7 +224,7 @@ namespace VEPROMS else return tmpProcedures[GetDisplayNumberOnly(key)]; } - public dlgApproveProcedure(DocVersionInfo myDocVersion, bool selectSome, frmVEPROMS myFrmVEPROMS) + public dlgApproveProcedure(DocVersionInfo myDocVersion, bool selectSome, frmVEPROMS myFrmVEPROMS) // approve some procedures { MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing _MyApproval = new ApprovalInfo(myFrmVEPROMS);// Save frmVEPROMS for Import to shutoff SessionPing @@ -235,13 +233,14 @@ namespace VEPROMS InitializeComponent(); FlexGridAddEvents(); _MyApproval.StatusUpdated += new ApprovalStatusChangeEvent(_MyApproval_StatusUpdated); - _CheckForMore = false; - //pnlApprove.LocationChanged += new EventHandler(Panel_LocationChanged); - //pnlSelect.LocationChanged += new EventHandler(Panel_LocationChanged); - pnlSelect.SendToBack(); - this.Width = pnlSelect.Width + this.Width - this.ClientSize.Width; ; + // C2018-008 redesign of user interface + expAddProcConChk.Expanded = true; + _initializing = true; + InitializePanelApprove(); + InitializePanelSelect(); + _initializing = false; } - public dlgApproveProcedure(ProcedureInfo myProcedure, frmVEPROMS myFrmVEPROMS) + public dlgApproveProcedure(ProcedureInfo myProcedure, frmVEPROMS myFrmVEPROMS) // approve sigle (selected from tree view) { MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing _MyApproval = new ApprovalInfo(myFrmVEPROMS);// Save frmVEPROMS for Import to shutoff SessionPing @@ -251,11 +250,24 @@ namespace VEPROMS FlexGridAddEvents(); SetupComboBoxes(); _MyApproval.AddProcedure(myProcedure); - //SetupMyApproval(); - //pnlApprove.LocationChanged += new EventHandler(Panel_LocationChanged); - //pnlSelect.LocationChanged += new EventHandler(Panel_LocationChanged); - pnlApprove.SendToBack(); - this.Width = pnlApprove.Width; + // C2018-008 redesign of user interface + _initializing = true; + expAddProcConChk.Expanded = false; + InitializePanelApprove(); + if (!InitializePanelSelect()) //C2018-025 if there are duplicate proc numbers disable the Procedure List panel and display an message - this only needed with approving an indivial procedure from the tree + { + expAddProcConChk.Enabled = false; + MessageBox.Show("This procedure set has two or more procedures with the same procedure number.\n\n" + + "The Procedure List panel had be disabled.\n\n" + + "A Consistency Check cannot be done and the list of procedures in the set cannot be displayed.", "Approve Procedure",MessageBoxButtons.OK,MessageBoxIcon.Warning); + } + _initializing = false; + } + private bool ProcedureSetHasDuplicateProcedureNumbers() + { + bool hasDuplicateProcNums = false; + + return hasDuplicateProcNums; } void _MyApproval_StatusUpdated(ApprovalInfo sender, ApprovalMessageArgs e) { @@ -269,8 +281,8 @@ namespace VEPROMS // lblOldRevNumber.Text = _MyApproval.RevNumber; //else if (_MyApproval.MyProcedures.Count > 1) // lblMaxRevNumber1.Text = GetMaxRevNumber(); - _MyApproval.RevType = (revTypeBindingSource.Current as RevType).TypeID; - _MyApproval.RevStage = (stageInfoBindingSource.Current as StageInfo).StageID; + _MyApproval.RevType = 1; // C2018-008 redesign of user interface //(revTypeBindingSource.Current as RevType).TypeID; + _MyApproval.RevStage = (stageInfoBindingSource.Current == null) ? 0 : (stageInfoBindingSource.Current as StageInfo).StageID;// C2018-008 redesign of user interface approvalInfoBindingSource.ResetBindings(false); approvalProcedureBindingSource.DataSource = _MyApproval.MyProcedures; approvalProcedureBindingSource.ResetBindings(false); @@ -313,11 +325,13 @@ namespace VEPROMS this.DialogResult = DialogResult.None; this.Cursor = Cursors.Default; } - private void cmbRevisionType_SelectedIndexChanged(object sender, EventArgs e) - { - RevType rt = cmbRevisionType2.SelectedItem as RevType; - _MyApproval.RevType = rt.TypeID; - } + // C2018-008 redesign of user interface + // -- Note that the Revison Type data source is still connected (revTypeBindingSource) - commented out for documentatin purposes + //private void cmbRevisionType_SelectedIndexChanged(object sender, EventArgs e) + //{ + // RevType rt = cmbRevisionType2.SelectedItem as RevType; + // _MyApproval.RevType = rt.TypeID; + //} private void cmbRevisionStage_SelectedIndexChanged(object sender, EventArgs e) { StageInfo si = cmbRevisionStage2.SelectedItem as StageInfo; @@ -327,7 +341,7 @@ namespace VEPROMS { ProcedureInfo pi = GetProcedureInfoByKey(clbMore.Items[e.Index].ToString()); OwnerInfo oi = OwnerInfo.GetByItemID(pi.ItemID, CheckOutType.Procedure); - if (oi != null && oi.SessionID != MySessionInfo.SessionID) + if (oi != null && MySessionInfo != null && oi.SessionID != MySessionInfo.SessionID) { string msg = string.Format("Cannot select this procedure for approval.\n\n It is checked out to {0}", oi.SessionUserID); MessageBox.Show(msg,pi.DisplayNumber); @@ -335,26 +349,20 @@ namespace VEPROMS return; } if (e.NewValue == CheckState.Checked) - btnOkay.Enabled = true; - else - btnOkay.Enabled = (clbMore.CheckedItems.Count > 1); - btnCheckMore.Enabled = btnOkay.Enabled; - btnReportMore.Enabled = false; + { + btnCheckMore.Enabled = true; + } + btnOkay.Enabled = !_initializing && !_DoingConsistencyCheck; } private void btnOkay_Click(object sender, EventArgs e) { UpdateMyApproval(); - //lbProcs.DataSource = null; - //lbProcs.DataSource = _MyApproval.MyProcedures; - //lbProcs.DisplayMember = "DisplayNumber"; approvalProcedureBindingSource.DataSource = _MyApproval.MyProcedures; approvalProcedureBindingSource.ResetCurrentItem(); - pnlApprove.SendToBack(); + btnOkay.Enabled = false; } private void UpdateMyApproval() { - if (clbMore.CheckedItems.Count == 0) - pnlApprove.SendToBack(); SetupComboBoxes(); for (int i = 0; i < clbMore.Items.Count; i++) { @@ -371,25 +379,18 @@ namespace VEPROMS _MyApproval.DeleteProcedure(pi); } } + setupLablesAndSwitches(); // C2018-008 redesign of user interface SetupMyApproval(); } private void btnCheck_Click(object sender, EventArgs e) { - //if (chkCascade1.Checked || chkCascade2.Checked) - //{ - // MessageBox.Show("cascade"); - //} - //else - //{ - pnlSelect.SendToBack(); UpdateClbMore(); - //} } private ItemInfoList _MyItemInfoList; private void UpdateClbMore() { int checkedCount = clbMore.CheckedItems.Count; - int z = int.Parse("0" + lblPhase.Text); + int z = int.Parse("0" + lblPhase.Text); z++; lblPhase.Text = z.ToString(); string oldLabel = lblMore.Text; @@ -403,8 +404,6 @@ namespace VEPROMS ItemInfoList.ConsistencyCheckUpdated -= new ItemInfoListCCEvent(ItemInfoList_ConsistencyCheckUpdated); lblMore.Text = oldLabel; pbMore.Visible = false; - //clbMore.Items.Clear(); - //tmpProcedures.Clear(); for (int i = 0; i < clbMore.Items.Count; i++) { string info = clbMore.Items[i].ToString(); @@ -413,42 +412,39 @@ namespace VEPROMS } foreach (ProcedureInfo npi in _MyItemInfoList) { - string info = string.Format(npi.MyDifferenceReasons.StartsWith("No ") ? "{0}" : "{0} - ({1})", npi.DisplayNumber, npi.MyDifferenceReasons); + string info = string.Format("{0} - ({1})", npi.DisplayNumber, npi.MyDifferenceReasons); //checked list box - //int k = clbMore.Items.Add(info); for (int i = 0; i < clbMore.Items.Count; i++) { - if (clbMore.Items[i].ToString().StartsWith(npi.DisplayNumber)) + if (npi.DisplayNumber.Length == 0 && clbMore.Items[i].ToString().Length == 0 || + (npi.DisplayNumber.Length > 0 && clbMore.Items[i].ToString().StartsWith(npi.DisplayNumber))) // C2018-008 redesign of user interface { clbMore.Items[i] = info; tmpProcedures[npi.DisplayNumber] = npi; - if (chkCascade2.Checked || chkCascadeMore.Checked) + if (swtbtCascade.Value) // C2018-008 redesign of user interface clbMore.SetItemChecked(i, true); break; } } } + // C2018-008 redesign of user interface + for (int i = 0; i < clbMore.Items.Count; i++) + { + if (!clbMore.Items[i].ToString().Contains(" - (")) + clbMore.Items[i] = clbMore.Items[i].ToString() + " - (none)"; + } Application.DoEvents(); clbMore.Enabled = btnAll.Enabled = btnClear.Enabled = true; - //if (clbMore.Items.Count == 0) - //{ - // clbMore.Items.Add("None Found"); - // clbMore.Enabled = btnAll.Enabled = btnClear.Enabled = false; - //} lblMore.Text = string.Format("{0} Procedures, {1} Selected", clbMore.Items.Count, clbMore.CheckedItems.Count); btnReportMore.Enabled = true; - _CheckForMore = true; - if (chkCascade2.Checked || chkCascadeMore.Checked) + if (swtbtCascade.Value) // C2018-008 redesign of user interface { if (clbMore.CheckedItems.Count > checkedCount) { - //btnAll_Click(btnAll, new EventArgs()); UpdateMyApproval(); UpdateClbMore(); } - else - lblPhase.Text = ""; } } void ItemInfoList_ConsistencyCheckUpdated(object sender, ItemInfoListCCEventArgs args) @@ -465,10 +461,6 @@ namespace VEPROMS } Application.DoEvents(); } - //private void dtiRevisionDate_ValueChanged(object sender, EventArgs e) - //{ - // DevComponents.Editors.DateTimeAdv.DateTimeInput dti = sender as DevComponents.Editors.DateTimeAdv.DateTimeInput; - //} private void btnAll_Click(object sender, EventArgs e) { for (int i = 0; i < clbMore.Items.Count; i++) @@ -479,29 +471,6 @@ namespace VEPROMS for (int i = 0; i < clbMore.Items.Count; i++) clbMore.SetItemChecked(i, false); } - private void btnCancelMore_Click(object sender, EventArgs e) - { - if (!_CheckForMore) - { - this.Close(); - return; - } - //if (_MyApproval.MyProcedures.Count == 1) - // pnlOne.SendToBack(); - //else - pnlApprove.SendToBack(); - } - //private void tsmiRemove_Click(object sender, EventArgs e) - //{ - // ApprovalProcedure ap = approvalProcedureBindingSource.Current as ApprovalProcedure; - // _MyApproval.RemoveProcedure(ap.ProcInfo); - // approvalProcedureBindingSource.DataSource = _MyApproval.MyProcedures; - // approvalProcedureBindingSource.ResetCurrentItem(); - // //_MyApproval.RemoveProcedure(lbProcs.SelectedItem as ProcedureInfo); - // //lbProcs.DataSource = null; - // //lbProcs.DataSource = _MyApproval.MyProcedures; - // //lbProcs.DisplayMember = "DisplayNumber"; - //} private int _LastIndex = -1; private void clbMore_MouseMove(object sender, MouseEventArgs e) { @@ -533,7 +502,6 @@ namespace VEPROMS } } } - //sttMore.HideTooltip(); } private string GetDisplayNumberOnly(string s) { @@ -542,23 +510,23 @@ namespace VEPROMS s = s.Substring(0, d); //B2018-109 remvoed the call ".Trim()". had a procedure that began with a space and was being used as such everywhere else in the approveal logic return s; } + private bool _DoingConsistencyCheck = false; // C2018-008 redesign of user interface private void btnCheckMore_Click(object sender, EventArgs e) { - UpdateMyApproval(); + _DoingConsistencyCheck = true; + if (swtbtCascade.Value) + UpdateMyApproval(); UpdateClbMore(); + _DoingConsistencyCheck = false; + btnCheckMore.Enabled = false; + btnOkay.Enabled = !swtbtCascade.Value; // C2018-008 only disable if we automatically selected procedures (cascade during consistancy check) + } private void btnReportMore_Click(object sender, EventArgs e) { OnConsistencyPrintRequest(new ConsistencyReportArgs(Volian.Base.Library.VlnSettings.TemporaryFolder + @"\MyConsistency.pdf", _MyItemInfoList)); } - private void CascadeChecksUpdated(object sender, EventArgs e) - { - DevComponents.DotNetBar.Controls.CheckBoxX cb = sender as DevComponents.DotNetBar.Controls.CheckBoxX; - if (cb != null) - { - chkCascade2.Checked = chkCascadeMore.Checked = cb.Checked; - } - } + private void fgProcs_AfterEdit(object sender, C1.Win.C1FlexGrid.RowColEventArgs e) { ApprovalProcedure ap = approvalProcedureBindingSource.Current as ApprovalProcedure; @@ -580,7 +548,7 @@ namespace VEPROMS int fgmr = fgProcs.MouseRow; if (e.Row == fgmr && ap.RevDate == dts) return; - if (chkSetAllDates.Checked) + if (swtbtSetAllRevDates.Value) // C2018-008 redesign of user interface { foreach (ApprovalProcedure app in _MyApproval.MyProcedures) { @@ -590,14 +558,6 @@ namespace VEPROMS } } } - //private void tsmiAddMore_Click(object sender, EventArgs e) - //{ - // pnlSelect.SendToBack(); - //} - private void btnModifyList_Click(object sender, EventArgs e) - { - pnlSelect.SendToBack(); - } private void btnIncrement_Click(object sender, EventArgs e) { @@ -661,6 +621,30 @@ namespace VEPROMS } return rv; } + + private void swtbtCascade_ValueChanged(object sender, EventArgs e) // C2018-008 redesign of user interface + { + if (swtbtCascade.Value) + btnCheckMore.Enabled = true; + } + + private void expAddProcConChk_ExpandedChanged(object sender, ExpandedChangeEventArgs e) // C2018-008 redesign of user interface + { + if (expAddProcConChk.Expanded) + this.Size = new Size(this.Size.Width + (expAddProcConChk.Size.Width - expAddProcConChk.TitlePanel.Size.Height), this.Size.Height); + } + + private void expAddProcConChk_ExpandedChanging(object sender, ExpandedChangeEventArgs e) // C2018-008 redesign of user interface + { + if (expAddProcConChk.Expanded) + this.Size = new Size(this.Size.Width - (expAddProcConChk.Size.Width - expAddProcConChk.TitlePanel.Size.Height), this.Size.Height); + } + + private void fgProcs_AfterDataRefresh(object sender, ListChangedEventArgs e) + { + btnApprove2.Enabled = CanApprove && tsslStatus.Text.Length == 0; // B2016-057 If did un-successful Auto Increament Rev Number, then don't enable Approve (Do Work Flow) button + } + } public class ApprovalProcedure { @@ -715,21 +699,12 @@ namespace VEPROMS proc.ProcedureConfig.SelectedSlave = proc.MyDocVersion.DocVersionConfig.SelectedSlave; ProcInfo = proc; RevNumber = proc.ProcedureConfig.Print_Rev == string.Empty ? "0" : proc.ProcedureConfig.Print_Rev; - //AppRevDate Change - //DateTime revdate; string sRevDate = proc.ProcedureConfig.Print_RevDate; if (sRevDate == string.Empty) sRevDate = DateTime.Now.ToString("M/d/y"); DateTime revDate; if (!DateTime.TryParse(sRevDate, out revDate)) revDate = DateTime.Now; RevDate = revDate; - //RevDate = DateTime.Parse(sRevDate); - //RevDate = DateTime.Parse(proc.ProcedureConfig.Print_RevDate); - //if (print_revdate == string.Empty && DateTime.TryParse(RevNumber, out revdate)) - // ; - //else - // revdate = DateTime.TryParse(proc.ProcedureConfig.Print_RevDate.Replace("-", "/").Replace("00/", "01/"), out revdate) ? revdate : DateTime.Now; - //RevDate = revdate; } } public class ApprovalMessageArgs : EventArgs @@ -1021,7 +996,6 @@ namespace VEPROMS StageInfo nsi = StageInfo.GetJustStage(RevStage); foreach (ApprovalProcedure ap in MyProcedures) //spin thru looking for updating current revision { - //RevisionInfo ric = RevisionInfo.GetCurrentByItemID(ap.ProcInfo.ItemID); RevisionInfo ric = ap.ProcInfo.MyDocVersion.DocVersionConfig.SelectedSlave > 0 ? RevisionInfo.GetCurrentByItemIDandUnitID(ap.ProcInfo.ItemID,ap.ProcInfo.MyDocVersion.DocVersionConfig.SelectedSlave) : RevisionInfo.GetCurrentByItemID(ap.ProcInfo.ItemID); if (ric != null) { diff --git a/PROMS/VEPROMS User Interface/dlgApproveProcedure.resx b/PROMS/VEPROMS User Interface/dlgApproveProcedure.resx index 53f2d28b..08bcaca7 100644 --- a/PROMS/VEPROMS User Interface/dlgApproveProcedure.resx +++ b/PROMS/VEPROMS User Interface/dlgApproveProcedure.resx @@ -118,25 +118,66 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 572, 17 + 384, 17 - 17, 17 + 109, 17 - 771, 17 + 583, 17 + + 290, 17 + + + When switched on, the Revision Dates, on all of the procedures listed below, will be changed to the selected date. + +i.e. changing the date on the first procedure in the list will result in all of the procedures in the list to get that same date. + + + When switched on, the Revision Dates, on all of the procedures listed below, will be changed to the selected date. + +i.e. changing the date on the first procedure in the list will result in all of the procedures in the list to get that same date. + 3,0,0,0,0,95,Columns:0{Width:150;Name:"DisplayNumber";Caption:"Procedure";AllowEditing:False;Style:"DataType:System.String;Font:Microsoft Sans Serif, 8pt;BackColor:ButtonFace;Margins:1, 0, 0, 0;TextAlign:LeftCenter;TextEffect:Flat;TextDirection:Normal;Trimming:None;";StyleFixed:"Font:Microsoft Sans Serif, 8pt;Margins:1, 0, 0, 0;TextEffect:Flat;TextDirection:Normal;Trimming:None;";} 1{Width:162;Name:"RevNumber";Caption:"Revision";Style:"DataType:System.String;Font:Microsoft Sans Serif, 8pt;Margins:1, 0, 0, 0;TextAlign:LeftCenter;TextEffect:Flat;TextDirection:Normal;Trimming:None;";StyleFixed:"Font:Microsoft Sans Serif, 8pt;Margins:1, 0, 0, 0;TextEffect:Flat;TextDirection:Normal;Trimming:None;";} 2{Name:"RevDate";Caption:"Revision Date";Style:"Format:""d"";DataType:System.DateTime;Font:Microsoft Sans Serif, 8pt;Margins:1, 0, 0, 0;TextAlign:LeftCenter;TextEffect:Flat;TextDirection:Normal;Trimming:None;";StyleFixed:"Font:Microsoft Sans Serif, 8pt;Margins:1, 0, 0, 0;TextEffect:Flat;TextDirection:Normal;Trimming:None;";} - 1041, 17 + 756, 17 - 456, 17 + 17, 17 - - 216, 17 + + Select the Work Flow or Approval revison stage. + +Work Flow stages will retain change bars in the working draft procedure(s). + +Approval Stages will delete (reset) change bars in the working draft procedure(s). + + + Select the Work Flow or Approval revison stage. + +Work Flow stages will retain change bars in the working draft procedure(s). + +Approval Stages will delete (reset) change bars in the working draft procedure(s). + + + PROMS will look at the selected procedure and list other procedures that should be selected, based on Transitions, Referenced Objects, and Library Documents. + +The procedures that should be selected will have a list of reasons in parenthisis next to them. + +Select the check box next to any of the procedures you want to include in this Revision Stage (Work Flow or Approval), then select the OK button. + +If the Auto Selct switch is turned on, these additional procedures will automatically be selected for inclusion in this Revison Stage. + + + This will update the list of procedures (in the left panel), in which you want to apply the selected Revison Stage. + +Note that you can select and un-select procedures in the panel above (right panel). The OK button will reflect your changes. + + + 42 50 diff --git a/PROMS/Volian.Controls.Library/vlnTreeView.cs b/PROMS/Volian.Controls.Library/vlnTreeView.cs index 36f0d8cf..c53ff0e1 100644 --- a/PROMS/Volian.Controls.Library/vlnTreeView.cs +++ b/PROMS/Volian.Controls.Library/vlnTreeView.cs @@ -14,6 +14,7 @@ using VEPROMS.CSLA.Library; using System.IO; using Volian.Base.Library; using DevComponents.DotNetBar; +using JR.Utils.GUI.Forms; //C2018-026 show notes entered during approval or workflow stage namespace Volian.Controls.Library { @@ -1126,6 +1127,12 @@ namespace Volian.Controls.Library mir.Tag = ri; if (ri.LatestVersion.MyStage.IsApproved > 0 && (ri.RevisionID > lastApprovedRevisionID)) lastApprovedRevisionID = ri.RevisionID; + if (ri.Notes.Length > 0) //C2018-026 add the ability to show notes entered during approval or workflow stage in the sub-menu + { + MenuItem mirp = mir.MenuItems.Add("View Revision Stage Notes"); + mirp.Tag = ri; + mirp.Click += new EventHandler(ViewRevisonStageNotes_Click); + } if (ri.LatestVersion.PDF != null) { MenuItem mirp = mir.MenuItems.Add("View Procedure"); @@ -1180,6 +1187,12 @@ namespace Volian.Controls.Library //mir.Click += new EventHandler(ApprovedRevision_Click); //added jcb 20111031 //_MyLog.WarnFormat("Context Menu 1 b4ViewProc- {0}", GC.GetTotalMemory(true)); + if (ri.Notes.Length > 0) //C2018-026 add the ability to show notes entered during approval or workflow stage in the sub-menu + { + MenuItem mirp = mir.MenuItems.Add("View Revision Stage Notes"); + mirp.Tag = ri; + mirp.Click += new EventHandler(ViewRevisonStageNotes_Click); + } if (ri.LatestVersion.PDF != null) { MenuItem mirp = mir.MenuItems.Add("View Procedure"); @@ -1300,6 +1313,15 @@ namespace Volian.Controls.Library OnViewPDF(sender, args); // System.Diagnostics.Process pps = System.Diagnostics.Process.Start(GetDocSummaryPdf(ri)); } + //C2018-026 show notes entered during approval or workflow stage + private void ViewRevisonStageNotes_Click(object sender, EventArgs e) + { + MenuItem mi = sender as MenuItem; + if (mi == null) return; + RevisionInfo ri = mi.Tag as RevisionInfo; + FlexibleMessageBox.Show(ri.Notes, "Revison Stage Notes", MessageBoxButtons.OK); + } + //private string GetDocPdf(RevisionInfo ri, bool superceded) //{ // string fileName = Volian.Base.Library.TmpFile.CreateFileName(ItemInfo.Get(ri.ItemID).DisplayNumber);