C2020-024 Added a more descriptive End Message after Approval is complete.
C2020-039 Populate revision stage list when Approve Some dialog is first opened. C2020-040 As a procedure is selected in the right panel, place in the left panel of the approve dialog C2020-044 Rename the “Do Revision Stage” button to “Generate Revision Stage” C2020-045 Added a On/Off Switch to turn off the pop-ups when the mouse hovers over the items in the right panel list of procedures
This commit is contained in:
parent
6abe915a66
commit
df46c0091c
@ -1,3 +1,5 @@
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace VEPROMS
|
||||
{
|
||||
partial class dlgApproveProcedure
|
||||
@ -52,7 +54,7 @@ namespace VEPROMS
|
||||
this.cmbRevisionStage2 = new DevComponents.DotNetBar.Controls.ComboBoxEx();
|
||||
this.pnlSelect = new DevComponents.DotNetBar.PanelEx();
|
||||
this.labelX2 = new DevComponents.DotNetBar.LabelX();
|
||||
this.lblPhase = new DevComponents.DotNetBar.LabelX();
|
||||
this.swtbtPopUps = new DevComponents.DotNetBar.Controls.SwitchButton();
|
||||
this.labelX1 = new DevComponents.DotNetBar.LabelX();
|
||||
this.swtbtCascade = new DevComponents.DotNetBar.Controls.SwitchButton();
|
||||
this.btnReportMore = new DevComponents.DotNetBar.ButtonX();
|
||||
@ -61,7 +63,6 @@ namespace VEPROMS
|
||||
this.btnClear = new DevComponents.DotNetBar.ButtonX();
|
||||
this.btnAll = new DevComponents.DotNetBar.ButtonX();
|
||||
this.clbMore = new System.Windows.Forms.CheckedListBox();
|
||||
this.btnOkay = new DevComponents.DotNetBar.ButtonX();
|
||||
this.lblMore = new DevComponents.DotNetBar.LabelX();
|
||||
this.sttMore = new DevComponents.DotNetBar.SuperTooltip();
|
||||
this.expAddProcConChk = new DevComponents.DotNetBar.ExpandablePanel();
|
||||
@ -177,7 +178,7 @@ namespace VEPROMS
|
||||
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.lblViewPDF.Size = new System.Drawing.Size(68, 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)));
|
||||
@ -260,14 +261,14 @@ namespace VEPROMS
|
||||
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(242, 586);
|
||||
this.btnApprove2.Location = new System.Drawing.Point(187, 587);
|
||||
this.btnApprove2.Name = "btnApprove2";
|
||||
this.btnApprove2.Size = new System.Drawing.Size(138, 27);
|
||||
this.btnApprove2.Size = new System.Drawing.Size(145, 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" +
|
||||
this.sttMore.SetSuperTooltip(this.btnApprove2, new DevComponents.DotNetBar.SuperTooltipInfo("Generate 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 = "Do Revision Stage";
|
||||
this.btnApprove2.Text = "Generate Revision Stage";
|
||||
this.btnApprove2.Click += new System.EventHandler(this.btnApprove_Click);
|
||||
//
|
||||
// btnCancel2
|
||||
@ -354,7 +355,7 @@ namespace VEPROMS
|
||||
// pnlSelect
|
||||
//
|
||||
this.pnlSelect.Controls.Add(this.labelX2);
|
||||
this.pnlSelect.Controls.Add(this.lblPhase);
|
||||
this.pnlSelect.Controls.Add(this.swtbtPopUps);
|
||||
this.pnlSelect.Controls.Add(this.labelX1);
|
||||
this.pnlSelect.Controls.Add(this.swtbtCascade);
|
||||
this.pnlSelect.Controls.Add(this.btnReportMore);
|
||||
@ -363,7 +364,6 @@ namespace VEPROMS
|
||||
this.pnlSelect.Controls.Add(this.btnClear);
|
||||
this.pnlSelect.Controls.Add(this.btnAll);
|
||||
this.pnlSelect.Controls.Add(this.clbMore);
|
||||
this.pnlSelect.Controls.Add(this.btnOkay);
|
||||
this.pnlSelect.Controls.Add(this.lblMore);
|
||||
this.pnlSelect.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.pnlSelect.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
@ -374,34 +374,36 @@ namespace VEPROMS
|
||||
//
|
||||
// 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.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.labelX2.Location = new System.Drawing.Point(250, 530);
|
||||
this.labelX2.Name = "labelX2";
|
||||
this.labelX2.Size = new System.Drawing.Size(166, 19);
|
||||
this.labelX2.Size = new System.Drawing.Size(106, 20);
|
||||
this.sttMore.SetSuperTooltip(this.labelX2, new DevComponents.DotNetBar.SuperTooltipInfo("Show Pop-Ups", "", "When turned on, a pop-up will appear as the mouse hovers over a procedure in the " +
|
||||
"Procedure List, displaying the information resulting from running the Consistenc" +
|
||||
"y Check.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
|
||||
this.labelX2.TabIndex = 36;
|
||||
this.labelX2.Text = "Consistency Scan Count";
|
||||
this.labelX2.Visible = false;
|
||||
this.labelX2.Text = "Show Pop-Ups";
|
||||
//
|
||||
// lblPhase
|
||||
// swtbtPopUps
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
this.lblPhase.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
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(31, 23);
|
||||
this.lblPhase.TabIndex = 35;
|
||||
this.lblPhase.Text = "0";
|
||||
this.lblPhase.Visible = false;
|
||||
this.swtbtPopUps.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.swtbtPopUps.Location = new System.Drawing.Point(362, 532);
|
||||
this.swtbtPopUps.Name = "swtbtPopUps";
|
||||
this.swtbtPopUps.Size = new System.Drawing.Size(66, 22);
|
||||
this.swtbtPopUps.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.sttMore.SetSuperTooltip(this.swtbtPopUps, new DevComponents.DotNetBar.SuperTooltipInfo("Show Pop-Ups", "", "When turned on, a pop-up will appear as the mouse hovers over a procedure in the " +
|
||||
"Procedure List, displaying the information resulting from running the Consistenc" +
|
||||
"y Check.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(195, 95)));
|
||||
this.swtbtPopUps.TabIndex = 35;
|
||||
this.swtbtPopUps.Value = true;
|
||||
this.swtbtPopUps.ValueObject = "Y";
|
||||
//
|
||||
// labelX1
|
||||
//
|
||||
@ -409,10 +411,10 @@ namespace VEPROMS
|
||||
//
|
||||
//
|
||||
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.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.labelX1.Location = new System.Drawing.Point(16, 530);
|
||||
this.labelX1.Name = "labelX1";
|
||||
this.labelX1.Size = new System.Drawing.Size(79, 23);
|
||||
this.labelX1.Size = new System.Drawing.Size(84, 20);
|
||||
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;
|
||||
@ -424,7 +426,7 @@ namespace VEPROMS
|
||||
//
|
||||
//
|
||||
this.swtbtCascade.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.swtbtCascade.Location = new System.Drawing.Point(100, 14);
|
||||
this.swtbtCascade.Location = new System.Drawing.Point(106, 532);
|
||||
this.swtbtCascade.Name = "swtbtCascade";
|
||||
this.swtbtCascade.Size = new System.Drawing.Size(66, 22);
|
||||
this.swtbtCascade.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
@ -439,10 +441,10 @@ namespace VEPROMS
|
||||
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, 564);
|
||||
this.btnReportMore.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.btnReportMore.Location = new System.Drawing.Point(351, 559);
|
||||
this.btnReportMore.Name = "btnReportMore";
|
||||
this.btnReportMore.Size = new System.Drawing.Size(77, 23);
|
||||
this.btnReportMore.Size = new System.Drawing.Size(84, 28);
|
||||
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)));
|
||||
@ -454,7 +456,7 @@ 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(24, 536);
|
||||
this.pbMore.Location = new System.Drawing.Point(15, 507);
|
||||
this.pbMore.Name = "pbMore";
|
||||
this.pbMore.Size = new System.Drawing.Size(420, 15);
|
||||
this.pbMore.TabIndex = 29;
|
||||
@ -467,9 +469,9 @@ namespace VEPROMS
|
||||
this.btnCheckMore.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
|
||||
this.btnCheckMore.Enabled = false;
|
||||
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.Location = new System.Drawing.Point(15, 560);
|
||||
this.btnCheckMore.Name = "btnCheckMore";
|
||||
this.btnCheckMore.Size = new System.Drawing.Size(156, 30);
|
||||
this.btnCheckMore.Size = new System.Drawing.Size(156, 28);
|
||||
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;
|
||||
@ -482,7 +484,7 @@ 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(363, 39);
|
||||
this.btnClear.Location = new System.Drawing.Point(363, 7);
|
||||
this.btnClear.Name = "btnClear";
|
||||
this.btnClear.Size = new System.Drawing.Size(72, 23);
|
||||
this.btnClear.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
@ -497,7 +499,7 @@ 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(363, 13);
|
||||
this.btnAll.Location = new System.Drawing.Point(284, 7);
|
||||
this.btnAll.Name = "btnAll";
|
||||
this.btnAll.Size = new System.Drawing.Size(72, 23);
|
||||
this.btnAll.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
@ -514,30 +516,17 @@ namespace VEPROMS
|
||||
this.clbMore.CheckOnClick = true;
|
||||
this.clbMore.FormattingEnabled = true;
|
||||
this.clbMore.HorizontalScrollbar = true;
|
||||
this.clbMore.Location = new System.Drawing.Point(24, 68);
|
||||
this.clbMore.Location = new System.Drawing.Point(15, 36);
|
||||
this.clbMore.Name = "clbMore";
|
||||
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);
|
||||
this.clbMore.SelectedIndexChanged += new System.EventHandler(this.clbMore_SelectedIndexChanged);
|
||||
this.clbMore.MouseEnter += new System.EventHandler(this.clbMore_MouseEnter);
|
||||
this.clbMore.MouseLeave += new System.EventHandler(this.clbMore_MouseLeave);
|
||||
this.clbMore.MouseMove += new System.Windows.Forms.MouseEventHandler(this.clbMore_MouseMove);
|
||||
//
|
||||
// btnOkay
|
||||
//
|
||||
this.btnOkay.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
|
||||
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(378, 564);
|
||||
this.btnOkay.Name = "btnOkay";
|
||||
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);
|
||||
//
|
||||
// lblMore
|
||||
//
|
||||
this.lblMore.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
@ -547,9 +536,10 @@ namespace VEPROMS
|
||||
//
|
||||
//
|
||||
this.lblMore.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.lblMore.Location = new System.Drawing.Point(15, 47);
|
||||
this.lblMore.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.lblMore.Location = new System.Drawing.Point(16, 13);
|
||||
this.lblMore.Name = "lblMore";
|
||||
this.lblMore.Size = new System.Drawing.Size(80, 16);
|
||||
this.lblMore.Size = new System.Drawing.Size(86, 17);
|
||||
this.lblMore.TabIndex = 10;
|
||||
this.lblMore.Text = "Procedure List";
|
||||
//
|
||||
@ -687,7 +677,6 @@ namespace VEPROMS
|
||||
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;
|
||||
@ -695,8 +684,8 @@ namespace VEPROMS
|
||||
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;
|
||||
private DevComponents.DotNetBar.Controls.SwitchButton swtbtPopUps;
|
||||
}
|
||||
}
|
||||
|
||||
@ -259,6 +259,7 @@ namespace VEPROMS
|
||||
_MyDocVersion = myDocVersion;
|
||||
InitializeComponent();
|
||||
FlexGridAddEvents();
|
||||
SetupComboBoxes(); // C2020-039 - initialize work flow stage drop down
|
||||
_MyApproval.StatusUpdated += new ApprovalStatusChangeEvent(_MyApproval_StatusUpdated);
|
||||
// C2018-008 redesign of user interface
|
||||
expAddProcConChk.Expanded = true;
|
||||
@ -381,14 +382,6 @@ namespace VEPROMS
|
||||
{
|
||||
btnCheckMore.Enabled = true;
|
||||
}
|
||||
btnOkay.Enabled = !_initializing && !_DoingConsistencyCheck;
|
||||
}
|
||||
private void btnOkay_Click(object sender, EventArgs e)
|
||||
{
|
||||
UpdateMyApproval();
|
||||
approvalProcedureBindingSource.DataSource = _MyApproval.MyProcedures;
|
||||
approvalProcedureBindingSource.ResetCurrentItem();
|
||||
btnOkay.Enabled = false;
|
||||
}
|
||||
private void UpdateMyApproval()
|
||||
{
|
||||
@ -419,9 +412,6 @@ namespace VEPROMS
|
||||
private void UpdateClbMore()
|
||||
{
|
||||
int checkedCount = clbMore.CheckedItems.Count;
|
||||
int z = int.Parse("0" + lblPhase.Text);
|
||||
z++;
|
||||
lblPhase.Text = z.ToString();
|
||||
string oldLabel = lblMore.Text;
|
||||
pbMore.Visible = true;
|
||||
ItemInfoList.ConsistencyCheckUpdated += new ItemInfoListCCEvent(ItemInfoList_ConsistencyCheckUpdated);
|
||||
@ -515,12 +505,11 @@ namespace VEPROMS
|
||||
if (_MyApproval.MyProcedures.Count > 0)
|
||||
{
|
||||
int itemIndex = clbMore.IndexFromPoint(new Point(e.X, e.Y));
|
||||
if (itemIndex == -1)
|
||||
sttMore.HideTooltip();
|
||||
if (itemIndex == _LastIndex)
|
||||
return;
|
||||
_LastIndex = itemIndex;
|
||||
if (itemIndex >= 0)
|
||||
// C2020-045 Added on/off switch to allow user control of the pop-ups
|
||||
if (itemIndex >= 0 && swtbtPopUps.Value)
|
||||
{
|
||||
if (clbMore.Items[itemIndex] != null)
|
||||
{
|
||||
@ -540,7 +529,10 @@ namespace VEPROMS
|
||||
}
|
||||
}
|
||||
}
|
||||
if (sttMore.GetSuperTooltip(clbMore).BodyText.Length == 0)
|
||||
sttMore.HideTooltip(); // C2020-045 - no information to display so hide
|
||||
}
|
||||
|
||||
private string GetDisplayNumberOnly(string s)
|
||||
{
|
||||
int d = s.IndexOf(" - ");
|
||||
@ -557,7 +549,6 @@ namespace VEPROMS
|
||||
UpdateClbMore();
|
||||
_DoingConsistencyCheck = false;
|
||||
btnCheckMore.Enabled = false;
|
||||
btnOkay.Enabled = !swtbtCascade.Value; // C2018-008 only disable if we automatically selected procedures (cascade during consistency check)
|
||||
|
||||
}
|
||||
private void btnReportMore_Click(object sender, EventArgs e)
|
||||
@ -683,6 +674,29 @@ namespace VEPROMS
|
||||
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
|
||||
}
|
||||
|
||||
// C2020-040 automatically update left panel when tree item in right panel is selected or deselected
|
||||
private void clbMore_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (!_initializing && !_DoingConsistencyCheck)
|
||||
{
|
||||
UpdateMyApproval();
|
||||
approvalProcedureBindingSource.DataSource = _MyApproval.MyProcedures;
|
||||
approvalProcedureBindingSource.ResetCurrentItem();
|
||||
}
|
||||
}
|
||||
// C2020045 added mouse enter and leave events to help control the pop ups.
|
||||
private void clbMore_MouseEnter(object sender, EventArgs e) //C2020-045 - added switch to control if pop-ups are displayed in procedure list
|
||||
{
|
||||
if (!swtbtPopUps.Value)
|
||||
sttMore.Enabled = false;
|
||||
else
|
||||
sttMore.Enabled = true;
|
||||
}
|
||||
|
||||
private void clbMore_MouseLeave(object sender, EventArgs e) //C2020-045 - added switch to control if pop-ups are displayed in procedure list
|
||||
{
|
||||
sttMore.Enabled = true;
|
||||
}
|
||||
}
|
||||
public class ApprovalProcedure
|
||||
{
|
||||
@ -1244,9 +1258,19 @@ namespace VEPROMS
|
||||
pi.MyDocVersion.DocVersionConfig.SelectedSlave = selectedSlave;
|
||||
}
|
||||
// C2019-019: Put out a complete message when approval is done.
|
||||
// C2020-024 Display a more descriptive end message
|
||||
if (procsApproved.Count > 0)
|
||||
{
|
||||
MessageBox.Show("Approve Procedures has completed.", "Approve Procedure", MessageBoxButtons.OK);
|
||||
string msg = "";
|
||||
if (procsApproved.Count == (MyProcedures[0]).ProcInfo.MyDocVersion.Procedures.Count)
|
||||
msg = "All Procedures were Approved.";
|
||||
else
|
||||
{
|
||||
msg = "The following procedures were approved:\n";
|
||||
foreach (string prc in procsApproved)
|
||||
msg += "\n" + prc;
|
||||
}
|
||||
FlexibleMessageBox.Show( msg, "Approve Procedure(s)", MessageBoxButtons.OK);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -112,21 +112,21 @@
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<metadata name="approvalInfoBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<metadata name="approvalInfoBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>384, 17</value>
|
||||
</metadata>
|
||||
<metadata name="stageInfoBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<metadata name="stageInfoBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>109, 17</value>
|
||||
</metadata>
|
||||
<metadata name="revTypeBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<metadata name="revTypeBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>583, 17</value>
|
||||
</metadata>
|
||||
<metadata name="sttMore.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<metadata name="sttMore.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>290, 17</value>
|
||||
</metadata>
|
||||
<data name="swtbtSetAllRevDates.SuperTooltip" xml:space="preserve">
|
||||
@ -142,10 +142,10 @@ i.e. changing the date on the first procedure in the list will result in all of
|
||||
<data name="fgProcs.ColumnInfo" xml:space="preserve">
|
||||
<value>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;";} </value>
|
||||
</data>
|
||||
<metadata name="approvalProcedureBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<metadata name="approvalProcedureBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>756, 17</value>
|
||||
</metadata>
|
||||
<metadata name="ssMsg2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<metadata name="ssMsg2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
<data name="labelX16.SuperTooltip" xml:space="preserve">
|
||||
@ -167,19 +167,11 @@ Approval Stages will delete (reset) change bars in the working draft procedure(s
|
||||
|
||||
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.
|
||||
Select the check box next to any of the procedures you want to include in this Revision Stage (Work Flow or Approval).
|
||||
|
||||
If the Auto Selct switch is turned on, these additional procedures will automatically be selected for inclusion in this Revison Stage.</value>
|
||||
</data>
|
||||
<data name="btnOkay.SuperTooltip" xml:space="preserve">
|
||||
<value>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.</value>
|
||||
</data>
|
||||
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>42</value>
|
||||
</metadata>
|
||||
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>50</value>
|
||||
</metadata>
|
||||
</root>
|
||||
Loading…
x
Reference in New Issue
Block a user