2021-05-27 14:08:13 +00:00
parent 9f7b167fab
commit bc81c7b060
7 changed files with 94 additions and 6 deletions
--- a/server/AyaNova/biz/FormFieldReference.cs
+++ b/server/AyaNova/biz/FormFieldReference.cs
@@ -919,7 +919,29 @@ namespace AyaNova.Biz
                    l.Add(new FormField { TKey = "WorkOrderItemOutsideServiceList", FieldKey = "WorkOrderItemOutsideServiceList", TKeySection = "WorkOrderItem", Requireable = false });


-                    //todo WORKORDER ITEM UNIT
+                    //WORKORDER ITEM UNIT
+                    l.Add(new FormField { TKey = "WorkOrderItemUnitNotes", FieldKey = "WorkOrderItemUnitNotes", TKeySection = "WorkOrderItemUnit" });
+                    l.Add(new FormField { TKey = "Unit", FieldKey = "WorkOrderItemUnit", TKeySection = "WorkOrderItemUnit" });
+                    l.Add(new FormField { TKey = "Tags", FieldKey = "WorkOrderItemUnitTags", TKeySection = "WorkOrderItemUnit" });
+                    l.Add(new FormField { TKey = "Wiki", FieldKey = "WorkOrderItemUnitWiki", TKeySection = "WorkOrderItemUnit" });
+                    l.Add(new FormField { TKey = "Attachments", FieldKey = "WorkOrderItemUnitAttachments", TKeySection = "WorkOrderItemUnit" });
+                    l.Add(new FormField { TKey = "WorkOrderItemUnitCustom1", FieldKey = "WorkOrderItemUnitCustom1", IsCustomField = true, TKeySection = "WorkOrderItemUnit" });
+                    l.Add(new FormField { TKey = "WorkOrderItemUnitCustom2", FieldKey = "WorkOrderItemUnitCustom2", IsCustomField = true, TKeySection = "WorkOrderItemUnit" });
+                    l.Add(new FormField { TKey = "WorkOrderItemUnitCustom3", FieldKey = "WorkOrderItemUnitCustom3", IsCustomField = true, TKeySection = "WorkOrderItemUnit" });
+                    l.Add(new FormField { TKey = "WorkOrderItemUnitCustom4", FieldKey = "WorkOrderItemUnitCustom4", IsCustomField = true, TKeySection = "WorkOrderItemUnit" });
+                    l.Add(new FormField { TKey = "WorkOrderItemUnitCustom5", FieldKey = "WorkOrderItemUnitCustom5", IsCustomField = true, TKeySection = "WorkOrderItemUnit" });
+                    l.Add(new FormField { TKey = "WorkOrderItemUnitCustom6", FieldKey = "WorkOrderItemUnitCustom6", IsCustomField = true, TKeySection = "WorkOrderItemUnit" });
+                    l.Add(new FormField { TKey = "WorkOrderItemUnitCustom7", FieldKey = "WorkOrderItemUnitCustom7", IsCustomField = true, TKeySection = "WorkOrderItemUnit" });
+                    l.Add(new FormField { TKey = "WorkOrderItemUnitCustom8", FieldKey = "WorkOrderItemUnitCustom8", IsCustomField = true, TKeySection = "WorkOrderItemUnit" });
+                    l.Add(new FormField { TKey = "WorkOrderItemUnitCustom9", FieldKey = "WorkOrderItemUnitCustom9", IsCustomField = true, TKeySection = "WorkOrderItemUnit" });
+                    l.Add(new FormField { TKey = "WorkOrderItemUnitCustom10", FieldKey = "WorkOrderItemUnitCustom10", IsCustomField = true, TKeySection = "WorkOrderItemUnit" });
+                    l.Add(new FormField { TKey = "WorkOrderItemUnitCustom11", FieldKey = "WorkOrderItemUnitCustom11", IsCustomField = true, TKeySection = "WorkOrderItemUnit" });
+                    l.Add(new FormField { TKey = "WorkOrderItemUnitCustom12", FieldKey = "WorkOrderItemUnitCustom12", IsCustomField = true, TKeySection = "WorkOrderItemUnit" });
+                    l.Add(new FormField { TKey = "WorkOrderItemUnitCustom13", FieldKey = "WorkOrderItemUnitCustom13", IsCustomField = true, TKeySection = "WorkOrderItemUnit" });
+                    l.Add(new FormField { TKey = "WorkOrderItemUnitCustom14", FieldKey = "WorkOrderItemUnitCustom14", IsCustomField = true, TKeySection = "WorkOrderItemUnit" });
+                    l.Add(new FormField { TKey = "WorkOrderItemUnitCustom15", FieldKey = "WorkOrderItemUnitCustom15", IsCustomField = true, TKeySection = "WorkOrderItemUnit" });
+                    l.Add(new FormField { TKey = "WorkOrderItemUnitCustom16", FieldKey = "WorkOrderItemUnitCustom16", IsCustomField = true, TKeySection = "WorkOrderItemUnit" });
+


                    //WORKORDER ITEM SCHEDULED USER
