Przeglądaj źródła

Added FormProcessed and FormCancelled TimeStamps, deleted Processed boolean value

Frank van den Bos 1 rok temu
rodzic
commit
b36180c0bc

+ 22 - 9
InABox.Core/DigitalForms/Forms/EntityForm.cs

@@ -57,11 +57,26 @@ namespace InABox.Core
         [NullEditor]
         [Obsolete("Being Replaced by FormCompleted", true)]
         public DateTime QACompleted { get; set; }
-
+        
         [EditorSequence(2)]
+        [Caption("Started")]
+        [DateTimeEditor]
+        public DateTime FormStarted { get; set; }
+
+        [EditorSequence(3)]
         [Caption("Completed")]
         [DateTimeEditor]
         public DateTime FormCompleted { get; set; }
+        
+        [EditorSequence(4)]
+        [Caption("Processed")]
+        [DateTimeEditor]
+        public DateTime FormProcessed { get; set; }
+        
+        [EditorSequence(5)]
+        [Caption("Cancelled")]
+        [DateTimeEditor]
+        public DateTime FormCancelled { get; set; }
 
         [NullEditor]
         [Obsolete("Being Replaced by FormCompletedBy")]
@@ -71,10 +86,10 @@ namespace InABox.Core
         [Caption("User")]
         public UserLink FormCompletedBy { get; set; }
 
-        [EditorSequence(4)]
-        [CheckBoxEditor]
+        [NullEditor]
+        [Obsolete("Replaced with Status", true)]
         public bool Processed { get; set; }
-
+        
         [NullEditor]
         public Location Location { get; set; }
 
@@ -91,7 +106,7 @@ namespace InABox.Core
             return Parent.ID;
         }
 
-        public DateTime FormStarted { get; set; }
+        [DurationEditor(Visible=Visible.Optional, Editable = Editable.Hidden)]
         public TimeSpan FormOpen { get; set; }
 
         [NullEditor]
@@ -109,10 +124,8 @@ namespace InABox.Core
             Description = "";
             FormStarted = DateTime.MinValue;
             FormOpen = TimeSpan.Zero;
-            Processed = false;
+            CoreUtils.SetPropertyValue(this, "Processed", false);
         }
-
-
-
+        
     }
 }

+ 4 - 1
InABox.Core/DigitalForms/Forms/IDigitalFormInstance.cs

@@ -2,12 +2,15 @@
 
 namespace InABox.Core
 {
+    
     public interface IBaseDigitalFormInstance : IEntity
     {
         DigitalFormLink Form { get; set; }
         DateTime FormStarted { get; set; }
-        DateTime FormCompleted { get; set; }
         TimeSpan FormOpen { get; set; }
+        DateTime FormCompleted { get; set; }
+        DateTime FormProcessed { get; set; }
+        DateTime FormCancelled { get; set; }
     }
     
     public interface ICoreDigitalFormInstance : IBaseDigitalFormInstance