Added TimeSheet Note Save Button

prs.mobile.new/PRS.Mobile.iOS/PRS.Mobile.iOS.csproj

@@ -156,7 +156,7 @@
         <PackageReference Include="Syncfusion.Xamarin.SfPopupLayout" Version="22.1.39" />
         <PackageReference Include="System.Json" Version="4.7.1" />
         <PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
-        <PackageReference Include="Xamarin.Forms" Version="5.0.0.2578" />
+        <PackageReference Include="Xamarin.Forms" Version="5.0.0.2612" />
         <PackageReference Include="Xamarin.IQKeyboardManager" Version="1.4.1" />
         <PackageReference Include="XF.Material" Version="1.8.0" />
         <PackageReference Include="ZXing.Net.Mobile" Version="2.4.1" />

prs.mobile.new/PRS.Mobile/Main/TimeSheetNotePage.xaml

@@ -9,6 +9,10 @@
     x:Class="PRS.Mobile.TimeSheetNotePage"
     BackgroundColor="Gray">
     
+    <mobile:MobilePage.PrimaryMenu>
+        <mobile:MobileMenuButton Image="save" Clicked="Save_Clicked" />
+    </mobile:MobilePage.PrimaryMenu>
+    
     <mobile:MobilePage.PageContent>
     
         <Frame x:Name="clockOffFrame" CornerRadius="10" BorderColor="Black" Margin="10,10,10,20" Padding="0">

prs.mobile.new/PRS.Mobile/Main/TimeSheetNotePage.xaml.cs

@@ -7,6 +7,7 @@ using InABox.Clients;
 using Comal.Classes;
 using System.Threading.Tasks;
 using System.Linq;
+using InABox.Mobile;
 
 namespace PRS.Mobile
 {
@@ -26,49 +27,9 @@ namespace PRS.Mobile
             InitializeComponent();
 
             timeSheet = _timeSheet;
-
-            NavigationPage.SetBackButtonTitle(this, "Cancel");
-
-            ToolbarItems.Clear();
-
-            ToolbarItems.Add(new ToolbarItem("Save", "", () =>
-            {
-                SaveNewNotes();
-                Navigation.PopAsync();
-            }));
-
-            LoadNewNotes();
-        }
-
-        private void LoadNewNotes()
-        {
-            Task.Run(() =>
-            {
-                try
-                {
-                    CoreTable table =
-                        new Client<TimeSheet>().Query
-                        (
-                        new Filter<TimeSheet>(x => x.ID).IsEqualTo(timeSheet.ID),
-                        new Columns<TimeSheet>(
-                        x => x.Notes
-                        ));
-                    if (table.Rows.Any())
-                    {
-                        CoreRow row = table.Rows.FirstOrDefault();
-                        List<object> list = row.Values;
-                        if (list[0] == null) { list[0] = ""; }
-                        Device.BeginInvokeOnMainThread(() =>
-                            {
-                        notesLbl.Text = list[0].ToString();
-                    });
-
-                    }
-                }
-                catch { }
-            });
+            notesLbl.Text = _timeSheet.Notes;
         }
-
+        
         private void SaveNewNotes()
         {
             try
@@ -88,5 +49,11 @@ namespace PRS.Mobile
             }
             catch { }
         }
+
+        private void Save_Clicked(object sender, MobileMenuButtonClickedEventArgs args)
+        {
+            SaveNewNotes();
+            Navigation.PopAsync();
+        }
     }
 }

prs.mobile.new/PRS.Mobile/PRS.Mobile.csproj

@@ -46,7 +46,7 @@
         <PackageReference Include="Xam.Plugin.Media" Version="6.0.2" />
         <PackageReference Include="Xamarin.CommunityToolkit" Version="2.0.6" />
         <PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
-        <PackageReference Include="Xamarin.Forms" Version="5.0.0.2578" />
+        <PackageReference Include="Xamarin.Forms" Version="5.0.0.2612" />
         <PackageReference Include="Xamarin.Forms.Maps" Version="5.0.0.2578" />
         <PackageReference Include="XF.Material" Version="1.8.0" />
         <PackageReference Include="ZXing.Net.Mobile" Version="2.4.1" />