2019-05-02 22:02:41 +00:00
parent 9d40b832d7
commit b380174709
7 changed files with 238 additions and 194 deletions
--- a/ayanova/src/views/About.vue
+++ b/ayanova/src/views/About.vue
@@ -1,5 +1,18 @@
 <template>
  <v-layout row v-if="this.formState.ready">
+    <v-flex xs12 mt-1 mb-2>
+      <v-alert
+        ref="errorbox"
+        v-show="formState.errorBoxMessage"
+        color="error"
+        icon="fa-exclamation-circle "
+        value="true"
+        transition="scale-transition"
+        class="multi-line"
+        outline
+        >{{ formState.errorBoxMessage }}</v-alert
+      >
+    </v-flex>
    <v-flex>
      <v-card>
        <!-- <v-toolbar>
@@ -17,14 +30,10 @@
          <v-list-tile avatar>
            <v-list-tile-content>
              <v-list-tile-title>
-                {{
-                this.$gzlocale.get("Version")
-                }}
+                {{ this.$gzlocale.get("Version") }}
              </v-list-tile-title>
              <v-list-tile-sub-title>
-                {{
-                clientInfo.version
-                }}
+                {{ clientInfo.version }}
              </v-list-tile-sub-title>
            </v-list-tile-content>
          </v-list-tile>
@@ -35,70 +44,50 @@
          <v-list-tile avatar>
            <v-list-tile-content>
              <v-list-tile-title>
-                {{
-                this.$gzlocale.get("ServerAddress")
-                }}
+                {{ this.$gzlocale.get("ServerAddress") }}
              </v-list-tile-title>
              <v-list-tile-sub-title>
-                {{
-                this.$store.state.apiUrl
-                }}
+                {{ 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")
-                }}
+                {{ this.$gzlocale.get("Version") }}
              </v-list-tile-title>
              <v-list-tile-sub-title>
-                {{
-                serverInfo.serverVersion
-                }}
+                {{ 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")
-                }}
+                {{ this.$gzlocale.get("SchemaVersion") }}
              </v-list-tile-title>
              <v-list-tile-sub-title>
-                {{
-                serverInfo.dbSchemaVersion
-                }}
+                {{ 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")
-                }}
+                {{ this.$gzlocale.get("ServerTime") }}
              </v-list-tile-title>
              <v-list-tile-sub-title>
-                {{
-                serverInfo.serverLocalTime
-                }}
+                {{ 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")
-                }}
+                {{ this.$gzlocale.get("TimeZone") }}
              </v-list-tile-title>
              <v-list-tile-sub-title>
-                {{
-                serverInfo.serverTimeZone
-                }}
+                {{ serverInfo.serverTimeZone }}
              </v-list-tile-sub-title>
            </v-list-tile-content>
          </v-list-tile>
@@ -109,79 +98,57 @@
          <v-list-tile avatar>
            <v-list-tile-content>
              <v-list-tile-title>
-                {{
-                this.$gzlocale.get("RegisteredUser")
-                }}
+                {{ this.$gzlocale.get("RegisteredUser") }}
              </v-list-tile-title>
              <v-list-tile-sub-title>
-                {{
-                serverInfo.license.license.licensedTo
-                }}
+                {{ 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")
-                }}
+                {{ this.$gzlocale.get("DatabaseID") }}
              </v-list-tile-title>
              <v-list-tile-sub-title>
-                {{
-                serverInfo.license.license.dbId
-                }}
+                {{ 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")
-                }}
+                {{ this.$gzlocale.get("LicenseSerial") }}
              </v-list-tile-title>
              <v-list-tile-sub-title>
-                {{
-                serverInfo.license.license.keySerial
-                }}
+                {{ 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")
-                }}
+                {{ this.$gzlocale.get("LicenseExpiration") }}
              </v-list-tile-title>
              <v-list-tile-sub-title>
-                {{
-                serverInfo.license.license.licenseExpiration
-                }}
+                {{ 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")
-                }}
+                {{ this.$gzlocale.get("SupportedUntil") }}
              </v-list-tile-title>
              <v-list-tile-sub-title>
-                {{
-                serverInfo.license.license.maintenanceExpiration
-                }}
+                {{ 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")
-                }}
+                {{ this.$gzlocale.get("LicensedOptions") }}
              </v-list-tile-title>
              <v-list-tile-sub-title
                v-for="item in serverInfo.license.license.features"
