From faa5551d19b6f579c5e74f5180850abb3cef84d0 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Wed, 6 Jan 2021 19:47:58 +0000
Subject: [PATCH]

---
 ayanova/src/views/acc-service-rate.vue | 24 ++++++-------
 ayanova/src/views/acc-tax-code.vue     | 24 ++++++-------
 ayanova/src/views/acc-travel-rate.vue  | 24 ++++++-------
 ayanova/src/views/adm-user.vue         | 23 ++++++------
 ayanova/src/views/ay-report-edit.vue   | 23 ++++++------
 ayanova/src/views/cust-customer.vue    | 28 +++++++--------
 ayanova/src/views/cust-head-office.vue | 24 ++++++-------
 ayanova/src/views/cust-user.vue        | 23 ++++++------
 ayanova/src/views/ops-backup.vue       | 21 +++++------
 ayanova/src/views/svc-project.vue      | 23 ++++++------
 ayanova/src/views/svc-unit-model.vue   | 48 ++++++++++++--------------
 ayanova/src/views/svc-unit.vue         | 24 ++++++-------
 ayanova/src/views/vendor.vue           | 24 ++++++-------
 ayanova/src/views/widget.vue           | 24 ++++++-------
 14 files changed, 168 insertions(+), 189 deletions(-)

diff --git a/ayanova/src/views/acc-service-rate.vue b/ayanova/src/views/acc-service-rate.vue
index da325155..7556c15d 100644
--- a/ayanova/src/views/acc-service-rate.vue
+++ b/ayanova/src/views/acc-service-rate.vue
@@ -18,18 +18,6 @@
             ></v-text-field>
           </v-col>
 
-          <v-col cols="12" sm="6" lg="4" xl="3">
-            <v-checkbox
-              v-model="obj.active"
-              :readonly="formState.readOnly"
-              :label="$ay.t('Active')"
-              ref="active"
-              data-cy="active"
-              :error-messages="form().serverErrors(this, 'active')"
-              @change="fieldValueChanged('active')"
-            ></v-checkbox>
-          </v-col>
-
           <v-col
             v-if="form().showMe(this, 'RateAccountNumber')"
             cols="12"
@@ -109,7 +97,17 @@
               @input="fieldValueChanged('unit')"
             ></v-text-field>
           </v-col>
-
+          <v-col cols="12" sm="6" lg="4" xl="3">
+            <v-checkbox
+              v-model="obj.active"
+              :readonly="formState.readOnly"
+              :label="$ay.t('Active')"
+              ref="active"
+              data-cy="active"
+              :error-messages="form().serverErrors(this, 'active')"
+              @change="fieldValueChanged('active')"
+            ></v-checkbox>
+          </v-col>
           <!-- --------------------------------- -->
           <v-col v-if="form().showMe(this, 'ServiceRateNotes')" cols="12">
             <v-textarea
diff --git a/ayanova/src/views/acc-tax-code.vue b/ayanova/src/views/acc-tax-code.vue
index 2bdd4fbc..1add67e3 100644
--- a/ayanova/src/views/acc-tax-code.vue
+++ b/ayanova/src/views/acc-tax-code.vue
@@ -18,18 +18,6 @@
             ></v-text-field>
           </v-col>
 
-          <v-col cols="12" sm="6" lg="4" xl="3">
-            <v-checkbox
-              v-model="obj.active"
-              :readonly="formState.readOnly"
-              :label="$ay.t('Active')"
-              ref="active"
-              data-cy="active"
-              :error-messages="form().serverErrors(this, 'active')"
-              @change="fieldValueChanged('active')"
-            ></v-checkbox>
-          </v-col>
-
           <v-col
             v-if="form().showMe(this, 'TaxCodeTaxA')"
             cols="12"
@@ -91,7 +79,17 @@
               @change="fieldValueChanged('taxOnTax')"
             ></v-checkbox>
           </v-col>
