server/AyaNova/models/AyContext.cs

@@ -70,7 +70,8 @@ namespace AyaNova.Models
         public virtual DbSet<ServiceRate> ServiceRate { get; set; }
         public virtual DbSet<TravelRate> TravelRate { get; set; }
         public virtual DbSet<CustomerServiceRequest> CustomerServiceRequest { get; set; }
-
+        public virtual DbSet<TaskGroup> TaskGroup { get; set; }
+        public virtual DbSet<TaskGroupItem> TaskGroupItem { get; set; }
 
 
         //WorkOrder        

server/AyaNova/models/TaskGroup.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using AyaNova.Biz;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Newtonsoft.Json;
+
+namespace AyaNova.Models
+{
+    //https://stackoverflow.com/questions/46517584/how-to-add-a-parent-record-with-its-children-records-in-ef-core#46615455
+
+    public class TaskGroup 
+    {
+        public long Id { get; set; }
+        public uint Concurrency { get; set; }
+
+        [Required]
+        public string Name { get; set; }
+        public bool Active { get; set; }
+        public string Notes { get; set; }
+       
+        public List<TaskGroupItem> Items { get; set; } = new List<TaskGroupItem>();
+
+        [NotMapped, JsonIgnore]
+        public AyaType AyaType { get => AyaType.TaskGroup; }
+
+    }//eoc
+
+}//eons
+

server/AyaNova/models/TaskGroupItem.cs

@@ -0,0 +1,27 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Newtonsoft.Json;
+
+namespace AyaNova.Models
+{
+    //https://stackoverflow.com/questions/46517584/how-to-add-a-parent-record-with-its-children-records-in-ef-core#46615455
+    public class TaskGroupItem
+    {
+        public long Id { get; set; }
+        public uint Concurrency { get; set; }
+
+        [Required]
+        public long TaskGroupId { get; set; }
+
+        public int DisplayOrder { get; set; } = 0;
+
+        [Required]
+        public string Task { get; set; }
+
+
+        [JsonIgnore]
+        public TaskGroup TaskGroup { get; set; }
+
+    }//eoc
+
+}//eons

server/AyaNova/models/WorkOrderItemLabor.cs

@@ -21,7 +21,9 @@ namespace AyaNova.Models
         public decimal NoChargeQuantity { get; set; }
         public long? ServiceBankId { get; set; }
         public long? TaxCodeSaleId { get; set; }
-
+        public decimal BasePrice { get; set; }//Rate price per unit at time of entry
+        public decimal Price { get; set; }//contract adjusted price or a copy of BasePrice if no contract
+        public decimal ManualDiscountPct { get; set; }// (V7 "Discount") ad-hoc / % off of the contractprice (which is always set regardless if contract or not) entered manually
 
 
         [Required]

server/AyaNova/models/WorkOrderItemTask.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Newtonsoft.Json;
@@ -8,15 +8,20 @@ namespace AyaNova.Models
 {
     public class WorkOrderItemTask : ICoreBizObjectModel
     {
-        public WorkOrderItemTask()
-        {
-            Tags = new List<string>();
-        }
+
         public long Id { get; set; }
         public uint Concurrency { get; set; }
-        public string Notes { get; set; }
-        public string CustomFields { get; set; }
-        public List<string> Tags { get; set; }
+
+        public int DisplayOrder { get; set; } = 0;
+        [Required]
+        public string Task { get; set; }
+        [Required]
+        public WorkorderItemTaskCompletionType Status { get; set; } = WorkorderItemTaskCompletionType.Incomplete;
+        public long? CompletedByUserId { get; set; }
+        public DateTime? CompletedDate { get; set; }
+
+
+
         [Required]
         public long WorkOrderItemId { get; set; }
         [JsonIgnore]
@@ -27,3 +32,15 @@ namespace AyaNova.Models
 
     }//eoc
 }//eons
+/*
+CREATE TABLE [dbo].[AWORKORDERITEMTASK](
+	[AID] [uniqueidentifier] NOT NULL,
+	[AWORKORDERITEMID] [uniqueidentifier] NOT NULL,
+	[ATASKID] [uniqueidentifier] NOT NULL,//drop, feeds now, Task it linked to is literally just a single string "Name" so this is an easy decision
+	[ATASKGROUPID] [uniqueidentifier] NOT NULL,//drop feeds now
+	[ACREATOR] [uniqueidentifier] NOT NULL,
+	[AMODIFIER] [uniqueidentifier] NOT NULL,
+	[ACREATED] [datetime] NOT NULL,
+	[AMODIFIED] [datetime] NOT NULL,
+	[AWORKORDERITEMTASKCMPLTNTYPE] [smallint] NOT NULL//rename to Status
+*/

server/AyaNova/models/WorkOrderItemTravel.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Newtonsoft.Json;
@@ -8,15 +8,26 @@ namespace AyaNova.Models
 {
     public class WorkOrderItemTravel : ICoreBizObjectModel
     {
-        public WorkOrderItemTravel()
-        {
-            Tags = new List<string>();
-        }
+
         public long Id { get; set; }
         public uint Concurrency { get; set; }
         public string Notes { get; set; }
-        public string CustomFields { get; set; }
-        public List<string> Tags { get; set; }
+
+
+        public long? UserId { get; set; }
+        public DateTime? TravelStartDate { get; set; }
+        public DateTime? TravelStopDate { get; set; }
+        public long? TravelRateId { get; set; }
+        public string TravelDetails { get; set; }
+        public decimal TravelRateQuantity { get; set; }
+        public decimal NoChargeQuantity { get; set; }
+        public long? ServiceBankId { get; set; }
+        public long? TaxCodeSaleId { get; set; }
+        public decimal Distance { get; set; }
+        public decimal BasePrice { get; set; }//Rate price per unit at time of entry
+        public decimal Price { get; set; }//contract adjusted price or a copy of BasePrice if no contract
+        public decimal ManualDiscountPct { get; set; }// (V7 "Discount") ad-hoc / % off of the contractprice (which is always set regardless if contract or not) entered manually
+
         [Required]
         public long WorkOrderItemId { get; set; }
         [JsonIgnore]
@@ -27,3 +38,23 @@ namespace AyaNova.Models
 
     }//eoc
 }//eons
+/*
+CREATE TABLE [dbo].[AWORKORDERITEMTRAVEL](
+	[AID] [uniqueidentifier] NOT NULL,
+	[AWORKORDERITEMID] [uniqueidentifier] NOT NULL,
+	[ACREATOR] [uniqueidentifier] NOT NULL,
+	[AMODIFIER] [uniqueidentifier] NOT NULL,
+	[ACREATED] [datetime] NOT NULL,
+	[AMODIFIED] [datetime] NOT NULL,
+	[ANOTES] [ntext] NULL,
+	[AUSERID] [uniqueidentifier] NULL,
+	[ATRAVELSTARTDATE] [datetime] NULL,
+	[ATRAVELSTOPDATE] [datetime] NULL,
+	[ATRAVELRATEID] [uniqueidentifier] NULL,
+	[ATRAVELDETAILS] [nvarchar](255) NULL,
+	[ATRAVELRATEQUANTITY] [decimal](19, 5) NULL,
+	[ANOCHARGEQUANTITY] [decimal](19, 5) NULL,
+	[ADISTANCE] [decimal](19, 5) NULL,
+	[ATAXRATESALEID] [uniqueidentifier] NULL,
+	[ASERVICEBANKID] [uniqueidentifier] NULL
+*/