From 0a434b92b2e1e1d291fca357fe11c3edc528232b Mon Sep 17 00:00:00 2001 From: Rich Date: Tue, 2 Aug 2011 14:53:02 +0000 Subject: [PATCH] Fix to the TagPanel not to fail if it is expanded Only refresh list if visible Removed debugging Fixed report to work with MSWord Section changes --- PROMS/VEPROMS User Interface/frmVEPROMS.cs | 2 +- PROMS/Volian.Controls.Library/DisplayHistory.cs | 2 +- PROMS/Volian.Controls.Library/VlnFlexGrid.cs | 8 -------- .../Volian.Print.Library/PDFChronologyReport.cs | 16 ++++++++-------- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 28015383..768b71e9 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -1520,7 +1520,7 @@ namespace VEPROMS // if our active tab is a Word attachment, call the Click even on the RO tab // to ensure that the RO FST is loaded. This fixes a bug where if the first thing you // open is a Word attachment, the RO panel would not have the RO's listed. - if (infoPanel.Expanded && _CurrentItem.HasWordContent) + if (infoPanel.Expanded && _CurrentItem != null && _CurrentItem.HasWordContent) infotabRO_Click(sender, e); } #endregion diff --git a/PROMS/Volian.Controls.Library/DisplayHistory.cs b/PROMS/Volian.Controls.Library/DisplayHistory.cs index 72732a8d..90789941 100644 --- a/PROMS/Volian.Controls.Library/DisplayHistory.cs +++ b/PROMS/Volian.Controls.Library/DisplayHistory.cs @@ -816,7 +816,7 @@ namespace Volian.Controls.Library private void DisplayHistory_VisibleChanged(object sender, EventArgs e) { - this.RefreshList(); + if(this.Visible)this.RefreshList(); } } diff --git a/PROMS/Volian.Controls.Library/VlnFlexGrid.cs b/PROMS/Volian.Controls.Library/VlnFlexGrid.cs index 10fd5226..b6c14637 100644 --- a/PROMS/Volian.Controls.Library/VlnFlexGrid.cs +++ b/PROMS/Volian.Controls.Library/VlnFlexGrid.cs @@ -4500,14 +4500,6 @@ namespace Volian.Controls.Library } public class GridCopyInfo { - private int _Bozo = 5; - [XmlIgnore] - public int Bozo - { - get { return _Bozo; } - set { _Bozo = value; } - } - private GridCopyOption _MyCopyOption = GridCopyOption.Selection; public GridCopyOption MyCopyOption diff --git a/PROMS/Volian.Print.Library/PDFChronologyReport.cs b/PROMS/Volian.Print.Library/PDFChronologyReport.cs index 1e5450d7..b50c739b 100644 --- a/PROMS/Volian.Print.Library/PDFChronologyReport.cs +++ b/PROMS/Volian.Print.Library/PDFChronologyReport.cs @@ -205,7 +205,7 @@ namespace Volian.Print.Library foreach (ContentAuditInfo cai in AuditList) { //raw path - string[] NewPath = Regex.Replace(cai.Path, "^..+?\\u0007.", "").Split("\x7".ToCharArray()); + string[] NewPath = Regex.Replace(cai.Path + "\x7\x7\x7", "^..+?\\u0007.", "").Split("\x7".ToCharArray()); if (NewPath[0] != section) { section = NewPath[0]; @@ -536,14 +536,14 @@ namespace Volian.Print.Library foreach (ContentAuditInfo cai in AuditList) { if(cai.ContentID == contentID) - return Regex.Replace(cai.Path, "^..+?\\u0007.", "").Split("\x7".ToCharArray()); + return Regex.Replace(cai.Path + "\x7\x7\x7", "^..+?\\u0007.", "").Split("\x7".ToCharArray()); } ItemInfoList iil = ItemInfoList.GetByContentID(contentID); if (iil.Count > 0) { - return Regex.Replace(iil[0].SearchPath, "^..+?\\u0007.", "").Split("\x7".ToCharArray()); + return Regex.Replace(iil[0].SearchPath + "\x7\x7\x7", "^..+?\\u0007.", "").Split("\x7".ToCharArray()); } - return "obozo\x7obiden".Split("\x7".ToCharArray()); + return "Section\x7Step".Split("\x7".ToCharArray()); } private void BuildSummaryReport2(iTextSharp.text.Document doc) { @@ -555,7 +555,7 @@ namespace Volian.Print.Library List auditList = new List(); foreach (ContentAuditInfo cai in AuditList) { - string[] NewPath = Regex.Replace(cai.Path, "^..+?\\u0007.", "").Split("\x7".ToCharArray()); + string[] NewPath = Regex.Replace(cai.Path + "\x7\x7\x7", "^..+?\\u0007.", "").Split("\x7".ToCharArray()); if (NewPath[1] != stepnum) { stepnum = NewPath[1]; @@ -680,7 +680,7 @@ namespace Volian.Print.Library foreach (ContentAuditInfo cai in auditList) { //raw path - string[] NewPath = Regex.Replace(cai.Path, "^..+?\\u0007.", "").Split("\x7".ToCharArray()); + string[] NewPath = Regex.Replace(cai.Path + "\x7\x7\x7", "^..+?\\u0007.", "").Split("\x7".ToCharArray()); if (NewPath[0] != section) { section = NewPath[0]; @@ -787,7 +787,7 @@ namespace Volian.Print.Library { if (cai.ContentID == aai.IContentID) { - string[] NewPath = Regex.Replace(cai.Path, "^..+?\\u0007.", "").Split("\x7".ToCharArray()); + string[] NewPath = Regex.Replace(cai.Path + "\x7\x7\x7", "^..+?\\u0007.", "").Split("\x7".ToCharArray()); if (NewPath[1] != stepnum) { stepnum = NewPath[1]; @@ -1017,7 +1017,7 @@ namespace Volian.Print.Library foreach (ContentAuditInfo cai in auditList) { //raw path - string[] NewPath = Regex.Replace(cai.Path, "^..+?\\u0007.", "").Split("\x7".ToCharArray()); + string[] NewPath = Regex.Replace(cai.Path + "\x7\x7\x7", "^..+?\\u0007.", "").Split("\x7".ToCharArray()); if (NewPath[0] != section) { section = NewPath[0];