From 9e35e1ec4b610fbbc2d10c03b6d019ffc61f9fe4 Mon Sep 17 00:00:00 2001 From: Rich Date: Wed, 6 Feb 2013 16:36:34 +0000 Subject: [PATCH] Added new SlashReplace format variable to control how Slashes are treated when the procedure number is converted to a pdf name. Changed formating of Cautions (Not Bold and Heading removed underline) Corrected RO_Lookup logic for page Header. --- .../DlgPrintProcedure.cs | 5 ++++- .../Format/PlantFormat.cs | 8 ++++++++ PROMS/fmtxml/WSTALRall.xml | Bin 51010 -> 51022 bytes 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs index 062467cf..c5504613 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs @@ -270,7 +270,10 @@ namespace VEPROMS if (ProcNum == string.Empty) txbPDFName.Text = this.UnitNumber + ".pdf"; else - txbPDFName.Text = string.Format("{0}.pdf", ProcNum.Replace('/', '_').Replace('\\', '_')); + { + string slashReplace = _MyProcedure.ActiveFormat.PlantFormat.FormatData.PrintData.SlashReplace ?? "_"; + txbPDFName.Text = string.Format("{0}.pdf", ProcNum.Replace("/", slashReplace).Replace("\\", slashReplace)); + } if (txbPDFName.Text.StartsWith("*")) txbPDFName.Text = txbPDFName.Text.Replace("*", this.UnitNumber); ProcedureConfig pc = _MyProcedure.MyConfig as ProcedureConfig; diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 5c3cf744..e72de45d 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -635,6 +635,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SectionLevelFoldouts, "@SectionLevelFoldouts"); } } + private LazyLoad _SlashReplace; + public string SlashReplace + { + get + { + return LazyLoad(ref _SlashReplace, "@SlashReplace"); + } + } private LazyLoad _RevDateWithForwardSlash; public bool RevDateWithForwardSlash { diff --git a/PROMS/fmtxml/WSTALRall.xml b/PROMS/fmtxml/WSTALRall.xml index 816395c6df4236bbd865c0477cba565ece51f7e4..b14199ffdd684799abfd0a1022f7dd9e5660932f 100644 GIT binary patch delta 135 zcmX@q$9%4jdBY`U*