-
+          <v-col cols="12" sm="6" lg="4" xl="3">
+            <v-checkbox
+              v-model="obj.active"
+              :readonly="formState.readOnly"
+              :label="$ay.t('Active')"
+              ref="active"
+              data-cy="active"
+              :error-messages="form().serverErrors(this, 'active')"
+              @change="fieldValueChanged('active')"
+            ></v-checkbox>
+          </v-col>
           <!-- --------------------------------- -->
           <v-col v-if="form().showMe(this, 'TaxCodeNotes')" cols="12">
             <v-textarea
diff --git a/ayanova/src/views/acc-travel-rate.vue b/ayanova/src/views/acc-travel-rate.vue
index 23fa8e38..45bd5d19 100644
--- a/ayanova/src/views/acc-travel-rate.vue
+++ b/ayanova/src/views/acc-travel-rate.vue
@@ -18,18 +18,6 @@
             ></v-text-field>
           </v-col>
 
-          <v-col cols="12" sm="6" lg="4" xl="3">
-            <v-checkbox
-              v-model="obj.active"
-              :readonly="formState.readOnly"
-              :label="$ay.t('Active')"
-              ref="active"
-              data-cy="active"
-              :error-messages="form().serverErrors(this, 'active')"
-              @change="fieldValueChanged('active')"
-            ></v-checkbox>
-          </v-col>
-
           <v-col
             v-if="form().showMe(this, 'RateAccountNumber')"
             cols="12"
@@ -109,7 +97,17 @@
               @input="fieldValueChanged('unit')"
             ></v-text-field>
           </v-col>
-
+          <v-col cols="12" sm="6" lg="4" xl="3">
+            <v-checkbox
+              v-model="obj.active"
+              :readonly="formState.readOnly"
+              :label="$ay.t('Active')"
+              ref="active"
+              data-cy="active"
+              :error-messages="form().serverErrors(this, 'active')"
+              @change="fieldValueChanged('active')"
+            ></v-checkbox>
+          </v-col>
           <!-- --------------------------------- -->
           <v-col v-if="form().showMe(this, 'TravelRateNotes')" cols="12">
             <v-textarea
diff --git a/ayanova/src/views/adm-user.vue b/ayanova/src/views/adm-user.vue
index c57ae1d8..62bab7bd 100644
--- a/ayanova/src/views/adm-user.vue
+++ b/ayanova/src/views/adm-user.vue
@@ -73,18 +73,6 @@
                   ></gz-role-picker>
                 </v-col>
 
-                <v-col cols="12" sm="6" lg="4" xl="3">
-                  <v-checkbox
-                    v-model="obj.active"
-                    :readonly="formState.readOnly"
-                    :label="$ay.t('Active')"
-                    ref="active"
-                    data-cy="active"
-                    :error-messages="form().serverErrors(this, 'active')"
-                    @change="fieldValueChanged('active')"
-                  ></v-checkbox>
-                </v-col>
-
                 <v-col
                   v-if="form().showMe(this, 'UserType')"
                   cols="12"
@@ -150,6 +138,17 @@
                     testId="lastLogin"
                   ></gz-date-time-picker>
                 </v-col>
+                <v-col cols="12" sm="6" lg="4" xl="3">
+                  <v-checkbox
+                    v-model="obj.active"
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('Active')"
+                    ref="active"
+                    data-cy="active"
+                    :error-messages="form().serverErrors(this, 'active')"
+                    @change="fieldValueChanged('active')"
+                  ></v-checkbox>
+                </v-col>
                 <v-col v-if="form().showMe(this, 'Notes')" cols="12">
                   <v-textarea
                     v-model="obj.notes"
diff --git a/ayanova/src/views/ay-report-edit.vue b/ayanova/src/views/ay-report-edit.vue
index 0802c78d..bd86dbac 100644
--- a/ayanova/src/views/ay-report-edit.vue
+++ b/ayanova/src/views/ay-report-edit.vue
@@ -68,18 +68,6 @@
               ></v-text-field>
             </v-col>
 
