From d5ba5d134cc6c47cc05c474c3348217f562dc4e5 Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Wed, 10 Aug 2016 16:21:22 +0200
Subject: [PATCH] updated time string to UTC and ISO8601
---
VECTO/Configuration.vb | 2 +-
VECTO/Input Files/cENG.vb | 2 +-
VECTO/Input Files/cGBX.vb | 2 +-
VECTO/Input Files/cVECTO.vb | 4 +-
VECTO/Input Files/cVEH.vb | 2 +-
VECTO/MODcalc/cMOD.vb | 2 +-
VECTO/cDeclaration.vb | 2 +-
VECTO/cVSUM.vb | 40 +++++++++----------
.../OutputData/PDF/PDFDeclarationReport.cs | 2 +-
9 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/VECTO/Configuration.vb b/VECTO/Configuration.vb
index 613fc83ba3..7ef8bfea2d 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 14f533a2ab..72d732b2d5 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 4f4ba23381..6b6518593d 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 842ea56431..b3dcf06c2b 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 65eee0efe4..456aeb9cbf 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 072191c583..b82a9ae3ae 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 5f61cfced3..1781c4db39 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 8449badabe..c1dbef4cbc 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 1b00382da9..f5e2e3b24d 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
--
GitLab