Merge pull request 'B2025-048 Problem with Printing CAS Steps' (#623) from B2025-048 into Development
good for testing phase
This commit is contained in:
@@ -284,6 +284,15 @@ namespace VEPROMS
|
||||
cachePartInfo = PartInfo.CacheList;
|
||||
}
|
||||
|
||||
//B2025-048 Problem with Printing CAS Steps
|
||||
// skip doing section titles if printing CAS or CTAS
|
||||
// - was causing it to
|
||||
// skip/overwrite data
|
||||
if (OnlyShowContinuousActionSummary)
|
||||
{ MyPromsPrinter.PromsPrinterPrintType = PromsPrinterPrintType.CAS_Only; }
|
||||
if (OnlyShowTimeCriticalActionSummary)
|
||||
{ MyPromsPrinter.PromsPrinterPrintType = PromsPrinterPrintType.TCAS_only; }
|
||||
|
||||
_PdfFile = MyPromsPrinter.Print(PDFPath, MakePlaceKeeper, MakeContinuousActionSummary, MakeTimeCriticalActionSummary, PrtSectID);
|
||||
|
||||
ProfileTimer.Pop(profileDepth);
|
||||
|
@@ -85,6 +85,14 @@ namespace Volian.Print.Library
|
||||
ProgressSetup,
|
||||
LoadVlnParagraph
|
||||
}
|
||||
|
||||
//B2025-048 Problem with Printing CAS Steps
|
||||
public enum PromsPrinterPrintType
|
||||
{
|
||||
Normal,
|
||||
CAS_Only,
|
||||
TCAS_only
|
||||
}
|
||||
public class PromsPrinter
|
||||
{
|
||||
public bool NeedSupInfoBreak = false;
|
||||
@@ -331,6 +339,12 @@ namespace Volian.Print.Library
|
||||
get { return _MergedPdf; }
|
||||
set { _MergedPdf = value; }
|
||||
}
|
||||
|
||||
//B2025-048 Problem with Printing CAS Steps
|
||||
// default to Normal
|
||||
// will skip certain logic if CAS Only or CTS Only
|
||||
public PromsPrinterPrintType PromsPrinterPrintType { get; set; } = PromsPrinterPrintType.Normal;
|
||||
|
||||
public PromsPrinter(ItemInfo myItem, string rev, string watermark, bool debugOutput, bool origPgBrk, string backgroundFolder, bool openPDF, bool overWrite,
|
||||
ChangeBarDefinition cbd, String pdfFile, bool insertBlankPages, bool batchPrint, string prefix, bool saveLinks, int removeTrailngHardReturnsAndManualPageBreaks, string blankPageText, bool didAll, MergedPdf mergedPdf, string watermarkColor, int PrtSectID = -1)
|
||||
{
|
||||
|
@@ -2159,7 +2159,10 @@ namespace Volian.Print.Library
|
||||
}
|
||||
// If "doSectionTitleContinued" is true then print the section title with "(Continued)" appended to it
|
||||
// format must have ContinueSectinHeader format flag set to true
|
||||
if (doSectionTitleContinued)
|
||||
//B2025-048 Problem with Printing CAS Steps
|
||||
// skip this if printing CAS or CTAS - was causing it to
|
||||
// skip/overwrite data
|
||||
if (doSectionTitleContinued && MyPromsPrinter.PromsPrinterPrintType == PromsPrinterPrintType.Normal)
|
||||
{
|
||||
vlnParagraph sectContPara;
|
||||
string contMsg = (MyItemInfo.ActiveSection != null) ? MyItemInfo.ActiveSection.MyDocStyle.Continue.SectionTitle.AppendToTitle : ""; // C2018-003 fixed use of getting the active section
|
||||
|
Reference in New Issue
Block a user