admin/raven-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2021-09-16 23:00:50 +00:00
parent b6a94be261
commit 0b15a595ef
3 changed files with 88 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ayanova/devdocs/todo.txt
View File

@@ -780,3 +780,5 @@ MID CENTURY MODERN TUNES - https://www.allmusic.com/album/ultra-lounge-vol-14-bo
BUILD 131 CHANGES OF NOTE BUILD 131 CHANGES OF NOTE
- case 3946 at a glance wiki present implemented - case 3946 at a glance wiki present implemented
- Added work order states collection to report data for work order and status viz fields: Name, color, completed, locked
- Added work order item status and priority Name and Color fields as viz fields to report data for work order

72
ayanova/src/views/ay-about.vue
View File

@@ -5,97 +5,97 @@
<v-card id="ayaNovaVersioncard" data-cy="versionCard"> <v-card id="ayaNovaVersioncard" data-cy="versionCard">
<v-subheader>AyaNova App</v-subheader> <v-subheader>AyaNova App</v-subheader>
<div> <div>
<span class="ml-6 body-1">{{ $ay.t("Version") }}: </span> <span class="ml-6 text-body-1">{{ $ay.t("Version") }}: </span>
<span class="body-2">{{ clientInfo.version }}</span> <span class="text-body-2">{{ clientInfo.version }}</span>
</div> </div>
<div> <div>
<span class="ml-6 body-1">{{ $ay.t("User") }}: </span> <span class="ml-6 text-body-1">{{ $ay.t("User") }}: </span>
<span class="body-2">{{ this.$store.state.userName }}</span> <span class="text-body-2">{{ this.$store.state.userName }}</span>
</div> </div>
<div> <div>
<span class="ml-6 body-1">12h: </span> <span class="ml-6 text-body-1">12h: </span>
<span class="body-2"> <span class="text-body-2">
{{ locale().getHour12() }} {{ locale().getHour12() }}
</span> </span>
</div> </div>
<div> <div>
<span class="ml-6 body-1">{{ $ay.t("TimeZone") }}: </span> <span class="ml-6 text-body-1">{{ $ay.t("TimeZone") }}: </span>
<span class="body-2"> <span class="text-body-2">
{{ locale().getResolvedTimeZoneName() }} {{ locale().getResolvedTimeZoneName() }}
</span> </span>
</div> </div>
<div> <div>
<span class="ml-6 body-1">{{ $ay.t("LanguageCode") }}: </span> <span class="ml-6 text-body-1">{{ $ay.t("LanguageCode") }}: </span>
<span class="body-2">{{ locale().getResolvedLanguage() }}</span> <span class="text-body-2">{{ locale().getResolvedLanguage() }}</span>
</div> </div>
<div> <div>
<span class="ml-6 body-1">{{ $ay.t("CurrencyCode") }}: </span> <span class="ml-6 text-body-1">{{ $ay.t("CurrencyCode") }}: </span>
<span class="body-2">{{ locale().getCurrencyName() }}</span> <span class="text-body-2">{{ locale().getCurrencyName() }}</span>
</div> </div>
<v-divider class="mt-6"></v-divider> <v-divider class="mt-6"></v-divider>
<v-subheader>{{ $ay.t("Browser") }}</v-subheader> <v-subheader>{{ $ay.t("Browser") }}</v-subheader>
<div v-for="(value, name) in browser" :key="name"> <div v-for="(value, name) in browser" :key="name">
<span class="ml-6 body-1">{{ name }}: </span> <span class="ml-6 text-body-1">{{ name }}: </span>
<span class="body-2">{{ value }}</span> <span class="text-body-2">{{ value }}</span>
</div> </div>
<v-divider class="mt-6"></v-divider> <v-divider class="mt-6"></v-divider>
<v-subheader>{{ $ay.t("Server") }}</v-subheader> <v-subheader>{{ $ay.t("Server") }}</v-subheader>
<div> <div>
<span class="ml-6 body-1">{{ $ay.t("ServerAddress") }}: </span> <span class="ml-6 text-body-1">{{ $ay.t("ServerAddress") }}: </span>
<span class="body-2">{{ this.$store.state.apiUrl }}</span> <span class="text-body-2">{{ this.$store.state.apiUrl }}</span>
</div> </div>
<div> <div>
<span class="ml-6 body-1">{{ $ay.t("Version") }}: </span> <span class="ml-6 text-body-1">{{ $ay.t("Version") }}: </span>
<span class="body-2">{{ serverInfo.serverVersion }}</span> <span class="text-body-2">{{ serverInfo.serverVersion }}</span>
</div> </div>
<div> <div>
<span class="ml-6 body-1">{{ $ay.t("SchemaVersion") }}: </span> <span class="ml-6 text-body-1">{{ $ay.t("SchemaVersion") }}: </span>
<span class="body-2">{{ serverInfo.dbSchemaVersion }}</span> <span class="text-body-2">{{ serverInfo.dbSchemaVersion }}</span>
</div> </div>
<div> <div>
<span class="ml-6 body-1">{{ $ay.t("ServerTime") }}: </span> <span class="ml-6 text-body-1">{{ $ay.t("ServerTime") }}: </span>
<span class="body-2">{{ serverInfo.serverLocalTime }}</span> <span class="text-body-2">{{ serverInfo.serverLocalTime }}</span>
</div> </div>
<div> <div>
<span class="ml-6 body-1">{{ $ay.t("TimeZone") }}: </span> <span class="ml-6 text-body-1">{{ $ay.t("TimeZone") }}: </span>
<span class="body-2">{{ serverInfo.serverTimeZone }}</span> <span class="text-body-2">{{ serverInfo.serverTimeZone }}</span>
</div> </div>
<div v-if="canViewLicenseInfo()"> <div v-if="canViewLicenseInfo()">
<v-divider class="mt-6"></v-divider> <v-divider class="mt-6"></v-divider>
<v-subheader>{{ $ay.t("HelpLicense") }}</v-subheader> <v-subheader>{{ $ay.t("HelpLicense") }}</v-subheader>
<div> <div>
<span class="ml-6 body-1">{{ $ay.t("RegisteredUser") }}: </span> <span class="ml-6 text-body-1">{{ $ay.t("RegisteredUser") }}: </span>
<span class="body-2">{{ <span class="text-body-2">{{
serverInfo.license.license.licensedTo serverInfo.license.license.licensedTo
}}</span> }}</span>
</div> </div>
<div> <div>
<span class="ml-6 body-1">{{ $ay.t("DatabaseID") }}: </span> <span class="ml-6 text-body-1">{{ $ay.t("DatabaseID") }}: </span>
<span class="body-2">{{ <span class="text-body-2">{{
serverInfo.license.license.serverDbId serverInfo.license.license.serverDbId
}}</span> }}</span>
</div> </div>
<div> <div>
<span class="ml-6 body-1">{{ $ay.t("LicenseSerial") }}: </span> <span class="ml-6 text-body-1">{{ $ay.t("LicenseSerial") }}: </span>
<span class="body-2">{{ <span class="text-body-2">{{
serverInfo.license.license.keySerial serverInfo.license.license.keySerial
}}</span> }}</span>
</div> </div>
<div> <div>
<span class="ml-6 body-1">{{ $ay.t("LicenseExpiration") }}: </span> <span class="ml-6 text-body-1">{{ $ay.t("LicenseExpiration") }}: </span>
<span class="body-2">{{ <span class="text-body-2">{{
serverInfo.license.license.licenseExpiration serverInfo.license.license.licenseExpiration
}}</span> }}</span>
</div> </div>
<div> <div>
<span class="ml-6 body-1">{{ $ay.t("SupportedUntil") }}: </span> <span class="ml-6 text-body-1">{{ $ay.t("SupportedUntil") }}: </span>
<span class="body-2">{{ <span class="text-body-2">{{
serverInfo.license.license.maintenanceExpiration serverInfo.license.license.maintenanceExpiration
}}</span> }}</span>
</div> </div>
@@ -109,8 +109,8 @@
v-for="item in serverInfo.license.license.features" v-for="item in serverInfo.license.license.features"
:key="item.Feature" :key="item.Feature"
> >
<span class="ml-6 body-1">{{ item.Feature }}</span> <span class="ml-6 text-body-1">{{ item.Feature }}</span>
<span class="body-2">{{ <span class="text-body-2">{{
item.Count ? ": " + item.Count : "" item.Count ? ": " + item.Count : ""
}}</span> }}</span>
</div> </div>

