Added ID Columns to AutoEntities

prs.classes/Entities/Employee/EmployeeActivity.cs

@@ -25,6 +25,12 @@ namespace Comal.Classes
         public override Expression<Func<RoleActivity, Guid>> RightLink => x => x.Role.ID;
 
         public override bool Distinct => true;
+
+        public override Column<IEmployeeActivity>[] IDColumns => new Column<IEmployeeActivity>[]
+        {
+            new Column<IEmployeeActivity>(x => x.Employee.ID),
+            new Column<IEmployeeActivity>(x => x.Activity.ID)
+        };
     }
     
     [UserTracking(typeof(Employee))]

prs.classes/Entities/Employee/EmployeeDigitalForm.cs

@@ -25,6 +25,12 @@ namespace Comal.Classes
         public override Expression<Func<RoleForm, Guid>> RightLink => x => x.Role.ID;
 
         public override bool Distinct => true;
+
+        public override Column<IEmployeeDigitalForm>[] IDColumns => new Column<IEmployeeDigitalForm>[]
+        {
+            new Column<IEmployeeDigitalForm>(x => x.Employee.ID),
+            new Column<IEmployeeDigitalForm>(x => x.Form.ID)
+        };
     }
     
     [UserTracking(typeof(Employee))]

prs.classes/Entities/Job/JobActivity.cs

@@ -81,6 +81,12 @@ namespace Comal.Classes
         }
 
         public override bool Distinct => true;
+
+        public override Column<IJobActivity>[] IDColumns => new Column<IJobActivity>[]
+        {
+            new Column<IJobActivity>(x => x.JobLink.ID),
+            new Column<IJobActivity>(x => x.ActivityLink.ID)
+        };
     }
 
     [AutoEntity(typeof(JobActivityAssignmentUnionGenerator))]

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

@@ -170,6 +170,19 @@ namespace Comal.Classes
         }
 
         public override bool Distinct => true;
+
+        public override Column<IJobMaterial>[] IDColumns => new Column<IJobMaterial>[]
+        {
+            new Column<IJobMaterial>(x => x.Job.ID),
+            new Column<IJobMaterial>(x => x.Product.ID),
+            new Column<IJobMaterial>(x => x.Style.ID),
+            new Column<IJobMaterial>(x => x.Dimensions.Unit.ID),
+            new Column<IJobMaterial>(x => x.Dimensions.Quantity),
+            new Column<IJobMaterial>(x => x.Dimensions.Length),
+            new Column<IJobMaterial>(x => x.Dimensions.Width),
+            new Column<IJobMaterial>(x => x.Dimensions.Height),
+            new Column<IJobMaterial>(x => x.Dimensions.Weight)
+        };
     }    
     
     

prs.classes/Entities/LeaveRequest/EmployeeStandardLeave.cs

@@ -44,6 +44,12 @@ namespace Comal.Classes
         }
 
         public override bool Distinct => false;
+
+        public override Column<IEmployeeLeaveRequest>[] IDColumns => new Column<IEmployeeLeaveRequest>[]
+        {
+            new Column<IEmployeeLeaveRequest>(x => x.EmployeeLink.ID),
+            new Column<IEmployeeLeaveRequest>(x => x.StandardLeave.ID)
+        };
     }
     
     [AutoEntity(typeof(EmployeeStandardLeaveGenerator))]

prs.classes/Entities/LeaveRequest/LeaveCalendar.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using InABox.Core;
 
 namespace Comal.Classes
@@ -13,6 +14,12 @@ namespace Comal.Classes
         }
 
         public override bool Distinct => false;
+
+        public override Column<IEmployeeLeaveRequest>[] IDColumns => new Column<IEmployeeLeaveRequest>[]
+        {
+            new Column<IEmployeeLeaveRequest>(x => x.EmployeeLink.ID),
+            new Column<IEmployeeLeaveRequest>(x => x.StandardLeave.ID)
+        };
     }
     
     [AutoEntity(typeof(LeaveCalendarGenerator))]

prs.classes/Entities/Stock/StockHolding.cs

@@ -134,6 +134,20 @@ namespace Comal.Classes
         }
 
         public override bool Distinct => true;
+
+        public override Column<IStockHolding>[] IDColumns => new Column<IStockHolding>[]
+        {
+            new Column<IStockHolding>(x => x.Job.ID),
+            new Column<IStockHolding>(x => x.Location.ID),
+            new Column<IStockHolding>(x => x.Product.ID),
+            new Column<IStockHolding>(x => x.Style.ID),
+            new Column<IStockHolding>(x => x.Dimensions.Unit.ID),
+            new Column<IStockHolding>(x => x.Dimensions.Quantity),
+            new Column<IStockHolding>(x => x.Dimensions.Length),
+            new Column<IStockHolding>(x => x.Dimensions.Width),
+            new Column<IStockHolding>(x => x.Dimensions.Height),
+            new Column<IStockHolding>(x => x.Dimensions.Weight),
+        };
     }
     
     [UserTracking(typeof(StockMovement))]

prs.desktop/PRSDesktop.csproj

@@ -30,9 +30,7 @@
     
     
     <ItemGroup>
-        <None Remove="Dashboards\milestone.png" />
         <None Remove="Resources\001-box.png" />
-        <Resource Include="Dashboards\milestone.png" />
         <Resource Include="Resources\001-box.png">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Resource>