-            <v-col cols="12" sm="6" lg="4" xl="3">
-              <v-checkbox
-                v-model="obj.active"
-                :readonly="formState.readOnly"
-                :label="$ay.t('Active')"
-                ref="active"
-                data-cy="active"
-                :error-messages="form().serverErrors(this, 'active')"
-                @change="fieldValueChanged('active')"
-              ></v-checkbox>
-            </v-col>
-
             <v-col cols="12" sm="6" lg="4" xl="3">
               <gz-role-picker
                 :label="$ay.t('AuthorizationRoles')"
@@ -92,6 +80,17 @@
                 limitSelectionTo="inside"
               ></gz-role-picker>
             </v-col>
+            <v-col cols="12" sm="6" lg="4" xl="3">
+              <v-checkbox
+                v-model="obj.active"
+                :readonly="formState.readOnly"
+                :label="$ay.t('Active')"
+                ref="active"
+                data-cy="active"
+                :error-messages="form().serverErrors(this, 'active')"
+                @change="fieldValueChanged('active')"
+              ></v-checkbox>
+            </v-col>
 
             <v-col cols="12">
               <v-textarea
diff --git a/ayanova/src/views/cust-customer.vue b/ayanova/src/views/cust-customer.vue
index bfccf673..29718c1e 100644
--- a/ayanova/src/views/cust-customer.vue
+++ b/ayanova/src/views/cust-customer.vue
@@ -26,18 +26,6 @@
                   ></v-text-field>
                 </v-col>
 
-                <v-col cols="12" sm="6" lg="4" xl="3">
-                  <v-checkbox
-                    v-model="obj.active"
-                    :readonly="formState.readOnly"
-                    :label="$ay.t('Active')"
-                    ref="active"
-                    data-cy="active"
-                    :error-messages="form().serverErrors(this, 'active')"
-                    @change="fieldValueChanged('active')"
-                  ></v-checkbox>
-                </v-col>
-
                 <v-col
                   v-if="form().showMe(this, 'AccountNumber')"
                   cols="12"
@@ -317,10 +305,18 @@
                     </template>
                   </v-checkbox>
                 </v-col>
-
-                <!--   
-                  
-                    --------------------------------- -->
+                <v-col cols="12" sm="6" lg="4" xl="3">
+                  <v-checkbox
+                    v-model="obj.active"
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('Active')"
+                    ref="active"
+                    data-cy="active"
+                    :error-messages="form().serverErrors(this, 'active')"
+                    @change="fieldValueChanged('active')"
+                  ></v-checkbox>
+                </v-col>
+                <!-------------------------------- -->
                 <v-col v-if="form().showMe(this, 'Notes')" cols="12">
                   <v-textarea
                     v-model="obj.notes"
diff --git a/ayanova/src/views/cust-head-office.vue b/ayanova/src/views/cust-head-office.vue
index 931a0083..34190594 100644
--- a/ayanova/src/views/cust-head-office.vue
+++ b/ayanova/src/views/cust-head-office.vue
@@ -28,18 +28,6 @@
                   ></v-text-field>
                 </v-col>
 
-                <v-col cols="12" sm="6" lg="4" xl="3">
-                  <v-checkbox
-                    v-model="obj.active"
-                    :readonly="formState.readOnly"
-                    :label="$ay.t('Active')"
-                    ref="active"
-                    data-cy="active"
-                    :error-messages="form().serverErrors(this, 'active')"
-                    @change="fieldValueChanged('active')"
-                  ></v-checkbox>
-                </v-col>
-
                 <v-col
                   v-if="form().showMe(this, 'AccountNumber')"
                   cols="12"
@@ -255,7 +243,17 @@
                     </template></v-checkbox
                   >
                 </v-col>
-
+                <v-col cols="12" sm="6" lg="4" xl="3">
+                  <v-checkbox
+                    v-model="obj.active"
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('Active')"
+                    ref="active"
+                    data-cy="active"
+                    :error-messages="form().serverErrors(this, 'active')"
+                    @change="fieldValueChanged('active')"
+                  ></v-checkbox>
+                </v-col>
                 <!-- --------------------------------- -->
                 <v-col v-if="form().showMe(this, 'Notes')" cols="12">
                   <v-textarea
