Activity becomes

Yavsc/Models/Booking/BookQuery.cs

@@ -4,6 +4,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 using Newtonsoft.Json;
 using Yavsc.Models.Billing;
 using Yavsc.Models.Relationship;
+using Yavsc.Models.Workflow;
 
 namespace Yavsc.Models.Booking
 {

Yavsc/Models/Market/Service.cs

@@ -1,8 +1,9 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Yavsc.Models.Market {
-    using System.Collections.Generic;
-    using System.ComponentModel.DataAnnotations.Schema;
     using Billing;
+    using Workflow;
 
     public partial class Service : BaseProduct
     {

Yavsc/Models/Workflow/Activity.cs

@@ -1,13 +1,14 @@
 
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using Newtonsoft.Json;
 using Yavsc.Models.Market;
-using Yavsc.Models.Workflow;
 
-namespace Yavsc.Models
+namespace Yavsc.Models.Workflow
 {
-    public class Activity
+    public class Activity : IBaseTrackedEntity
     {
 
         [StringLength(512),Required,Key]
@@ -22,10 +23,10 @@ namespace Yavsc.Models
         [StringLength(512)]
         public string ParentCode { get; set; }
 
-        [ForeignKey("ParentCode")]
+        [ForeignKey("ParentCode"),JsonIgnore]
         public virtual Activity Parent { get; set; }
 
-        [InverseProperty("Parent")]
+        [InverseProperty("Parent"),JsonIgnore]
         public virtual List<Activity> Children { get; set; }
 
         public string Description {get; set;}
@@ -59,5 +60,25 @@ namespace Yavsc.Models
 
         [InverseProperty("Context")]
         public virtual List<CommandForm> Forms { get; set; }
+
+        public DateTime DateCreated
+        {
+            get; set; 
+        }
+
+        public string UserCreated
+        {
+            get; set; 
+        }
+
+        public DateTime DateModified
+        {
+            get; set; 
+        }
+
+        public string UserModified
+        {
+            get; set; 
+        }
     }
 }

Yavsc/Models/Workflow/CommandForm.cs

@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using Newtonsoft.Json;
 
 namespace Yavsc.Models.Workflow
 {
@@ -8,14 +9,14 @@ namespace Yavsc.Models.Workflow
         [Key,DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         public long Id { get; set; }
 
-        public string ViewName { get; set; }
+        public string Action { get; set; }
 
         public string Title { get; set; } 
         
         [Required]
         public string ActivityCode { get; set; }
 
-        [ForeignKey("ActivityCode")]
+        [ForeignKey("ActivityCode"),JsonIgnore]
         public virtual Activity Context { get; set; }
     }
 }