@@ -205,24 +172,26 @@ import aboutInfo from "../api/aboutinfo";
 export default {
  beforeCreate() {
    var vm = this;
-    this.$gzlocale.fetch([
-      "HelpAboutAyaNova",
-      "ClientApp",
-      "Server",
-      "Version",
-      "SchemaVersion",
-      "ServerTime",
-      "ServerAddress",
-      "TimeZone",
-      "HelpLicense",
-      "RegisteredUser",
-      "DatabaseID",
-      "LicenseSerial",
-      "LicenseExpiration",
-      "SupportedUntil",
-      "LicensedOptions",
-      "Log"
-    ]).then(() => (vm.formState.ready = true))
+    this.$gzlocale
+      .fetch([
+        "HelpAboutAyaNova",
+        "ClientApp",
+        "Server",
+        "Version",
+        "SchemaVersion",
+        "ServerTime",
+        "ServerAddress",
+        "TimeZone",
+        "HelpLicense",
+        "RegisteredUser",
+        "DatabaseID",
+        "LicenseSerial",
+        "LicenseExpiration",
+        "SupportedUntil",
+        "LicensedOptions",
+        "Log"
+      ])
+      .then(() => (vm.formState.ready = true))
      .catch(err => {
        vm.formState.ready = true;
        vm.$gzHandleFormError(err);
--- 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>
--- a/ayanova/src/views/inventory.vue
+++ b/ayanova/src/views/inventory.vue
@@ -1,34 +1,44 @@
 <template>
-  <v-layout column wrap class="my-5" align-center v-if="this.formReady">
-    <v-flex xs12>
-      <v-container grid-list-xl>
-        <v-layout row wrap align-top>
-          <WidgetList />
-          <WarehouseTop />
-          <POTop />
-          <PartTop />
-          <PartAssemblyTop />
-          <v-flex xs12 md4>
-            <v-card class="elevation-0 transparent">
-              <v-card-text class="text-xs-center">
-                <v-icon x-large color="accent">fa-lightbulb</v-icon>
-              </v-card-text>
-              <v-card-title primary-title class="layout justify-center">
-                <div class="headline text-xs-center">Material Design</div>
-              </v-card-title>
-              <v-card-text>
-                Cras facilisis mi vitae nunc lobortis pharetra. Nulla volutpat
-                tincidunt ornare. Pellentesque habitant morbi tristique senectus
-                et netus et malesuada fames ac turpis egestas. Nullam in aliquet
-                odio. Aliquam eu est vitae tellus bibendum tincidunt.
-                Suspendisse potenti.
-              </v-card-text>
-            </v-card>
-          </v-flex>
-        </v-layout>
-      </v-container>
+  <!-- <v-flex xs12>
+  <v-container grid-list-xl>-->
+  <v-layout row wrap align-top v-if="this.formState.ready">
+    <v-flex xs12 mt-1 mb-2 >
+      <v-alert
+        ref="errorbox"
+        v-show="formState.errorBoxMessage"
+        color="error"
+        icon="fa-exclamation-circle "
+        value="true"
+        transition="scale-transition"
+        class="multi-line"
+        outline
+      >{{ formState.errorBoxMessage }}</v-alert>
+    </v-flex>
+    <WidgetList/>
+    <WarehouseTop/>
+    <POTop/>
+    <PartTop/>
+    <PartAssemblyTop/>
+    <v-flex xs12 md4>
+      <v-card class="elevation-0 transparent">
+        <v-card-text class="text-xs-center">
+          <v-icon x-large color="accent">fa-lightbulb</v-icon>
+        </v-card-text>
+        <v-card-title primary-title class="layout justify-center">
+          <div class="headline text-xs-center">Material Design</div>
+        </v-card-title>
+        <v-card-text>
+          Cras facilisis mi vitae nunc lobortis pharetra. Nulla volutpat
+          tincidunt ornare. Pellentesque habitant morbi tristique senectus
+          et netus et malesuada fames ac turpis egestas. Nullam in aliquet
+          odio. Aliquam eu est vitae tellus bibendum tincidunt.
+          Suspendisse potenti.
+        </v-card-text>
+      </v-card>
    </v-flex>
  </v-layout>
+  <!-- </v-container>
+  </v-flex>-->
 </template>

 <script>
@@ -43,9 +53,9 @@ export default {
  beforeCreate() {
    this.$gzlocale
      .fetch(["Inventory"])
-      .then(() => (this.formReady = true))
+      .then(() => (this.formState.ready = true))
      .catch(err => {
-        this.formReady = true;
+        this.formState.ready = true;
        this.$gzHandleFormError(err);
      });
  },
@@ -65,7 +75,13 @@ export default {
  },
  data() {
    return {
-      formReady: false
+      formState: {
+        ready: false,
+        loading: true,
+        errorBoxMessage: null,
+        appError: null,
+        serverError: {}
+      }
    };
  }
 };
--- a/ayanova/src/views/log.vue
+++ b/ayanova/src/views/log.vue
@@ -1,5 +1,18 @@
 <template>
-  <v-layout row v-if="this.formReady">
+  <v-layout row v-if="this.formState.ready">
+    <v-flex xs12 mt-1 mb-2>
+      <v-alert
+        ref="errorbox"
+        v-show="formState.errorBoxMessage"
+        color="error"
+        icon="fa-exclamation-circle "
+        value="true"
+        transition="scale-transition"
+        class="multi-line"
+        outline
+        >{{ formState.errorBoxMessage }}</v-alert
+      >
+    </v-flex>
    <v-flex>
      <h1>{{ this.$gzlocale.get("Log") }}</h1>
      <v-textarea v-model="logText" full-width readonly auto-grow></v-textarea>
@@ -18,14 +31,23 @@ export default {
    this.logText = outText;
    this.$gzlocale
      .fetch(["Log"])
-      .then(() => (this.formReady = true))
+      .then(() => (this.formState.ready = true))
      .catch(err => {
-        this.formReady = true;
+        this.formState.ready = true;
        this.$gzHandleFormError(err);
      });
  },
  data() {
-    return { logText: "", formReady: false };
+    return {
+      logText: "",
+      formState: {
+        ready: false,
+        loading: true,
+        errorBoxMessage: null,
+        appError: null,
+        serverError: {}
+      }
+    };
  }
 };
 </script>
--- a/ayanova/src/views/login.vue
+++ b/ayanova/src/views/login.vue
@@ -2,7 +2,12 @@
  <v-container fluid>
    <v-layout row wrap>
      <v-flex xs12 class="hidden-sm-and-down text-xs-center" mt-5 ml-5 pl-5>
-        <v-img :src="require('../assets/logo.svg')" class="my-3" contain height="200"></v-img>
+        <v-img
+          :src="require('../assets/logo.svg')"
+          class="my-3"
+          contain
+          height="200"
+        ></v-img>
      </v-flex>
      <v-flex xs12 class="hidden-md-and-up text-xs-center">
        <v-img :src="require('../assets/logo.svg')" contain height="64"></v-img>