diff --git a/ayanova/src/views/cust-user.vue b/ayanova/src/views/cust-user.vue
index a05f8e7d..492932bb 100644
--- a/ayanova/src/views/cust-user.vue
+++ b/ayanova/src/views/cust-user.vue
@@ -85,18 +85,6 @@
                   ></gz-role-picker>
                 </v-col>
 
-                <v-col cols="12" sm="6" lg="4" xl="3">
-                  <v-checkbox
-                    v-model="obj.active"
-                    :readonly="formState.readOnly"
-                    :label="$ay.t('Active')"
-                    ref="active"
-                    data-cy="active"
-                    :error-messages="form().serverErrors(this, 'active')"
-                    @change="fieldValueChanged('active')"
-                  ></v-checkbox>
-                </v-col>
-
                 <v-col cols="12" sm="6" lg="4" xl="3">
                   <v-text-field
                     name="username"
@@ -140,6 +128,17 @@
                     testId="lastLogin"
                   ></gz-date-time-picker>
                 </v-col>
+                <v-col cols="12" sm="6" lg="4" xl="3">
+                  <v-checkbox
+                    v-model="obj.active"
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('Active')"
+                    ref="active"
+                    data-cy="active"
+                    :error-messages="form().serverErrors(this, 'active')"
+                    @change="fieldValueChanged('active')"
+                  ></v-checkbox>
+                </v-col>
                 <v-col v-if="form().showMe(this, 'Notes')" cols="12">
                   <v-textarea
                     v-model="obj.notes"
diff --git a/ayanova/src/views/ops-backup.vue b/ayanova/src/views/ops-backup.vue
index c7243d71..33cf46b3 100644
--- a/ayanova/src/views/ops-backup.vue
+++ b/ayanova/src/views/ops-backup.vue
@@ -7,16 +7,7 @@
           <v-col cols="12">
             <span class="title">{{ $ay.t("BackupSettings") }}</span>
           </v-col>
-          <v-col cols="12" sm="6" lg="4" xl="3">
-            <v-checkbox
-              v-model="obj.active"
-              :readonly="formState.readOnly"
-              :label="$ay.t('Active')"
-              ref="active"
-              :error-messages="form().serverErrors(this, 'active')"
-              @change="fieldValueChanged('active')"
-            ></v-checkbox>
-          </v-col>
+
           <v-col cols="12" sm="6" lg="4" xl="3">
             <gz-time-picker
               :label="$ay.t('BackupTime')"
@@ -52,6 +43,16 @@
               type="number"
             ></v-text-field>
           </v-col>
+          <v-col cols="12" sm="6" lg="4" xl="3">
+            <v-checkbox
+              v-model="obj.active"
+              :readonly="formState.readOnly"
+              :label="$ay.t('Active')"
+              ref="active"
+              :error-messages="form().serverErrors(this, 'active')"
+              @change="fieldValueChanged('active')"
+            ></v-checkbox>
+          </v-col>
         </v-row>
         <v-row>
           <v-col cols="12" class="mt-6">
diff --git a/ayanova/src/views/svc-project.vue b/ayanova/src/views/svc-project.vue
index 63577424..c6c04442 100644
--- a/ayanova/src/views/svc-project.vue
+++ b/ayanova/src/views/svc-project.vue
@@ -18,18 +18,6 @@
             ></v-text-field>
           </v-col>
 
-          <v-col cols="12" sm="6" lg="4" xl="3">
-            <v-checkbox
-              v-model="obj.active"
-              :readonly="formState.readOnly"
-              :label="$ay.t('Active')"
-              ref="active"
-              data-cy="active"
-              :error-messages="form().serverErrors(this, 'active')"
-              @change="fieldValueChanged('active')"
-            ></v-checkbox>
-          </v-col>
-
           <v-col
             v-if="form().showMe(this, 'ProjectAccountNumber')"
             cols="12"
