Merge remote-tracking branch 'origin/dev-app'

NRCan · Jun 2, 2023 · d1a81d7 · d1a81d7
2 parents f0938ad + 992830a
commit d1a81d7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/GSCFieldApp/Package.appxmanifest b/GSCFieldApp/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="NaturalResourcesCanada.GeologicalSurveyCanadaField" Publisher="CN=Geological Survey of Canada, O=Natural Resources Canada, C=CA" Version="2.3.12.0" />
+  <Identity Name="NaturalResourcesCanada.GeologicalSurveyCanadaField" Publisher="CN=Geological Survey of Canada, O=Natural Resources Canada, C=CA" Version="2.3.13.0" />
   <mp:PhoneIdentity PhoneProductId="06e90cbe-1a34-4205-8fe6-3ce0ad4467db" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>Geological Survey Canada Field Application</DisplayName>

diff --git a/GSCFieldApp/Views/DocumentDialog.xaml.cs b/GSCFieldApp/Views/DocumentDialog.xaml.cs
@@ -50,7 +50,7 @@ public DocumentDialog(FieldNotes inDetailViewModel, FieldNotes stationSummaryID,
 
         private void DocumentSaveButton_GotFocus(object sender, RoutedEventArgs e)
         {
-            //this.documentSaveButton.GotFocus -= DocumentSaveButton_GotFocus;
+            this.documentSaveButton.GotFocus -= DocumentSaveButton_GotFocus;
 
             //Will save and close control only if a save can be performed.
             bool didSave = DocViewModel.SaveDialogInfoAsync();

diff --git a/GSCFieldApp/Views/EnvironmentDialog.xaml.cs b/GSCFieldApp/Views/EnvironmentDialog.xaml.cs
@@ -39,6 +39,7 @@ public EnvironmentDialog(FieldNotes inParentReport)
 
         private void EnvSaveButton_GotFocus(object sender, RoutedEventArgs e)
         {
+            this.envSaveButton.GotFocus -= EnvSaveButton_GotFocus;
             EnvViewModel.SaveDialogInfo();
             CloseControl();
         }

diff --git a/GSCFieldApp/Views/SampleDialog.xaml.cs b/GSCFieldApp/Views/SampleDialog.xaml.cs
@@ -38,6 +38,7 @@ public SampleDialog(FieldNotes inDetailViewModel, bool isQuickSample)
 
         private void SampleSaveButton_GotFocus(object sender, RoutedEventArgs e)
         {
+            this.sampleSaveButton.GotFocus -= SampleSaveButton_GotFocus;
             ViewModel.SaveDialogInfo();
             CloseControl();
         }