Fixed Main Page Layout Issues

Corrected Filter Handling on Purchase Order Screens

prs.mobile.new/PRS.Mobile/Data Models/Details/Employee/EmployeeDetailModel.cs

@@ -20,7 +20,7 @@ namespace PRS.Mobile
         }
         
         public Guid ID => Item?.ID ?? Guid.Empty;
-        public String Name => Item?.Name ?? "";
+        public String Name => Item?.Name ?? Item?.Code ?? "";
 
 
     }

prs.mobile.new/PRS.Mobile/Main/DataModel.cs

@@ -230,10 +230,7 @@ namespace PRS.Mobile
             EquipmentGroups = new EquipmentGroupModel(this,
                 LookupFactory.DefineFilter<EquipmentGroup>);
 
-            Deliveries = new DeliveryModel(this,
-                () => new Filter<Delivery>(x => x.Completed).IsEqualTo(DateTime.MinValue)
-                    .Or(x => x.Completed).IsGreaterThanOrEqualTo(DateTime.Today.AddDays(-90))
-            );
+            Deliveries = new DeliveryModel(this, () => null);
 
             DeliveryItems = new DeliveryItemModel(this,
                 LookupFactory.DefineFilter<DeliveryItem>

prs.mobile.new/PRS.Mobile/MainPage.xaml

@@ -13,13 +13,13 @@
     </mobile:MobilePage.PrimaryMenu>
     
     <mobile:MobilePage.PageContent>
-        <Grid x:Name="homeScreenGrid" RowSpacing="5" ColumnSpacing="5" Margin="5">
+        <Grid x:Name="homeScreenGrid" RowSpacing="0" ColumnSpacing="0" Margin="5">
             
             <Grid.RowDefinitions>
-                <RowDefinition Height="5.5*" x:Name="ClockOnRow"/>
-                <RowDefinition Height="45" x:Name="JobRow"/>
-                <RowDefinition Height="45" x:Name="TaskRow"/>
-                <RowDefinition Height="12*"/>
+                <RowDefinition Height="Auto" x:Name="ClockOnRow"/>
+                <RowDefinition Height="Auto" x:Name="JobRow"/>
+                <RowDefinition Height="Auto" x:Name="TaskRow"/>
+                <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
             
             <Grid.ColumnDefinitions>
@@ -33,7 +33,9 @@
                 Grid.ColumnSpan="2"
                 BackgroundColor="Gainsboro" 
                 Clicked="ClockOnOff_Clicked" 
-                IsEnabled="False">
+                IsEnabled="False"
+                HeightRequest="200"
+                Margin="0,0,0,5">
                 <StackLayout Orientation="Vertical" VerticalOptions="Center" HorizontalOptions="Center">
                     <Label x:Name="ClockOnOffLabel" Text="PLEASE WAIT" FontSize="Large" FontAttributes="Bold" BackgroundColor="Transparent" HorizontalTextAlignment="Center" HorizontalOptions="Fill"/>
                     <Label x:Name="CurrentLocation" Text="Initializing.." FontSize="Medium" FontAttributes="Bold" BackgroundColor="Transparent" HorizontalTextAlignment="Center" HorizontalOptions="Fill" />
@@ -46,7 +48,9 @@
                 Clicked="JobBtn_Tapped" 
                 x:Name="jobBtn" 
                 IsEnabled="False"
-                Text="Select Job" 
+                Text="Select Job"
+                Margin="0,0,0,5"
+                HeightRequest="45"
                 HorizontalOptions="FillAndExpand"
             />
 
@@ -57,16 +61,33 @@
                 x:Name="addNoteBtn" 
                 IsEnabled="False"
                 Text="Add note"
+                Margin="5,0,0,5"
+                HeightRequest="45"
                 HorizontalOptions="FillAndExpand"
             />
             
-            <mobile:MobileButton Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Clicked="TaskBtn_Tapped" x:Name="taskBtn" IsEnabled="False"
-                    Text="Select Task" 
-                    HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand"
-                    />
+            <mobile:MobileButton 
+                Grid.Row="2" 
+                Grid.Column="0" 
+                Grid.ColumnSpan="2" 
+                Clicked="TaskBtn_Tapped" 
+                x:Name="taskBtn" 
+                IsEnabled="False"
+                Text="Select Task" 
+                HorizontalOptions="FillAndExpand" 
+                VerticalOptions="FillAndExpand"
+                HeightRequest="45"
+                Margin="0,0,0,5"/>
 
-            <mobile:MobileToolGrid Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" x:Name="Tools" BorderColor="Gray">
-                <mobile:MobileToolGrid.Items>
+            <mobile:MobileToolGrid 
+                Grid.Row="3" 
+                Grid.Column="0" 
+                Grid.ColumnSpan="2" 
+                x:Name="Tools" 
+                Margin="0"
+                BorderColor="Gray">
+                <mobile:MobileToolGrid.Items
+                >
                     
                     <mobile:MobileMobileToolItem
                         x:Name="Assignments"

prs.mobile.new/PRS.Mobile/MainPage.xaml.cs

@@ -38,13 +38,13 @@ namespace PRS.Mobile
             
             _setuptasks = new Task[]
             {
-                Task.Run(() => App.Data.Activities.Refresh(false)),
-                Task.Run(() => App.Data.Employees.Refresh(false)),
-                Task.Run(() => App.Data.TimeSheets.Refresh(false)),
+                //Task.Run(() => App.Data.Activities.Refresh(false)),
+                //Task.Run(() => App.Data.Employees.Refresh(false)),
+                //Task.Run(() => App.Data.TimeSheets.Refresh(false)),
                 Task.Run(() => App.Data.GPSTrackers.Refresh(false)),
                 Task.Run(() => App.Data.BluetoothGates.Refresh(false)),
-                Task.Run(() => App.Data.Notifications.Refresh(false)),
-                Task.Run(() => App.Data.Kanbans.Refresh(false))
+                //Task.Run(() => App.Data.Notifications.Refresh(false)),
+                //Task.Run(() => App.Data.Kanbans.Refresh(false))
             };
             
             MobileLogging.Log("MainPage.Create");
@@ -150,9 +150,10 @@ namespace PRS.Mobile
 
             void SetupClockOnButton(bool disable)
             {
-                ClockOnRow.Height = disable ? 0 : new GridLength(5.5, GridUnitType.Star);
-                JobRow.Height = disable ? 0 : 55;
-                TaskRow.Height = disable ? 0 : 55;  
+                ClockOnButton.IsVisible = !disable;
+                jobBtn.IsVisible = !disable;
+                addNoteBtn.IsVisible = !disable;
+                taskBtn.IsVisible = !disable;
             }
             
             SetupClockOnButton(InABox.Core.Security.IsAllowed<IsJobOnlyEmployee>());
@@ -243,7 +244,9 @@ namespace PRS.Mobile
 
             var location = GetAddress();
             
-            Title = App.Data.Me != null ? App.Data.Me.Name : "(Not Logged In)";
+            Title = App.Data.Me != null 
+                ? App.Data.Me.Name
+                : "(Not Logged In)";
 
             ClockOnButton.IsEnabled = App.Data.IsConnected() && GateReady;
             

prs.mobile.new/PRS.Mobile/Modules/Human Resources/Employee Details/MyDetailsPage.xaml

@@ -48,7 +48,6 @@
                     HorizontalOptions="FillAndExpand" 
                     VerticalOptions="Center"
                     Placeholder="Mobile #" 
-                    HeightRequest="40"
                     Keyboard="Plain"
                     TextChanged="Mobile_OnTextChanged"/>  
             </Frame>
@@ -73,7 +72,6 @@
                     Placeholder="Email Address"
                     HorizontalOptions="FillAndExpand" 
                     VerticalOptions="Center"
-                    HeightRequest="40"
                     Keyboard="Plain"
                     TextChanged="Email_OnTextChanged"/>
             </Frame>

prs.mobile.new/PRS.Mobile/Modules/Purchases/PurchaseOrderList.xaml

@@ -10,14 +10,14 @@
     <mobile:MobilePage.PrimaryMenu>
         <mobile:MobileMenuButton
             x:Name="_filter"
-            Image="dots"/>
+            Image="dots"
+            IsVisible="False"/>
     </mobile:MobilePage.PrimaryMenu>
     
     <mobile:MobilePage.PageContent>
         
         <local:PurchaseOrderListView
             x:Name="_list"
-            ConfigureFilters="_list_OnConfigureFilters"
             PurchaseOrderSelected="_list_OnPurchaseOrderSelected"
             />
 

prs.mobile.new/PRS.Mobile/Modules/Purchases/PurchaseOrderList.xaml.cs

@@ -10,19 +10,10 @@ namespace PRS.Mobile
         public PurchaseOrderList()
         {
             InitializeComponent();
-        }
-
-        private void _list_OnPurchaseOrderSelected(object sender, PurchaseOrderSelectedEventArgs args)
-        {
-            PurchaseOrderDetails details = new PurchaseOrderDetails(args.Order);
-            Navigation.PushAsync(details);
-        }
-
-        private void _list_OnConfigureFilters(object swipeendedeventargs, PurchaseOrderFilterConfigurationEventArgs args)
-        {
-            Title = args.SelectedFilter;
+            
+            Title = _list.CurrentFilter;
             _filter.Items.Clear();
-            foreach (var filter in args.Filters)
+            foreach (var filter in _list.Filters)
             {
                 MobileMenuItem item = new MobileMenuItem() { Text = filter.Name };
                 item.Clicked += (o, e) =>
@@ -34,7 +25,13 @@ namespace PRS.Mobile
                 _filter.Items.Add(item);
             }
             _filter.IsVisible = _filter.Items.Any();
+        }
 
+        private void _list_OnPurchaseOrderSelected(object sender, PurchaseOrderSelectedEventArgs args)
+        {
+            PurchaseOrderDetails details = new PurchaseOrderDetails(args.Order);
+            Navigation.PushAsync(details);
         }
+        
     }
 }

