Browse Source

Removing unnecessary properties on links being set. Fixed back button

Kenric Nugteren 2 years ago
parent
commit
928efd8e05

+ 0 - 17
prs.mobile.new/PRS.Mobile/Modules/Warehousing/Transfer/RecTransCompletion.xaml.cs

@@ -219,14 +219,9 @@ namespace PRS.Mobile
             movement.Dimensions.UnitSize = shell.DimensionsUnitSize;
             movement.Dimensions.Value = shell.DimensionsValue;
             movement.Product.ID = shell.ProductID;
-            movement.Product.Code = shell.Code;
-            movement.Product.Name = shell.Name;
             movement.Employee.ID = App.Data.Me.ID;
-            movement.Employee.Name = App.Data.Me.Name;
 
             movement.Location.ID = location.ID;
-            movement.Location.Code = location.Code;
-            movement.Location.Description = location.Description;
 
             return movement;
         }
@@ -236,13 +231,7 @@ namespace PRS.Mobile
             var originalShell = GetOriginalShell(shell);
 
             movement.Style.ID = originalShell.StyleID;
-            movement.Style.Code = originalShell.StyleCode;
-            movement.Style.Description = originalShell.Finish;
-
             movement.Job.ID = originalShell.JobID;
-            movement.Job.JobNumber = originalShell.JobNumber;
-            movement.Job.Name = originalShell.JobName;
-
             movement.Issued = shell.Units;
 
             return movement;
@@ -251,13 +240,7 @@ namespace PRS.Mobile
         private StockMovement ReceiveStockMovement(StockHoldingShell_Old shell, StockMovement movement)
         {
             movement.Style.ID = shell.StyleID;
-            movement.Style.Code = shell.StyleCode;
-            movement.Style.Description = shell.Finish;
-
             movement.Job.ID = shell.JobID;
-            movement.Job.JobNumber = shell.JobNumber;
-            movement.Job.Name = shell.JobName;
-
             movement.Received = shell.Units;
 
             return movement;

+ 2 - 2
prs.mobile.new/PRS.Mobile/Modules/Warehousing/Transfer/RecTransferPopup.xaml

@@ -5,10 +5,10 @@
              xmlns:material="clr-namespace:XF.Material.Forms.UI;assembly=XF.Material"
              xmlns:mobile="clr-namespace:InABox.Mobile;assembly=InABox.Mobile.Shared"
              material:MaterialNavigationPage.AppBarColor="#a2006d">
-    <NavigationPage.TitleView>
+    <!--NavigationPage.TitleView>
         <Button Text="Back" FontSize="Medium" TextColor="White" VerticalOptions="Center" HorizontalOptions="Start" Clicked="BackBtn_Clicked"
                 BackgroundColor="Transparent"/>
-    </NavigationPage.TitleView>
+    </NavigationPage.TitleView-->
     <mobile:MobilePage.PageContent>
         <ScrollView>
             <StackLayout>

+ 2 - 2
prs.mobile.new/PRS.Mobile/Modules/Warehousing/Transfer/RecTransferPopup.xaml.cs

@@ -53,10 +53,10 @@ namespace PRS.Mobile
             LoadScreen();
         }
 
-        private void BackBtn_Clicked(object sender, EventArgs e)
+        protected override Task<bool> OnBackButtonClicked()
         {
             OnRecTransferPopupBackButtonPressed?.Invoke();
-            Navigation.PopAsync();
+            return base.OnBackButtonClicked();
         }
 
         private void LoadScreen()