From 95c7792d575d3bf4c9cd8566356bd052e788ce9b Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Tue, 16 Jun 2020 22:17:25 +0000
Subject: [PATCH]

---
 ayanova/src/views/ay-evaluate.vue | 118 +++++++++++++++---------------
 ayanova/src/views/login.vue       |  16 +---
 2 files changed, 63 insertions(+), 71 deletions(-)

diff --git a/ayanova/src/views/ay-evaluate.vue b/ayanova/src/views/ay-evaluate.vue
index 0cfafd5d..488a5e77 100644
--- a/ayanova/src/views/ay-evaluate.vue
+++ b/ayanova/src/views/ay-evaluate.vue
@@ -4,64 +4,66 @@
       <v-form ref="form">
         <v-row>
           <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
-          <v-col cols="12">
-            <div class="text-h4 text-md-h2 mb-2">{{ $ay.t("Welcome") }}</div>
-          </v-col>
-          <v-col cols="12">
-            <v-btn @click="helpEvaluate()" class="my-8 mr-4">{{
-              $ay.t("EvaluationGuide")
-            }}</v-btn>
-            <v-btn :href="supportLink()" target="blank" class="my-8 mr-4">{{
-              $ay.t("HelpTechSupport")
-            }}</v-btn>
-          </v-col>
-          <v-col cols="12">
-            <div class="text-h5 mt-8 mb-2">
-              {{ $ay.t("GenerateSampleData") }}
-            </div>
-            <v-col cols="12" sm="6" v-if="formState.readOnly">
-              <div class="text-h6 mt-8 warning--text">
-                {{ $ay.t("ErrorSecurityAdministratorOnlyMessage") }}
-              </div>
-            </v-col>
-            <v-col cols="12" sm="6">
-              <v-select
-                v-model="obj.seedLevel"
-                :items="selectLists.seedLevels"
-                :rules="[form().required(this, 'seedLevel')]"
-                @input="fieldValueChanged('seedLevel')"
-                ref="seedLevel"
-                item-text="name"
-                item-value="id"
-                :readonly="formState.readOnly"
-                :disabled="formState.readOnly"
-                :label="$ay.t('SeedLevel')"
-              ></v-select>
-            </v-col>
-            <v-col cols="12" sm="6">
-              <v-text-field
-                v-model="obj.timeZoneOffset"
-                :readonly="formState.readOnly"
-                :disabled="formState.readOnly"
-                :rules="[
-                  form().decimalValid(this, 'timeZoneOffset'),
-                  form().required(this, 'timeZoneOffset')
-                ]"
-                :label="$ay.t('UserTimeZoneOffset')"
-                type="number"
-                ref="timeZoneOffset"
-                @input="fieldValueChanged('timeZoneOffset')"
-              ></v-text-field>
-            </v-col>
-
+          <v-col cols="12" offset-md="3">
             <v-col cols="12">
-              <v-btn
-                :loading="seedingJobActive"
-                :disabled="formState.readOnly"
-                @click="generate()"
-                class="my-8 mr-4"
-                >{{ $ay.t("StartJob") }}</v-btn
-              >
+              <div class="text-h4 text-md-h2 mb-2">{{ $ay.t("Welcome") }}</div>
+            </v-col>
+            <v-col cols="12">
+              <v-btn @click="helpEvaluate()" class="my-8 mr-16">{{
+                $ay.t("EvaluationGuide")
+              }}</v-btn>
+              <v-btn :href="supportLink()" target="blank" class="my-8 mr-12">{{
+                $ay.t("HelpTechSupport")
+              }}</v-btn>
+            </v-col>
+            <v-col cols="12">
+              <div class="text-h5 mt-8 mb-2">
+                {{ $ay.t("GenerateSampleData") }}
+              </div>
+              <v-col cols="12" sm="6" v-if="formState.readOnly">
+                <div class="text-h6 mt-8 warning--text">
+                  {{ $ay.t("ErrorSecurityAdministratorOnlyMessage") }}
+                </div>
+              </v-col>
+              <v-col cols="12" sm="6">
+                <v-select
+                  v-model="obj.seedLevel"
+                  :items="selectLists.seedLevels"
+                  :rules="[form().required(this, 'seedLevel')]"
+                  @input="fieldValueChanged('seedLevel')"
+                  ref="seedLevel"
+                  item-text="name"
+                  item-value="id"
+                  :readonly="formState.readOnly"
+                  :disabled="formState.readOnly"
+                  :label="$ay.t('SeedLevel')"
+                ></v-select>
+              </v-col>
+              <v-col cols="12" sm="6">
+                <v-text-field
+                  v-model="obj.timeZoneOffset"
+                  :readonly="formState.readOnly"
+                  :disabled="formState.readOnly"
+                  :rules="[
+                    form().decimalValid(this, 'timeZoneOffset'),
+                    form().required(this, 'timeZoneOffset')
+                  ]"
+                  :label="$ay.t('UserTimeZoneOffset')"
+                  type="number"
+                  ref="timeZoneOffset"
+                  @input="fieldValueChanged('timeZoneOffset')"
+                ></v-text-field>
+              </v-col>
+
+              <v-col cols="12">
+                <v-btn
+                  :loading="seedingJobActive"
+                  :disabled="formState.readOnly"
+                  @click="generate()"
+                  class="my-8 mr-4"
+                  >{{ $ay.t("StartJob") }}</v-btn
+                >
+              </v-col>
             </v-col>
           </v-col>
         </v-row>
@@ -213,7 +215,7 @@ export default {
         //get status
 
         while (vm.seedingJobActive == true) {
-          await window.$gz.util.sleepAsync(5000);
+          await window.$gz.util.sleepAsync(1000);
           //check if done
           jobStatus = await window.$gz.api.get(
             `job-operations/status/${jobId}`
diff --git a/ayanova/src/views/login.vue b/ayanova/src/views/login.vue
index bf7f90a1..4f56e854 100644
--- a/ayanova/src/views/login.vue
+++ b/ayanova/src/views/login.vue
@@ -21,7 +21,7 @@
             <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
           </v-col>
 
-          <v-col cols="12" md="7" v-if="serverStatus == 1">
+          <v-col cols="12" md="7" v-if="showEvalUsers == true">
             <v-select
               v-model="selectedTrialUserId"
               :items="selectLists.trialUsers"
@@ -97,7 +97,7 @@ export default {
       errorBadCreds: false,
       reveal: false,
       formState: { errorBoxMessage: null },
-      serverStatus: 0,
+      showEvalUsers: false,
       selectedTrialUserId: 1,
       selectLists: {
         trialUsers: [
@@ -226,17 +226,7 @@ export default {
       .get("notify/hello")
       .then(res => {
         if (res.data != null) {
-          /**public enum LicenseStatus
-            {
-                NONE = 0,
-                ActiveTrial = 1,
-                ExpiredTrial = 2,
-                ActivePurchased = 3,
-                ExpiredPurchased = 4,
-                Revoked = 5
-            } */
-
-          vm.serverStatus = res.data;
+          vm.showEvalUsers = res.data;
         }
       })
       .catch(function handleGetTrialModeError(error) {