From 0db453db75cb21f41e8ce9b00793696761d3e074 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Fri, 19 Feb 2021 01:30:29 +0000
Subject: [PATCH]

---
 ayanova/devdocs/todo.txt                 |  13 ++
 ayanova/src/api/locale.js                |   2 +-
 ayanova/src/views/inv-purchase-order.vue | 163 ++++++++++++++---------
 3 files changed, 113 insertions(+), 65 deletions(-)

diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index 1cf5f351..8c346807 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -8,6 +8,19 @@
 MISC ITEMS THAT CAME UP
 
 ## CLIENT MISC ITEMS
+todo: inconsistent use of browser language and browser languages
+	getBrowserLanguages() <--- more often used vs getBrowserFirstLanguage() <-- fewer times used
+	some things are using the default first language
+	and some are using the entire array
+	In some cases array will work, in others it requires single
+	need to check into this and be consistent or understand what's happening
+	I'm guessing we favor languages as it seems to be accepted by whatever is using it and it will work better if the first one is unsupported
+
+todo: locale.js  look into this:
+	  	// also for sake of future proofing and edge cases need to have it be manually settable as well
+  		//  ############### TODO: modify all of these to put the user's manual override first in line (if there is one)
+
+
 todo: when have po, can po serial number be set by user and accepted by postgres?
 	I think it can with the definition I have set up.
 	this would be useful for scenarios like 4alarm with the oddball po and other auto generated id numbers
diff --git a/ayanova/src/api/locale.js b/ayanova/src/api/locale.js
index 481f0134..f0873ed3 100644
--- a/ayanova/src/api/locale.js
+++ b/ayanova/src/api/locale.js
@@ -1,7 +1,7 @@
 /* ZZeslint-disable */
 //Browser Locale conversion utilities
 
-import { faYinYang } from "@fortawesome/free-solid-svg-icons";
+// import { faYinYang } from "@fortawesome/free-solid-svg-icons";
 
 //dates,numbers currency etc
 export default {
diff --git a/ayanova/src/views/inv-purchase-order.vue b/ayanova/src/views/inv-purchase-order.vue
index d8ace26d..70c97e3c 100644
--- a/ayanova/src/views/inv-purchase-order.vue
+++ b/ayanova/src/views/inv-purchase-order.vue
@@ -220,7 +220,7 @@
               auto-grow
             ></v-textarea>
           </v-col>
-          {{ obj.items }}
+
           <v-col cols="12">
             <!-- <span class="title">{{ $ay.t("PurchaseOrderItemList") }}</span>
             <v-btn @click="getBackupStatus" class="mb-6">
@@ -382,7 +382,6 @@ export default {
       },
       showWarehouses: true,
       headers: [],
-      itemList: [],
       obj:
         //IMPORTANT NOTE: Fields that are NON NULLABLE in the schema for the table but *are* hideable **MUST** have a default value set here or else there will be no way to save the record
         //I.E. Serial, usertype fields, ACTIVE
@@ -419,7 +418,11 @@ export default {
         serverError: {}
       },
       rights: window.$gz.role.defaultRightsObject(),
-      ayaType: window.$gz.type.PurchaseOrder
+      ayaType: window.$gz.type.PurchaseOrder,
+      currencyName: window.$gz.locale.getCurrencyName(),
+      timeZoneName: window.$gz.locale.getResolvedTimeZoneName(),
+      languageName: window.$gz.locale.getBrowserLanguages(),
+      hour12: window.$gz.locale.getHour12()
     };
   },
   //WATCHERS
@@ -456,6 +459,61 @@ export default {
       deep: true
     }
   },
