Updated AutoEntities for LeaveCalendar and JobMaterials

prs.classes/Entities/Job/JobActivity.cs

@@ -76,8 +76,8 @@ namespace Comal.Classes
     {
         protected override void Configure()
         {
-            Add<JobActivity>();
-            Add<Assignment>();
+            AddTable<JobActivity>();
+            AddTable<Assignment>();
         }
 
         public override bool Distinct => true;

prs.classes/Entities/Job/Materials/JobMaterials.cs

@@ -163,10 +163,10 @@ namespace Comal.Classes
     {
         protected override void Configure()
         {
-            Add<StockMovement>();
-            Add<JobBillOfMaterialsItem>();
-            Add<JobRequisitionItem>();
-            Add<PurchaseOrderItem>();
+            AddTable<StockMovement>();
+            AddTable<JobBillOfMaterialsItem>();
+            AddTable<JobRequisitionItem>();
+            AddTable<PurchaseOrderItem>();
         }
 
         public override bool Distinct => true;

prs.classes/Entities/LeaveRequest/EmployeeStandardLeave.cs

@@ -19,6 +19,8 @@ namespace Comal.Classes
         
         DateTime Approved { get; set; }
         LeaveRequestStatus Status { get; set; }
+        
+        StandardLeaveLink StandardLeave { get; set; }
 
     }
     
@@ -35,7 +37,8 @@ namespace Comal.Classes
                 .AddMapping(x => x.FromTime, x => x.FromTime)
                 .AddMapping(x => x.To, x => x.To)
                 .AddMapping(x => x.ToTime, x => x.ToTime)
-                .AddMapping(x=>x.Created, x=>x.Approved);
+                .AddMapping(x=>x.Created, x=>x.Approved)
+                .AddMapping(x=>x.ID, x=>x.StandardLeave.ID);
             
             AddConstant(LeaveRequestStatus.Approved.ToString(), x=>x.Status);
         }
@@ -54,12 +57,14 @@ namespace Comal.Classes
         public TimeSpan ToTime { get; set; }
         public DateTime Approved { get; set; }
         public LeaveRequestStatus Status { get; set; }
-
+        public StandardLeaveLink StandardLeave { get; set; }
+        
         protected override void Init()
         {
             base.Init();
             EmployeeLink = new EmployeeLink();
             LeaveType = new LeaveRequestActivityLink();
+            StandardLeave = new StandardLeaveLink();
         }
     }
     

prs.classes/Entities/LeaveRequest/LeaveCalendar.cs

@@ -8,8 +8,8 @@ namespace Comal.Classes
     {
         protected override void Configure()
         {
-            Add<EmployeeStandardLeave>();
-            Add<LeaveRequest>();
+            AddTable<EmployeeStandardLeave>();
+            AddTable<LeaveRequest>();
         }
 
         public override bool Distinct => false;
@@ -26,12 +26,14 @@ namespace Comal.Classes
         public TimeSpan ToTime { get; set; }
         public DateTime Approved { get; set; }
         public LeaveRequestStatus Status { get; set; }
+        public StandardLeaveLink StandardLeave { get; set; }
 
         protected override void Init()
         {
             base.Init();
             EmployeeLink = new EmployeeLink();
             LeaveType = new LeaveRequestActivityLink();
+            StandardLeave = new StandardLeaveLink();
         }
     }
 }

prs.classes/Entities/LeaveRequest/LeaveRequest.cs

@@ -12,7 +12,7 @@ namespace Comal.Classes
 
     [UserTracking("Holiday Calendar")]
     [Caption("Leave Requests")]
-    public class LeaveRequest : Entity, IRemotable, IPersistent, IEmployeeLeaveRequest, ILicense<LeaveManagementLicense>
+    public class LeaveRequest : Entity, IRemotable, IPersistent, ILicense<LeaveManagementLicense>
     {
         [EditorSequence(1)]
         public EmployeeLink EmployeeLink { get; set; }

prs.classes/Entities/Stock/StockHolding.cs

@@ -130,7 +130,7 @@ namespace Comal.Classes
     {
         protected override void Configure()
         {
-            Add<StockMovement>();
+            AddTable<StockMovement>();
         }
 
         public override bool Distinct => true;