Convert date time to local time zone prior to formatting. (#275)

Author: jonathanrandev

src/DIPS.Xamarin.UI/Converters/ValueConverters/DateAndTimeConverter.cs

@@ -9,7 +9,7 @@
 namespace DIPS.Xamarin.UI.Converters.ValueConverters
 {
     /// <summary>
-    ///     Converters a DateTime object with an format and convert it to a readable string
+    ///     Converters a DateTime object with a format and convert it to a readable string in local time zone
     /// </summary>
     public class DateAndTimeConverter : IMarkupExtension, IValueConverter
     {
@@ -36,6 +36,11 @@ public enum DateAndTimeConverterFormat
             Text,
         }
 
+        /// <summary>
+        ///     Ignores the conversion to local timezone
+        /// </summary>
+        public bool IgnoreLocalTime { get; set; } = false;
+
         private const string Space = " ";
         private IServiceProvider m_serviceProvider;
 
@@ -60,9 +65,9 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
                 throw new XamlParseException("The input has to be of type DateTime").WithXmlLineInfo(m_serviceProvider);
             return Format switch
             {
-                DateAndTimeConverterFormat.Short => ConvertToShortFormat(dateTimeInput, culture),
+                DateAndTimeConverterFormat.Short => ConvertToShortFormat(dateTimeInput, culture, IgnoreLocalTime),
                 DateAndTimeConverterFormat.Text
-                    => ConvertToTextFormat(dateTimeInput, culture),
+                    => ConvertToTextFormat(dateTimeInput, culture, IgnoreLocalTime),
                 _ => string.Empty
             };
         }
@@ -74,11 +79,11 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu
             throw new NotImplementedException();
         }
 
