소스 검색

Added DeliveryMethod To Requisition

Frank van den Bos 1 년 전
부모
커밋
9e37db383a

+ 16 - 12
prs.classes/Entities/Requisition/Requisition.cs

@@ -82,30 +82,34 @@ namespace Comal.Classes
         public DateTime Due { get; set; }
         public DateTime Due { get; set; }
         
         
         [EditorSequence(9)]
         [EditorSequence(9)]
-        public EmployeeLink Employee { get; set; }
+        public RequisitionDeliveryMethodLink DeliveryMethod { get; set; }
         
         
-        [EditorSequence(10)]
-        [IntegerEditor]
-        public int Boxes { get; set; }
+        [EditorSequence("Fulfilment", 1)]
+        [Caption("Assigned To")]
+        public EmployeeLink Employee { get; set; }
         
         
-        [EditorSequence(11)]
+        [EditorSequence("Fulfilment", 2)]
         [TimestampEditor]
         [TimestampEditor]
         public DateTime Filled { get; set; }
         public DateTime Filled { get; set; }
         
         
-        [EditorSequence(12)]
+        [EditorSequence("Fulfilment", 3)]
+        [IntegerEditor]
+        public int Boxes { get; set; }
+        
+        [EditorSequence("Fulfilment", 4)]
         [LoggableProperty]
         [LoggableProperty]
         [RequiredColumn]
         [RequiredColumn]
         public EmployeeLink TakenBy { get; set; }
         public EmployeeLink TakenBy { get; set; }
-
-        [EditorSequence(13)]
+        
+        [EditorSequence("Fulfilment", 5)]
+        [TimestampEditor(Editable = Editable.Disabled)]
+        public DateTime StockUpdated { get; set; }
+        
+        [EditorSequence("Fulfilment", 6)]
         [TimestampEditor(Editable = Editable.Disabled)]
         [TimestampEditor(Editable = Editable.Disabled)]
         [LoggableProperty]
         [LoggableProperty]
         public DateTime Archived { get; set; } = DateTime.MinValue;
         public DateTime Archived { get; set; } = DateTime.MinValue;
         
         
-        [EditorSequence(14)]
-        [TimestampEditor(Editable = Editable.Disabled)]
-        public DateTime StockUpdated { get; set; }
-
         public override string ToString()
         public override string ToString()
         {
         {
             return string.Format("{0}: {1} ({2} - {3})", Number, Title, JobLink.JobNumber, JobLink.Name);
             return string.Format("{0}: {1} ({2} - {3})", Number, Title, JobLink.JobNumber, JobLink.Name);

+ 10 - 0
prs.classes/Entities/Requisition/RequisitionDeliveryMethod.cs

@@ -0,0 +1,10 @@
+using System;
+using InABox.Core;
+
+namespace Comal.Classes
+{
+    public class RequisitionDeliveryMethod : Entity, IRemotable, IPersistent
+    {
+        public String Description { get; set; }
+    }
+}

+ 14 - 0
prs.classes/Entities/Requisition/RequisitionDeliveryMethodLink.cs

@@ -0,0 +1,14 @@
+using System;
+using InABox.Core;
+
+namespace Comal.Classes
+{
+    public class RequisitionDeliveryMethodLink : EntityLink<RequisitionDeliveryMethod>
+    {
+        [LookupEditor(typeof(RequisitionDeliveryMethod))]
+        public override Guid ID { get; set; }
+        
+        [TextBoxEditor(Visible = Visible.Default, Editable = Editable.Hidden)]
+        public String Description { get; set; }
+    }
+}