Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

C2020-024 Added a more descriptive End Message after Approval is complete.

Browse Source 
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:
John Jenko
2020-11-04 14:09:55 +00:00
parent 6abe915a66
commit df46c0091c
3 changed files with 98 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
PROMS/VEPROMS User Interface/dlgApproveProcedure.cs
View File

@@ -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;
}