prs.mobile.new/PRS.Mobile/Modules/Purchases/PurchaseOrderListView.xaml.cs

@@ -14,21 +14,21 @@ namespace PRS.Mobile
         public String FilterName { get; set; }
     }
     
-    public class PurchaseOrderFilterConfigurationEventArgs : EventArgs
-    {
-        public CoreFilterDefinitions Filters { get; private set; }
-
-        public String SelectedFilter { get; private set; }
-        
-        public PurchaseOrderFilterConfigurationEventArgs(CoreFilterDefinitions filters, String selectedfilter)
-        {
-            Filters = filters;
-            SelectedFilter = selectedfilter;
-        }
-    }
+    // public class PurchaseOrderFilterConfigurationEventArgs : EventArgs
+    // {
+    //     public CoreFilterDefinitions Filters { get; private set; }
+    //
+    //     public String SelectedFilter { get; private set; }
+    //     
+    //     public PurchaseOrderFilterConfigurationEventArgs(CoreFilterDefinitions filters, String selectedfilter)
+    //     {
+    //         Filters = filters;
+    //         SelectedFilter = selectedfilter;
+    //     }
+    // }
     
-    public delegate void PurchaseOrderFilterConfigurationEvent(object sender,
-        PurchaseOrderFilterConfigurationEventArgs args);
+    // public delegate void PurchaseOrderFilterConfigurationEvent(object sender,
+    //     PurchaseOrderFilterConfigurationEventArgs args);
     
     public class PurchaseOrderSelectedEventArgs : EventArgs
     {
@@ -49,11 +49,14 @@ namespace PRS.Mobile
     {
         
         private PurchaseOrderModuleSettings _settings;
-        private CoreFilterDefinitions _filters;
         
-
-        public event PurchaseOrderFilterConfigurationEvent ConfigureFilters;
+        //public event PurchaseOrderFilterConfigurationEvent ConfigureFilters;
         public event PurchaseOrderSelectedEvent PurchaseOrderSelected;
+
+        private CoreFilterDefinitions _filters;
+        public CoreFilterDefinitions Filters => _filters;
+
+        public String CurrentFilter => _settings?.FilterName ?? "";
         
         public PurchaseOrderListView()
         {
@@ -67,7 +70,7 @@ namespace PRS.Mobile
             InitializeComponent();
             
             Task.WaitAll(_setup);
-            ConfigureFilters?.Invoke(this,new PurchaseOrderFilterConfigurationEventArgs(_filters, _settings.FilterName));
+            //ConfigureFilters?.Invoke(this,new PurchaseOrderFilterConfigurationEventArgs(_filters, _settings.FilterName));
             
             RefreshData(false,true);
         }

prs.mobile.new/PRS.Mobile/Modules/Warehousing/Receivals/PurchaseOrderPage.xaml

@@ -10,14 +10,14 @@
     <mobile:MobilePage.PrimaryMenu>
         <mobile:MobileMenuButton
             x:Name="_filter"
-            Image="dots"/>
+            Image="dots"
+            IsVisible="False"/>
     </mobile:MobilePage.PrimaryMenu>
     
     <mobile:MobilePage.PageContent>
 
         <local:PurchaseOrderListView
             x:Name="_list"
-            ConfigureFilters="_list_OnConfigureFilters"
             PurchaseOrderSelected="_list_OnPurchaseOrderSelected"
         />
         

prs.mobile.new/PRS.Mobile/Modules/Warehousing/Receivals/PurchaseOrderPage.xaml.cs

@@ -22,19 +22,10 @@ namespace PRS.Mobile
         public PurchaseOrderPage()
         {
             InitializeComponent();
-        }
-        
-        private void _list_OnPurchaseOrderSelected(object sender, PurchaseOrderSelectedEventArgs args)
-        {
-            Receivals receivalsPage = new Receivals(args.Order.ID, args.Order.PONumber, args.Order.SupplierID);
-            Navigation.PushAsync(receivalsPage);
-        }
-        
-        private void _list_OnConfigureFilters(object sender, PurchaseOrderFilterConfigurationEventArgs args)
-        {
-            Title = args.SelectedFilter;
+            
+            Title = _list.CurrentFilter;
             _filter.Items.Clear();
-            foreach (var filter in args.Filters)
+            foreach (var filter in _list.Filters)
             {
                 MobileMenuItem item = new MobileMenuItem() { Text = filter.Name };
                 item.Clicked += (o, e) =>
@@ -47,6 +38,12 @@ namespace PRS.Mobile
             }
             _filter.IsVisible = _filter.Items.Any();
         }
+        
+        private void _list_OnPurchaseOrderSelected(object sender, PurchaseOrderSelectedEventArgs args)
+        {
+            Receivals receivalsPage = new Receivals(args.Order.ID, args.Order.PONumber, args.Order.SupplierID);
+            Navigation.PushAsync(receivalsPage);
+        }
     }