re-factor / cleanup

ayanova/src/components/work-order-address.vue

@@ -8,8 +8,8 @@
         <v-btn
           icon
           class="ml-n1 mr-2"
-          @click="openDialog = true"
           :data-cy="`${dataCy}:open`"
+          @click="openDialog = true"
         >
           <v-icon>$ayiEdit</v-icon>
         </v-btn>
@@ -25,7 +25,7 @@
           <v-card-text>
             <v-row>
               <v-col cols="12">
-                <v-menu offset-y v-if="!readonly">
+                <v-menu v-if="!readonly" offset-y>
                   <template v-slot:activator="{ on, attrs }">
                     <span class="text-h6">
                       {{ $ay.t("AddressTypePhysical") }}</span
@@ -66,7 +66,7 @@
                     </v-list-item>
                   </v-list>
                 </v-menu>
-                <span class="text-h6" v-else>
+                <span v-else class="text-h6">
                   {{ $ay.t("AddressTypePhysical") }}</span
                 >
               </v-col>
@@ -78,10 +78,10 @@
                 xl="3"
               >
                 <v-text-field
+                  ref="address"
                   v-model="value.address"
                   :readonly="readonly"
                   :label="$ay.t('AddressDeliveryAddress')"
-                  ref="address"
                   data-cy="address"
                   :error-messages="form().serverErrors(this, 'address')"
                   @input="fieldValueChanged('address')"
@@ -96,10 +96,10 @@
                 xl="3"
               >
                 <v-text-field
+                  ref="city"
                   v-model="value.city"
                   :readonly="readonly"
                   :label="$ay.t('AddressCity')"
-                  ref="city"
                   data-cy="city"
                   :error-messages="form().serverErrors(this, 'city')"
                   @input="fieldValueChanged('city')"
@@ -114,10 +114,10 @@
                 xl="3"
               >
                 <v-text-field
+                  ref="region"
                   v-model="value.region"
                   :readonly="readonly"
                   :label="$ay.t('AddressStateProv')"
-                  ref="region"
                   data-cy="region"
                   :error-messages="form().serverErrors(this, 'region')"
                   @input="fieldValueChanged('region')"
@@ -132,10 +132,10 @@
                 xl="3"
               >
                 <v-text-field
+                  ref="country"
                   v-model="value.country"
                   :readonly="readonly"
                   :label="$ay.t('AddressCountry')"
-                  ref="country"
                   data-cy="country"
                   :error-messages="form().serverErrors(this, 'country')"
                   @input="fieldValueChanged('country')"
@@ -150,15 +150,15 @@
                 xl="3"
               >
                 <gz-decimal
+                  ref="latitude"
                   v-model="value.latitude"
                   :readonly="readonly"
                   :label="$ay.t('AddressLatitude')"
-                  ref="latitude"
                   data-cy="latitude"
                   :rules="[form().decimalValid(this, 'latitude')]"
                   :error-messages="form().serverErrors(this, 'latitude')"
-                  @input="fieldValueChanged('latitude')"
                   :precision="6"
+                  @input="fieldValueChanged('latitude')"
                 ></gz-decimal>
               </v-col>
 
@@ -170,20 +170,20 @@
                 xl="3"
               >
                 <gz-decimal
+                  ref="longitude"
                   v-model="value.longitude"
                   :readonly="readonly"
                   :label="$ay.t('AddressLongitude')"
-                  ref="longitude"
                   data-cy="longitude"
                   :rules="[form().decimalValid(this, 'longitude')]"
                   :error-messages="form().serverErrors(this, 'longitude')"
-                  @input="fieldValueChanged('longitude')"
                   :precision="6"
+                  @input="fieldValueChanged('longitude')"
                 ></gz-decimal>
               </v-col>
 
               <v-col cols="12">
-                <v-menu offset-y v-if="!readonly">
+                <v-menu v-if="!readonly" offset-y>
                   <template v-slot:activator="{ on, attrs }">
                     <span class="text-h6">
                       {{ $ay.t("AddressTypePostal") }}</span
@@ -216,7 +216,7 @@
                     </v-list-item>
                   </v-list>
                 </v-menu>