+  computed: {
+    itemList: function() {
+      let vm = this;
+      // let ret = [];
+      // ret.push(...vm.obj.items);
+      // return ret;
+      //       kvArray.map(obj => {
+      //    let rObj = {}
+      //    rObj[obj.key] = obj.value
+      //    return rObj
+      // })
+      /*[ 
+        { "id": 1, "concurrency": 7262944, "purchaseOrderId": 1, "partId": 8, "partWarehouseId": 2, "quantityOrdered": 24, 
+        "quantityReceived": 24, "purchaseOrderCost": 2.0518, "receivedCost": 10, "receivedDate": "2020-11-03T11:39:07.594439Z", 
+        "partRequestedById": null, "workorderItemPartRequestId": null, "purchaseTaxCodeId": null, "vendorPartNumber": "aws-785477", 
+        "displayPartNumber": "785477", "displayWarehouse": "WHS- Baron Corners", "displayRequestUser": null, 
+        "displayRequestWorkorder": null, "displayTaxCode": null } ] 
+        */
+      return vm.obj.items.map(x => {
+        return {
+          id: x.id,
+          quantityOrdered: window.$gz.locale.decimalLocalized(
+            x.quantityOrdered,
+            vm.languageName
+          ),
+          quantityReceived: window.$gz.locale.decimalLocalized(
+            x.quantityReceived,
+            vm.languageName
+          ),
+          purchaseOrderCost: window.$gz.locale.currencyLocalized(
+            x.purchaseOrderCost,
+            vm.languageName,
+            vm.currencyName
+          ),
+          receivedCost: window.$gz.locale.currencyLocalized(
+            x.receivedCost,
+            vm.languageName,
+            vm.currencyName
+          ),
+          receivedDate: window.$gz.locale.utcDateToShortDateAndTimeLocalized(
+            x.receivedDate,
+            vm.timeZoneName,
+            vm.languageName,
+            vm.hour12
+          ),
+          vendorPartNumber: x.vendorPartNumber,
+          displayPartNumber: x.displayPartNumber,
+          displayWarehouse: x.displayWarehouse,
+          displayRequestUser: x.displayRequestUser,
+          displayRequestWorkorder: x.displayRequestWorkorder,
+          displayTaxCode: x.displayTaxCode
+        };
+      });
+    }
+  },
   methods: {
     canSave: function() {
       return this.formState.valid && this.formState.dirty;
@@ -838,102 +896,77 @@ async function fetchWarehouseCount(vm) {
 //
 //
 async function createTableHeaders(vm) {
-  vm.headers.push({
-    text: vm.$ay.t("PurchaseOrderItemQuantityOrdered"),
-    align: "start",
-    value: "quantityOrdered"
-  });
-  vm.headers.push({
-    text: vm.$ay.t("PurchaseOrderItemQuantityReceived"),
-    align: "start",
-    value: "quantityReceived"
-  });
-
+  /*
+  If the column is a text, left-align it
+  If the column is a number or number + unit, right-align it (like excel)
+  */
   vm.headers.push({
     text: vm.$ay.t("Part"),
-    align: "start",
+    align: "left",
     value: "displayPartNumber"
   });
 
   if (vm.showWarehouses) {
     vm.headers.push({
       text: vm.$ay.t("PartWarehouse"),
-      align: "start",
+      align: "left",
       value: "displayWarehouse"
     });
   }
+  vm.headers.push({
+    text: vm.$ay.t("PurchaseOrderItemQuantityOrdered"),
+    align: "right",
+    value: "quantityOrdered"
+  });
+  vm.headers.push({
+    text: vm.$ay.t("PurchaseOrderItemQuantityReceived"),
+    align: "right",
+    value: "quantityReceived"
+  });
+  vm.headers.push({
+    text: vm.$ay.t("PurchaseOrderReceiptReceivedDate"),
+    align: "left",
+    value: "receivedDate"
+  });
 
-//receiveddate
-//receivedcost
-//PO COST
+  vm.headers.push({
+    text: vm.$ay.t("PurchaseOrderItemPurchaseOrderCost"),
+    align: "right",
+    value: "purchaseOrderCost"
+  });
+
+  vm.headers.push({
+    text: vm.$ay.t("PurchaseOrderReceiptItemReceiptCost"),
+    align: "right",
+    value: "receivedCost"
+  });
 
   vm.headers.push({
     text: vm.$ay.t("TaxCode"),
-    align: "start",
+    align: "left",
     value: "displayTaxCode"
   });
 
   vm.headers.push({
     text: vm.$ay.t("PurchaseOrderItemVendorPartNumber"),
-    align: "start",
+    align: "left",
     value: "vendorPartNumber"
   });
 
   vm.headers.push({
     text: vm.$ay.t("PurchaseOrderItemPartRequestedByID"),
-    align: "start",
+    align: "left",
     value: "displayRequestUser"
   });
 
   vm.headers.push({
     text: vm.$ay.t("PurchaseOrderItemWorkOrderNumber"),
-    align: "start",
+    align: "left",
     value: "displayRequestWorkorder"
   });
   //--------------
 }
 
-/*
- [Required]
-        public long PurchaseOrderId { get; set; }
-        [Required]
-        public long PartId { get; set; }
-        [Required]
-        public long PartWarehouseId { get; set; }
-        [Required]
-        public decimal QuantityOrdered { get; set; }
-        [Required]
-        public decimal QuantityReceived { get; set; }
-        [Required]
-        public decimal PurchaseOrderCost { get; set; }
-        [Required]
-        public decimal ReceivedCost { get; set; }
-        public DateTime? ReceivedDate { get; set; }
-        public long? PartRequestedById { get; set; }
-        public long? WorkorderItemPartRequestId { get; set; }
-        public long? PurchaseTaxCodeId { get; set; }
-        public string VendorPartNumber { get; set; }
-
-        "PurchaseOrderItemLineTotal": "Line Total",
-        "PurchaseOrderItemNetTotal": "Net Total",
-        "PurchaseOrderItemPartName": "Part Name",
-        "PurchaseOrderItemPartNumber": "Part Number",
-        "PurchaseOrderItemPartRequestedByID": "Requested by",
-        "PurchaseOrderItemPurchaseOrderCost": "P.O. Cost",
-        "PurchaseOrderItemQuantityOrdered": "Quantity Ordered",
-        "PurchaseOrderItemQuantityReceived": "Quantity Received",
-        "PurchaseOrderItemUIOrderedFrom": "Ordered from",
-        "PurchaseOrderItemUISaveWarning": "Are you sure you want to save?\r\nOnce this record is saved it will be locked and can no longer be edited.",
-        "PurchaseOrderItemWorkOrderNumber": "WorkOrder #",
-
-  { 
-   "id": 1, "concurrency": 7252069, "purchaseOrderId": 1, "partId": 5, "partWarehouseId": 3, "quantityOrdered": 74, 
-  "quantityReceived": 74, "purchaseOrderCost": 3.8921, "receivedCost": 10, "receivedDate": "2020-06-30T17:14:19.446974Z", 
-  "partRequestedById": null, "workorderItemPartRequestId": null, "purchaseTaxCodeId": null, "vendorPartNumber": "aws-188369" 
-  "displayPartNumber": "182799", "displayWarehouse": "WHS- Jaron River", "displayRequestUser": null, "displayRequestWorkorder": null, "displayTaxCode": null
-  }
-*/
-
 //////////////////////
 //
 //
@@ -979,6 +1012,8 @@ async function fetchTranslatedText(vm) {
     "PurchaseOrderItemLineTotal",
     "TaxCodeTaxA",
     "TaxCodeTaxB",
+    "PurchaseOrderReceiptReceivedDate",
+    "PurchaseOrderReceiptItemReceiptCost",
     "PurchaseOrderCustom1",
     "PurchaseOrderCustom2",
     "PurchaseOrderCustom3",