From 55bb5f8c9553b032809fe5d605e4f6a07736f80a Mon Sep 17 00:00:00 2001 From: Rich Date: Tue, 4 Dec 2012 22:41:01 +0000 Subject: [PATCH] Added ProcName attribute with value to History node of ConfigInfo xml For multi unit data, added Applicability attribute with value to MasterSlave node of ConfigInfo xml --- PROMS/DataLoader/Steps.cs | 57 ++++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/PROMS/DataLoader/Steps.cs b/PROMS/DataLoader/Steps.cs index 6a93bc68..f6318374 100644 --- a/PROMS/DataLoader/Steps.cs +++ b/PROMS/DataLoader/Steps.cs @@ -28,7 +28,14 @@ namespace DataLoader frmMain.UpdateLabels(0, 0, 1); ConfigInfo ci = new ConfigInfo(null); ci.AddItem("History", "RecID", Recid); - string stptext = null; + ci.AddItem("History", "ProcName", ProcFileName.ToUpper()); + if (MultiUnitCount > 0) + { + string apple = AddApplicability(Recid); + if(apple != null) + ci.AddItem("MasterSlave", "Applicability", apple); + } + string stptext = null; if (userid == null || userid == "") userid = "Migration"; int tok = -1; //char[] chrarr = { '\x1', '\x2', '\x3', '\x5' }; @@ -291,18 +298,18 @@ namespace DataLoader if (fmt.PlantFormat.FormatData.ProcData.ChangeBarData.ChgBarMessageFromEdit && fmt.PlantFormat.FormatData.ProcData.ChangeBarData.MultipleChangeIds) { - if ((nxttok = tkstring.IndexOf("\x2")) > -1) // Multiple Change Ids - { + if ((nxttok = tkstring.IndexOf("\x2")) > -1) // Multiple Change Ids + { string tmpchgid = tkstring.Substring(nxttok + 1); if (tmpchgid.Length > 0) { - //Console.WriteLine("Multiple Change ID: {0}", tkstring.Substring(nxttok + 1)); - ci.AddItem("Step", "MultipleChangeID", tkstring.Substring(nxttok + 1)); - recdirty = true; - //recdirty |= AddContentDetail(content, STP_MULT_CHGID, tkstring.Substring(nxttok + 1)); + //Console.WriteLine("Multiple Change ID: {0}", tkstring.Substring(nxttok + 1)); + ci.AddItem("Step", "MultipleChangeID", tkstring.Substring(nxttok + 1)); + recdirty = true; + //recdirty |= AddContentDetail(content, STP_MULT_CHGID, tkstring.Substring(nxttok + 1)); } - tkstring = tkstring.Substring(0, nxttok); - } + tkstring = tkstring.Substring(0, nxttok); + } } if ((nxttok = tkstring.IndexOf("\x1")) > -1) // Comment @@ -409,7 +416,7 @@ namespace DataLoader //MessageBox.Show("Before ConvertTableToGrid " + GC.GetTotalMemory(true).ToString()); using (VlnFlexGrid grd = new VlnFlexGrid(1, 1)) { - grd.IsRoTable = isROTable; + grd.IsRoTable = isROTable; if (isROTable) { // put the ROID and ROdb into the grid properties @@ -417,23 +424,23 @@ namespace DataLoader grd.RODbId = tablerodbid; grd.ROID = tableroid; } - VE_Font vefont = fmt.PlantFormat.FormatData.StepDataList.Table.Font; - Font GridFont = new Font(vefont.Family, (float)vefont.Size); - grd.Font = GridFont; // this also changes the default Row Height "Rows.DefaultSize" - grd.ParseTableFromText(stepText, border); - grd.AutoSizeCols(); - grd.AutoSizeRows(); - grd.MakeRTFcells(); + VE_Font vefont = fmt.PlantFormat.FormatData.StepDataList.Table.Font; + Font GridFont = new Font(vefont.Family, (float)vefont.Size); + grd.Font = GridFont; // this also changes the default Row Height "Rows.DefaultSize" + grd.ParseTableFromText(stepText,border); + grd.AutoSizeCols(); + grd.AutoSizeRows(); + grd.MakeRTFcells(); grd.FixTableCellsHeightWidth(); grd.AdjustGridControlSize(); - using (StringWriter sw = new StringWriter()) - { - grd.WriteXml(sw); - //Console.WriteLine(sw.GetStringBuilder().ToString()); - content.MyGrid.Data = sw.GetStringBuilder().ToString(); - strGrid = grd.GetSearchableText(); - sw.Close(); - } + using (StringWriter sw = new StringWriter()) + { + grd.WriteXml(sw); + //Console.WriteLine(sw.GetStringBuilder().ToString()); + content.MyGrid.Data = sw.GetStringBuilder().ToString(); + strGrid = grd.GetSearchableText(); + sw.Close(); + } if (isROTable) { // re-attach the RO Link prfix and suffix