Merge branch 'kenric' into requisition_changes

prs.desktop/Grids/TimesheetGrid.cs

@@ -27,7 +27,7 @@ namespace PRSDesktop
             {
                 if (value is not null)
                 {
-                    Filters = new DynamicGridSelectedFilterSettings(new List<CoreFilterDefinition> { value }, false);
+                    Filters = new DynamicGridSelectedFilterSettings(new List<CoreFilterDefinition> { value }, false, null);
                 }
             }
         }

prs.desktop/Panels/Customers/CustomerReceipts.cs

@@ -25,7 +25,7 @@ public class ReceiptGridSettings : IUserConfigurationSettings
         {
             if (value is not null)
             {
-                Filters = new DynamicGridSelectedFilterSettings(new List<CoreFilterDefinition> { value }, false);
+                Filters = new DynamicGridSelectedFilterSettings(new List<CoreFilterDefinition> { value }, false, null);
             }
         }
     }

prs.desktop/Panels/DataEntry/DataEntryHistory.cs

@@ -25,7 +25,7 @@ public class DataEntryHistorySettings : IUserConfigurationSettings
         {
             if (value is not null)
             {
-                Filters = new DynamicGridSelectedFilterSettings(new List<CoreFilterDefinition> { value }, false);
+                Filters = new DynamicGridSelectedFilterSettings(new List<CoreFilterDefinition> { value }, false, null);
             }
         }
     }

prs.desktop/Panels/DigitalForms/DigitalFormRoleCrossTab.cs

@@ -18,8 +18,12 @@ public class DigitalFormRoleCrossTab : DynamicManyToManyCrossTab<RoleForm, Digit
 
     public DigitalFormRoleCrossTab()
     {
-        DigitalFormFilter = new(this, new GlobalConfiguration<CoreFilterDefinitions>(nameof(DigitalForm))) { ButtonText = "Digital Forms" };
-        RoleFilter = new(this, new GlobalConfiguration<CoreFilterDefinitions>(nameof(Role))) { ButtonText = "Roles" };
+        DigitalFormFilter = new(this,
+            new GlobalConfiguration<CoreFilterDefinitions>(nameof(DigitalForm)),
+            new UserConfiguration<CoreFilterDefinitions>(nameof(DigitalForm))) { ButtonText = "Digital Forms" };
+        RoleFilter = new(this,
+            new GlobalConfiguration<CoreFilterDefinitions>(nameof(Role)),
+            new UserConfiguration<CoreFilterDefinitions>(nameof(Role))) { ButtonText = "Roles" };
 
         DigitalFormFilter.OnFilterRefresh += () => Refresh(false, true);
         RoleFilter.OnFilterRefresh += () => Refresh(true, true);

prs.desktop/Panels/Employees/EmployeeRoleCrossTab.cs

@@ -8,54 +8,57 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PRSDesktop
+namespace PRSDesktop;
+
+public class EmployeeRoleCrossTab : DynamicManyToManyCrossTab<EmployeeRole, Employee, Role>
 {
-    public class EmployeeRoleCrossTab : DynamicManyToManyCrossTab<EmployeeRole, Employee, Role>
+    public DynamicGridFilterButtonComponent<Employee> EmployeeFilter { get; init; }
+
+    public DynamicGridFilterButtonComponent<Role> RoleFilter { get; init; }
+
+    public EmployeeRoleCrossTab()
+    {
+        EmployeeFilter = new(this,
+            new GlobalConfiguration<CoreFilterDefinitions>(nameof(Employee)),
+            new UserConfiguration<CoreFilterDefinitions>(nameof(Employee))) { ButtonText = "Employees" };
+        RoleFilter = new(this,
+            new GlobalConfiguration<CoreFilterDefinitions>(nameof(Role)),
+            new UserConfiguration<CoreFilterDefinitions>(nameof(Role))) { ButtonText = "Roles" };
+
+        EmployeeFilter.OnFilterRefresh += () => Refresh(false, true);
+        RoleFilter.OnFilterRefresh += () => Refresh(true, true);
+    }
+
+    protected override Filter<Employee>? RowFilter()
+    {
+        return EmployeeFilter.GetFilter();
+    }
+
+    protected override Filter<Role>? ColumnFilter()
+    {
+        return RoleFilter.GetFilter();
+    }
+
+    protected override Columns<Role>? LoadColumnColumns()
+    {
+        return new Columns<Role>(x => x.Code);
+    }
+
+    protected override string FormatColumnHeader(CoreRow row)
+    {
+        return row.Get<Role, string>(x => x.Code);
+    }
+
+    protected override SortOrder<Role>? LoadColumnSort()
+    {
+        return null;
+    }
+
+    protected override DynamicGridColumns LoadRowColumns()
     {
-        public DynamicGridFilterButtonComponent<Employee> EmployeeFilter { get; init; }
-
-        public DynamicGridFilterButtonComponent<Role> RoleFilter { get; init; }
-
-        public EmployeeRoleCrossTab()
-        {
-            EmployeeFilter = new(this, new GlobalConfiguration<CoreFilterDefinitions>(nameof(Employee))) { ButtonText = "Employees" };
-            RoleFilter = new(this, new GlobalConfiguration<CoreFilterDefinitions>(nameof(Role))) { ButtonText = "Roles" };
-
-            EmployeeFilter.OnFilterRefresh += () => Refresh(false, true);
-            RoleFilter.OnFilterRefresh += () => Refresh(true, true);
-        }
-
-        protected override Filter<Employee>? RowFilter()
-        {
-            return EmployeeFilter.GetFilter();
-        }
-
-        protected override Filter<Role>? ColumnFilter()
-        {
-            return RoleFilter.GetFilter();
-        }
-
-        protected override Columns<Role>? LoadColumnColumns()
-        {
-            return new Columns<Role>(x => x.Code);
-        }
-
-        protected override string FormatColumnHeader(CoreRow row)
-        {
-            return row.Get<Role, string>(x => x.Code);
-        }
-
-        protected override SortOrder<Role>? LoadColumnSort()
-        {
-            return null;
-        }
-
-        protected override DynamicGridColumns LoadRowColumns()
-        {
-            var columns = new DynamicGridColumns();
-            columns.Add<Employee, string>(x => x.Code, 100, "Code", "", Alignment.MiddleLeft);
-            columns.Add<Employee, string>(x => x.Name, 100, "Name", "", Alignment.MiddleLeft);
-            return columns;
-        }
+        var columns = new DynamicGridColumns();
+        columns.Add<Employee, string>(x => x.Code, 100, "Code", "", Alignment.MiddleLeft);
+        columns.Add<Employee, string>(x => x.Name, 100, "Name", "", Alignment.MiddleLeft);
+        return columns;
     }
 }

prs.desktop/Panels/Invoices/InvoiceGrid.cs

@@ -29,7 +29,7 @@ namespace PRSDesktop
             {
                 if (value is not null)
                 {
-                    Filters = new DynamicGridSelectedFilterSettings(new List<CoreFilterDefinition> { value }, false);
+                    Filters = new DynamicGridSelectedFilterSettings(new List<CoreFilterDefinition> { value }, false, null);
                 }
             }
         }

