Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

C2025-033 Added a new field and supporting logic to specify if a PageStyle item should be printed for the Child procedure being printed.

Browse Source
This commit is contained in:
John Jenko 2025-05-16 10:52:37 -04:00
parent 59372b23e4
commit 69f8e3f4fc
7 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PROMS/Formats/Formats.csproj
View File

@ -282,6 +282,10 @@
<Content Include="fmtall\NSPWGall.xml" />
<Content Include="fmtall\NSP_00all.xml" />
<Content Include="fmtall\OHLPall.xml" />
<Content Include="fmtall\PROMSDemo1all.xml" />
<Content Include="fmtall\PROMSDemo2all.xml" />
<Content Include="fmtall\PROMSDemoALRall.xml" />
<Content Include="fmtall\PROMSDemoBCKall.xml" />
<Content Include="fmtall\PROMSMan1all.xml" />
<Content Include="fmtall\PROMSMan2all.xml" />
<Content Include="fmtall\RGEall.xml" />
@ -499,6 +503,10 @@
<Content Include="genmacall\nspsam.svg" />
<Content Include="genmacall\nspsamdev.svg" />
<Content Include="genmacall\ohlp.svg" />
<Content Include="genmacall\PROMSDemo1.svg" />
<Content Include="genmacall\PROMSDemo2.svg" />
<Content Include="genmacall\PROMSDemoALR.svg" />
<Content Include="genmacall\PROMSDemoBCK.svg" />
<Content Include="genmacall\PROMSMan1.svg" />
<Content Include="genmacall\PROMSMan2.svg" />
<Content Include="genmacall\rge.svg" />

BIN
PROMS/Formats/fmtall/PROMSDemo1all.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/PROMSDemo2all.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/PROMSDemoALRall.xml
View File

Binary file not shown.

7
PROMS/VEPROMS User Interface/DlgPrintProcedure.cs
View File

@ -418,7 +418,12 @@ namespace VEPROMS
//txbPDFLocation.Text = _PDFPath;
BuildPDFFileName();
ProcedureConfig pc = _MyProcedure.MyConfig as ProcedureConfig;
if(SelectedSlave > 0) pc.SelectedSlave = SelectedSlave;
// C2025-033 set which Child procedure is being printed used for PageStyle items
VlnSvgPageHelper.PrintingChild = SelectedSlave;
if (SelectedSlave > 0)
{
pc.SelectedSlave = SelectedSlave;
}
if (pc != null)
{
//C2021-062 use the save rev number for all procedures if set, or just use the rev number in the current procedure config

10
PROMS/VEPROMS.CSLA.Library/Format/PageStyles.cs
View File

@ -244,6 +244,16 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _TrimEnding, "@TrimEnding");
}
}
// C2025-033 to specify to print pagestyle item for a specific Child procedure
private LazyLoad<int?> _ChildNum;
public int? ChildNum
{
get
{
return (LazyLoad(ref _ChildNum, "@ChildNum"));
}
}
#endregion
#region Override ToString
public override string ToString()

10
PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
View File

@ -252,6 +252,14 @@ namespace Volian.Print.Library
get { return _CountInApplProcs; }
set { _CountInApplProcs = value; }
}
// C2025-033 Child (slave) being printed
private static int _PrintingChild = 0;
public static int PrintingChild
{
get { return _PrintingChild; }
set { _PrintingChild = value; }
}
//private bool _AddBlankPagesForDuplexPrinting = false;
//public bool AddBlankPagesForDuplexPrinting // Tells us if a the option to add a blank page is turn on (for procedures with duplex foldouts)
//{
@ -1363,6 +1371,8 @@ i = 0;
foreach (VEPROMS.CSLA.Library.PageItem pageItem in pageStyle.PageItems)
{
if (pageItem.Token == null) continue; // can be null if token is dependent on PSI lookup!
// 2024-089 selectively print pagestyle item base on Child Procedure being printed
if (PrintingChild > 0 && pageItem.ChildNum > 0 && pageItem.ChildNum != PrintingChild) continue; // C2025-033 item should not be printed for this child
DidHLSText = false; // reset to false for this group of tokens.
//if (pageItem.Token.Contains("HLSTEXT"))
// Console.WriteLine("{0} - PageList Token", pageItem.Token);