@@ -107,6 +95,17 @@
               @input="fieldValueChanged('dateCompleted')"
             ></gz-date-time-picker>
           </v-col>
+          <v-col cols="12" sm="6" lg="4" xl="3">
+            <v-checkbox
+              v-model="obj.active"
+              :readonly="formState.readOnly"
+              :label="$ay.t('Active')"
+              ref="active"
+              data-cy="active"
+              :error-messages="form().serverErrors(this, 'active')"
+              @change="fieldValueChanged('active')"
+            ></v-checkbox>
+          </v-col>
           <!-- --------------------------------- -->
           <v-col v-if="form().showMe(this, 'Notes')" cols="12">
             <v-textarea
diff --git a/ayanova/src/views/svc-unit-model.vue b/ayanova/src/views/svc-unit-model.vue
index 8f38f2a4..7fcceef3 100644
--- a/ayanova/src/views/svc-unit-model.vue
+++ b/ayanova/src/views/svc-unit-model.vue
@@ -18,18 +18,6 @@
             ></v-text-field>
           </v-col>
 
-          <v-col cols="12" sm="6" lg="4" xl="3">
-            <v-checkbox
-              v-model="obj.active"
-              :readonly="formState.readOnly"
-              :label="$ay.t('Active')"
-              ref="active"
-              data-cy="active"
-              :error-messages="form().serverErrors(this, 'active')"
-              @change="fieldValueChanged('active')"
-            ></v-checkbox>
-          </v-col>
-
           <v-col
             v-if="form().showMe(this, 'Name')"
             cols="12"
@@ -86,19 +74,6 @@
             ></v-text-field>
           </v-col>
 
-          <v-col v-if="form().showMe(this, 'UnitModelNotes')" cols="12">
-            <v-textarea
-              v-model="obj.notes"
-              :readonly="formState.readOnly"
-              :label="$ay.t('UnitModelNotes')"
-              :error-messages="form().serverErrors(this, 'notes')"
-              ref="notes"
-              data-cy="notes"
-              @input="fieldValueChanged('notes')"
-              auto-grow
-            ></v-textarea>
-          </v-col>
-
           <v-col
             v-if="form().showMe(this, 'UnitModelIntroducedDate')"
             cols="12"
@@ -203,9 +178,32 @@
               auto-grow
             ></v-textarea>
           </v-col>
+          <v-col cols="12" sm="6" lg="4" xl="3">
+            <v-checkbox
+              v-model="obj.active"
+              :readonly="formState.readOnly"
+              :label="$ay.t('Active')"
+              ref="active"
+              data-cy="active"
+              :error-messages="form().serverErrors(this, 'active')"
+              @change="fieldValueChanged('active')"
+            ></v-checkbox>
+          </v-col>
 
           <!-- --------------------------------- -->
 
+          <v-col v-if="form().showMe(this, 'UnitModelNotes')" cols="12">
+            <v-textarea
+              v-model="obj.notes"
+              :readonly="formState.readOnly"
+              :label="$ay.t('UnitModelNotes')"
+              :error-messages="form().serverErrors(this, 'notes')"
+              ref="notes"
+              data-cy="notes"
+              @input="fieldValueChanged('notes')"
+              auto-grow
+            ></v-textarea>
+          </v-col>
           <v-col v-if="form().showMe(this, 'Tags')" cols="12">
             <gz-tag-picker
               v-model="obj.tags"
diff --git a/ayanova/src/views/svc-unit.vue b/ayanova/src/views/svc-unit.vue
index 5417293c..d23cc7d2 100644
--- a/ayanova/src/views/svc-unit.vue
+++ b/ayanova/src/views/svc-unit.vue
@@ -25,18 +25,6 @@
                   ></v-text-field>
                 </v-col>
 
