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

Merging F2023-081 and F2023-087 from development into Master

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}":