From 03ec9bd464763026025cee6e9ebc3562a136e2a5 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Wed, 22 May 2019 20:07:06 +0000
Subject: [PATCH]

---
 ayanova/src/views/About.vue                 | 161 ++------------------
 ayanova/src/views/inventory-widget-edit.vue |  13 +-
 2 files changed, 19 insertions(+), 155 deletions(-)

diff --git a/ayanova/src/views/About.vue b/ayanova/src/views/About.vue
index 83795195..fa49ae92 100644
--- a/ayanova/src/views/About.vue
+++ b/ayanova/src/views/About.vue
@@ -10,163 +10,24 @@
         transition="scale-transition"
         class="multi-line"
         outline
-        >{{ formState.errorBoxMessage }}</v-alert
-      >
+      >{{ formState.errorBoxMessage }}</v-alert>
     </v-flex>
     <v-flex>
       <v-card>
-        <!-- <v-toolbar>
-          <v-avatar size="64px" tile>
-            <img :src="require('../assets/bw-logo.svg')" alt="AyaNova">
-          </v-avatar>
-          <v-toolbar-title>{{ this.$gzlocale.get("HelpAboutAyaNova")}}</v-toolbar-title>
-          <v-spacer></v-spacer>
-          <v-btn large icon to="/log">
-            <v-icon>fa-glasses</v-icon>
-          </v-btn>
-        </v-toolbar>-->
-        <v-list two-line subheader>
-          <v-subheader>{{ this.$gzlocale.get("ClientApp") }}</v-subheader>
-          <v-list-tile avatar>
-            <v-list-tile-content>
-              <v-list-tile-title>
-                {{ this.$gzlocale.get("Version") }}
-              </v-list-tile-title>
-              <v-list-tile-sub-title>
-                {{ clientInfo.version }}
-              </v-list-tile-sub-title>
-            </v-list-tile-content>
-          </v-list-tile>
-        </v-list>
+        <v-subheader>{{ this.$gzlocale.get("ClientApp") }}</v-subheader>
+        <div>{{this.$gzlocale.get("Version")}}: {{clientInfo.version}}</div>
+
+        {{this.$gzlocale.get("User")}}: {{clientInfo.userName}}
         <v-divider></v-divider>
