From ad6fea21bcba496ba86c4118f71b695012388b26 Mon Sep 17 00:00:00 2001 From: Rich Date: Thu, 7 Aug 2014 21:01:50 +0000 Subject: [PATCH] Added code to handle procedure number with space - dash - space in the number --- .../dlgApproveProcedure.cs | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs b/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs index a75d26de..f82fece7 100644 --- a/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs +++ b/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs @@ -189,7 +189,7 @@ namespace VEPROMS } for (int i = 0; i < clbMore.Items.Count; i++) { - ProcedureInfo pi = tmpProcedures[GetDisplayNumberOnly(clbMore.Items[i].ToString())]; + ProcedureInfo pi = GetProcedureInfoByKey(clbMore.Items[i].ToString()); clbMore.SetItemChecked(i, _MyApproval.ProcedureExists(pi)); } } @@ -198,6 +198,13 @@ namespace VEPROMS SetupMyApproval(); } private Dictionary tmpProcedures = new Dictionary(); + private ProcedureInfo GetProcedureInfoByKey(string key) + { + if (tmpProcedures.ContainsKey(key)) + return tmpProcedures[key]; + else + return tmpProcedures[GetDisplayNumberOnly(key)]; + } public dlgApproveProcedure(DocVersionInfo myDocVersion, bool selectSome) { this.ConsistencyPrintRequest += new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest); @@ -318,7 +325,7 @@ namespace VEPROMS for (int i = 0; i < clbMore.Items.Count; i++) { string xyz = clbMore.Items[i].ToString(); - ProcedureInfo pi = tmpProcedures[GetDisplayNumberOnly(clbMore.Items[i].ToString())]; + ProcedureInfo pi = GetProcedureInfoByKey(clbMore.Items[i].ToString()); if (clbMore.GetItemChecked(i)) { if (!_MyApproval.ProcedureExists(pi)) @@ -477,11 +484,10 @@ namespace VEPROMS if (clbMore.Items[itemIndex] != null) { SuperTooltipInfo stti = sttMore.GetSuperTooltip(clbMore); - //string xyz = GetDisplayNumberOnly(clbMore.Items[itemIndex].ToString()); //string headerText = tmpProcedures[xyz].DisplayNumber; //string bodyText = tmpProcedures[xyz].MyDifferencesText; - stti.HeaderText = tmpProcedures[GetDisplayNumberOnly(clbMore.Items[itemIndex].ToString())].DisplayNumber; - stti.BodyText = tmpProcedures[GetDisplayNumberOnly(clbMore.Items[itemIndex].ToString())].MyDifferencesText; + stti.HeaderText = GetProcedureInfoByKey(clbMore.Items[itemIndex].ToString()).DisplayNumber; + stti.BodyText = GetProcedureInfoByKey(clbMore.Items[itemIndex].ToString()).MyDifferencesText; stti.FooterVisible = false; using (Graphics g = CreateGraphics()) {