From 5f9331b1b8755883e468ccc808672ee1ebee533a Mon Sep 17 00:00:00 2001 From: John Date: Fri, 16 May 2014 18:23:59 +0000 Subject: [PATCH] =?UTF-8?q?Added=20the=20PrintCommonForZeroUnit=20format?= =?UTF-8?q?=20flag=20Print=20=E2=80=9CCOMMON=E2=80=9D=20instead=20of=20?= =?UTF-8?q?=E2=80=9CUNIT=200=E2=80=9D=20logic=20(Comanche=20Peak)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Format/PlantFormat.cs | 9 +++++++++ .../Volian.Print.Library/VlnSvgPageHelper.cs | 6 +++++- PROMS/fmtxml/FmtFileToXml.cs | 5 ++++- PROMS/fmtxml/PlantSpecific_ComanchePeak.cs | 11 +++++++++++ PROMS/fmtxml/TranslateFMT.XSL | Bin 211440 -> 211908 bytes 5 files changed, 29 insertions(+), 2 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 62be36bc..cc7c3470 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -753,6 +753,15 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SpecialCaseWestinghouse, "@SpecialCaseWestinghouse"); } } + // Put in for Comanche Peak to print "COMMON" for the unit number instead of "Unit 0" + private LazyLoad _PrintCommonForZeroUnit; + public bool PrintCommonForZeroUnit + { + get + { + return LazyLoad(ref _PrintCommonForZeroUnit, "@PrintCommonForZeroUnit"); + } + } } #endregion #region VersionIdText diff --git a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs index 4f6d853a..2befffa7 100644 --- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs +++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs @@ -1320,7 +1320,11 @@ namespace Volian.Print.Library break; case "{UNITNUMBER}": case "[UNITNUMBER]": - plstr = plstr.Replace(token, MySection.MyDocVersion.DocVersionConfig.Unit_Number); + string unbr = MySection.MyDocVersion.DocVersionConfig.Unit_Number; + if (MySection.ActiveFormat.PlantFormat.FormatData.PrintData.PrintCommonForZeroUnit && unbr == "0") + plstr = "COMMON"; // for Comanche Peak, replace "Unit 0" with "COMMON" + else + plstr = plstr.Replace(token, unbr); break; case "{ATTACHNUM}": case "[ATTACHNUM]": diff --git a/PROMS/fmtxml/FmtFileToXml.cs b/PROMS/fmtxml/FmtFileToXml.cs index c5a974e3..893ccf0e 100644 --- a/PROMS/fmtxml/FmtFileToXml.cs +++ b/PROMS/fmtxml/FmtFileToXml.cs @@ -424,7 +424,9 @@ public struct GeneralPrint // this piece of data is stored in the config for a docversion & is used for pagelist items. public string UnitNumber; // Added for BGE: didn't want to name it for them, but that's what it is - public string SpecialCaseCalvert; + public string SpecialCaseCalvert; + // added for Comanche Peak to print "COMMON" in place of "Unit 0" (from pagelist) + public string PrintCommonForZeroUnit; // added for Comanche Peak to print "COMMON" in place of "Unit 0" (from pagelist) //public string SpecialStepsFoldout; // Added AllowDuplex to eliminate hardcoded check for WEP2 and WPB formats // for the Disable Automatic Duplexing @@ -4922,6 +4924,7 @@ namespace fmtxml if (mainFmt.PrintData.RevDateWithForwardSlash != null && mainFmt.PrintData.RevDateWithForwardSlash == subFmt.PrintData.RevDateWithForwardSlash) subFmt.PrintData.RevDateWithForwardSlash = "null"; if (mainFmt.PrintData.UnitNumber != null && mainFmt.PrintData.UnitNumber == subFmt.PrintData.UnitNumber) subFmt.PrintData.UnitNumber = "null"; if (mainFmt.PrintData.UnitNumber != null && mainFmt.PrintData.UnitNumber == subFmt.PrintData.UnitNumber) subFmt.PrintData.UnitNumber = "null"; if (mainFmt.PrintData.SpecialCaseCalvert != null && mainFmt.PrintData.SpecialCaseCalvert == subFmt.PrintData.SpecialCaseCalvert) subFmt.PrintData.SpecialCaseCalvert = "null"; + if (mainFmt.PrintData.PrintCommonForZeroUnit != null && mainFmt.PrintData.PrintCommonForZeroUnit == subFmt.PrintData.PrintCommonForZeroUnit) subFmt.PrintData.PrintCommonForZeroUnit = "null"; //if (mainFmt.PrintData.SpecialStepsFoldout != null && mainFmt.PrintData.SpecialStepsFoldout == subFmt.PrintData.SpecialStepsFoldout) subFmt.PrintData.SpecialStepsFoldout = "null"; if (mainFmt.PrintData.AccessoryDocsInDuplex != null && mainFmt.PrintData.AccessoryDocsInDuplex == subFmt.PrintData.AccessoryDocsInDuplex) subFmt.PrintData.AccessoryDocsInDuplex = "null"; if (mainFmt.PrintData.AllowDuplex != null && mainFmt.PrintData.AllowDuplex == subFmt.PrintData.AllowDuplex) subFmt.PrintData.AllowDuplex = "null"; diff --git a/PROMS/fmtxml/PlantSpecific_ComanchePeak.cs b/PROMS/fmtxml/PlantSpecific_ComanchePeak.cs index c61e00c5..b6986016 100644 --- a/PROMS/fmtxml/PlantSpecific_ComanchePeak.cs +++ b/PROMS/fmtxml/PlantSpecific_ComanchePeak.cs @@ -9,6 +9,7 @@ namespace fmtxml { private void AddTuecfmt(ref FormatData fmtdata) // Comanche Peak { + fmtdata.PrintData.PrintCommonForZeroUnit = "True"; // SectionNumber fmtdata.SectData.SectionNumber.Pos = 0; fmtdata.SectData.SectionNumber.Just = "PSLeft"; @@ -37,6 +38,16 @@ namespace fmtxml fmtdata.StepData[7].OneLineBeforeTab = "True"; // Continuous Action High Level Step fmtdata.StepData[9].TabData.Ident = "*{numeric} "; + // LossOfAC - still working on this + //fmtdata.StepData[18].ColOverride = "38"; + //fmtdata.StepData[18].ColOverrideEdit = "38"; + //fmtdata.StepData[18].WidthOverride = "438,192,120"; + //fmtdata.StepData[18].WidthOverrideEdit = "438,192,120"; + //fmtdata.StepData[18].StepEditData.TypeMenu.MenuItem = "Symptoms and Entry Step"; + //fmtdata.StepData[18].TabData.IdentEdit = "{numeric}) "; + //fmtdata.StepData[18].TabData.Ident = "{numeric}) "; + //fmtdata.StepData[18].TabData.RNOIdentEdit = " "; + //fmtdata.StepData[18].TabData.Justify = "Left"; // Caution 2 fmtdata.StepData[21].ParentType = "Base"; // Paragraph diff --git a/PROMS/fmtxml/TranslateFMT.XSL b/PROMS/fmtxml/TranslateFMT.XSL index 15c94e72830bd7c8d6a0e4e2f5ad70f41891fac1..6c47c98223453986499fbde9b3211a2e87216768 100644 GIT binary patch delta 170 zcmezHndiuNo((C|ngI+&44Djh3?&TC4EYSXK$s8YxdF){hA4(qAeqk)3KYrQ94~Dz zFj;_8XL5iu%j9{IZ1My&OgmWBbO{*h0{N7V-lXMkh*BPfh40r^EvJIbJ~nR M%(VTSHnS2R0Qbo))c^nh delta 49 zcmX@|o#(@6o((C|n