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

Added code to handle procedure number with space - dash - space in the number

Browse Source
This commit is contained in:
Rich 2014-08-07 21:01:50 +00:00
parent 5e3f6b5e0e
commit ad6fea21bc
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -189,7 +189,7 @@ namespace VEPROMS
} }
for (int i = 0; i < clbMore.Items.Count; i++) 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)); clbMore.SetItemChecked(i, _MyApproval.ProcedureExists(pi));
} }
} }
@ -198,6 +198,13 @@ namespace VEPROMS
SetupMyApproval(); SetupMyApproval();
} }
private Dictionary<string, ProcedureInfo> tmpProcedures = new Dictionary<string, ProcedureInfo>(); private Dictionary<string, ProcedureInfo> tmpProcedures = new Dictionary<string, ProcedureInfo>();
private ProcedureInfo GetProcedureInfoByKey(string key)
{
if (tmpProcedures.ContainsKey(key))
return tmpProcedures[key];
else
return tmpProcedures[GetDisplayNumberOnly(key)];
}
public dlgApproveProcedure(DocVersionInfo myDocVersion, bool selectSome) public dlgApproveProcedure(DocVersionInfo myDocVersion, bool selectSome)
{ {
this.ConsistencyPrintRequest += new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest); this.ConsistencyPrintRequest += new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
@ -318,7 +325,7 @@ namespace VEPROMS
for (int i = 0; i < clbMore.Items.Count; i++) for (int i = 0; i < clbMore.Items.Count; i++)
{ {
string xyz = clbMore.Items[i].ToString(); 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 (clbMore.GetItemChecked(i))
{ {
if (!_MyApproval.ProcedureExists(pi)) if (!_MyApproval.ProcedureExists(pi))
@ -477,11 +484,10 @@ namespace VEPROMS
if (clbMore.Items[itemIndex] != null) if (clbMore.Items[itemIndex] != null)
{ {
SuperTooltipInfo stti = sttMore.GetSuperTooltip(clbMore); SuperTooltipInfo stti = sttMore.GetSuperTooltip(clbMore);
//string xyz = GetDisplayNumberOnly(clbMore.Items[itemIndex].ToString());
//string headerText = tmpProcedures[xyz].DisplayNumber; //string headerText = tmpProcedures[xyz].DisplayNumber;
//string bodyText = tmpProcedures[xyz].MyDifferencesText; //string bodyText = tmpProcedures[xyz].MyDifferencesText;
stti.HeaderText = tmpProcedures[GetDisplayNumberOnly(clbMore.Items[itemIndex].ToString())].DisplayNumber; stti.HeaderText = GetProcedureInfoByKey(clbMore.Items[itemIndex].ToString()).DisplayNumber;
stti.BodyText = tmpProcedures[GetDisplayNumberOnly(clbMore.Items[itemIndex].ToString())].MyDifferencesText; stti.BodyText = GetProcedureInfoByKey(clbMore.Items[itemIndex].ToString()).MyDifferencesText;
stti.FooterVisible = false; stti.FooterVisible = false;
using (Graphics g = CreateGraphics()) using (Graphics g = CreateGraphics())
{ {