Kenric Nugteren 7 mēneši atpakaļ
vecāks
revīzija
6800449ca7

+ 8 - 0
prs.classes/Entities/DeliveryItem/DeliveryEquipment.cs

@@ -17,6 +17,14 @@ namespace Comal.Classes
 
         [EditorSequence(3)]
         public DeliveryEquipmentType Type { get; set; }
+
+        static DeliveryEquipment()
+        {
+            DefaultColumns.Add<DeliveryEquipment>(x => x.Delivery.Number);
+            DefaultColumns.Add<DeliveryEquipment>(x => x.Equipment.Code);
+            DefaultColumns.Add<DeliveryEquipment>(x => x.Equipment.Description);
+            DefaultColumns.Add<DeliveryEquipment>(x => x.Type, width: 70);
+        }
     }
 
     public enum DeliveryEquipmentType

+ 9 - 0
prs.desktop/Panels/Delivery/DeliveryEquipmentList.cs

@@ -45,6 +45,15 @@ internal class DeliveryEquipmentList : DynamicDataGrid<DeliveryEquipment>, IMast
         return columns;
     }
 
+    protected override BaseEditor? GetEditor(object item, DynamicGridColumn column)
+    {
+        if(column.ColumnName.StartsWith(nameof(DeliveryEquipment.Equipment) + "."))
+        {
+            return new NullEditor();
+        }
+        return base.GetEditor(item, column);
+    }
+
     protected override void DoAdd(bool openEditorOnDirectEdit = false)
     {
         if ((Master?.ID ?? Guid.Empty) == Guid.Empty)

+ 2 - 1
prs.stores/DeliveryStore.cs

@@ -129,7 +129,8 @@ internal class DeliveryStore : BaseStore<Delivery>
             new Filter<JobEquipment>(x => x.JobLink.ID).IsEqualTo(delivery.Job.ID),
             Columns.Required<JobEquipment>()
                 .Add(x => x.ID)
-                .Add(x => x.EquipmentLink.ID))
+                .Add(x => x.EquipmentLink.ID)
+                .Add(x => x.OnSite))
             .ToObjects<JobEquipment>()
             .ToDictionary(x => x.EquipmentLink.ID);