diff --git a/VECTO/Configuration.vb b/VECTO/Configuration.vb index 613fc83ba340059db8600ae2e02c2aa5ef8f17ba..7ef8bfea2d8c5fcc3e5b391c968513a1a87d47dd 100644 --- a/VECTO/Configuration.vb +++ b/VECTO/Configuration.vb @@ -111,7 +111,7 @@ Public Class Configuration dic = New Dictionary(Of String, Object) dic.Add("CreatedBy", Lic.LicString & " (" & Lic.GUID & ")") - dic.Add("Date", Now.ToString) + dic.Add("Date", Now.ToUniversalTime().ToString("o")) dic.Add("AppVersion", VECTOvers) dic.Add("FileVersion", FormatVersion) json.Content.Add("Header", dic) diff --git a/VECTO/Input Files/cENG.vb b/VECTO/Input Files/cENG.vb index 14f533a2ab62896bb48a304c302f2b010c0d466a..72d732b2d50e3da77dfe2aa17b5cbb31080aa37c 100644 --- a/VECTO/Input Files/cENG.vb +++ b/VECTO/Input Files/cENG.vb @@ -193,7 +193,7 @@ End Property 'Header dic = New Dictionary(Of String, Object) dic.Add("CreatedBy", Lic.LicString & " (" & Lic.GUID & ")") - dic.Add("Date", Now.ToString) + dic.Add("Date", Now.ToUniversalTime().ToString("o")) dic.Add("AppVersion", VECTOvers) dic.Add("FileVersion", FormatVersion) JSON.Content.Add("Header", dic) diff --git a/VECTO/Input Files/cGBX.vb b/VECTO/Input Files/cGBX.vb index 4f4ba23381bf707b93f560f756164cd66a1a6939..6b6518593db6b12ee33526e0224cfe3007bd445c 100644 --- a/VECTO/Input Files/cGBX.vb +++ b/VECTO/Input Files/cGBX.vb @@ -157,7 +157,7 @@ Public Class cGBX 'Header dic = New Dictionary(Of String, Object) dic.Add("CreatedBy", Lic.LicString & " (" & Lic.GUID & ")") - dic.Add("Date", Now.ToString) + dic.Add("Date", Now.ToUniversalTime().ToString("o")) dic.Add("AppVersion", VECTOvers) dic.Add("FileVersion", FormatVersion) JSON.Content.Add("Header", dic) diff --git a/VECTO/Input Files/cVECTO.vb b/VECTO/Input Files/cVECTO.vb index 842ea56431ae59c84cefa67c5b7e6da64d531d44..b3dcf06c2bcc2bc3c36928840163981758d36d46 100644 --- a/VECTO/Input Files/cVECTO.vb +++ b/VECTO/Input Files/cVECTO.vb @@ -147,7 +147,7 @@ Public Class cVECTO 'Header json.Content.Add("Header", New Dictionary(Of String, Object) From { {"CreatedBy", Lic.LicString & " (" & Lic.GUID & ")"}, - {"Date", Now.ToString}, + {"Date", Now.ToUniversalTime().ToString("o")}, {"AppVersion", VECTOvers}, {"FileVersion", FormatVersion}}) @@ -525,7 +525,7 @@ Public Class cVECTO line = file.ReadLine - _laDesV.Add(CSng(line(0)) / 3.6) 'km/h => m/s !!!! + _laDesV.Add(CSng(line(0)) / 3.6) 'km/h => m/s !!!! _laDesMax.Add(CSng(line(1))) _laDesMin.Add(CSng(line(2))) diff --git a/VECTO/Input Files/cVEH.vb b/VECTO/Input Files/cVEH.vb index 65eee0efe439c2c88d5ac0bbf8b844b8a1e7155f..456aeb9cbf53d2d22662de0d3d1d2e8114a80d37 100644 --- a/VECTO/Input Files/cVEH.vb +++ b/VECTO/Input Files/cVEH.vb @@ -278,7 +278,7 @@ Public Class cVEH 'Header json.Content.Add("Header", New Dictionary(Of String, Object) From { {"CreatedBy", Lic.LicString & " (" & Lic.GUID & ")"}, - {"Date", Now.ToString}, + {"Date", Now.ToUniversalTime().ToString("o")}, {"AppVersion", VECTOvers}, {"FileVersion", FormatVersion}}) diff --git a/VECTO/MODcalc/cMOD.vb b/VECTO/MODcalc/cMOD.vb index 072191c58301e6a1c50f07be5ccbd592d740a4a7..b82a9ae3ae8bef569288a1b3743c4f1ee3520060 100644 --- a/VECTO/MODcalc/cMOD.vb +++ b/VECTO/MODcalc/cMOD.vb @@ -560,7 +560,7 @@ Public Class cMOD If DEV.AdvFormat Then f.WriteLine("VECTO " & VECTOvers) - f.WriteLine(Now.ToString) + f.WriteLine(Now.ToUniversalTime().ToString("o")) f.WriteLine("Input File: " & JobFile) End If diff --git a/VECTO/cDeclaration.vb b/VECTO/cDeclaration.vb index 5f61cfced3b63ef3ce9a596a7656dfca7ba7c095..1781c4db394b89dc914f74098fc250f2577e4a16 100644 --- a/VECTO/cDeclaration.vb +++ b/VECTO/cDeclaration.vb @@ -876,7 +876,7 @@ lbInt: .AxleConf = SegRef.AxleConf .MassMaxStr = VEH.MassMax & "t" .JobFile = fFILE(JobFile, True) - .DateStr = Now.ToString + .DateStr = Now.ToUniversalTime().ToString("o") .Creator = Lic.LicString .EngStr = (ENG.Displ / 1000).ToString("0.0") & " l " & Math.Round(ENG.Pmax, 0).ToString("#") & " kW" .EngModelStr = ENG.ModelName diff --git a/VECTO/cVSUM.vb b/VECTO/cVSUM.vb index 8449badabedaf3982152e184c25428a6867019b4..c1dbef4cbcb12289126a8ccfe336962c41f79b65 100644 --- a/VECTO/cVSUM.vb +++ b/VECTO/cVSUM.vb @@ -527,7 +527,7 @@ Public Class cVSUM dic = New Dictionary(Of String, Object) dic.Add("CreatedBy", Lic.LicString & " (" & Lic.GUID & ")") - dic.Add("Date", Now.ToString) + dic.Add("Date", Now.ToUniversalTime().ToString("o")) dic.Add("AppVersion", VECTOvers) dic.Add("FileVersion", FormatVersion) vsumJSON.Content.Add("Header", dic) @@ -545,7 +545,7 @@ Public Class cVSUM 'Info If DEV.AdvFormat Then Fvsum.WriteLine("VECTO " & VECTOvers) - Fvsum.WriteLine(Now.ToString) + Fvsum.WriteLine(Now.ToUniversalTime().ToString("o")) Fvsum.WriteLine("Input File: " & JobFile) End If @@ -758,28 +758,28 @@ End Class Public Class cVSUMentry Public Head As String Public Unit As String - Public MyVal As Object - Public Multi As Boolean + Public MyVal As Object + Public Multi As Boolean - Public Sub New(ByVal HeadStr As String, ByVal UnitStr As String) - Head = HeadStr - Unit = UnitStr - MyVal = Nothing + Public Sub New(ByVal HeadStr As String, ByVal UnitStr As String) + Head = HeadStr + Unit = UnitStr + MyVal = Nothing Multi = False End Sub - Public Property ValueString As Object - Get - If MyVal Is Nothing Then - Return "-" - Else - Return MyVal - End If - End Get - Set(value As Object) - MyVal = value - End Set - End Property + Public Property ValueString As Object + Get + If MyVal Is Nothing Then + Return "-" + Else + Return MyVal + End If + End Get + Set(value As Object) + MyVal = value + End Set + End Property diff --git a/VectoCore/VectoCore/OutputData/PDF/PDFDeclarationReport.cs b/VectoCore/VectoCore/OutputData/PDF/PDFDeclarationReport.cs index 1b00382da93f601a9abb974b4fa490f69099f626..f5e2e3b24df131fdb643ec627b141950664954b3 100644 --- a/VectoCore/VectoCore/OutputData/PDF/PDFDeclarationReport.cs +++ b/VectoCore/VectoCore/OutputData/PDF/PDFDeclarationReport.cs @@ -97,7 +97,7 @@ namespace TUGraz.VectoCore.OutputData.PDF /// </summary> protected internal override void DoWriteReport() { - ReportDate = DateTime.Now.ToString(CultureInfo.InvariantCulture); + ReportDate = DateTime.Now.ToUniversalTime().ToString(CultureInfo.InvariantCulture); var tasks = new List<Task<Stream>> { Task.Run(() => CreateTitlePage(Missions)) }; tasks.AddRange(Missions