Merge remote-tracking branch 'origin'

GSCFieldApp/App.xaml.cs

@@ -1,12 +1,12 @@
-using Windows.UI.Xaml;
-using System.Threading.Tasks;
-using GSCFieldApp.Services.SettingsServices;
 using GSCFieldApp.Services.DatabaseServices;
-using Windows.ApplicationModel.Activation;
+using GSCFieldApp.Services.SettingsServices;
+using System.Threading.Tasks;
 using Template10.Controls;
-using Windows.UI.Xaml.Data;
-using Windows.UI.ViewManagement;
+using Windows.ApplicationModel.Activation;
 using Windows.Foundation;
+using Windows.UI.ViewManagement;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Data;
 
 namespace GSCFieldApp
 {
@@ -31,10 +31,10 @@ public App()
             CacheMaxDuration = _settings.CacheMaxDuration;
             ShowShellBackButton = _settings.UseShellBackButton;
 
-            
+
 
             #endregion
-            
+
             SetESRILicence();
 
         }
@@ -51,13 +51,13 @@ public override Task OnStartAsync(StartKind startKind, IActivatedEventArgs args)
         /// <returns></returns>
         public override async Task OnInitializeAsync(IActivatedEventArgs args)
         {
-            
+
             //Will enable smaller size window for desktop testing, compared to default 500x320.
             ApplicationView.GetForCurrentView().SetPreferredMinSize(new Size(200, 200));
 
             if (Window.Current.Content as ModalDialog == null)
             {
-                // create a new frame 
+                // create a new frame
                 var nav = NavigationServiceFactory(BackButton.Attach, ExistingContent.Include);
 
                 // create modal root

GSCFieldApp/Converters/DateTimeConverter.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Windows.UI.Xaml.Data;
+
+namespace GSCFieldApp.Converters
+{
+    public class DateTimeConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            return new DateTimeOffset(((DateTime)value).ToUniversalTime());
+
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            return ((DateTimeOffset)value).DateTime;
+        }
+    }
+}

GSCFieldApp/Converters/ElevationConverter.cs

