diff --git a/PROMS/Volian.Controls.Library/DisplayHistory.resx b/PROMS/Volian.Controls.Library/DisplayHistory.resx
new file mode 100644
index 00000000..ba42be92
--- /dev/null
+++ b/PROMS/Volian.Controls.Library/DisplayHistory.resx
@@ -0,0 +1,167 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ <?xml version="1.0" encoding="utf-8"?>
+<VlnBorders Rows="4" Columns="3">
+ <VerticalLines Rows="4" Columns="4">
+ <Lines>
+ <GridLinePattern>Single</GridLinePattern>
+ <GridLinePattern>Single</GridLinePattern>
+ <GridLinePattern>Single</GridLinePattern>
+ <GridLinePattern>Single</GridLinePattern>
+ <GridLinePattern>Single</GridLinePattern>
+ <GridLinePattern>Single</GridLinePattern>
+ <GridLinePattern>Single</GridLinePattern>
+ <GridLinePattern>Single</GridLinePattern>
+ <GridLinePattern>Single</GridLinePattern>
+ <GridLinePattern>Single</GridLinePattern>
+ <GridLinePattern>Single</GridLinePattern>
+ <GridLinePattern>Single</GridLinePattern>
+ <GridLinePattern>Single</GridLinePattern>
+ <GridLinePattern>Single</GridLinePattern>
+ <GridLinePattern>Single</GridLinePattern>
+ <GridLinePattern>Single</GridLinePattern>
+ </Lines>
+ </VerticalLines>
+ <HorizontalLines Rows="5" Columns="3">
+ <Lines>
+ <GridLinePattern>Single</GridLinePattern>
+ <GridLinePattern>Single</GridLinePattern>
+ <GridLinePattern>Single</GridLinePattern>
+ <GridLinePattern>Single</GridLinePattern>
+ <GridLinePattern>Single</GridLinePattern>
+ <GridLinePattern>Single</GridLinePattern>
+ <GridLinePattern>Single</GridLinePattern>
+ <GridLinePattern>Single</GridLinePattern>
+ <GridLinePattern>Single</GridLinePattern>
+ <GridLinePattern>Single</GridLinePattern>
+ <GridLinePattern>Single</GridLinePattern>
+ <GridLinePattern>Single</GridLinePattern>
+ <GridLinePattern>Single</GridLinePattern>
+ <GridLinePattern>Single</GridLinePattern>
+ <GridLinePattern>Single</GridLinePattern>
+ </Lines>
+ </HorizontalLines>
+</VlnBorders>
+
+
+ Normal{Font:Microsoft Sans Serif, 8.25pt;BackColor:White;TextAlign:LeftTop;Border:Flat,1,Black,Both;} Alternate{BackColor:White;} Fixed{BackColor:Control;ForeColor:ControlText;Border:Flat,1,ControlDark,Both;BackgroundImageLayout:Hide;} Highlight{BackColor:LightCyan;ForeColor:Black;} Focus{BackColor:LightCyan;} Editor{} Search{BackColor:Highlight;ForeColor:HighlightText;} Frozen{BackColor:Beige;} NewRow{ForeColor:GrayText;} EmptyArea{BackColor:Transparent;Border:None,1,Black,Both;} SelectedColumnHeader{} SelectedRowHeader{} GrandTotal{BackColor:Black;ForeColor:White;} Subtotal0{BackColor:ControlDarkDark;ForeColor:White;} Subtotal1{BackColor:ControlDarkDark;ForeColor:White;} Subtotal2{BackColor:ControlDarkDark;ForeColor:White;} Subtotal3{BackColor:ControlDarkDark;ForeColor:White;} Subtotal4{BackColor:ControlDarkDark;ForeColor:White;} Subtotal5{BackColor:ControlDarkDark;ForeColor:White;} FilterEditor{} FirstCustomStyle{}
+
+
\ No newline at end of file
diff --git a/PROMS/Volian.Print.Library/PDFConsistencyCheckReport.cs b/PROMS/Volian.Print.Library/PDFConsistencyCheckReport.cs
index 5dfcd8ce..00c797de 100644
--- a/PROMS/Volian.Print.Library/PDFConsistencyCheckReport.cs
+++ b/PROMS/Volian.Print.Library/PDFConsistencyCheckReport.cs
@@ -288,7 +288,8 @@ namespace Volian.Print.Library
}
else
{
- Dictionary> ros = new Dictionary>();
+// Dictionary> ros = new Dictionary>();
+ Dictionary> ros = new Dictionary>();
ROFSTLookup lu = MyItemInfoList[0].MyDocVersion.DocVersionAssociations[0].MyROFst.ROFSTLookup;
if (types.ContainsKey(0))
{
@@ -299,22 +300,24 @@ namespace Volian.Print.Library
ROFSTLookup.rochild rocc = lu.GetRoChild12(roc.ROID);
if (rocc.type == 1)
{
- string rotitle = string.Format("{0} - {1}", lu.GetROTitle(roc.ROID), lu.GetRoValue(roc.ROID).Replace('`','\xb0'));
+ string newROValue = lu.GetRoValue(roc.ROID).Replace('`', '\xb0');
+ string rotitle = string.Format("{0} - Current Version: {1}", lu.GetROTitle(roc.ROID), lu.GetRoValue(roc.ROID).Replace('`','\xb0'));
if (ros.ContainsKey(rotitle))
{
- ros[rotitle].Add(string.Format("Procedure {0} has an ROValue of: {1}", pi.DisplayNumber, roc.ROValue));
+ ros[rotitle].Add(string.Format("Procedure {0} has an ROValue of: {1}", pi.DisplayNumber, roc.ROValue),roc.ROValue == newROValue);
}
else
{
- ros.Add(rotitle, new List());
- ros[rotitle].Add(string.Format("Procedure {0} has an ROValue of: {1}", pi.DisplayNumber, roc.ROValue));
+ ros.Add(rotitle, new Dictionary());
+ ros[rotitle].Add(string.Format("Procedure {0} has an ROValue of: {1}", pi.DisplayNumber, roc.ROValue),roc.ROValue == newROValue);
}
}
}
}
}
//jcb
- Dictionary> trs = new Dictionary>();
+ Dictionary> trs = new Dictionary>();
+ //Dictionary> trs = new Dictionary>();
if (types.ContainsKey(1))
{
foreach (ProcedureInfo pi in MyItemInfoList)
@@ -322,21 +325,29 @@ namespace Volian.Print.Library
foreach (TransitionCheck trc in pi.MyDifferences.TransitionConsistency.MyTransitionChecks)
{
TransitionInfo ti = TransitionInfo.Get(trc.TransitionID);
- string trtitle = "From Procedure " + ti.MyContent.ContentItems[0].Path;
+ string fromText = ti.MyContent.Text;
+ //GO TO \\v \\v0
+ MatchCollection mc = Regex.Matches(fromText, @"\");
+ foreach (Match m in mc)
+ if (m.Groups[2].Value == ti.TransitionID.ToString())
+ fromText = ItemInfo.ConvertToDisplayText(m.Groups[1].Value);
+ string newValue = ti.MyContent.ContentItems[0].Path + "\r\nCurrent Version: " + fromText;
+ string trtitle = "From Procedure " + newValue;
if (trs.ContainsKey(trtitle))
{
- trs[trtitle].Add(string.Format("According to {0} the destination is: {1}", pi.DisplayNumber, ItemInfo.ConvertToDisplayText(trc.TransitionValue)));
+ trs[trtitle].Add(string.Format("According to {0} the destination is: {1}", pi.DisplayNumber, ItemInfo.ConvertToDisplayText(trc.TransitionValue)), ItemInfo.ConvertToDisplayText(trc.TransitionValue) == fromText);
}
else
{
- trs.Add(trtitle, new List());
- trs[trtitle].Add(string.Format("According to {0} the destination is: {1}", pi.DisplayNumber, ItemInfo.ConvertToDisplayText(trc.TransitionValue)));
+ trs.Add(trtitle, new Dictionary());
+ trs[trtitle].Add(string.Format("According to {0} the destination is: {1}", pi.DisplayNumber, ItemInfo.ConvertToDisplayText(trc.TransitionValue)), ItemInfo.ConvertToDisplayText(trc.TransitionValue) == fromText);
}
}
}
}
//end jcb
- Dictionary> lds = new Dictionary>();
+ Dictionary> lds = new Dictionary>();
+ //Dictionary> lds = new Dictionary>();
if (types.ContainsKey(2))
{
foreach (ProcedureInfo pi in MyItemInfoList)
@@ -344,19 +355,22 @@ namespace Volian.Print.Library
foreach (LibDocCheck ldc in pi.MyDifferences.LibDocConsistency.MyLibDocChecks)
{
DocumentInfo di = DocumentInfo.Get(ldc.DocID);
- string ldtitle = string.Format("{0} - {1}", di.DocumentTitle, di.DTS.ToString());
+ string newValue = di.DTS.ToString();
+ string ldtitle = string.Format("{0} - Current Version: {1}", di.DocumentTitle, di.DTS.ToString());
if (lds.ContainsKey(ldtitle))
{
- lds[ldtitle].Add(string.Format("Procedure {0} has a Document Date of: {1}", pi.DisplayNumber, ldc.DocDate.ToString()));
+ lds[ldtitle].Add(string.Format("Procedure {0} has a Document Date of: {1}", pi.DisplayNumber, ldc.DocDate.ToString()),ldc.DocDate.ToString() == newValue);
}
else
{
- lds.Add(ldtitle, new List());
- lds[ldtitle].Add(string.Format("Procedure {0} has a Document Date of: {1}", pi.DisplayNumber, ldc.DocDate.ToString()));
+ lds.Add(ldtitle, new Dictionary());
+ lds[ldtitle].Add(string.Format("Procedure {0} has a Document Date of: {1}", pi.DisplayNumber, ldc.DocDate.ToString()), ldc.DocDate.ToString() == newValue);
}
}
}
}
+ Color goodColor = new Color(System.Drawing.Color.PaleGreen);
+ Color badColor = new Color(System.Drawing.Color.Khaki);
if (types.ContainsKey(0))
{
h = new Phrase();
@@ -373,14 +387,19 @@ namespace Volian.Print.Library
h.Add(rotitle);
c = new PdfPCell(h);
c.Colspan = cols - 1;
+ c.BackgroundColor = goodColor;
t.AddCell(c);
- foreach (string s in ros[rotitle])
+ foreach (KeyValuePair d in ros[rotitle])
{
t.AddCell(BlankCell(2));
h = new Phrase();
h.Font = f3;
- h.Add(s);
+ h.Add(d.Key);
c = new PdfPCell(h);
+ if (d.Value)
+ c.BackgroundColor = goodColor;
+ else
+ c.BackgroundColor = badColor;
t.AddCell(c);
}
}
@@ -402,14 +421,19 @@ namespace Volian.Print.Library
h.Add(trtitle);
c = new PdfPCell(h);
c.Colspan = cols - 1;
+ c.BackgroundColor = goodColor;
t.AddCell(c);
- foreach (string s in trs[trtitle])
+ foreach (KeyValuePair d in trs[trtitle])
{
t.AddCell(BlankCell(2));
h = new Phrase();
h.Font = f3;
- h.Add(s);
+ h.Add(d.Key);
c = new PdfPCell(h);
+ if (d.Value)
+ c.BackgroundColor = goodColor;
+ else
+ c.BackgroundColor = badColor;
t.AddCell(c);
}
}
@@ -431,14 +455,19 @@ namespace Volian.Print.Library
h.Add(ldtitle);
c = new PdfPCell(h);
c.Colspan = cols - 1;
+ c.BackgroundColor = goodColor;
t.AddCell(c);
- foreach (string s in lds[ldtitle])
+ foreach (KeyValuePair d in lds[ldtitle])
{
t.AddCell(BlankCell(2));
h = new Phrase();
h.Font = f3;
- h.Add(s);
+ h.Add(d.Key);
c = new PdfPCell(h);
+ if (d.Value)
+ c.BackgroundColor = goodColor;
+ else
+ c.BackgroundColor = badColor;
t.AddCell(c);
}
}