diff --git a/server/AyaNova/models/AyContext.cs b/server/AyaNova/models/AyContext.cs index aa9068c1..a2171dfc 100644 --- a/server/AyaNova/models/AyContext.cs +++ b/server/AyaNova/models/AyContext.cs @@ -123,8 +123,11 @@ namespace AyaNova.Models .WithOne(i => i.User) .HasForeignKey(b => b.UserId) .OnDelete(DeleteBehavior.NoAction); - - + + //Workorder + modelBuilder.Entity() + .HasOne(p => p.WorkOrder) + .WithMany(b => b.WorkorderItems); //----------- diff --git a/server/AyaNova/models/Translation.cs b/server/AyaNova/models/Translation.cs index 36d2162a..e8484ad2 100644 --- a/server/AyaNova/models/Translation.cs +++ b/server/AyaNova/models/Translation.cs @@ -30,7 +30,7 @@ namespace AyaNova.Models // public ICollection TranslationItems { get; set; } //Not perhaps so useful here but this is a good way to lazy initialize collections which - //is more efficient when there are many child collections (workorder) and means no need to null check the collection + //is more efficient when there are many child collections (but when would that ever be desired for AyaNova?)and means no need to null check the collection //https://stackoverflow.com/a/20773057/8939 private ICollection _translationItem; diff --git a/server/AyaNova/models/WorkOrder.cs b/server/AyaNova/models/WorkOrder.cs index c90c7293..0bd74db8 100644 --- a/server/AyaNova/models/WorkOrder.cs +++ b/server/AyaNova/models/WorkOrder.cs @@ -22,6 +22,8 @@ namespace AyaNova.Models public string CustomFields { get; set; } public List Tags { get; set; } + //dependents + public List WorkorderItems { get; set; } public WorkOrder() { diff --git a/server/AyaNova/models/WorkOrderItem.cs b/server/AyaNova/models/WorkOrderItem.cs index 20dd1dc0..9a2b4627 100644 --- a/server/AyaNova/models/WorkOrderItem.cs +++ b/server/AyaNova/models/WorkOrderItem.cs @@ -8,20 +8,25 @@ namespace AyaNova.Models { //NOTE: Any non required field (nullable in DB) sb nullable here, i.e. decimal? not decimal, //otherwise the server will call it an invalid record if the field isn't sent from client - + public partial class WorkOrderItem { public long Id { get; set; } public uint ConcurrencyToken { get; set; } [Required] - public string Name { get; set; } - public bool Active { get; set; } - public string Notes { get; set; } - public string Wiki {get;set;} + public string Name { get; set; } + public bool Active { get; set; } + public string Notes { get; set; } + public string Wiki { get; set; } public string CustomFields { get; set; } public List Tags { get; set; } - + + //Principle + public int WorkorderId { get; set; }//fk + public WorkOrder WorkOrder { get; set; } + + //Dependents public WorkOrderItem() {