-                <v-col cols="12" sm="6" lg="4" xl="3">
-                  <v-checkbox
-                    v-model="obj.active"
-                    :readonly="formState.readOnly"
-                    :label="$ay.t('Active')"
-                    ref="active"
-                    data-cy="active"
-                    :error-messages="form().serverErrors(this, 'active')"
-                    @change="fieldValueChanged('active')"
-                  ></v-checkbox>
-                </v-col>
-
                 <v-col
                   v-if="form().showMe(this, 'Customer')"
                   cols="12"
@@ -344,7 +332,17 @@
                     @input="fieldValueChanged('text4')"
                   ></v-text-field>
                 </v-col>
-
+                <v-col cols="12" sm="6" lg="4" xl="3">
+                  <v-checkbox
+                    v-model="obj.active"
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('Active')"
+                    ref="active"
+                    data-cy="active"
+                    :error-messages="form().serverErrors(this, 'active')"
+                    @change="fieldValueChanged('active')"
+                  ></v-checkbox>
+                </v-col>
                 <!-- --------------------------------- -->
                 <v-col v-if="form().showMe(this, 'Notes')" cols="12">
                   <v-textarea
diff --git a/ayanova/src/views/vendor.vue b/ayanova/src/views/vendor.vue
index c07446df..1ddf6348 100644
--- a/ayanova/src/views/vendor.vue
+++ b/ayanova/src/views/vendor.vue
@@ -24,18 +24,6 @@
                   ></v-text-field>
                 </v-col>
 
-                <v-col cols="12" sm="6" lg="4" xl="3">
-                  <v-checkbox
-                    v-model="obj.active"
-                    :readonly="formState.readOnly"
-                    :label="$ay.t('Active')"
-                    ref="active"
-                    data-cy="active"
-                    :error-messages="form().serverErrors(this, 'active')"
-                    @change="fieldValueChanged('active')"
-                  ></v-checkbox>
-                </v-col>
-
                 <v-col
                   v-if="form().showMe(this, 'AccountNumber')"
                   cols="12"
@@ -197,7 +185,17 @@
                     @input="fieldValueChanged('phone5')"
                   ></gz-phone>
                 </v-col>
-
+                <v-col cols="12" sm="6" lg="4" xl="3">
+                  <v-checkbox
+                    v-model="obj.active"
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('Active')"
+                    ref="active"
+                    data-cy="active"
+                    :error-messages="form().serverErrors(this, 'active')"
+                    @change="fieldValueChanged('active')"
+                  ></v-checkbox>
+                </v-col>
                 <!-- --------------------------------- -->
                 <v-col v-if="form().showMe(this, 'Notes')" cols="12">
                   <v-textarea
diff --git a/ayanova/src/views/widget.vue b/ayanova/src/views/widget.vue
index d41cddb7..b25f5ef8 100644
--- a/ayanova/src/views/widget.vue
+++ b/ayanova/src/views/widget.vue
@@ -102,17 +102,6 @@
                 @input="fieldValueChanged('endDate')"
               ></gz-date-time-picker>
             </v-col>
-            <v-col cols="12" sm="6" lg="4" xl="3">
-              <v-checkbox
-                v-model="obj.active"
-                :readonly="formState.readOnly"
-                :label="$ay.t('Active')"
-                ref="active"
-                data-cy="active"
-                :error-messages="form().serverErrors(this, 'active')"
-                @change="fieldValueChanged('active')"
-              ></v-checkbox>
-            </v-col>
 
             <v-col
               v-if="form().showMe(this, 'UserId')"
@@ -155,7 +144,18 @@
                 @input="fieldValueChanged('usertype')"
               ></v-select>
             </v-col>
-
+            <v-col cols="12" sm="6" lg="4" xl="3">
+              <v-checkbox
+                v-model="obj.active"
+                :readonly="formState.readOnly"
+                :label="$ay.t('Active')"
+                ref="active"
+                data-cy="active"
+                :error-messages="form().serverErrors(this, 'active')"
+                @change="fieldValueChanged('active')"
+              ></v-checkbox>
+            </v-col>
+            <!-- ------------------------------------- -->
             <v-col v-if="form().showMe(this, 'Notes')" cols="12">
               <v-textarea
                 v-model="obj.notes"