@@ -1027,7 +1049,6 @@ namespace AyaNova.Biz
                    l.Add(new FormField { TKey = "WorkOrderItemLoanDueDate", FieldKey = "WorkOrderItemLoanDueDate", TKeySection = "WorkOrderItemLoans" });
                    l.Add(new FormField { TKey = "WorkOrderItemLoanReturnDate", FieldKey = "WorkOrderItemLoanReturnDate", TKeySection = "WorkOrderItemLoans" });
                    l.Add(new FormField { TKey = "WorkOrderItemLoanTaxCodeID", FieldKey = "WorkOrderItemLoanTaxCodeID", TKeySection = "WorkOrderItemLoans" });
-                    //l.Add(new FormField { TKey = "WorkOrderItemLoanTaxLoanSaleID", FieldKey = "WorkOrderItemLoanTaxLoanSaleID", TKeySection = "WorkOrderItemLoans" });
                    l.Add(new FormField { TKey = "WorkOrderItemLoanUnit", FieldKey = "WorkOrderItemLoanUnit", TKeySection = "WorkOrderItemLoans" });
                    l.Add(new FormField { TKey = "WorkOrderItemLoanQuantity", FieldKey = "WorkOrderItemLoanQuantity", TKeySection = "WorkOrderItemLoans" });
                    l.Add(new FormField { TKey = "WorkOrderItemLoanRate", FieldKey = "WorkOrderItemLoanRate", TKeySection = "WorkOrderItemLoans" });
--- a/server/AyaNova/biz/WorkOrderBiz.cs
+++ b/server/AyaNova/biz/WorkOrderBiz.cs
@@ -4846,9 +4846,7 @@ namespace AyaNova.Biz
        //  
        private async Task UnitPopulateVizFields(WorkOrderItemUnit o)
        {
-            await Task.CompletedTask;
-            // if (o.WorkOrderOverseerId != null)
-            //     o.WorkOrderOverseerViz = await ct.User.AsNoTracking().Where(x => x.Id == o.WorkOrderOverseerId).Select(x => x.Name).FirstOrDefaultAsync();
+            o.UnitViz = await ct.Unit.AsNoTracking().Where(x => x.Id == o.UnitId).Select(x => x.Serial).FirstOrDefaultAsync();
        }

        ////////////////////////////////////////////////////////////////////////////////////////////////
--- a/server/AyaNova/models/WorkOrderItemUnit.cs
+++ b/server/AyaNova/models/WorkOrderItemUnit.cs
@@ -17,7 +17,8 @@ namespace AyaNova.Models
        public List<string> Tags { get; set; } = new List<string>();
        [Required]
        public long UnitId { get; set; }
-
+        [NotMapped]
+        public string UnitViz { get; set; }

        //UTILITY FIELDS
        [NotMapped]
--- a/server/AyaNova/resource/de.json
+++ b/server/AyaNova/resource/de.json
@@ -2216,6 +2216,23 @@
  "WorkOrderCustom15": "Angepasstes Feld 15",
  "WorkOrderCustom16": "Angepasstes Feld 16",
  "WorkOrderItemUnitList": "Einheiten",
+  "WorkOrderItemUnitNotes":"Anmerkungen",
+  "WorkOrderItemUnitCustom1": "Angepasstes Feld 1",
+  "WorkOrderItemUnitCustom2": "Angepasstes Feld 2",
+  "WorkOrderItemUnitCustom3": "Angepasstes Feld 3",
+  "WorkOrderItemUnitCustom4": "Angepasstes Feld 4",
+  "WorkOrderItemUnitCustom5": "Angepasstes Feld 5",
+  "WorkOrderItemUnitCustom6": "Angepasstes Feld 6",
+  "WorkOrderItemUnitCustom7": "Angepasstes Feld 7",
+  "WorkOrderItemUnitCustom8": "Angepasstes Feld 8",
+  "WorkOrderItemUnitCustom9": "Angepasstes Feld 9",
+  "WorkOrderItemUnitCustom10": "Angepasstes Feld 10",
+  "WorkOrderItemUnitCustom11": "Angepasstes Feld 11",
+  "WorkOrderItemUnitCustom12": "Angepasstes Feld 12",
+  "WorkOrderItemUnitCustom13": "Angepasstes Feld 13",
+  "WorkOrderItemUnitCustom14": "Angepasstes Feld 14",
+  "WorkOrderItemUnitCustom15": "Angepasstes Feld 15",
+  "WorkOrderItemUnitCustom16": "Angepasstes Feld 16",
  "SelectAlternateAddress": "Stellen Sie eine alternative Adresse ein",
  "WorkOrderItemStatusList": "Artikelstatusliste",
  "WorkOrderItemStatusName": "Name",
--- a/server/AyaNova/resource/en.json
+++ b/server/AyaNova/resource/en.json
@@ -2216,6 +2216,23 @@
  "WorkOrderCustom15": "Custom15",
  "WorkOrderCustom16": "Custom16",
  "WorkOrderItemUnitList": "Units",
