diff --git a/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs b/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs index f993cc29..86d86e12 100644 --- a/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs +++ b/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs @@ -67,6 +67,7 @@ namespace VEPROMS ApplicabilityIndex = myDocVersion.DocVersionConfig.SelectedSlave; this.ConsistencyPrintRequest += new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest); _MyDocVersion = myDocVersion; + _MyDocVersion.ResetProcedures(); // B2021-035: Pasted, modified number and deleted procedures not refreshed so missing from list InitializeComponent(); FlexGridAddEvents(); _MyApproval.StatusUpdated += new ApprovalStatusChangeEvent(_MyApproval_StatusUpdated); @@ -258,6 +259,7 @@ namespace VEPROMS _MyApproval = new ApprovalInfo(myFrmVEPROMS);// Save frmVEPROMS for Import to shutoff SessionPing this.ConsistencyPrintRequest += new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest); _MyDocVersion = myDocVersion; + _MyDocVersion.ResetProcedures(); // B2021-035: Pasted, modified number and deleted procedures not refreshed so missing from list InitializeComponent(); FlexGridAddEvents(); SetupComboBoxes(); // C2020-039 - initialize work flow stage drop down @@ -275,6 +277,7 @@ namespace VEPROMS _MyApproval = new ApprovalInfo(myFrmVEPROMS);// Save frmVEPROMS for Import to shutoff SessionPing this.ConsistencyPrintRequest += new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest); _MyDocVersion = myProcedure.MyDocVersion; + _MyDocVersion.ResetProcedures(); // B2021-035: Pasted, modified number and deleted procedures not refreshed so missing from list InitializeComponent(); FlexGridAddEvents(); SetupComboBoxes(); @@ -404,6 +407,7 @@ namespace VEPROMS } setupLablesAndSwitches(); // C2018-008 redesign of user interface SetupMyApproval(); + RefreshCount(); // B2021-015: select/clear all not populating left panel & count not refreshed. } private void btnCheck_Click(object sender, EventArgs e) { @@ -436,9 +440,9 @@ namespace VEPROMS for (int i = 0; i < clbMore.Items.Count; i++) { string info = clbMore.Items[i].ToString(); - if(info.Contains(" - (")) + if (info.Contains(" - (")) clbMore.Items[i] = info.Substring(0, info.IndexOf(" - (")); - } + } foreach (ProcedureInfo npi in _MyItemInfoList) { string info = string.Format("{0} - ({1})", npi.DisplayNumber, npi.MyDifferenceReasons); @@ -464,7 +468,7 @@ namespace VEPROMS } Application.DoEvents(); clbMore.Enabled = btnAll.Enabled = btnClear.Enabled = true; - lblMore.Text = string.Format("{0} Procedures, {1} Selected", clbMore.Items.Count, clbMore.CheckedItems.Count); + RefreshCount(); btnReportMore.Enabled = true; if (swtbtCascade.Value) // C2018-008 redesign of user interface @@ -476,6 +480,12 @@ namespace VEPROMS } } } + // B2021-015: select/clear all not populating left panel & count not refreshed. + private void RefreshCount() + { + lblMore.Text = string.Format("{0} Procedures, {1} Selected", clbMore.Items.Count, clbMore.CheckedItems.Count); + } + void ItemInfoList_ConsistencyCheckUpdated(object sender, ItemInfoListCCEventArgs args) { if (sender != null) @@ -494,11 +504,13 @@ namespace VEPROMS { for (int i = 0; i < clbMore.Items.Count; i++) clbMore.SetItemChecked(i, true); + UpdateMyApproval(); // B2021-015: select/clear all not populating left panel & count not refreshed. } private void btnClear_Click(object sender, EventArgs e) { for (int i = 0; i < clbMore.Items.Count; i++) clbMore.SetItemChecked(i, false); + UpdateMyApproval(); // B2021-015: select/clear all not populating left panel & count not refreshed. } private int _LastIndex = -1; private void clbMore_MouseMove(object sender, MouseEventArgs e)