diff --git a/src/Storage/Controllers/ContentOnDemandController.cs b/src/Storage/Controllers/ContentOnDemandController.cs index 5eb7dc1f..04aba04b 100644 --- a/src/Storage/Controllers/ContentOnDemandController.cs +++ b/src/Storage/Controllers/ContentOnDemandController.cs @@ -183,8 +183,18 @@ public async Task GetFormdataAsPdf([FromRoute] string org, [FromRoute] s MemoryStream pdfStream = new(); mergedDoc.Save(pdfStream); - instance.DataValues.TryGetValue("A2ArchRefTs", out string watermark); - watermark = (watermark ?? ((DateTime)instance.Created).ToLocalTime().ToString("dd-MM-yyyy HH:mm:ss", CultureInfo.InvariantCulture)) + DateTime created; + if (instance.DataValues.TryGetValue("A2ArchRefTs", out string a2ArchRefTs)) + { + created = DateTime.ParseExact(a2ArchRefTs, "dd-MM-yyyy HH:mm:ss", CultureInfo.InvariantCulture); + } + else + { + created = ((DateTime)instance.Created).ToLocalTime(); + } + + string timestampFormat = language == "en" ? "MM/dd/yyyy hh:mm:ss tt" : "dd.MM.yyyy HH:mm:ss"; + string watermark = created.ToString(timestampFormat, CultureInfo.InvariantCulture) + $" AR{instance.DataValues["A2ArchRef"]}"; using var finalPdfDocument = PdfReader.Open(pdfStream, PdfDocumentOpenMode.Modify);