Compare commits

..

No commits in common. "5d50ed6bdfbc86b5394bdacf306ef7715064f97f" and "d7ace4eaf936b014827de381c451298ddf012dd0" have entirely different histories.

8 changed files with 19 additions and 26 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -44,11 +44,8 @@ using System.Runtime.InteropServices;
// Revision DHH (day - no leading zero, two digit hour - military time // Revision DHH (day - no leading zero, two digit hour - military time
// //
// ********* REMEMBER TO CHECK THE AssemblyConfiguration SETTING (ABOVE) ******** // ********* REMEMBER TO CHECK THE AssemblyConfiguration SETTING (ABOVE) ********
[assembly: AssemblyVersion("2.1.2404.509")] [assembly: AssemblyVersion("2.1.2403.2209")]
[assembly: AssemblyFileVersion("2.1.2404.509")] [assembly: AssemblyFileVersion("2.1.2403.2209")]

View File

@ -4452,10 +4452,9 @@ namespace VEPROMS.CSLA.Library
} }
} }
// F2024-037 reset the seq sub-step numbering if the parent is an un-numbered high level step // F2024-037 reset the seq sub-step numbering if the parent is an un-numbered high level step
// F2024-049 changed to specify the level via the format file (Generic EOP and Vogtle 3&4) else if (sd.StepSectionLayoutData.ResetSeqNumberingAfterUnnumberedHLS && IsSequential && MyParent != null && MyParent.IsHigh && MyParent.MyTab.Text.Length == 0)
else if (sd.StepSectionLayoutData.ResetSeqNumberingAfterUnnumberedHLS != null && IsSequential && MyParent != null && MyParent.IsHigh && MyParent.MyTab.Text.Length == 0)
{ {
localPrintLevel = (int)sd.StepSectionLayoutData.ResetSeqNumberingAfterUnnumberedHLS; localPrintLevel--; // since parent is a high level step we only need to go back one level
itmp = (localPrintLevel + PrintBias + OffsetTab) % seqtabs.MaxIndex; itmp = (localPrintLevel + PrintBias + OffsetTab) % seqtabs.MaxIndex;
} }
if (!tbformat.Contains(@"{!C")) if (!tbformat.Contains(@"{!C"))

View File

@ -4508,9 +4508,8 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _AllowNoteCautionAdd, "@AllowNoteCautionAdd"); return LazyLoad(ref _AllowNoteCautionAdd, "@AllowNoteCautionAdd");
} }
} }
// F2024-049 changed to specify the sub-step level via the format file (Generic EOP and Vogtle 3&4) private LazyLoad<bool> _ResetSeqNumberingAfterUnnumberedHLS;
private LazyLoad<int?> _ResetSeqNumberingAfterUnnumberedHLS; public bool ResetSeqNumberingAfterUnnumberedHLS
public int? ResetSeqNumberingAfterUnnumberedHLS
{ {
get get
{ {

View File

@ -700,8 +700,6 @@ namespace Volian.Print.Library
try try
{ {
if (File.Exists(outputFileName)) if (File.Exists(outputFileName))
{
if (!BaselineTesting)
{ {
String tmpExt = System.IO.Path.GetExtension(outputFileName); String tmpExt = System.IO.Path.GetExtension(outputFileName);
String tmpPTH = System.IO.Path.GetDirectoryName(outputFileName); String tmpPTH = System.IO.Path.GetDirectoryName(outputFileName);
@ -718,7 +716,7 @@ namespace Volian.Print.Library
} while (files.Contains(filename)); } while (files.Contains(filename));
outputFileName = filename; outputFileName = filename;
}
} }
writer = PdfWriter.GetInstance(document, new FileStream(outputFileName, FileMode.Create)); writer = PdfWriter.GetInstance(document, new FileStream(outputFileName, FileMode.Create));