-        private static string ConvertToTextFormat(DateTime dateTimeInput, CultureInfo culture)
+        private static string ConvertToTextFormat(DateTime dateTimeInput, CultureInfo culture, bool ignoreLocalTime)
         {
-            var date = new DateConverter {Format = DateConverter.DateConverterFormat.Text}.Convert(dateTimeInput, null,
+            var date = new DateConverter {Format = DateConverter.DateConverterFormat.Text, IgnoreLocalTime = ignoreLocalTime}.Convert(dateTimeInput, null,
                 null, culture);
-            var time = new TimeConverter {Format = TimeConverter.TimeConverterFormat.Default}.Convert(dateTimeInput,
+            var time = new TimeConverter {Format = TimeConverter.TimeConverterFormat.Default, IgnoreLocalTime = ignoreLocalTime}.Convert(dateTimeInput,
                 null, null, culture);
 
             if (culture.IsNorwegian())
@@ -94,11 +99,11 @@ private static string ConvertToTextFormat(DateTime dateTimeInput, CultureInfo cu
             return $"{date}{Space}{time}";
         }
 
-        private static string ConvertToShortFormat(DateTime dateTimeInput, CultureInfo culture)
+        private static string ConvertToShortFormat(DateTime dateTimeInput, CultureInfo culture, bool ignoreLocalTime)
         {
-            var date = new DateConverter {Format = DateConverter.DateConverterFormat.Short}.Convert(dateTimeInput, null,
+            var date = new DateConverter {Format = DateConverter.DateConverterFormat.Short, IgnoreLocalTime = ignoreLocalTime}.Convert(dateTimeInput, null,
                 null, culture);
-            var time = new TimeConverter {Format = TimeConverter.TimeConverterFormat.Default}.Convert(dateTimeInput,
+            var time = new TimeConverter {Format = TimeConverter.TimeConverterFormat.Default, IgnoreLocalTime = ignoreLocalTime}.Convert(dateTimeInput,
                 null, null, culture);
 
             return culture.IsNorwegian() ? $"{date}{Space}kl{Space}{time}" : $"{date}{Space}{time}";

src/DIPS.Xamarin.UI/Converters/ValueConverters/DateConverter.cs

@@ -10,7 +10,7 @@
 namespace DIPS.Xamarin.UI.Converters.ValueConverters
 {
     /// <summary>
-    ///     Converts an DateTime object to an format and convert it to a readable string
+    ///     Converts an DateTime object to a format and convert it to a readable string in local timezone
     /// </summary>
     public class DateConverter : IValueConverter, IMarkupExtension
     {
@@ -48,6 +48,11 @@ public enum DateConverterFormat
         /// </summary>
         public DateConverterFormat Format { get; set; }
 
+        /// <summary>
+        ///     Ignores the conversion to the local timezone
+        /// </summary>
+        public bool IgnoreLocalTime { get; set; }
+
         /// <inheritdoc />
         [ExcludeFromCodeCoverage]
         public object ProvideValue(IServiceProvider serviceProvider)
@@ -64,9 +69,9 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
                 throw new XamlParseException("The input has to be of type DateTime").WithXmlLineInfo(m_serviceProvider);
             return Format switch
             {
-                DateConverterFormat.Short => ConvertToDefaultDateTime(dateTimeInput, culture),
+                DateConverterFormat.Short => ConvertToDefaultDateTime(dateTimeInput, culture, IgnoreLocalTime),
                 DateConverterFormat.Text =>
-                    ConvertDateTimeAsText(dateTimeInput, culture),
+                    ConvertDateTimeAsText(dateTimeInput, culture, IgnoreLocalTime),
                 _ => string.Empty
             };
         }
@@ -78,8 +83,13 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu
             throw new NotImplementedException();
         }
 
-        private static string ConvertToDefaultDateTime(DateTime dateTime, CultureInfo culture)
+        private static string ConvertToDefaultDateTime(DateTime dateTime, CultureInfo culture, bool ignoreLocalTime)
         {
+            if (!ignoreLocalTime)
+            {
+                dateTime = dateTime.ToLocalTime();
+            }
+
             var day = GetDayBasedOnCulture(dateTime, culture);
 
             var month = GetMonthBasedOnCulture(dateTime, culture);
@@ -114,8 +124,13 @@ private static string GetDayBasedOnCulture(DateTime dateTime, CultureInfo cultur
             return day;
         }
 
-        private static string ConvertDateTimeAsText(DateTime dateTime, CultureInfo culture)
+        private static string ConvertDateTimeAsText(DateTime dateTime, CultureInfo culture, bool ignoreLocalTime)
         {
+            if (!ignoreLocalTime)
+            {
+                dateTime = dateTime.ToLocalTime();
+            }
+            
             if (dateTime.IsToday())
             {
                 return InternalLocalizedStrings.Today;

src/DIPS.Xamarin.UI/Converters/ValueConverters/TimeConverter.cs

@@ -9,7 +9,8 @@
 namespace DIPS.Xamarin.UI.Converters.ValueConverters
 {
     /// <summary>
-    ///     Converts an DateTime or TimeSpan object with a format and convert it to a readable time string
+    ///     Converts an DateTime or TimeSpan object with a format and convert it to a readable time string in local
+    ///     timezone
     /// </summary>
     public class TimeConverter : IMarkupExtension, IValueConverter
     {
@@ -32,6 +33,11 @@ public enum TimeConverterFormat
         /// </summary>
         public TimeConverterFormat Format { get; set; }
 
+        /// <summary>
+        ///     Ignores the conversion to the local timezone
+        /// </summary>
+        public bool IgnoreLocalTime { get; set; }
+
         /// <inheritdoc />
         [ExcludeFromCodeCoverage]
         public object ProvideValue(IServiceProvider serviceProvider)
@@ -55,7 +61,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
                     dateTimeInput += timeSpanInput;
                     break;
                 case DateTime dateTimeValue:
-                    dateTimeInput = dateTimeValue;
+                    dateTimeInput = IgnoreLocalTime ? dateTimeValue : dateTimeValue.ToLocalTime();
                     break;
             }