diff --git a/PROMS/Formats/fmtall/BGEOI_00all.xml b/PROMS/Formats/fmtall/BGEOI_00all.xml index 2fb99de3..e48eca64 100644 Binary files a/PROMS/Formats/fmtall/BGEOI_00all.xml and b/PROMS/Formats/fmtall/BGEOI_00all.xml differ diff --git a/PROMS/Formats/fmtall/BGEOIall.xml b/PROMS/Formats/fmtall/BGEOIall.xml index e14b5fef..7d15ecc5 100644 Binary files a/PROMS/Formats/fmtall/BGEOIall.xml and b/PROMS/Formats/fmtall/BGEOIall.xml differ diff --git a/PROMS/Formats/fmtall/BGESTPall.xml b/PROMS/Formats/fmtall/BGESTPall.xml index 2f324558..cb65a2cd 100644 Binary files a/PROMS/Formats/fmtall/BGESTPall.xml and b/PROMS/Formats/fmtall/BGESTPall.xml differ diff --git a/PROMS/Formats/genmacall/bgeoi.svg b/PROMS/Formats/genmacall/bgeoi.svg index 5da16c59..27d76d40 100644 Binary files a/PROMS/Formats/genmacall/bgeoi.svg and b/PROMS/Formats/genmacall/bgeoi.svg differ diff --git a/PROMS/Formats/genmacall/bgestp.svg b/PROMS/Formats/genmacall/bgestp.svg index da011299..7fc5a0a0 100644 Binary files a/PROMS/Formats/genmacall/bgestp.svg and b/PROMS/Formats/genmacall/bgestp.svg differ diff --git a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs index dff0edc8..f846c3c6 100644 --- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs +++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs @@ -1601,6 +1601,15 @@ namespace Volian.Print.Library else plstr = plstr.Replace(token, "ONE AND TWO"); break; + case "{INITIALS}": + // For Calvert: if this section has checkoffs turned on, put out this pagelist item: + // Get SectionInfos to access specific section config items... + SectionInfo si = SectionInfo.Get(MySection.ItemID); + SectionConfig sectCfg = si.MyConfig as SectionConfig; + int sc = sectCfg.Section_CheckoffListSelection; + if (sc < 2) plstr = plstr.Replace(token, ""); + else plstr = plstr.Replace(token, "INITIALS"); + break; case "{REVUNIT}": // copied from 16bit's pagelist.cs for BGE: string revUnit = null; diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index bfb4c3a1..57d587ad 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -4106,7 +4106,16 @@ namespace Volian.Print.Library if (itemInfo.IsHigh) { float CheckOffAdj = 0; - if (itemInfo.MyDocStyle.UseCheckOffs) + bool ChkOff = itemInfo.MyDocStyle.UseCheckOffs; + if (itemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert) + { + // For Calvert STP/OP: see if this section has checkoffs by looking in the section config: + SectionInfo si = SectionInfo.Get(itemInfo.ActiveSection.ItemID); + SectionConfig sectCfg = si.MyConfig as SectionConfig; + int sc = sectCfg.Section_CheckoffListSelection; + ChkOff = (sc >= 2); + } + if (ChkOff) { bool FmtHasAdj = false; if (formatInfo.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffAdjustment != null)