diff --git a/PROMS/Formats/Formats.csproj b/PROMS/Formats/Formats.csproj index 064f0f08..cc7b37d9 100644 --- a/PROMS/Formats/Formats.csproj +++ b/PROMS/Formats/Formats.csproj @@ -301,6 +301,7 @@ + @@ -376,7 +377,7 @@ - + @@ -512,6 +513,7 @@ + diff --git a/PROMS/Formats/fmtall/VEGP1all.xml b/PROMS/Formats/fmtall/VEGP1all.xml index c0d8b478..b90414e0 100644 Binary files a/PROMS/Formats/fmtall/VEGP1all.xml and b/PROMS/Formats/fmtall/VEGP1all.xml differ diff --git a/PROMS/Formats/fmtall/VEGP2all.xml b/PROMS/Formats/fmtall/VEGP2all.xml index fa6ee9b4..3016f4ef 100644 Binary files a/PROMS/Formats/fmtall/VEGP2all.xml and b/PROMS/Formats/fmtall/VEGP2all.xml differ diff --git a/PROMS/Formats/fmtall/VEGPBckStpsall.xml b/PROMS/Formats/fmtall/VEGPBckStpsall.xml new file mode 100644 index 00000000..2e1c10b3 Binary files /dev/null and b/PROMS/Formats/fmtall/VEGPBckStpsall.xml differ diff --git a/PROMS/Formats/fmtall/VEGPBckall.xml b/PROMS/Formats/fmtall/VEGPBckall.xml index 3501a8b3..396b8ea6 100644 Binary files a/PROMS/Formats/fmtall/VEGPBckall.xml and b/PROMS/Formats/fmtall/VEGPBckall.xml differ diff --git a/PROMS/Formats/genmacall/VEGPBckStps.svg b/PROMS/Formats/genmacall/VEGPBckStps.svg new file mode 100644 index 00000000..f81f5b07 Binary files /dev/null and b/PROMS/Formats/genmacall/VEGPBckStps.svg differ diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index f7ea84f7..110e2b15 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -4104,7 +4104,7 @@ namespace VEPROMS.CSLA.Library ItemInfo srcItem = ItemInfo.Get(eds[0].ItemID); if (srcItem == null) return null; - if (srcItem.IsHigh) return srcItem.Ordinal; + if (srcItem.IsHigh || srcItem.IsSection || srcItem.IsProcedure) return srcItem.Ordinal; // B2018-118: the LinkedOrdinal count must take into account cautions versus notes types: ItemInfo hls = srcItem.MyHLS; bool enIsCaution = this.IsCaution; diff --git a/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs b/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs index e4eefcc3..a89a2e3a 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs @@ -171,7 +171,8 @@ namespace VEPROMS.CSLA.Library DSS_PageListAddSectCont = 0x400000000, // for this section, add the top continue message when doing the ATTACHTITLECONT pagelist token (Calvert/Landscape word docs) DSS_WordContentLandscaped = 0x800000000, // for this section, the word content is landscaped. DSS_ChklstEditSize = 0x100000000, // Westinghouse checklist - edit window size - DSS_SameXOffSubsections = 0x2000000000, // print subsections at same offset as section & preceeding subsections,start HLS xoff at section text (not number) + DSS_SameXOffSubsections = 0x2000000000, // print subsections at same offset as section & preceeding subsections,start HLS xoff at section text (not number) + DSS_PageListBkgndStpContMsg = 0x4000000000, // Background Step Number printed via Pagelist with "{CM:(Cont)}" which will print "(cont)" next to step number if it's continued to the next page - (VEGPBckStp) F2023-112 }; public enum E_DocStyleUse : uint { diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index dbb64880..192b3ce9 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -1912,7 +1912,11 @@ namespace Volian.Print.Library float bcm_yLocation = TableBottom == -1 ? yLocation: Math.Min(TableBottom,yLocation); DoBottomContinueMsg(cb, yBottomMargin, bcm_yLocation, docstyle, doThreeContinues); MyPromsPrinter.NewPage(); - if (MyItemInfo.IsStep && (MyItemInfo.ActiveSection != null && ((MyItemInfo.ActiveSection.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_PageListSpBckgrnd) == E_DocStructStyle.DSS_PageListSpBckgrnd))) // C2018-003 fixed use of getting the active section + // C2018-003 fixed use of getting the active section + // F2023-112 Vogtle Units 3 & 4 background document format DSS_PageListBkgndStpContMsg to print continue message next to step number + if (MyItemInfo.IsStep && (MyItemInfo.ActiveSection != null && + ((MyItemInfo.ActiveSection.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_PageListSpBckgrnd) == E_DocStructStyle.DSS_PageListSpBckgrnd) || + ((MyItemInfo.ActiveSection.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_PageListBkgndStpContMsg) == E_DocStructStyle.DSS_PageListBkgndStpContMsg))) { // check if parent (can be HLS, Caution or Note) has the UseOldTemplate. If so, // flag that a continue message should be printed as part of a pagelist header (if pagelist