55
ayanova/src/views/home-schedule.vue
View File

@@ -1,6 +1,7 @@
<template> <template>
<div v-if="formState.ready" v-resize="onResize" class="my-n8"> <div v-if="formState.ready" v-resize="onResize" class="my-n8">
<!-- `{{ "focus:" + focus }}` {{ diagInfo() }}--> <!-- `{{ "focus:" + focus }}` {{ diagInfo() }}
{{ eventMoreInfo }}-->
<gz-error :error-box-message="formState.errorBoxMessage"></gz-error> <gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
<v-sheet height="64"> <v-sheet height="64">
@@ -64,7 +65,7 @@
:event-color="getEventColor" :event-color="getEventColor"
:type="viewType" :type="viewType"
:locale="languageName" :locale="languageName"
@click:event="showEvent" @click:event="showEventMoreInfo"
@click:more="viewDay" @click:more="viewDay"
@click:date="viewDay" @click:date="viewDay"
@change="fetchEvents" @change="fetchEvents"
@@ -102,7 +103,34 @@
</v-btn> --> </v-btn> -->
</v-toolbar> </v-toolbar>
<v-card-text> <v-card-text>
{{ selectedEvent }} <!--woitemscheduleduser -->
<div v-if="selectedEvent.type == 41">
<!-- serial = w.Serial,
w.CustomerViz,
wosummary = w.Notes,
wostatus = WoStatusName,
wostatuscolor = WoStatusColor,
woitemnotes = w.Items[0].Notes,
woitemtechnotes = w.Items[0].TechNotes,
woitemstatus = w.Items[0].WorkOrderItemStatusNameViz,
woitemstatuscolor = w.Items[0].WorkOrderItemStatusColorViz,
woitempriority = w.Items[0].WorkOrderItemPriorityNameViz,
woitemprioritycolor = w.Items[0].WorkOrderItemPriorityColorViz,
scheduser = w.Items[0].ScheduledUsers[0].UserViz,
qty = w.Items[0].ScheduledUsers[0].EstimatedQuantity,
rate = w.Items[0].ScheduledUsers[0].ServiceRateViz,
wotags = w.Tags,
woitemtags = w.Items[0].Tags -->
<div>
<span class="text-h6">{{ $ay.t("WorkOrder") }}: </span>
<span class="text-body-1"
>{{ eventMoreInfo.serial }}&nbsp;
{{ eventMoreInfo.customerViz }}</span
>
</div>
{{ selectedEvent }}
{{ eventMoreInfo }}
</div>
</v-card-text> </v-card-text>
<v-card-actions> <v-card-actions>
<v-btn text color="secondary" @click="selectedOpen = false"> <v-btn text color="secondary" @click="selectedOpen = false">
@@ -241,7 +269,7 @@ export default {
selectedElement: null, selectedElement: null,
selectedOpen: false, selectedOpen: false,
events: [], events: [],
eventMoreInfo: null,
formState: { formState: {
ready: false, ready: false,
dirty: false, dirty: false,
@@ -320,8 +348,23 @@ export default {
id: this.selectedEvent.id id: this.selectedEvent.id
}); });
}, },
showEvent({ nativeEvent, event }) { async showEventMoreInfo({ nativeEvent, event }) {
//console.log("ShowEvent:event ", JSON.stringify(event)); //console.log("showEventMoreInfo:event ", JSON.stringify(event));
let route = null;
this.eventMoreInfo = null;
switch (event.type) {
case window.$gz.type.WorkOrderItemScheduledUser:
route = `workorder/items/scheduled-users/sched-info/${event.id}`;
break;
}
if (route) {
let res = await window.$gz.api.get(route);
if (!res.error) {
this.eventMoreInfo = res.data;
}
}
const open = () => { const open = () => {
this.selectedEvent = event; this.selectedEvent = event;
this.selectedElement = nativeEvent.target; this.selectedElement = nativeEvent.target;