prs.desktop/Panels/Jobs/JobGrid.cs

@@ -23,7 +23,7 @@ namespace PRSDesktop
             {
                 if (value is not null)
                 {
-                    Filters = new DynamicGridSelectedFilterSettings(new List<CoreFilterDefinition> { value }, false);
+                    Filters = new DynamicGridSelectedFilterSettings(new List<CoreFilterDefinition> { value }, false, null);
                 }
             }
         }

prs.desktop/Panels/Products/Reservation Management/JobRequisitionReviewGrid.cs

@@ -26,7 +26,7 @@ namespace PRSDesktop
             {
                 if (value is not null)
                 {
-                    Filters = new DynamicGridSelectedFilterSettings(new List<CoreFilterDefinition> { value }, false);
+                    Filters = new DynamicGridSelectedFilterSettings(new List<CoreFilterDefinition> { value }, false, null);
                 }
             }
         }

prs.desktop/Panels/Staging/Setouts/StagingSetoutGrid.cs

@@ -42,7 +42,7 @@ namespace PRSDesktop
             {
                 if (value is not null)
                 {
-                    Filters = new DynamicGridSelectedFilterSettings(new List<CoreFilterDefinition> { value }, false);
+                    Filters = new DynamicGridSelectedFilterSettings(new List<CoreFilterDefinition> { value }, false, null);
                 }
             }
         }

prs.desktop/Panels/Suppliers/PurchaseOrders/SupplierPurchaseOrders.cs

@@ -28,7 +28,7 @@ namespace PRSDesktop
             {
                 if (value is not null)
                 {
-                    Filters = new DynamicGridSelectedFilterSettings(new List<CoreFilterDefinition> { value }, false);
+                    Filters = new DynamicGridSelectedFilterSettings(new List<CoreFilterDefinition> { value }, false, null);
                 }
             }
         }

prs.mobile.new/PRS.Mobile/Modules/Site/JobWebDocuments/JobWebDocuments.xaml.cs

@@ -25,7 +25,7 @@ namespace PRS.Mobile
             Webview.On<Xamarin.Forms.PlatformConfiguration.Android>().DisplayZoomControls(true);
             
             var webSettings = new GlobalConfiguration<WebSettings>().Load();
-            var DBSettings = new LocalConfiguration<DatabaseSettings>().Load();
+            var DBSettings = new LocalConfiguration<MobileDatabaseSettings>().Load();
             string userid = Encryption.Encrypt(DBSettings.UserID, DateTime.Now.ToString("yyyy-MM-dd"), true);
             string password = Encryption.Encrypt(DBSettings.Password, DateTime.Now.ToString("yyyy-MM-dd"), true);
             Webview.Source = $"{webSettings.URL}:{webSettings.Port}/v1/Job/job_documents?id={Job.ID}&userid={userid}&password={password}";