From 2007758a7e6698bd2ee535e39436471d651eac78 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Wed, 23 Jun 2021 19:45:12 +0000
Subject: [PATCH]

---
 .../src/components/work-order-item-loans.vue  | 49 +------------------
 .../src/views/ay-data-list-column-view.vue    | 18 +++++--
 2 files changed, 15 insertions(+), 52 deletions(-)

diff --git a/ayanova/src/components/work-order-item-loans.vue b/ayanova/src/components/work-order-item-loans.vue
index c288a2da..5e75bfff 100644
--- a/ayanova/src/components/work-order-item-loans.vue
+++ b/ayanova/src/components/work-order-item-loans.vue
@@ -389,54 +389,7 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////
 /*  XXXeslint-disable    */
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*
-//WORKORDER ITEM LOAN
-l.Add(new FormField { TKey = "WorkOrderItemLoanNotes", FieldKey = "WorkOrderItemLoanNotes", TKeySection = "WorkOrderItemLoans" });
-l.Add(new FormField { TKey = "WorkOrderItemLoanOutDate", FieldKey = "WorkOrderItemLoanOutDate", TKeySection = "WorkOrderItemLoans" });
-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 = "WorkOrderItemLoanTaxCodeID", FieldKey = "WorkOrderItemLoanTaxCodeID", 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" });
-l.Add(new FormField { TKey = "Cost", FieldKey = "LoanCost", TKeySection = "WorkOrderItemLoans" });
-l.Add(new FormField { TKey = "ListPrice", FieldKey = "LoanListPrice", TKeySection = "WorkOrderItemLoans" });
-l.Add(new FormField { TKey = "Price", FieldKey = "LoanPriceViz", TKeySection = "WorkOrderItemLoans" });
-l.Add(new FormField { TKey = "PriceOverride", FieldKey = "LoanPriceOverride", TKeySection = "WorkOrderItemLoans" });
-l.Add(new FormField { TKey = "UnitOfMeasure", FieldKey = "LoanUnitOfMeasureViz", TKeySection = "WorkOrderItemLoans" });
-l.Add(new FormField { TKey = "NetPrice", FieldKey = "LoanNetViz", TKeySection = "WorkOrderItemLoans" });
-l.Add(new FormField { TKey = "TaxAAmt", FieldKey = "LoanTaxAViz", TKeySection = "WorkOrderItemLoans" });
-l.Add(new FormField { TKey = "TaxBAmt", FieldKey = "LoanTaxBViz", TKeySection = "WorkOrderItemLoans" });
-l.Add(new FormField { TKey = "LineTotal", FieldKey = "LoanLineTotalViz", TKeySection = "WorkOrderItemLoans" });
-{
-	"0": {## Item, rate, quantity, loaned,due, returned,notes, $$$ FIELDS
-"id": 31,
-"concurrency": 8125060,
-"notes": null,
-"outDate": "2020-11-08T01:00:00Z",
-"dueDate": "2020-11-08T02:00:00Z",
-"returnDate": null,
-"taxCodeId": null,
-"taxCodeViz": null,
-"loanUnitId": 4,
-"loanUnitViz": null,
-"quantity": 1,
-"rate": 1,
-"cost": 0,
-"listPrice": 20.689718162496447,
-"priceOverride": null,
-"unitOfMeasureViz": "Hour rate",
-"priceViz": 20.689718162496447,
-"netViz": 20.689718162496447,
-"taxAViz": 0,
-"taxBViz": 0,
-"lineTotalViz": 20.689718162496447,
-"isDirty": false,
-"workOrderItemId": 16
-	}
-}
-*/
+
 export default {
   created() {
     this.setDefaultView();
diff --git a/ayanova/src/views/ay-data-list-column-view.vue b/ayanova/src/views/ay-data-list-column-view.vue
index 776b7ad8..e10b51dd 100644
--- a/ayanova/src/views/ay-data-list-column-view.vue
+++ b/ayanova/src/views/ay-data-list-column-view.vue
@@ -434,16 +434,20 @@ function initWorkingView(vm) {
 
   //Pass 1, iterate the columns first
   for (let i = 0; i < columns.length; i++) {
-    //de-lodash
-    //let fld = window.$gz. _.find(vm.fieldDefinitions, ["fieldKey", lvItem.fld]);
     let fld = vm.fieldDefinitions.find(z => z.fieldKey == columns[i]);
 
     let o = {
       key: fld.fieldKey,
-      title: vm.$ay.t(fld.tKey),
+      title: null,
       include: true
     };
 
+    if (fld.tKeySection != null) {
+      o.title = vm.$ay.t(fld.tKeySection) + "." + vm.$ay.t(fld.tKey);
+    } else {
+      o.title = vm.$ay.t(fld.tKey);
+    }
+
     if (fld.isRowId) {
       o.rid = true;
     }
@@ -459,10 +463,16 @@ function initWorkingView(vm) {
       //nope, so add it
       let o = {
         key: fld.fieldKey,
-        title: vm.$ay.t(fld.tKey),
+        title: null,
         include: false
       };
 
+      if (fld.tKeySection != null) {
+        o.title = vm.$ay.t(fld.tKeySection) + "." + vm.$ay.t(fld.tKey);
+      } else {
+        o.title = vm.$ay.t(fld.tKey);
+      }
+
       if (fld.isRowId) {
         o.rid = true;
         o.include = true;