Merge remote-tracking branch 'origin/nick' into frank

prs.desktop/Panels/Jobs/JobBillOfMaterialsItemsGrid.cs

@@ -26,10 +26,20 @@ namespace PRSDesktop
                 DynamicGridOption.DeleteRows
             );
             HiddenColumns.Add(x => x.Dimensions.Unit.ID);
+            HiddenColumns.Add(x => x.Dimensions.Unit.Format);
+            HiddenColumns.Add(x => x.Dimensions.Unit.Formula);
+            HiddenColumns.Add(x => x.Dimensions.Unit.HasLength);
+            HiddenColumns.Add(x => x.Dimensions.Unit.HasWidth);
+            HiddenColumns.Add(x => x.Dimensions.Unit.HasWeight);
+            HiddenColumns.Add(x => x.Dimensions.Unit.HasHeight);
+            HiddenColumns.Add(x => x.Dimensions.Unit.HasQuantity);
             HiddenColumns.Add(x => x.Dimensions.Length);
             HiddenColumns.Add(x => x.Dimensions.Width);
             HiddenColumns.Add(x => x.Dimensions.Height);
             HiddenColumns.Add(x => x.Dimensions.Weight);
+            HiddenColumns.Add(x => x.Dimensions.Quantity);
+            HiddenColumns.Add(x => x.Dimensions.UnitSize);
+            HiddenColumns.Add(x => x.Dimensions.Value);
             HiddenColumns.Add(x => x.Product.ID);
             HiddenColumns.Add(x => x.Product.Code);
             HiddenColumns.Add(x => x.Product.Name);

prs.mobile/comal.timesheets/DigitalForms/DigitalFormHost.xaml

@@ -13,8 +13,8 @@
             <Button Grid.Column="0" HorizontalOptions="Start" VerticalOptions="Center" TextColor="White" BackgroundColor="Transparent" Margin="0" Padding="0"
                 Text="Cancel" Clicked="ExitBtn_Clicked"/>
             <Label x:Name="titleLbl" Grid.Column="1" Text="Edit Form" HorizontalOptions="Fill" HorizontalTextAlignment="Center" VerticalOptions="Fill" VerticalTextAlignment="Center" TextColor="White"/>
-            <!-- <Button x:Name="saveProgressBtn" Grid.Column="2" HorizontalOptions="Center" VerticalOptions="Center" TextColor="White" BackgroundColor="Transparent" Margin="0" Padding="0" -->
-            <!--     Text="Save Progress" Clicked="SaveProgressBtn_Clicked" FontAttributes="Bold" IsVisible="true"/> -->
+             <Button x:Name="saveProgressBtn" Grid.Column="2" HorizontalOptions="Center" VerticalOptions="Center" TextColor="White" BackgroundColor="Transparent" Margin="0" Padding="0" 
+                 Text="Save Progress" Clicked="SaveProgressBtn_Clicked" FontAttributes="Bold" IsVisible="true"/> 
             <Button Grid.Column="2" HorizontalOptions="End" VerticalOptions="Center" TextColor="White" BackgroundColor="Transparent" Margin="0" Padding="0"
                     x:Name="saveBtn"
                 Text="Complete" Clicked="SaveBtn_Clicked"/>

prs.mobile/comal.timesheets/DigitalForms/DigitalFormHost.xaml.cs

@@ -71,17 +71,17 @@ namespace comal.timesheets
             Navigation.PopAsync();
         }
 
-        // private async void SaveProgressBtn_Clicked(object sender, EventArgs e)
-        // {
-        //     if (!readOnly)
-        //     {
-        //         using (await MaterialDialog.Instance.LoadingDialogAsync(message: "Saving Progress"))
-        //         {
-        //             viewer.SaveData(true);
-        //         }
-        //     }
-        //     Navigation.PopAsync();
-        // }
+        private async void SaveProgressBtn_Clicked(object sender, EventArgs e)
+        {
+            if (!readOnly)
+            {
+                using (await MaterialDialog.Instance.LoadingDialogAsync(message: "Saving Progress"))
+                {
+                    viewer.SaveData(true);
+                }
+            }
+            Navigation.PopAsync();
+        }
 
         private void SaveBtn_Clicked(object sender, EventArgs e)
         {