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-05-25 17:14:04 +00:00
parent e7c76318e7
commit 591f745dc2
4 changed files with 35 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ayanova/src/api/gzutil.js
View File

@@ -464,6 +464,7 @@ export default {
case window.$gz.type.WorkOrderItemScheduledUser: case window.$gz.type.WorkOrderItemScheduledUser:
return "$ayiUserClock"; return "$ayiUserClock";
case window.$gz.type.WorkOrderItemTask: case window.$gz.type.WorkOrderItemTask:
case window.$gz.type.TaskGroup:
return "$ayiTasks"; return "$ayiTasks";
case window.$gz.type.WorkOrderItemTravel: case window.$gz.type.WorkOrderItemTravel:
return "$ayiTruckMonster"; return "$ayiTruckMonster";

62
ayanova/src/views/svc-task-group.vue
View File

@@ -9,7 +9,7 @@
<v-text-field <v-text-field
v-model="obj.name" v-model="obj.name"
:readonly="formState.readOnly" :readonly="formState.readOnly"
:label="$ay.t('WorkOrderItemStatusName')" :label="$ay.t('TaskGroupName')"
:rules="[form().required(this, 'name')]" :rules="[form().required(this, 'name')]"
:error-messages="form().serverErrors(this, 'name')" :error-messages="form().serverErrors(this, 'name')"
ref="name" ref="name"
@@ -18,20 +18,6 @@
></v-text-field> ></v-text-field>
</v-col> </v-col>
<v-col cols="12" sm="6" lg="4" xl="3">
<span class="text-caption">
{{ $ay.t("WorkOrderItemStatusColor") }}
</span>
<v-color-picker
v-model="obj.color"
:readonly="formState.readOnly"
hide-mode-switch
mode="hexa"
:error-messages="form().serverErrors(this, 'color')"
ref="color"
@input="fieldValueChanged('color')"
></v-color-picker>
</v-col>
<v-col cols="12" sm="6" lg="4" xl="3"> <v-col cols="12" sm="6" lg="4" xl="3">
<v-checkbox <v-checkbox
v-model="obj.active" v-model="obj.active"
@@ -45,14 +31,11 @@
</v-col> </v-col>
<!-------------------------------------> <!------------------------------------->
<v-col <v-col cols="12">
v-if="form().showMe(this, 'WorkOrderItemStatusNotes')"
cols="12"
>
<v-textarea <v-textarea
v-model="obj.notes" v-model="obj.notes"
:readonly="formState.readOnly" :readonly="formState.readOnly"
:label="$ay.t('WorkOrderItemStatusNotes')" :label="$ay.t('TaskGroupNotes')"
:error-messages="form().serverErrors(this, 'notes')" :error-messages="form().serverErrors(this, 'notes')"
ref="notes" ref="notes"
data-cy="notes" data-cy="notes"
@@ -79,9 +62,9 @@
// //
//////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////
// //
const FORM_KEY = "svc-work-order-item-status-edit"; const FORM_KEY = "svc-task-group-edit";
const API_BASE_URL = "work-order-item-status/"; const API_BASE_URL = "task-group/";
const FORM_CUSTOM_TEMPLATE_KEY = "WorkOrderItemStatus"; //<-- Should always be CoreBizObject AyaType name here where possible //const FORM_CUSTOM_TEMPLATE_KEY = "svc-task-group"; //<-- Should always be CoreBizObject AyaType name here where possible
export default { export default {
async created() { async created() {
@@ -144,14 +127,14 @@ export default {
}, },
data() { data() {
return { return {
formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY, //formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
obj: { obj: {
id: 0, id: 0,
concurrency: 0, concurrency: 0,
name: null, name: null,
active: true, active: true,
notes: null, notes: null,
color: "#ffffff" //if no previously set value then control will respond with a big object with all color system values in place, this prevents that items: []
}, },
formState: { formState: {
ready: false, ready: false,
@@ -164,7 +147,7 @@ export default {
serverError: {} serverError: {}
}, },
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayaType: window.$gz.type.WorkOrderItemStatus ayaType: window.$gz.type.TaskGroup
}; };
}, },
//WATCHERS //WATCHERS
@@ -297,7 +280,7 @@ export default {
//NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO() //NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
this.$router.push({ this.$router.push({
name: "svc-work-order-status-edit", name: "svc-task-group",
params: { params: {
recordid: res.data.id, recordid: res.data.id,
obj: res.data // Pass data object to new form obj: res.data // Pass data object to new form
@@ -390,7 +373,7 @@ async function clickHandler(menuItem) {
break; break;
case "list": case "list":
m.vm.$router.push({ m.vm.$router.push({
name: "svc-work-order-item-status" name: "svc-task-groups"
}); });
break; break;
default: default:
@@ -409,13 +392,13 @@ function generateMenu(vm) {
let menuOptions = { let menuOptions = {
isMain: false, isMain: false,
readOnly: vm.formState.readOnly, readOnly: vm.formState.readOnly,
icon: "$ayiCircle", icon: "$ayiTasks",
title: "WorkOrderItemStatus", title: "TaskGroup",
helpUrl: "svc-work-order-item-status", helpUrl: "svc-task-groups",
formData: { formData: {
ayaType: window.$gz.type.WorkOrderItemStatus, ayaType: window.$gz.type.TaskGroup,
recordId: vm.$route.params.recordid, recordId: vm.$route.params.recordid,
formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY, //formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
recordName: vm.obj.name recordName: vm.obj.name
}, },
menuItems: [] menuItems: []
@@ -448,8 +431,8 @@ function generateMenu(vm) {
menuOptions.menuItems.push({ divider: true, inset: false }); menuOptions.menuItems.push({ divider: true, inset: false });
menuOptions.menuItems.push({ menuOptions.menuItems.push({
title: "WorkOrderItemStatusList", title: "TaskGroupList",
icon: "$ayiCircle", icon: "$ayiTasks",
key: FORM_KEY + ":list", key: FORM_KEY + ":list",
vm: vm vm: vm
}); });
@@ -466,7 +449,7 @@ let JUST_DELETED = false;
// //
async function initForm(vm) { async function initForm(vm) {
await fetchTranslatedText(); await fetchTranslatedText();
await window.$gz.formCustomTemplate.get(FORM_CUSTOM_TEMPLATE_KEY, vm); //await window.$gz.formCustomTemplate.get(FORM_CUSTOM_TEMPLATE_KEY, vm);
} }
////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////
@@ -475,10 +458,9 @@ async function initForm(vm) {
// //
async function fetchTranslatedText() { async function fetchTranslatedText() {
await window.$gz.translation.cacheTranslations([ await window.$gz.translation.cacheTranslations([
"WorkOrderItemStatus", "TaskGroupName",
"WorkOrderItemStatusName", "TaskGroupNotes",
"WorkOrderItemStatusColor", "Task"
"WorkOrderItemStatusNotes"
]); ]);
} }
</script> </script>

24
ayanova/src/views/svc-task-groups.vue
View File

@@ -2,31 +2,29 @@
<div> <div>
<gz-report-selector ref="reportSelector"></gz-report-selector> <gz-report-selector ref="reportSelector"></gz-report-selector>
<gz-extensions <gz-extensions
:aya-type="$ay.ayt().WorkOrderItemStatus" :aya-type="$ay.ayt().TaskGroup"
:selected-items="selectedItems" :selected-items="selectedItems"
ref="extensions" ref="extensions"
> >
</gz-extensions> </gz-extensions>
<gz-data-table <gz-data-table
ref="gzdatatable" ref="gzdatatable"
form-key="svc-work-order-item-status" form-key="svc-task-group"
data-list-key="WorkOrderItemStatusDataList" data-list-key="TaskGroupDataList"
:show-select="rights.read" :show-select="rights.read"
:reload="reload" :reload="reload"
@selection-change="handleSelected" @selection-change="handleSelected"
data-cy="woItemStatusTable" data-cy="taskGroupTable"
> >
</gz-data-table> </gz-data-table>
</div> </div>
</template> </template>
<script> <script>
const FORM_KEY = "svc-work-order-item-status"; const FORM_KEY = "svc-task-group";
export default { export default {
created() { created() {
this.rights = window.$gz.role.getRights( this.rights = window.$gz.role.getRights(window.$gz.type.TaskGroup);
window.$gz.type.WorkOrderItemStatus
);
window.$gz.eventBus.$on("menu-click", clickHandler); window.$gz.eventBus.$on("menu-click", clickHandler);
generateMenu(this); generateMenu(this);
}, },
@@ -59,7 +57,7 @@ async function clickHandler(menuItem) {
switch (m.key) { switch (m.key) {
case "new": case "new":
m.vm.$router.push({ m.vm.$router.push({
name: "svc-work-order-item-status-edit", name: "svc-task-group",
params: { recordid: 0 } params: { recordid: 0 }
}); });
break; break;
@@ -89,12 +87,12 @@ async function clickHandler(menuItem) {
function generateMenu(vm) { function generateMenu(vm) {
let menuOptions = { let menuOptions = {
isMain: true, isMain: true,
icon: "$ayiCircle", icon: "$ayiTasks",
title: "WorkOrderItemStatusList", title: "TaskGroupList",
helpUrl: "svc-work-order-item-status", helpUrl: "svc-task-groups",
menuItems: [], menuItems: [],
formData: { formData: {
ayaType: window.$gz.type.WorkOrderItemStatus ayaType: window.$gz.type.TaskGroup
} }
}; };

1
ayanova/src/views/svc-workorder.vue
View File

@@ -1462,6 +1462,7 @@ async function fetchTranslatedText(vm) {
"WorkOrderItemTaskCompletedDate", "WorkOrderItemTaskCompletedDate",
"WorkOrderItemTasks", "WorkOrderItemTasks",
"TaskGroup", "TaskGroup",
"TaskGroupList",
"SaveRecordToProceed", "SaveRecordToProceed",
"Cost", "Cost",
"ListPrice", "ListPrice",