This commit is contained in:
2019-07-19 19:41:58 +00:00
parent 177f08f49d
commit 7bbe2bd315
22 changed files with 191 additions and 192 deletions

View File

@@ -15,143 +15,109 @@
</v-flex>
<v-flex>
<v-card id="aboutinfocard">
<v-subheader>{{ this.$gzlocale.get("ClientApp") }}</v-subheader>
<v-subheader>{{ lt("ClientApp") }}</v-subheader>
<div>
<span class="ml-4 body-1">{{ this.$gzlocale.get("Version") }}:</span>
<span class="ml-4 body-1">{{ lt("Version") }}:</span>
<span class="body-2">{{ clientInfo.version }}</span>
</div>
<div>
<span class="ml-4 body-1">{{ this.$gzlocale.get("User") }}:</span>
<span class="ml-4 body-1">{{ lt("User") }}:</span>
<span class="body-2">{{ this.$store.state.userName }}</span>
</div>
<div>
<span class="ml-4 body-1"
>{{ this.$gzlocale.get("UserTimeZoneOffset") }}:</span
>
<span class="ml-4 body-1">{{ lt("UserTimeZoneOffset") }}:</span>
<span class="body-2">
{{ this.$gzlocale.format().timeZoneOffset }}
{{ ltFormat().timeZoneOffset }}
</span>
</div>
<div>
<span class="ml-4 body-1"
>{{ this.$gzlocale.get("DecimalSeparator") }}:</span
>
<span class="body-2">{{
this.$gzlocale.format().decimalSeparator
}}</span>
<span class="ml-4 body-1">{{ lt("DecimalSeparator") }}:</span>
<span class="body-2">{{ ltFormat().decimalSeparator }}</span>
</div>
<div>
<span class="ml-4 body-1"
>{{ this.$gzlocale.get("CurrencySymbol") }}:</span
>
<span class="body-2">{{
this.$gzlocale.format().currencySymbol
}}</span>
<span class="ml-4 body-1">{{ lt("CurrencySymbol") }}:</span>
<span class="body-2">{{ ltFormat().currencySymbol }}</span>
</div>
<div>
<span class="ml-4 body-1"
>{{ this.$gzlocale.get("ShortDateFormat") }}:</span
>
<span class="body-2">{{ this.$gzlocale.format().shortDate }}</span>
<span class="ml-4 body-1">{{ lt("ShortDateFormat") }}:</span>
<span class="body-2">{{ ltFormat().shortDate }}</span>
</div>
<div>
<span class="ml-4 body-1"
>{{ this.$gzlocale.get("ShortTimeFormat") }}:</span
>
<span class="body-2">{{ this.$gzlocale.format().shortTime }}</span>
<span class="ml-4 body-1">{{ lt("ShortTimeFormat") }}:</span>
<span class="body-2">{{ ltFormat().shortTime }}</span>
</div>
<div>
<span class="ml-4 body-1"
>{{ this.$gzlocale.get("ShortDateAndTimeFormat") }}:
</span>
<span class="body-2">{{
this.$gzlocale.format().shortDateAndTime
}}</span>
<span class="ml-4 body-1">{{ lt("ShortDateAndTimeFormat") }}: </span>
<span class="body-2">{{ ltFormat().shortDateAndTime }}</span>
</div>
<v-divider class="mt-4"></v-divider>
<v-subheader>{{ this.$gzlocale.get("Browser") }}</v-subheader>
<v-subheader>{{ lt("Browser") }}</v-subheader>
<div v-for="(value, name) in clientInfo.browser" :key="name">
<span class="ml-4 body-1">{{ name }}:</span>
<span class="body-2">{{ value }}</span>
</div>
<v-divider class="mt-4"></v-divider>
<v-subheader>{{ this.$gzlocale.get("Server") }}</v-subheader>
<v-subheader>{{ lt("Server") }}</v-subheader>
<div>
<span class="ml-4 body-1"
>{{ this.$gzlocale.get("ServerAddress") }}:</span
>
<span class="ml-4 body-1">{{ lt("ServerAddress") }}:</span>
<span class="body-2">{{ this.$store.state.apiUrl }}</span>
</div>
<div>
<span class="ml-4 body-1">{{ this.$gzlocale.get("Version") }}:</span>
<span class="ml-4 body-1">{{ lt("Version") }}:</span>
<span class="body-2">{{ serverInfo.serverVersion }}</span>
</div>
<div>
<span class="ml-4 body-1"
>{{ this.$gzlocale.get("SchemaVersion") }}:</span
>
<span class="ml-4 body-1">{{ lt("SchemaVersion") }}:</span>
<span class="body-2">{{ serverInfo.dbSchemaVersion }}</span>
</div>
<div>
<span class="ml-4 body-1"
>{{ this.$gzlocale.get("ServerTime") }}:</span
>
<span class="ml-4 body-1">{{ lt("ServerTime") }}:</span>
<span class="body-2">{{ serverInfo.serverLocalTime }}</span>
</div>
<div>
<span class="ml-4 body-1">{{ this.$gzlocale.get("TimeZone") }}:</span>
<span class="ml-4 body-1">{{ lt("TimeZone") }}:</span>
<span class="body-2">{{ serverInfo.serverTimeZone }}</span>
</div>
<v-divider class="mt-4"></v-divider>
<v-subheader>{{ this.$gzlocale.get("HelpLicense") }}</v-subheader>
<v-subheader>{{ lt("HelpLicense") }}</v-subheader>
<div>
<span class="ml-4 body-1"
>{{ this.$gzlocale.get("RegisteredUser") }}:</span
>
<span class="ml-4 body-1">{{ lt("RegisteredUser") }}:</span>
<span class="body-2">{{
serverInfo.license.license.licensedTo
}}</span>
</div>
<div>
<span class="ml-4 body-1"
>{{ this.$gzlocale.get("DatabaseID") }}:</span
>
<span class="ml-4 body-1">{{ lt("DatabaseID") }}:</span>
<span class="body-2">{{ serverInfo.license.license.dbId }}</span>
</div>
<div>
<span class="ml-4 body-1"
>{{ this.$gzlocale.get("LicenseSerial") }}:</span
>
<span class="ml-4 body-1">{{ lt("LicenseSerial") }}:</span>
<span class="body-2">{{ serverInfo.license.license.keySerial }}</span>
</div>
<div>
<span class="ml-4 body-1"
>{{ this.$gzlocale.get("LicenseExpiration") }}:</span
>
<span class="ml-4 body-1">{{ lt("LicenseExpiration") }}:</span>
<span class="body-2">{{
serverInfo.license.license.licenseExpiration
}}</span>
</div>
<div>
<span class="ml-4 body-1"
>{{ this.$gzlocale.get("SupportedUntil") }}:</span
>
<span class="ml-4 body-1">{{ lt("SupportedUntil") }}:</span>
<span class="body-2">{{
serverInfo.license.license.maintenanceExpiration
}}</span>
</div>
<v-divider class="mt-4"></v-divider>
<v-subheader>{{ this.$gzlocale.get("LicensedOptions") }}</v-subheader>
<v-subheader>{{ lt("LicensedOptions") }}</v-subheader>
<div
v-for="item in serverInfo.license.license.features"
@@ -187,7 +153,7 @@ function clickHandler(menuItem) {
var text = element.innerText || element.textContent;
var logText = "";
this.$_.forEach(m.vm.$store.state.logArray, function appendLogItem(
window.$gz._.forEach(m.vm.$store.state.logArray, function appendLogItem(
value
) {
logText += value + "\n";
@@ -206,7 +172,7 @@ function clickHandler(menuItem) {
export default {
beforeCreate() {
var vm = this;
this.$gzlocale
window.$gz.locale
.fetch([
"HelpAboutAyaNova",
"ClientApp",
@@ -239,17 +205,17 @@ export default {
window.$gz.eventbus.$emit("menu-change", {
isMain: false,
icon: "fa-info-circle",
title: vm.$gzlocale.get("HelpAboutAyaNova"),
title: window.$gz.locale.get("HelpAboutAyaNova"),
menuItems: [
{
title: vm.$gzlocale.get("Copy"),
title: window.$gz.locale.get("Copy"),
icon: "copy",
surface: true,
key: "about:copysupportinfo",
vm: vm
},
{
title: vm.$gzlocale.get("Log"),
title: window.$gz.locale.get("Log"),
icon: "glasses",
surface: true,
key: "app:nav:log",
@@ -265,7 +231,7 @@ export default {
});
},
created() {
this.$gzapi
window.$gz.api
.get("ServerInfo")
.then(response => {
this.serverInfo = response.data;
@@ -291,6 +257,14 @@ export default {
serverError: {}
}
};
},
methods: {
lt(ltKey) {
return window.$gz.locale.get(ltKey);
},
ltFormat() {
return window.$gz.locale.format();
}
}
};
</script>

View File

@@ -13,7 +13,7 @@ export default {
window.$gz.eventbus.$emit("menu-change", {
isMain: true,
icon: "fa-home",
title: this.$gzlocale.get("Home")
title: window.$gz.locale.get("Home")
});
}
};

View File

@@ -13,7 +13,7 @@ export default {
window.$gz.eventbus.$emit("menu-change", {
isMain: true,
icon: "fa-file-invoice-dollar",
title: this.$gzlocale.get("Accounting")
title: window.$gz.locale.get("Accounting")
});
}
};

View File

@@ -13,7 +13,7 @@ export default {
window.$gz.eventbus.$emit("menu-change", {
isMain: true,
icon: "fa-user-tie",
title: this.$gzlocale.get("Administration")
title: window.$gz.locale.get("Administration")
});
}
};

View File

@@ -13,7 +13,7 @@ export default {
window.$gz.eventbus.$emit("menu-change", {
isMain: true,
icon: "sliders-h",
title: this.$gzlocale.get("Customize")
title: window.$gz.locale.get("Customize")
});
}
};

View File

@@ -13,7 +13,7 @@ export default {
window.$gz.eventbus.$emit("menu-change", {
isMain: true,
icon: "fa-shipping-fast",
title: this.$gzlocale.get("Dispatch")
title: window.$gz.locale.get("Dispatch")
});
}
};

View File

@@ -23,7 +23,7 @@
clearable
@click:clear="onChange('name')"
:counter="255"
:label="this.$gzlocale.get('WidgetName')"
:label="lt('WidgetName')"
:rules="[
this.$gzform.max255(this, 'name'),
this.$gzform.required(this, 'name')
@@ -40,7 +40,7 @@
clearable
@click:clear="onChange('serial')"
:counter="10"
:label="this.$gzlocale.get('WidgetSerial')"
:label="lt('WidgetSerial')"
:rules="[this.$gzform.maxLength(this, 'serial', 10)]"
:error-messages="this.$gzform.serverErrors(this, 'serial')"
ref="serial"
@@ -54,7 +54,7 @@
clearable
@click:clear="onChange('count')"
:counter="10"
:label="this.$gzlocale.get('WidgetCount')"
:label="lt('WidgetCount')"
ref="count"
:rules="[
this.$gzform.integerValid(this, 'count'),
@@ -71,8 +71,8 @@
<v-text-field
v-model="obj.dollarAmount"
:readonly="this.formState.readOnly"
:prefix="this.$gzlocale.format().currencySymbol"
:label="this.$gzlocale.get('WidgetDollarAmount')"
:prefix="ltFormat().currencySymbol"
:label="lt('WidgetDollarAmount')"
ref="dollarAmount"
required
:rules="[
@@ -87,7 +87,7 @@
<v-flex xs12 sm6 lg4 xl3 px-2>
<gz-date-time-picker
:label="this.$gzlocale.get('WidgetStartDate')"
:label="lt('WidgetStartDate')"
v-model="obj.startDate"
:readonly="this.formState.readOnly"
ref="startDate"
@@ -98,7 +98,7 @@
<v-flex xs12 sm6 lg4 xl3 px-2>
<gz-date-time-picker
:label="this.$gzlocale.get('WidgetEndDate')"
:label="lt('WidgetEndDate')"
:rules="[
this.$gzform.datePrecedence(this, 'startDate', 'endDate')
]"
@@ -113,7 +113,7 @@
<v-checkbox
v-model="obj.active"
:readonly="this.formState.readOnly"
:label="this.$gzlocale.get('Active')"
:label="lt('Active')"
ref="active"
:error-messages="this.$gzform.serverErrors(this, 'active')"
required
@@ -127,7 +127,7 @@
item-text="name"
item-value="id"
:readonly="this.formState.readOnly"
:label="this.$gzlocale.get('WidgetRoles')"
:label="lt('WidgetRoles')"
ref="roles"
:rules="[
this.$gzform.integerValid(this, 'roles'),
@@ -143,7 +143,7 @@
<v-textarea
v-model="obj.notes"
:readonly="this.formState.readOnly"
:label="this.$gzlocale.get('WidgetNotes')"
:label="lt('WidgetNotes')"
:error-messages="this.$gzform.serverErrors(this, 'notes')"
ref="notes"
@change="onChange('notes')"
@@ -153,7 +153,7 @@
<v-flex xs12 px-2>
<gz-tag-picker
:label="this.$gzlocale.get('Tags')"
:label="lt('Tags')"
v-model="obj.tags"
:readonly="this.formState.readOnly"
ref="tags"
@@ -389,6 +389,12 @@ export default {
}
},
methods: {
lt(ltKey) {
return window.$gz.locale.get(ltKey);
},
ltFormat() {
return window.$gz.locale.format();
},
onChange(ref) {
if (!this.formState.loading && !this.formState.readOnly) {
this.$gzform.onChange(this, ref);
@@ -403,7 +409,7 @@ export default {
var vm = this;
this.$gzform.deleteAllErrorBoxErrors(this);
this.$gzapi
window.$gz.api
.get(url)
.then(res => {
if (res.error != undefined) {
@@ -450,7 +456,7 @@ export default {
//clear any errors vm might be around from previous submit
this.$gzform.deleteAllErrorBoxErrors(this);
this.$gzapi
window.$gz.api
.upsert(url, this.obj)
.then(res => {
vm.formState.loading = false;
@@ -504,7 +510,7 @@ export default {
var url = FORM_BASE_URL + vm.$route.params.id;
vm.$gzform.deleteAllErrorBoxErrors(vm);
vm.$gzapi
window.$gz.api
.remove(url)
.then(res => {
if (res.error != undefined) {
@@ -538,7 +544,7 @@ export default {
//clear any errors vm might be around from previous submit
this.$gzform.deleteAllErrorBoxErrors(this);
this.$gzapi
window.$gz.api
.duplicate(url)
.then(res => {
// debugger;
@@ -549,7 +555,10 @@ export default {
} else {
//Navigate to new record
vm.$router.push(
vm.$gzapi.replaceAfterLastSlash(vm.$route.fullPath, res.data.id)
window.$gz.api.replaceAfterLastSlash(
vm.$route.fullPath,
res.data.id
)
);
}
})
@@ -612,7 +621,7 @@ function generateMenu(vm) {
var menuOptions = {
isMain: false,
icon: "fa-splotch",
title: vm.$gzlocale.get("Widget"),
title: window.$gz.locale.get("Widget"),
helpUrl: "intro/#searching",
formData: { formKey: FORM_KEY, ayaType: window.$gz.type.Widget },
menuItems: []
@@ -620,7 +629,7 @@ function generateMenu(vm) {
if (vm.rights.change) {
menuOptions.menuItems.push({
title: vm.$gzlocale.get("Save"),
title: window.$gz.locale.get("Save"),
icon: "save",
surface: true,
key: FORM_KEY + ":save",
@@ -630,7 +639,7 @@ function generateMenu(vm) {
if (vm.rights.delete) {
menuOptions.menuItems.push({
title: vm.$gzlocale.get("Delete"),
title: window.$gz.locale.get("Delete"),
icon: "trash-alt",
surface: true,
key: FORM_KEY + ":delete",
@@ -640,7 +649,7 @@ function generateMenu(vm) {
if (vm.rights.change) {
menuOptions.menuItems.push({
title: vm.$gzlocale.get("Duplicate"),
title: window.$gz.locale.get("Duplicate"),
icon: "clone",
key: FORM_KEY + ":duplicate",
vm: vm
@@ -650,7 +659,7 @@ function generateMenu(vm) {
//STUB REPORTS
menuOptions.menuItems.push({
title: vm.$gzlocale.get("Print"),
title: window.$gz.locale.get("Print"),
icon: "print",
key: FORM_KEY + ":report",
vm: vm
@@ -680,12 +689,14 @@ function initForm(vm) {
//
//
function populatePickLists(vm) {
return vm.$gzapi.get("AyaEnumPickList/list/authorizationroles").then(res => {
if (res.error) {
throw res.error;
}
vm.pickLists.roles = res.data;
});
return window.$gz.api
.get("AyaEnumPickList/list/authorizationroles")
.then(res => {
if (res.error) {
throw res.error;
}
vm.pickLists.roles = res.data;
});
}
//////////////////////
@@ -721,7 +732,7 @@ function populatePickLists(vm) {
// "WidgetCustom16"
// ];
// return vm.$gzlocale.fetch(ltKeysRequired);
// return window.$gz.locale.fetch(ltKeysRequired);
// }
</script>

View File

@@ -51,7 +51,7 @@ import PartAssemblyTop from "../components/inventorypartassemblytop";
export default {
beforeCreate() {
this.$gzlocale
window.$gz.locale
.fetch(["Inventory"])
.then(() => (this.formState.ready = true))
.catch(err => {
@@ -63,7 +63,7 @@ export default {
window.$gz.eventbus.$emit("menu-change", {
isMain: true,
icon: "fa-dolly",
title: this.$gzlocale.get("Inventory")
title: window.$gz.locale.get("Inventory")
});
},
components: {

View File

@@ -26,10 +26,10 @@ export default {
window.$gz.eventbus.$emit("menu-change", {
isMain: false,
icon: "fa-info-circle",
title: this.$gzlocale.get("Log"),
title: window.$gz.locale.get("Log"),
menuItems: [
// {
// title: this.$gzlocale.get("Log"),
// title: window.$gz.locale.get("Log"),
// icon: "glasses",
// surface: true,
// key: "app:nav:log",
@@ -39,11 +39,13 @@ export default {
});
var outText = "";
this.$_.forEach(this.$store.state.logArray, function appendLogItem(value) {
window.$gz._.forEach(this.$store.state.logArray, function appendLogItem(
value
) {
outText += value + "\n";
});
this.logText = outText;
this.$gzlocale
window.$gz.locale
.fetch(["Log"])
.then(() => (this.formState.ready = true))
.catch(err => {

View File

@@ -5,7 +5,7 @@
<div class="text-xs-center">
<v-icon color="red" size="100">fa-dragon</v-icon>
<div class="headline">
{{ "404 - " + this.$gzlocale.get("ErrorAPI2010") }}
{{ "404 - " + window.$gz.locale.get("ErrorAPI2010") }}
</div>
</div>
</v-flex>
@@ -19,7 +19,7 @@ export default {
window.$gz.eventbus.$emit("menu-change", {
isMain: true,
icon: "fa-dragon",
title: "404 - " + this.$gzlocale.get("ErrorAPI2010")
title: "404 - " + window.$gz.locale.get("ErrorAPI2010")
});
}
};

View File

@@ -13,7 +13,7 @@ export default {
window.$gz.eventbus.$emit("menu-change", {
isMain: true,
icon: "fa-cogs",
title: this.$gzlocale.get("Operations")
title: window.$gz.locale.get("Operations")
});
}
};

View File

@@ -13,7 +13,7 @@ export default {
window.$gz.eventbus.$emit("menu-change", {
isMain: true,
icon: "fa-toolbox",
title: this.$gzlocale.get("Service")
title: window.$gz.locale.get("Service")
});
}
};