+  "WorkOrderItemUnitNotes":"Notes",
+  "WorkOrderItemUnitCustom1": "Custom1",
+  "WorkOrderItemUnitCustom2": "Custom2",
+  "WorkOrderItemUnitCustom3": "Custom3",
+  "WorkOrderItemUnitCustom4": "Custom4",
+  "WorkOrderItemUnitCustom5": "Custom5",
+  "WorkOrderItemUnitCustom6": "Custom6",
+  "WorkOrderItemUnitCustom7": "Custom7",
+  "WorkOrderItemUnitCustom8": "Custom8",
+  "WorkOrderItemUnitCustom9": "Custom9",
+  "WorkOrderItemUnitCustom10": "Custom10",
+  "WorkOrderItemUnitCustom11": "Custom11",
+  "WorkOrderItemUnitCustom12": "Custom12",
+  "WorkOrderItemUnitCustom13": "Custom13",
+  "WorkOrderItemUnitCustom14": "Custom14",
+  "WorkOrderItemUnitCustom15": "Custom15",
+  "WorkOrderItemUnitCustom16": "Custom16",
  "SelectAlternateAddress": "Select alternate address",
  "WorkOrderItemStatusList": "Work order item status list",
  "WorkOrderItemStatusName": "Name",
--- a/server/AyaNova/resource/es.json
+++ b/server/AyaNova/resource/es.json
@@ -2216,6 +2216,23 @@
  "WorkOrderCustom15": "Campo personalizado 15",
  "WorkOrderCustom16": "Campo personalizado 16",
  "WorkOrderItemUnitList": "Unidades",
+  "WorkOrderItemUnitNotes":"Notas",
+  "WorkOrderItemUnitCustom1": "Campo personalizado 1",
+  "WorkOrderItemUnitCustom2": "Campo personalizado 2",
+  "WorkOrderItemUnitCustom3": "Campo personalizado 3",
+  "WorkOrderItemUnitCustom4": "Campo personalizado 4",
+  "WorkOrderItemUnitCustom5": "Campo personalizado 5",
+  "WorkOrderItemUnitCustom6": "Campo personalizado 6",
+  "WorkOrderItemUnitCustom7": "Campo personalizado 7",
+  "WorkOrderItemUnitCustom8": "Campo personalizado 8",
+  "WorkOrderItemUnitCustom9": "Campo personalizado 9",
+  "WorkOrderItemUnitCustom10": "Campo personalizado 10",
+  "WorkOrderItemUnitCustom11": "Campo personalizado 11",
+  "WorkOrderItemUnitCustom12": "Campo personalizado 12",
+  "WorkOrderItemUnitCustom13": "Campo personalizado 13",
+  "WorkOrderItemUnitCustom14": "Campo personalizado 14",
+  "WorkOrderItemUnitCustom15": "Campo personalizado 15",
+  "WorkOrderItemUnitCustom16": "Campo personalizado 16",
  "SelectAlternateAddress": "Seleccionar dirección alternativa",
  "WorkOrderItemStatusList": "Lista de estado del artículo",
  "WorkOrderItemStatusName": "Nombre",
--- a/server/AyaNova/resource/fr.json
+++ b/server/AyaNova/resource/fr.json
@@ -2216,6 +2216,23 @@
  "WorkOrderCustom15": "Champ personnalisé 15",
  "WorkOrderCustom16": "Champ personnalisé 16",
  "WorkOrderItemUnitList": "Unités",
+  "WorkOrderItemUnitNotes":"Remarques",
+  "WorkOrderItemUnitCustom1": "Champ personnalisé 1",
+  "WorkOrderItemUnitCustom2": "Champ personnalisé 2",
+  "WorkOrderItemUnitCustom3": "Champ personnalisé 3",
+  "WorkOrderItemUnitCustom4": "Champ personnalisé 4",
+  "WorkOrderItemUnitCustom5": "Champ personnalisé 5",
+  "WorkOrderItemUnitCustom6": "Champ personnalisé 6",
+  "WorkOrderItemUnitCustom7": "Champ personnalisé 7",
+  "WorkOrderItemUnitCustom8": "Champ personnalisé 8",
+  "WorkOrderItemUnitCustom9": "Champ personnalisé 9",
+  "WorkOrderItemUnitCustom10": "Champ personnalisé 10",
+  "WorkOrderItemUnitCustom11": "Champ personnalisé 11",
+  "WorkOrderItemUnitCustom12": "Champ personnalisé 12",
+  "WorkOrderItemUnitCustom13": "Champ personnalisé 13",
+  "WorkOrderItemUnitCustom14": "Champ personnalisé 14",
+  "WorkOrderItemUnitCustom15": "Champ personnalisé 15",
+  "WorkOrderItemUnitCustom16": "Champ personnalisé 16",
  "SelectAlternateAddress": "Sélectionnez une autre adresse",
  "WorkOrderItemStatusList": "Liste des statuts des articles",
  "WorkOrderItemStatusName": "Nom",