Compare commits
22 Commits
b531dacb25
...
e7298c5201
Author | SHA1 | Date | |
---|---|---|---|
e7298c5201 | |||
03cbaa055a | |||
389847c9ca | |||
140d7c72e0 | |||
8e682201d7 | |||
5e272075f8 | |||
09d1e93404 | |||
7fe4fab1b7 | |||
24597b0aa1 | |||
149c1b4252 | |||
186b2c132d | |||
34689f75ec | |||
c24d4f17a4 | |||
3967b319ad | |||
53bed9e015 | |||
e33902b912 | |||
f65d2067ba | |||
f6c86e4b56 | |||
8c952663ac | |||
076fdb37a9 | |||
f393acb343 | |||
27dcedbeaa |
@ -301,6 +301,7 @@
|
|||||||
<Content Include="fmtall\SHESAMall.xml" />
|
<Content Include="fmtall\SHESAMall.xml" />
|
||||||
<Content Include="fmtall\SHESSDall.xml" />
|
<Content Include="fmtall\SHESSDall.xml" />
|
||||||
<Content Include="fmtall\SHESSD_00all.xml" />
|
<Content Include="fmtall\SHESSD_00all.xml" />
|
||||||
|
<Content Include="fmtall\VEGPBckall.xml" />
|
||||||
<Content Include="fmtall\VEGP1all.xml" />
|
<Content Include="fmtall\VEGP1all.xml" />
|
||||||
<Content Include="fmtall\VEGP2all.xml" />
|
<Content Include="fmtall\VEGP2all.xml" />
|
||||||
<Content Include="fmtall\VEGPAlrall.xml" />
|
<Content Include="fmtall\VEGPAlrall.xml" />
|
||||||
@ -376,6 +377,7 @@
|
|||||||
<Content Include="fmtall\wst1all.xml" />
|
<Content Include="fmtall\wst1all.xml" />
|
||||||
<Content Include="fmtall\wst2all.xml" />
|
<Content Include="fmtall\wst2all.xml" />
|
||||||
<Content Include="fmtall\wstalrall.xml" />
|
<Content Include="fmtall\wstalrall.xml" />
|
||||||
|
<Content Include="fmtall\VEGPBckStpsall.xml" />
|
||||||
<Content Include="fmtall\wstbckall.xml" />
|
<Content Include="fmtall\wstbckall.xml" />
|
||||||
<Content Include="fmtall\wstcklall.xml" />
|
<Content Include="fmtall\wstcklall.xml" />
|
||||||
<Content Include="fmtall\wstdcsall.xml" />
|
<Content Include="fmtall\wstdcsall.xml" />
|
||||||
@ -510,6 +512,8 @@
|
|||||||
<Content Include="genmacall\shervsu.svg" />
|
<Content Include="genmacall\shervsu.svg" />
|
||||||
<Content Include="genmacall\shesam.svg" />
|
<Content Include="genmacall\shesam.svg" />
|
||||||
<Content Include="genmacall\shessd.svg" />
|
<Content Include="genmacall\shessd.svg" />
|
||||||
|
<Content Include="genmacall\VEGPBck.svg" />
|
||||||
|
<Content Include="genmacall\VEGPBckStps.svg" />
|
||||||
<Content Include="genmacall\VEGP1.svg" />
|
<Content Include="genmacall\VEGP1.svg" />
|
||||||
<Content Include="genmacall\VEGP2.svg" />
|
<Content Include="genmacall\VEGP2.svg" />
|
||||||
<Content Include="genmacall\VEGPAlr.svg" />
|
<Content Include="genmacall\VEGPAlr.svg" />
|
||||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
PROMS/Formats/fmtall/VEGPBckStpsall.xml
Normal file
BIN
PROMS/Formats/fmtall/VEGPBckStpsall.xml
Normal file
Binary file not shown.
BIN
PROMS/Formats/fmtall/VEGPBckall.xml
Normal file
BIN
PROMS/Formats/fmtall/VEGPBckall.xml
Normal file
Binary file not shown.
BIN
PROMS/Formats/genmacall/VEGPBck.svg
Normal file
BIN
PROMS/Formats/genmacall/VEGPBck.svg
Normal file
Binary file not shown.
BIN
PROMS/Formats/genmacall/VEGPBckStps.svg
Normal file
BIN
PROMS/Formats/genmacall/VEGPBckStps.svg
Normal file
Binary file not shown.
@ -21962,8 +21962,8 @@ UPDATE Formats SET ApplicablePlant = 4 WHERE [Description] LIKE '%Beaver Valley%
|
|||||||
UPDATE Formats SET ApplicablePlant = 5 WHERE [Description] LIKE '%Byr-Bwd%' OR ([Name] LIKE 'EXC%' OR [Name] LIKE 'EXEB%' OR [Name] LIKE 'CWE%');
|
UPDATE Formats SET ApplicablePlant = 5 WHERE [Description] LIKE '%Byr-Bwd%' OR ([Name] LIKE 'EXC%' OR [Name] LIKE 'EXEB%' OR [Name] LIKE 'CWE%');
|
||||||
UPDATE Formats SET ApplicablePlant = 6 WHERE [Description] LIKE '%Callaway%' OR [Name] LIKE 'CAL%';
|
UPDATE Formats SET ApplicablePlant = 6 WHERE [Description] LIKE '%Callaway%' OR [Name] LIKE 'CAL%';
|
||||||
UPDATE Formats SET ApplicablePlant = 7 WHERE [Description] LIKE '%Catawba%' OR [Name] LIKE 'CAT%';
|
UPDATE Formats SET ApplicablePlant = 7 WHERE [Description] LIKE '%Catawba%' OR [Name] LIKE 'CAT%';
|
||||||
UPDATE Formats SET ApplicablePlant = 8 WHERE [Description] LIKE '%Comanche%' OR ([Name] LIKE 'CAT%' OR [Name] LIKE 'ComPeak%' OR [Name] LIKE 'CPD%' OR [Name] LIKE 'CPF%' OR [Name] LIKE 'CPS%' OR [Name] LIKE 'TUEC%');
|
UPDATE Formats SET ApplicablePlant = 8 WHERE [Description] LIKE '%Comanche%' OR ([Name] LIKE 'ComPeak%' OR [Name] LIKE 'CPD%' OR [Name] LIKE 'CPF%' OR [Name] LIKE 'CPS%' OR [Name] LIKE 'TUEC%');
|
||||||
UPDATE Formats SET ApplicablePlant = 9 WHERE [Description] LIKE '%Robinson%' OR [Name] LIKE 'AEP%' OR [Name] LIKE 'RNP%';
|
UPDATE Formats SET ApplicablePlant = 9 WHERE [Description] LIKE '%Robinson%' OR [Name] LIKE 'RNP%';
|
||||||
UPDATE Formats SET ApplicablePlant = 10 WHERE [Description] LIKE '%Harris%' OR ([Name] LIKE 'CPLS%' OR [Name] LIKE 'SHE%');
|
UPDATE Formats SET ApplicablePlant = 10 WHERE [Description] LIKE '%Harris%' OR ([Name] LIKE 'CPLS%' OR [Name] LIKE 'SHE%');
|
||||||
UPDATE Formats SET ApplicablePlant = 11 WHERE [Description] LIKE '%IP%' OR [Name] LIKE 'IP%';
|
UPDATE Formats SET ApplicablePlant = 11 WHERE [Description] LIKE '%IP%' OR [Name] LIKE 'IP%';
|
||||||
UPDATE Formats SET ApplicablePlant = 12 WHERE [Description] LIKE '%Farley%' OR [Name] LIKE 'FNP%';
|
UPDATE Formats SET ApplicablePlant = 12 WHERE [Description] LIKE '%Farley%' OR [Name] LIKE 'FNP%';
|
||||||
|
@ -4104,7 +4104,7 @@ namespace VEPROMS.CSLA.Library
|
|||||||
ItemInfo srcItem = ItemInfo.Get(eds[0].ItemID);
|
ItemInfo srcItem = ItemInfo.Get(eds[0].ItemID);
|
||||||
if (srcItem == null) return null;
|
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:
|
// B2018-118: the LinkedOrdinal count must take into account cautions versus notes types:
|
||||||
ItemInfo hls = srcItem.MyHLS;
|
ItemInfo hls = srcItem.MyHLS;
|
||||||
bool enIsCaution = this.IsCaution;
|
bool enIsCaution = this.IsCaution;
|
||||||
|
@ -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_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_WordContentLandscaped = 0x800000000, // for this section, the word content is landscaped.
|
||||||
DSS_ChklstEditSize = 0x100000000, // Westinghouse checklist - edit window size
|
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
|
public enum E_DocStyleUse : uint
|
||||||
{
|
{
|
||||||
|
@ -1912,7 +1912,11 @@ namespace Volian.Print.Library
|
|||||||
float bcm_yLocation = TableBottom == -1 ? yLocation: Math.Min(TableBottom,yLocation);
|
float bcm_yLocation = TableBottom == -1 ? yLocation: Math.Min(TableBottom,yLocation);
|
||||||
DoBottomContinueMsg(cb, yBottomMargin, bcm_yLocation, docstyle, doThreeContinues);
|
DoBottomContinueMsg(cb, yBottomMargin, bcm_yLocation, docstyle, doThreeContinues);
|
||||||
MyPromsPrinter.NewPage();
|
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,
|
// 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
|
// flag that a continue message should be printed as part of a pagelist header (if pagelist
|
||||||
@ -2823,6 +2827,40 @@ namespace Volian.Print.Library
|
|||||||
ItemInfo parentStep = MyItemInfo.MyHLS; // get the high level step
|
ItemInfo parentStep = MyItemInfo.MyHLS; // get the high level step
|
||||||
myMsg = string.Format(myMsg, parentStep.CombinedTab, parentStep.DisplayTextKeepSpecialChars);
|
myMsg = string.Format(myMsg, parentStep.CombinedTab, parentStep.DisplayTextKeepSpecialChars);
|
||||||
}
|
}
|
||||||
|
// B2023-115 Top continue message for Vogtle Alarms: 1st version done on 12/6/23. Changes to logic as per request
|
||||||
|
// from engineering done on 12/12/23. See comment below for logic for 12/12/23 (history of this file has previous
|
||||||
|
// logic)
|
||||||
|
if ((docstyle.Continue.Top.HLS ?? 0) == 4)
|
||||||
|
{
|
||||||
|
// Vogtle Alarms: Their alarms are set up differently than standard procedures - the HLS in Vogtle
|
||||||
|
// alarms is a section in other procedures. The top continue message is shown when a break occurs:
|
||||||
|
// • A continued message will appear on the top of the page ONLY if the pagination occurs anywhere
|
||||||
|
// within the first level substep. If, for example, the page break occurs between substep 3 and substep
|
||||||
|
// 4 as in example 2, no continued message will appear on the top of the page.
|
||||||
|
// • If a continued message is needed, the continued message will include the first level substep number
|
||||||
|
// if it is a sequential substep, such as “5. (continued)”. If it is NOT a sequential substep, then only
|
||||||
|
// the word “(continued)” will appear.
|
||||||
|
// • If a page break occurs between high level steps, such as before “Causes:”, then no continued message is needed.
|
||||||
|
bool doMessage = true;
|
||||||
|
if (MyItemInfo.IsHigh) doMessage = false; // at high, don't do message
|
||||||
|
if (MyItemInfo.MyParent.IsHigh) doMessage = false; // at first level, don't do message
|
||||||
|
// Caution/Note on first level, don't do message
|
||||||
|
if ((MyItemInfo.IsCaution || MyItemInfo.IsNote) && MyItemInfo.MyParent.MyParent.IsHigh) doMessage = false;
|
||||||
|
myMsg = docstyle.Continue.Top.Message;
|
||||||
|
if (doMessage)
|
||||||
|
{
|
||||||
|
// Get to highest level below HLS
|
||||||
|
ItemInfo cur = MyItemInfo;
|
||||||
|
while (!cur.MyParent.IsHigh) cur = cur.MyParent;
|
||||||
|
// if sequential, add on step number, otherwise just put out message:
|
||||||
|
myMsg = !cur.IsSequential ? myMsg : cur.CombinedTab + ". " + myMsg;
|
||||||
|
}
|
||||||
|
else // if not doing message, clear it & set yPageStart back to what it was before handling message
|
||||||
|
{
|
||||||
|
myMsg = "";
|
||||||
|
yPageStart += 2 * SixLinesPerInch;
|
||||||
|
}
|
||||||
|
}
|
||||||
// B2021-138: Top continue message for Barakah Single column New (2021) format was incorrect for some lower
|
// B2021-138: Top continue message for Barakah Single column New (2021) format was incorrect for some lower
|
||||||
// sub-steps.
|
// sub-steps.
|
||||||
if ((docstyle.Continue.Top.HLS ?? 0) == 6)
|
if ((docstyle.Continue.Top.HLS ?? 0) == 6)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user