From 0125c8b5b913b0e953874e7a5d195634efe4da09 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Sat, 6 Mar 2021 19:10:31 +0000
Subject: [PATCH]

---
 ayanova/devdocs/todo.txt                   |  9 +++-
 ayanova/src/components/percent-control.vue | 61 ++++++++++++++++++++++
 ayanova/src/main.js                        |  2 +
 ayanova/src/views/svc-contract.vue         | 17 +++---
 4 files changed, 79 insertions(+), 10 deletions(-)
 create mode 100644 ayanova/src/components/percent-control.vue

diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index a5c0acc1..3450c8ec 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -197,10 +197,15 @@ todo: Changes to allow in place updates of server:
 
 
 CURRENTLY DOING: Contract form
-	numeric overflow with 200%
-	other than that, can probably just dupe the tagged part adjustments for service and travel then on to the limited rates, also need restrict to rates checkbox, then help docs and then done
+	 dupe the tagged part adjustments for service and travel then on to the limited rates, also need restrict to rates checkbox, then help docs and then done
 	(might want to put more fields in the datalist, it's very sparse adn the old v7 had pretty much all the fields as well)
 
+todo: change percentage values to be actual percentages in db and end to end
+	rather than .05 for 5% tax just let people enter 5, store as 5 and then divide by 100 for calcs as required
+
+	150.345
+
+todo: need pctg control now, I'm unable to enter more than 2 digits to the right of decimal point but that's required, also the above stuff about pct
 
 todo: confirm Unit contract fields are ok and datalist is ok
 
diff --git a/ayanova/src/components/percent-control.vue b/ayanova/src/components/percent-control.vue
new file mode 100644
index 00000000..24829efc
--- /dev/null
+++ b/ayanova/src/components/percent-control.vue
@@ -0,0 +1,61 @@
+<template>
+  <div>
+    <v-text-field
+      ref="textField"
+      :value="currencyValue"
+      @change="updateValue"
+      v-currency="{
+        currency: null,
+        locale: languageName,
+        precision: precision
+      }"
+      :readonly="readonly"
+      :disabled="disabled"
+      :label="label"
+      :rules="rules"
+      :error-messages="errorMessages"
+      append-icon="$ayiPercent"
+    ></v-text-field>
+  </div>
+</template>
+<script>
+/*  Xeslint-disable */
+//### NOTE: THIS IS A DUPLICATE OF CURRENCYCONTROL AND THE ONLY DIFFERENCE IS THE "currency:" VALUE IS SET TO NULL IN THE TEMPLATE AND IN THE updateValue METHOD
+//https://dm4t2.github.io/vue-currency-input/guide/#introduction :value="formattedValue"
+//https://codesandbox.io/s/vue-template-kd7d1?fontsize=14&module=%2Fsrc%2FApp.vue
+//https://github.com/dm4t2/vue-currency-input
+//https://github.com/dm4t2/vue-currency-input/releases
+import { setValue, parseCurrency } from "vue-currency-input";
+export default {
+  data() {
+    return {
+      languageName: window.$gz.locale.getBrowserFirstLanguage()
+    };
+  },
+  props: {
+    label: { type: String, default: null },
+    rules: { type: Array, default: undefined },
+    value: { type: Number, default: null },
+    readonly: { type: Boolean, default: false },
+    disabled: { type: Boolean, default: false },
+    errorMessages: { type: Array, default: null },
+    precision: { type: Number, default: undefined }
+  },
+  computed: {
+    currencyValue() {
+      return this.value;
+    }
+  },
+  methods: {
+    updateValue() {
+      let val = this.$refs.textField.$refs.input.value;
+      let parsedValue = parseCurrency(val, {
+        currency: null,
+        locale: this.languageName
+      });
+
+      this.$emit("input", parsedValue);
+    }
+  }
+};
+</script>
diff --git a/ayanova/src/main.js b/ayanova/src/main.js
index 3049b14c..5f35b8a0 100644
--- a/ayanova/src/main.js
+++ b/ayanova/src/main.js
@@ -45,6 +45,7 @@ import dataTableMobileFilterColumnSelectorControl from "./components/data-table-
 import customFieldsControl from "./components/custom-fields-control.vue";
 import currencyControl from "./components/currency-control.vue";
 import decimalControl from "./components/decimal-control.vue";
+import percentControl from "./components/percent-control.vue";
 import phoneControl from "./components/phone-control.vue";
 import emailControl from "./components/email-control.vue";
 import urlControl from "./components/url-control.vue";
@@ -197,6 +198,7 @@ Vue.component(
 );
 Vue.component("gz-custom-fields", customFieldsControl);
 Vue.component("gz-currency", currencyControl);
+Vue.component("gz-percent", percentControl);
 Vue.component("gz-decimal", decimalControl);
 Vue.component("gz-phone", phoneControl);
 Vue.component("gz-email", emailControl);
diff --git a/ayanova/src/views/svc-contract.vue b/ayanova/src/views/svc-contract.vue
index c3d67fa1..44e73cd1 100644
--- a/ayanova/src/views/svc-contract.vue
+++ b/ayanova/src/views/svc-contract.vue
@@ -39,7 +39,7 @@
           <v-col cols="12">
             <v-row>
               <v-col>
-                <gz-decimal
+                <gz-percent
                   v-model="obj.partsOverride"
                   :readonly="formState.readOnly"
                   :label="$ay.t('PartList')"
@@ -51,7 +51,8 @@
                   ]"
                   :error-messages="form().serverErrors(this, 'partsOverride')"
                   @input="fieldValueChanged('partsOverride')"
-                ></gz-decimal>
+                  :precision="5"
+                ></gz-percent>
               </v-col>
 
               <v-col>
@@ -74,7 +75,7 @@
             </v-row>
             <v-row>
               <v-col>
-                <gz-decimal
+                <gz-percent
                   v-model="obj.serviceRatesOverride"
                   :readonly="formState.readOnly"
                   :label="$ay.t('ServiceRateList')"
@@ -88,7 +89,7 @@
                     form().serverErrors(this, 'serviceRatesOverride')
                   "
                   @input="fieldValueChanged('serviceRatesOverride')"
-                ></gz-decimal>
+                ></gz-percent>
               </v-col>
 
               <v-col>
@@ -114,7 +115,7 @@
 
             <v-row>
               <v-col>
-                <gz-decimal
+                <gz-percent
                   v-model="obj.travelRatesOverride"
                   :readonly="formState.readOnly"
                   :label="$ay.t('TravelRateList')"
@@ -128,7 +129,7 @@
                     form().serverErrors(this, 'travelRatesOverride')
                   "
                   @input="fieldValueChanged('travelRatesOverride')"
-                ></gz-decimal>
+                ></gz-percent>
               </v-col>
 
               <v-col>
@@ -324,7 +325,7 @@
             <v-card-text>
               <v-row>
                 <v-col cols="12" sm="6" lg="4" xl="3">
-                  <gz-decimal
+                  <gz-percent
                     v-model="
                       obj.contractPartOverrideItems[
                         editContractPartOverrideItemIndex
@@ -355,7 +356,7 @@
                         `ContractPartOverrideItems[${editContractPartOverrideItemIndex}].Override`
                       )
                     "
-                  ></gz-decimal>
+                  ></gz-percent>
                 </v-col>
                 <v-col cols="12" sm="6" lg="4" xl="3">
                   <v-select