From ae2473ba245926f1496aae211753e2124249a628 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 31 Aug 2016 18:39:25 +0000 Subject: [PATCH] Fix to import Transitions in Grids (tables) --- .../VEPROMS User Interface/dlgExportImport.cs | 45 +++++++++++-------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/PROMS/VEPROMS User Interface/dlgExportImport.cs b/PROMS/VEPROMS User Interface/dlgExportImport.cs index 2828a5e4..5cb9d39b 100644 --- a/PROMS/VEPROMS User Interface/dlgExportImport.cs +++ b/PROMS/VEPROMS User Interface/dlgExportImport.cs @@ -1991,24 +1991,24 @@ namespace VEPROMS MyWriter.WriteAttributeString("userid", gi.UserID.ToString()); MyWriter.WriteEndElement(); } - private void ExportEntry(XmlElement xn, EntryInfo ei, string nodename) - { - /* - ContentID - DocID - DTS - UserID - */ - XmlElement xe = xn.OwnerDocument.CreateElement(nodename); - xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "contentid", ei.ContentID.ToString())); - xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "docid", ei.DocID.ToString())); - xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "dts", ei.DTS.ToString("MM/dd/yyyy HH:mm:ss.fff"))); - xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "userid", ei.UserID.ToString())); - //entry audits - ExportEntryAudits(xe, ei); - xn.AppendChild(xe); - ExportDocument(xe, ei.MyDocument, "document"); - } + private void ExportEntry(XmlElement xn, EntryInfo ei, string nodename) + { + /* + ContentID + DocID + DTS + UserID + */ + XmlElement xe = xn.OwnerDocument.CreateElement(nodename); + xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "contentid", ei.ContentID.ToString())); + xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "docid", ei.DocID.ToString())); + xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "dts", ei.DTS.ToString("MM/dd/yyyy HH:mm:ss.fff"))); + xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "userid", ei.UserID.ToString())); + //entry audits + ExportEntryAudits(xe, ei); + xn.AppendChild(xe); + ExportDocument(xe, ei.MyDocument, "document"); + } private void ExportEntryAudits(XmlElement xn, EntryInfo ei) { if (cbxExportAudits.Checked) @@ -2072,7 +2072,7 @@ namespace VEPROMS XmlElement xe = xn.OwnerDocument.CreateElement(nodename); xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "docid", di.DocID.ToString())); xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "libtitle", libDocTitle)); // di.LibTitle)); - xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "doccontent", Convert.ToBase64String(buf))); + xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "doccontent", Convert.ToBase64String(buf))); xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "docascii", di.DocAscii)); xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "config", di.Config)); xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "dts", di.DTS.ToString("MM/dd/yyyy HH:mm:ss.fff"))); @@ -2519,6 +2519,8 @@ namespace VEPROMS else replacewith = string.Format("#Link:TransitionRange:{0} {1} {2} {3}", trantype, transitionid, toid, rangeid); content.Text = content.Text.Replace(lookfor, replacewith); + if (content.MyGrid != null && content.MyGrid.Data != "") + content.MyGrid.Data = content.MyGrid.Data.Replace(lookfor, replacewith); content.FixTransitionText(TransitionInfo.Get(tt.TransitionID)); content.Save(); } @@ -2586,6 +2588,8 @@ namespace VEPROMS else replacewith = string.Format("#Link:TransitionRange:{0} {1} {2} {3}", trantype, transitionid, toid, rangeid); cc.Text = cc.Text.Replace(lookfor, replacewith); + if (cc.MyGrid != null && cc.MyGrid.Data != "") + cc.MyGrid.Data = cc.MyGrid.Data.Replace(lookfor, replacewith); bool forceConvertToText = false; if (TransitionInfo.Get(tt.TransitionID).MyItemToID.ActiveSection != null) { @@ -2628,6 +2632,8 @@ namespace VEPROMS else replacewith = string.Format("#Link:TransitionRange:{0} {1} {2} {3}", trantype, transitionid, toid, rangeid); cc.Text = cc.Text.Replace(lookfor, replacewith); + if (cc.MyGrid != null && cc.MyGrid.Data != "") + cc.MyGrid.Data = cc.MyGrid.Data.Replace(lookfor, replacewith); if (TransitionInfo.Get(tt.TransitionID).MyItemToID.ActiveSection != null) { SectionConfig sc = TransitionInfo.Get(tt.TransitionID).MyItemToID.ActiveSection.MyConfig as SectionConfig; @@ -3853,6 +3859,7 @@ namespace VEPROMS DateTime dts = DateTime.Parse(nd.Attributes.GetNamedItem("dts").InnerText); Grid gg = Grid.MakeGrid(content, data, config, dts, userid); gg.Save(); + content.MyGrid = gg; } // jsj 4-29-2016 appears to not be used