2 files changed, 55 insertions, 3 deletions
diff --git a/Timeline/Models/Converters/JsonDateTimeConverter.cs b/Timeline/Models/Converters/JsonDateTimeConverter.cs
index ef129a01..865b6251 100644
--- a/Timeline/Models/Converters/JsonDateTimeConverter.cs
+++ b/Timeline/Models/Converters/JsonDateTimeConverter.cs
@@ -3,7 +3,8 @@ using System.Diagnostics;
 using System.Globalization;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-
+using Timeline.Helpers;
+
 namespace Timeline.Models.Converters
 {
     public class JsonDateTimeConverter : JsonConverter<DateTime>
@@ -11,12 +12,12 @@ namespace Timeline.Models.Converters
         public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             Debug.Assert(typeToConvert == typeof(DateTime));
-            return DateTime.Parse(reader.GetString(), CultureInfo.InvariantCulture);
+            return DateTime.Parse(reader.GetString(), CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal);
         }
 
         public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializerOptions options)
         {
-            writer.WriteStringValue(value.ToUniversalTime().ToString("s", CultureInfo.InvariantCulture) + "Z");
+            writer.WriteStringValue(value.MyToUtc().ToString("s", CultureInfo.InvariantCulture) + "Z");
         }
     }
 }
diff --git a/Timeline/Models/Converters/MyDateTimeConverter.cs b/Timeline/Models/Converters/MyDateTimeConverter.cs
new file mode 100644
index 00000000..f125cd5c
--- /dev/null
+++ b/Timeline/Models/Converters/MyDateTimeConverter.cs
@@ -0,0 +1,51 @@
+using System;
+using System.ComponentModel;
+using System.Globalization;
+
+namespace Timeline.Models.Converters
+{
+    public class MyDateTimeConverter : TypeConverter
+    {
+        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+        {
+            return sourceType == typeof(string) || base.CanConvertFrom(context, sourceType);
+        }
+
+        public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+        {
+            return base.CanConvertTo(context, destinationType);
+        }
+
+        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            if (value is string text)
+            {
+                text = text.Trim();
+                if (text.Length == 0)
+                {
+                    return DateTime.SpecifyKind(DateTime.MinValue, DateTimeKind.Utc);
+                }
+
+                return DateTime.Parse(text, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal | DateTimeStyles.AssumeUniversal);
+            }
+
+            return base.ConvertFrom(context, culture, value);
+        }
+
+        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string) && value is DateTime)
+            {
+                DateTime dt = (DateTime)value;
+                if (dt == DateTime.MinValue)
+                {
+                    return string.Empty;
+                }
+
+                return dt.ToString("s", CultureInfo.InvariantCulture) + "Z";
+            }
+
+            return base.ConvertTo(context, culture, value, destinationType);
+        }
+    }
+}