@@ -3,7 +3,7 @@
 
 namespace GSCFieldApp.Converters
 {
-    public class ElevationConverter: IValueConverter
+    public class ElevationConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, string language)
         {

GSCFieldApp/Converters/MandatoryFieldConverter.cs

@@ -13,7 +13,7 @@ public object Convert(object value, Type targetType, object parameter, string la
             }
             else if (value.ToString() != "")
             {
-                return value.ToString() + "*"; 
+                return value.ToString() + "*";
             }
             else
             {

GSCFieldApp/Converters/MediaBrushConverter.cs

@@ -9,7 +9,7 @@ namespace GSCFieldApp.Converters
     /// A converter that takes a solidColorBrush and output it as a  Windows.UI.Xaml.Media brush, which
     /// is used for foregrounds of fonts.
     /// </summary>
-    public class MediaBrushConverter: IValueConverter
+    public class MediaBrushConverter : IValueConverter
     {
         public Brush defaultBrush = new SolidColorBrush();
 

GSCFieldApp/Converters/PicklistDefaultValueConverter.cs

@@ -6,7 +6,7 @@ namespace GSCFieldApp.Converters
 {
     class PicklistDefaultValueConverter : IValueConverter
     {
-        
+
         public PicklistDefaultValueConverter()
         {
 

GSCFieldApp/Converters/PicklistDescriptionConverter.cs

@@ -13,7 +13,7 @@ public object Convert(object value, Type targetType, object parameter, string la
             }
             else if (value.ToString() != "")
             {
-                return "(" + value.ToString() + ")"; 
+                return "(" + value.ToString() + ")";
             }
             else
             {

GSCFieldApp/Converters/ReverseBoolConverter.cs

@@ -3,7 +3,7 @@
 
 namespace GSCFieldApp.Converters
 {
-    public class ReverseBoolConverter: IValueConverter
+    public class ReverseBoolConverter : IValueConverter
     {
 
         public ReverseBoolConverter()

GSCFieldApp/Converters/SecondOrderPicklistConverter.cs

@@ -3,7 +3,7 @@
 
 namespace GSCFieldApp.Converters
 {
-    public class SecondOrderPicklistConverter:IValueConverter
+    public class SecondOrderPicklistConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, string language)
         {

GSCFieldApp/Converters/SolidColorBrushConverter.cs

@@ -9,7 +9,7 @@ namespace GSCFieldApp.Converters
     /// A converter that takes a solidcolorbrush and outputs a solidcolorbrush, 
     /// with a default if value is null. Used for control colors.
     /// </summary>
-    public class SolidColorBrushConverter: IValueConverter
+    public class SolidColorBrushConverter : IValueConverter
     {
         readonly SolidColorBrush defaultBrush = new SolidColorBrush();
 

GSCFieldApp/Converters/String2Double.cs

@@ -1,7 +1,5 @@
 using System;
 using Windows.UI.Xaml.Data;
-using System.Diagnostics;
-using System.Globalization;
 
 namespace GSCFieldApp.Converters
 {

GSCFieldApp/Converters/String2Integer.cs

@@ -1,7 +1,5 @@
 using System;
 using Windows.UI.Xaml.Data;
-using System.Diagnostics;
-using System.Globalization;
 
 namespace GSCFieldApp.Converters
 {

GSCFieldApp/Converters/TextWithAzimDegreeConverter.cs

@@ -19,7 +19,7 @@ public object Convert(object value, Type targetType, object parameter, string la
                 return string.Format("{0}°", value);
             }
 
-            
+
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, string language)

GSCFieldApp/Converters/TextWithDegreeConverter.cs

@@ -11,15 +11,15 @@ public object Convert(object value, Type targetType, object parameter, string la
             {
                 return value;
             }
-                
-            else 
+
+            else
             {
                 double inDegree = double.Parse(value.ToString());
                 inDegree = Math.Round(inDegree, 8);
                 return string.Format("{0}°", inDegree.ToString());
             }
 
-            
+
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, string language)

GSCFieldApp/Converters/VisibilityFromReverseBoolConverter.cs

@@ -4,7 +4,7 @@
 
 namespace GSCFieldApp.Converters
 {
-    public class VisibilityFromReverseBoolConverter: IValueConverter
+    public class VisibilityFromReverseBoolConverter : IValueConverter
     {
 
         public VisibilityFromReverseBoolConverter()

GSCFieldApp/Converters/WidthFromVisibility.cs

@@ -1,11 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Data;
-using Windows.UI;
 
 namespace GSCFieldApp.Converters
 {

GSCFieldApp/Dictionaries/ApplicationLiterals.cs

@@ -7,7 +7,7 @@ public static class ApplicationLiterals
         //Will be use to keep track of user header expansion value in local settings.
         public const string KeyworkdExpandLocation = "expandLocation";
         public const string KeyworkdExpandStation = "expandStation";
-        public const string KeyworkdExpandEarthmat= "expandEarthmat";
+        public const string KeyworkdExpandEarthmat = "expandEarthmat";
         public const string KeyworkdExpandSample = "expandSample";
         public const string KeywordExpandDocument = "expandDocument";
         public const string KeywordExpandStructure = "expandStructure";
@@ -16,10 +16,11 @@ public static class ApplicationLiterals
         public const string KeywordExpandMineral = "expandMineral";
         public const string KeywordExpandMineralAlt = "expandMineralAlteration";
         public const string KeywordExpandEnv = "expandEnvironment";
+        public const string KeywordExpandDrill = "expandDrill";
 
         //Will be used to keep track of user photo or document model for document dialog
         public const string KeywordDocumentMode = "documentMode";
-        public const string KeywordDocumentHeaderTrue = "File";
+        public const string KeywordDocumentHeaderTrue = "Photo"; //Need to Fix this later
         public const string KeywordDocumentHeaderFalse = "Photo";
 
         //Will be used to keep track of user station travers incrementation option