Browse Source

Fix columns on JobEquipment grid to exclude job columns by default.

Kenric Nugteren 5 months ago
parent
commit
3d4207eb00

+ 5 - 5
prs.classes/Entities/Job/JobEquipment.cs

@@ -23,12 +23,12 @@ namespace Comal.Classes
         
         
         static JobEquipment()
         static JobEquipment()
         {
         {
-            DefaultColumns.Add<JobEquipment>(x => x.JobLink.JobNumber);
-            DefaultColumns.Add<JobEquipment>(x => x.JobLink.Name);
-            DefaultColumns.Add<JobEquipment>(x => x.EquipmentLink.Code);
-            DefaultColumns.Add<JobEquipment>(x => x.EquipmentLink.Description);
+            DefaultColumns.Add<JobEquipment>(x => x.JobLink.JobNumber, caption: "Job #");
+            DefaultColumns.Add<JobEquipment>(x => x.JobLink.Name, caption: "Job Name");
+            DefaultColumns.Add<JobEquipment>(x => x.EquipmentLink.Code, caption: "Code");
+            DefaultColumns.Add<JobEquipment>(x => x.EquipmentLink.Description, caption: "Description");
             DefaultColumns.Add<JobEquipment>(x => x.Certified);
             DefaultColumns.Add<JobEquipment>(x => x.Certified);
-            DefaultColumns.Add<JobEquipment>(x => x.OnSite);
+            DefaultColumns.Add<JobEquipment>(x => x.OnSite, caption: "On Site?");
         }
         }
     }
     }
 }
 }

+ 8 - 1
prs.desktop/Panels/Jobs/Equipment/JobEquipmentGrid.cs

@@ -24,7 +24,14 @@ namespace PRSDesktop
             options.SelectColumns = true;
             options.SelectColumns = true;
             options.FilterRows = true;
             options.FilterRows = true;
         }
         }
-        
+
+        public override DynamicGridColumns GenerateColumns()
+        {
+            var cols = new DynamicGridColumns();
+            cols.AddRange(base.GenerateColumns().Where(x => !x.ColumnName.StartsWith(nameof(JobEquipment.JobLink) + ".")));
+            return cols;
+        }
+
 
 
         public event DataModelUpdateEvent? OnUpdateDataModel;
         public event DataModelUpdateEvent? OnUpdateDataModel;