Merge pull request 'Development' (#46 ) from Development into master

Merging F2023-081 and F2023-087 from development into Master
Merge pull request 'F2023-081, F2023-087' (#45 ) from F2023-081_F2023-087 into Development
2023-07-26 09:49:07 -04:00 · 2023-07-26 09:33:15 -04:00 · 2023-07-26 09:11:03 -04:00
3 changed files with 5 additions and 0 deletions
--- a/PROMS/Formats/fmtall/VEGP2all.xml
+++ b/PROMS/Formats/fmtall/VEGP2all.xml
--- a/PROMS/Formats/fmtall/VEGPAlrall.xml
+++ b/PROMS/Formats/fmtall/VEGPAlrall.xml
--- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
+++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
@ -1887,6 +1887,11 @@ i = 0;
 				case "{PDFTime}":
 					plstr = plstr.Replace("{PDFTime}", DateTime.Now.ToString("HH:mm:ss"));
 					break;
+					// F2023-087:  Added PDFDate at PDFTime - note that cannot have multiple tokens in a conditional because of reg expression
+					//	processing.
+				case "[PDFDateAtTime]":
+					plstr = plstr.Replace("[PDFDateAtTime]", DateTime.Now.ToString("MM/dd/yyyy") + " at " + DateTime.Now.ToString("HH:mm:ss"));
+					break;
 				case "{EOPNUM}":
 				case "[EOPNUM]":
 				case "{PREDELIMEOPNUM}":
Author	SHA1	Message	Date
Devin Jankowski	957850f7cc	Merge pull request 'Development' (#46 ) from Development into master Merging F2023-081 and F2023-087 from development into Master	2023-07-26 09:49:07 -04:00
John Jenko	c2d43d8e78	Merge pull request 'F2023-081, F2023-087' (#45 ) from F2023-081_F2023-087 into Development The code change to support the new PageStyle token looks good.	2023-07-26 09:33:15 -04:00
Kathy Ruffing	fdb5918774	F2023-081, F2023-087 F2023-081: Westinghouse Proprietary statement added to Vogtle 3&4, alarm & dual column F2023-087: Pdf printed date/time added to Vogtle 3&4, alarm & dual column	2023-07-26 09:11:03 -04:00