-                <span class="text-h6" v-else>
+                <span v-else class="text-h6">
                   {{ $ay.t("AddressTypePostal") }}</span
                 >
               </v-col>
@@ -229,10 +229,10 @@
                 xl="3"
               >
                 <v-text-field
+                  ref="postAddress"
                   v-model="value.postAddress"
                   :readonly="readonly"
                   :label="$ay.t('AddressPostalDeliveryAddress')"
-                  ref="postAddress"
                   data-cy="postAddress"
                   :error-messages="form().serverErrors(this, 'postAddress')"
                   @input="fieldValueChanged('postAddress')"
@@ -247,10 +247,10 @@
                 xl="3"
               >
                 <v-text-field
+                  ref="postCity"
                   v-model="value.postCity"
                   :readonly="readonly"
                   :label="$ay.t('AddressPostalCity')"
-                  ref="postCity"
                   data-cy="postCity"
                   :error-messages="form().serverErrors(this, 'postCity')"
                   @input="fieldValueChanged('postCity')"
@@ -265,10 +265,10 @@
                 xl="3"
               >
                 <v-text-field
+                  ref="postRegion"
                   v-model="value.postRegion"
                   :readonly="readonly"
                   :label="$ay.t('AddressPostalStateProv')"
-                  ref="postRegion"
                   data-cy="postRegion"
                   :error-messages="form().serverErrors(this, 'postRegion')"
                   @input="fieldValueChanged('postRegion')"
@@ -283,10 +283,10 @@
                 xl="3"
               >
                 <v-text-field
+                  ref="postCountry"
                   v-model="value.postCountry"
                   :readonly="readonly"
                   :label="$ay.t('AddressPostalCountry')"
-                  ref="postCountry"
                   data-cy="postCountry"
                   :error-messages="form().serverErrors(this, 'postCountry')"
                   @input="fieldValueChanged('postCountry')"
@@ -301,10 +301,10 @@
                 xl="3"
               >
                 <v-text-field
+                  ref="postCode"
                   v-model="value.postCode"
                   :readonly="readonly"
                   :label="$ay.t('AddressPostalPostal')"
-                  ref="postCode"
                   data-cy="postCode"
                   :error-messages="form().serverErrors(this, 'postCode')"
                   @input="fieldValueChanged('postCode')"
@@ -318,15 +318,15 @@
             <v-btn
               color="blue darken-1"
               text
-              @click="close()"
               :data-cy="`${dataCy}:btnok`"
+              @click="close()"
               >{{ $ay.t("OK") }}</v-btn
             >
           </v-card-actions>
         </v-card>
       </v-dialog>
     </v-row>
-    <v-dialog max-width="600px" v-model="openSelectDialog">
+    <v-dialog v-model="openSelectDialog" max-width="600px">
       <v-card>
         <v-card-title>
           <span class="text-h5">{{ $ay.t("SelectAlternateAddress") }}</span>
@@ -361,14 +361,6 @@
 </template>
 <script>
 export default {
-  data() {
-    return {
-      openDialog: false,
-      openSelectDialog: false,
-      selectType: 1,
-      alternateAddresses: []
-    };
-  },
   props: {
     value: {
       default: null,
@@ -383,6 +375,25 @@ export default {
     readonly: Boolean,
     disabled: Boolean
   },
+  data() {
+    return {
+      openDialog: false,
+      openSelectDialog: false,
+      selectType: 1,
+      alternateAddresses: []
+    };
+  },
+  computed: {
+    formState: function() {
+      return this.pvm.formState;
+    },
+    formCustomTemplateKey: function() {
+      return this.pvm.formCustomTemplateKey;
+    },
+    displayServiceAddress() {
+      return formatAddress(this.value).physical;
+    }
+  },
 
   methods: {
     close() {
@@ -525,17 +536,6 @@ export default {
         //could fail on some platforms
       }
     }
-  },
-  computed: {
-    formState: function() {
-      return this.pvm.formState;
-    },
-    formCustomTemplateKey: function() {
-      return this.pvm.formCustomTemplateKey;
-    },
-    displayServiceAddress() {
-      return formatAddress(this.value).physical;
-    }
   }
 };