This commit is contained in:
2019-05-02 19:46:34 +00:00
parent 60d1fb82fe
commit 640c6ef095
20 changed files with 400 additions and 271 deletions

View File

@@ -13,88 +13,183 @@
</v-btn>
</v-toolbar>-->
<v-list two-line subheader>
<v-subheader>{{ this.$gzlocale.get("ClientApp")}}</v-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-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-divider></v-divider>
<v-list two-line subheader>
<v-subheader>{{ this.$gzlocale.get("Server")}}</v-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-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-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-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-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-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-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-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-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-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-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-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-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>
>
{{ item.Feature }}
{{ item.Count ? item.Count : "" }}
</v-list-tile-sub-title>
</v-list-tile-content>
</v-list-tile>
</v-list>
@@ -107,13 +202,6 @@
/* Xeslint-disable */
import aboutInfo from "../api/aboutinfo";
// function clickHandler(menuItem) {
// var item = this.$gzmenu.parseMenuItem(menuItem);
// if (item.owner == "about" && !item.disabled) {
// alert("about::context click: " + item.key);
// }
// }
export default {
beforeCreate() {
this.$gzlocale.fetch([

View File

@@ -1,5 +1,5 @@
<template>
<HelloWorld/>
<HelloWorld />
</template>
<script>

View File

@@ -179,7 +179,10 @@ function clickHandler(menuItem) {
m.vm.duplicate();
break;
default:
alert("inventory-widget-edit.vue::context click: [" + m.key + "]");
m.vm.$gzevent.$emit(
"notify-warning",
"inventory-widget-edit.vue::context click: [" + m.key + "]"
);
}
}
}
@@ -433,54 +436,12 @@ export default {
});
},
duplicate() {
// this.$gzform.confirmDelete(this).then(res => {
// console.log(res);
// });
// this.$dialog.confirm({
// text: "Do you really want to exit?",
// title: "Warning"
// }).then(res => {
// console.log("The dialog result is:");
// console.log(res);
// });
//console.log(this.$gzform.confirm(this));
// this.$dialog.error({
// text: "Cannot delete this item",
// title: "Error"
// });
// console.log("Done dialog");
// this.$dialog.notify.info("Test notification", {
// position: "top-right",
// timeout: 5000
// });
// this.$dialog.message.info("Test", {
// position: "top-left"
// });
// this.$gzevent.$emit(
// "popup-message",
// "This is a test popup message\r\nDUPLICATE ALL THE THINGS!"
// );
//only if not dirty
//check rights
//duplicate
//navigate to new record
alert("STUB: DUPLICATE");
},
stubTestClick() {
this.$gzevent.$emit("menu-replace-item", {
title: this.$gzlocale.get("Save"),
surface: true,
icon: "save",
color: "error",
disabled: true,
key: "inventory-widget-edit:save"
});
// alert("stub test click");
throw "T$EST";
//alert("STUB: DUPLICATE");
}
}
};

View File

@@ -3,11 +3,11 @@
<v-flex xs12>
<v-container grid-list-xl>
<v-layout row wrap align-top>
<WidgetList/>
<WarehouseTop/>
<POTop/>
<PartTop/>
<PartAssemblyTop/>
<WidgetList />
<WarehouseTop />
<POTop />
<PartTop />
<PartAssemblyTop />
<v-flex xs12 md4>
<v-card class="elevation-0 transparent">
<v-card-text class="text-xs-center">
@@ -17,9 +17,11 @@
<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.
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>

View File

@@ -1,7 +1,7 @@
<template>
<v-layout row v-if="this.formReady">
<v-flex>
<h1>{{ this.$gzlocale.get("Log")}}</h1>
<h1>{{ this.$gzlocale.get("Log") }}</h1>
<v-textarea v-model="logText" full-width readonly auto-grow></v-textarea>
</v-flex>
</v-layout>

View File

@@ -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>