This commit is contained in:
2021-03-18 22:13:46 +00:00
parent 3609deeca2
commit 54dfeef488
2 changed files with 31 additions and 20 deletions

View File

@@ -130,7 +130,11 @@ export default {
title: "Review", title: "Review",
icon: "$ayiCalendarCheck", icon: "$ayiCalendarCheck",
key: "app:review", key: "app:review",
data: { ayaType: formAyaType, recordId: formRecordId } data: {
ayaType: formAyaType,
recordId: formRecordId,
recordName: recordName
}
}); });
//AFAIK right now any item with an id and a type can have a history //AFAIK right now any item with an id and a type can have a history
@@ -311,16 +315,13 @@ export default {
case "review": case "review":
//go to list //go to list
// path: "/home-reviews/:objectType?/:objectId?", // path: "/home-reviews/:objectType?/:objectId?",
let objName = null;
if (vm && vm.obj && vm.obj.name) {
objName = vm.obj.name;
}
vm.$router.push({ vm.$router.push({
name: "home-reviews", name: "home-reviews",
params: { params: {
objectType: window.$gz.util.stringToIntOrNull(item.data.ayaType), objectType: window.$gz.util.stringToIntOrNull(item.data.ayaType),
objectId: window.$gz.util.stringToIntOrNull(item.data.recordId), objectId: window.$gz.util.stringToIntOrNull(item.data.recordId),
name: objName name: item.data.recordName
} }
}); });
break; break;

View File

@@ -1,11 +1,5 @@
<template> <template>
<div> <div>
<div v-if="objectType && objectId" class="mb-6">
<v-icon data-cy="clickThru" @click="navToTarget()" large>{{
iconForType()
}}</v-icon
><span @click="navToTarget()" class="text-h5"> {{ name }}</span>
</div>
<gz-report-selector ref="reportSelector"></gz-report-selector> <gz-report-selector ref="reportSelector"></gz-report-selector>
<gz-extensions <gz-extensions
:aya-type="ayType" :aya-type="ayType"
@@ -22,6 +16,8 @@
:reload="reload" :reload="reload"
@selection-change="handleSelected" @selection-change="handleSelected"
data-cy="reviewsTable" data-cy="reviewsTable"
:pre-filter-mode="preFilterMode"
@clear-pre-filter="clearPreFilter"
> >
</gz-data-table> </gz-data-table>
</div> </div>
@@ -44,6 +40,14 @@ export default {
if (vm.objectId && vm.objectId != 0 && vm.objectType) { if (vm.objectId && vm.objectId != 0 && vm.objectType) {
//OBJECTID,AYATYPE //OBJECTID,AYATYPE
vm.clientCriteria = `${vm.objectId},${vm.objectType}`; vm.clientCriteria = `${vm.objectId},${vm.objectType}`;
vm.preFilterMode = {
icon: window.$gz.util.iconForType(vm.objectType),
id: vm.objectId,
ayatype: vm.objectType,
viz: vm.$route.params.name,
clearable: true
};
} }
generateMenu(vm); generateMenu(vm);
@@ -58,6 +62,7 @@ export default {
selectedItems: [], selectedItems: [],
reload: false, reload: false,
clientCriteria: undefined, clientCriteria: undefined,
preFilterMode: null,
objectId: null, objectId: null,
objectType: null, objectType: null,
name: null name: null
@@ -69,18 +74,23 @@ export default {
// } // }
// }, // },
methods: { methods: {
navToTarget: function() { // navToTarget: function() {
window.$gz.eventBus.$emit("openobject", { // window.$gz.eventBus.$emit("openobject", {
type: this.objectType, // type: this.objectType,
id: this.objectId // id: this.objectId
}); // });
}, // },
handleSelected(selected) { handleSelected(selected) {
this.selectedItems = selected; this.selectedItems = selected;
}, },
iconForType() { clearPreFilter() {
return window.$gz.util.iconForType(this.objectType, 10); this.clientCriteria = null;
this.preFilterMode = null;
this.reload = !this.reload;
} }
// iconForType() {
// return window.$gz.util.iconForType(this.objectType, 10);
// }
} }
}; };