-        <v-list two-line subheader>
-          <v-subheader>{{ this.$gzlocale.get("Server") }}</v-subheader>
-          <v-list-tile avatar>
-            <v-list-tile-content>
-              <v-list-tile-title>
-                {{ this.$gzlocale.get("ServerAddress") }}
-              </v-list-tile-title>
-              <v-list-tile-sub-title>
-                {{ this.$store.state.apiUrl }}
-              </v-list-tile-sub-title>
-            </v-list-tile-content>
-          </v-list-tile>
-          <v-list-tile avatar>
-            <v-list-tile-content>
-              <v-list-tile-title>
-                {{ this.$gzlocale.get("Version") }}
-              </v-list-tile-title>
-              <v-list-tile-sub-title>
-                {{ serverInfo.serverVersion }}
-              </v-list-tile-sub-title>
-            </v-list-tile-content>
-          </v-list-tile>
-          <v-list-tile avatar>
-            <v-list-tile-content>
-              <v-list-tile-title>
-                {{ this.$gzlocale.get("SchemaVersion") }}
-              </v-list-tile-title>
-              <v-list-tile-sub-title>
-                {{ serverInfo.dbSchemaVersion }}
-              </v-list-tile-sub-title>
-            </v-list-tile-content>
-          </v-list-tile>
-          <v-list-tile avatar>
-            <v-list-tile-content>
-              <v-list-tile-title>
-                {{ this.$gzlocale.get("ServerTime") }}
-              </v-list-tile-title>
-              <v-list-tile-sub-title>
-                {{ serverInfo.serverLocalTime }}
-              </v-list-tile-sub-title>
-            </v-list-tile-content>
-          </v-list-tile>
-          <v-list-tile avatar>
-            <v-list-tile-content>
-              <v-list-tile-title>
-                {{ this.$gzlocale.get("TimeZone") }}
-              </v-list-tile-title>
-              <v-list-tile-sub-title>
-                {{ serverInfo.serverTimeZone }}
-              </v-list-tile-sub-title>
-            </v-list-tile-content>
-          </v-list-tile>
-        </v-list>
-        <v-divider></v-divider>
-        <v-list two-line subheader>
-          <v-subheader>{{ this.$gzlocale.get("HelpLicense") }}</v-subheader>
-          <v-list-tile avatar>
-            <v-list-tile-content>
-              <v-list-tile-title>
-                {{ this.$gzlocale.get("RegisteredUser") }}
-              </v-list-tile-title>
-              <v-list-tile-sub-title>
-                {{ serverInfo.license.license.licensedTo }}
-              </v-list-tile-sub-title>
-            </v-list-tile-content>
-          </v-list-tile>
-          <v-list-tile avatar>
-            <v-list-tile-content>
-              <v-list-tile-title>
-                {{ this.$gzlocale.get("DatabaseID") }}
-              </v-list-tile-title>
-              <v-list-tile-sub-title>
-                {{ serverInfo.license.license.dbId }}
-              </v-list-tile-sub-title>
-            </v-list-tile-content>
-          </v-list-tile>
-          <v-list-tile avatar>
-            <v-list-tile-content>
-              <v-list-tile-title>
-                {{ this.$gzlocale.get("LicenseSerial") }}
-              </v-list-tile-title>
-              <v-list-tile-sub-title>
-                {{ serverInfo.license.license.keySerial }}
-              </v-list-tile-sub-title>
-            </v-list-tile-content>
-          </v-list-tile>
-          <v-list-tile avatar>
-            <v-list-tile-content>
-              <v-list-tile-title>
-                {{ this.$gzlocale.get("LicenseExpiration") }}
-              </v-list-tile-title>
-              <v-list-tile-sub-title>
-                {{ serverInfo.license.license.licenseExpiration }}
-              </v-list-tile-sub-title>
-            </v-list-tile-content>
-          </v-list-tile>
-          <v-list-tile avatar>
-            <v-list-tile-content>
-              <v-list-tile-title>
-                {{ this.$gzlocale.get("SupportedUntil") }}
-              </v-list-tile-title>
-              <v-list-tile-sub-title>
-                {{ serverInfo.license.license.maintenanceExpiration }}
-              </v-list-tile-sub-title>
-            </v-list-tile-content>
-          </v-list-tile>
-          <v-list-tile avatar>
-            <v-list-tile-content>
-              <v-list-tile-title>
-                {{ this.$gzlocale.get("LicensedOptions") }}
-              </v-list-tile-title>
-              <v-list-tile-sub-title
-                v-for="item in serverInfo.license.license.features"
-                :key="item.Feature"
-              >
-                {{ item.Feature }}
-                {{ item.Count ? item.Count : "" }}
-              </v-list-tile-sub-title>
-            </v-list-tile-content>
-          </v-list-tile>
-        </v-list>
+        <v-subheader>{{ this.$gzlocale.get("Server") }}</v-subheader>
+        {{this.$gzlocale.get("ServerAddress")}}: {{this.$store.state.apiUrl}}
       </v-card>
     </v-flex>
   </v-layout>
 </template>
 
 <script>
-/* Xeslint-disable */
+/* eslint-disable */
 import aboutInfo from "../api/aboutinfo";
 
 export default {
@@ -189,7 +50,9 @@ export default {
         "LicenseExpiration",
         "SupportedUntil",
         "LicensedOptions",
-        "Log"
+        "Log",
+        "User",
+        "Browser"
       ])
       .then(() => (vm.formState.ready = true))
       .catch(err => {
@@ -214,7 +77,7 @@ export default {
     });
     // this.$gzevent.$on("menu-click", clickHandler);
 
-    this.clientInfo.version = aboutInfo.version;
+    this.clientInfo = aboutInfo;
     this.$gzapi
       .get("ServerInfo")
       .then(response => {
diff --git a/ayanova/src/views/inventory-widget-edit.vue b/ayanova/src/views/inventory-widget-edit.vue
index e43c0d2f..184b14a8 100644
--- a/ayanova/src/views/inventory-widget-edit.vue
+++ b/ayanova/src/views/inventory-widget-edit.vue
@@ -13,7 +13,8 @@
               transition="scale-transition"
               class="multi-line"
               outline
-            >{{ formState.errorBoxMessage }}</v-alert>
+              >{{ formState.errorBoxMessage }}</v-alert
+            >
           </v-flex>
           <v-flex xs12 sm6 lg4 xl3 px-2>
             <v-text-field
@@ -140,15 +141,15 @@
         <v-layout align-left justify-center row wrap mt-5>
           <v-flex xs6 sm4>
             READY: {{ formState.ready }}
-            <br>
+            <br />
             LOADING: {{ formState.loading }}
-            <br>
+            <br />
             DIRTY: {{ formState.dirty }}
-            <br>
+            <br />
             VALID: {{ formState.valid }}
-            <br>
+            <br />
             READONLY: {{ formState.readOnly }}
-            <br>
+            <br />
           </v-flex>
         </v-layout>
       </v-form>