This commit is contained in:
2021-03-10 17:47:33 +00:00
parent e4b0a6280a
commit cfadab9160
7 changed files with 122 additions and 43 deletions

View File

@@ -173,6 +173,7 @@ export default {
return;
} else {
//log unhandled api error
window.$gz.store.commit(
"logItem",
"API error: status=" +
@@ -696,8 +697,11 @@ export default {
let res = await window.$gz.api.upsert("report/render", reportDataOptions);
if (res.error) {
throw new Error(window.$gz.errorHandler.errorToString(res));
//throw new Error(res.error);
if (redirectNotPopup) {
return res;
} else {
throw new Error(window.$gz.errorHandler.errorToString(res));
}
} else {
let reportUrl = window.$gz.api.reportDownloadUrl(res.data);
if (redirectNotPopup) {

View File

@@ -722,13 +722,24 @@ export default new Router({
{
//REPORT VIEW FROM URL
path: "/viewreport",
beforeEnter: (to, from, next) => {
(async function() {
//open report links have a query string /viewreport?oid=[objectid]&rid=[reportid]
let objectId = parseInt(to.query.oid);
let reportId = parseInt(to.query.rid);
await window.$gz.api.renderReport(objectId, reportId, true);
})();
beforeEnter: async (to, from, next) => {
// (async function() {
//open report links have a query string /viewreport?oid=[objectid]&rid=[reportid]
let objectId = parseInt(to.query.oid);
let reportId = parseInt(to.query.rid);
let res = await window.$gz.api.renderReport(objectId, reportId, true);
if (res.error) {
//log the error and do a popup for it
let msg = `/viewReport, query ${JSON.stringify(
to.query
)}, server error: ${JSON.stringify(res.error)}`;
// window.$gz.store.commit("logItem", msg);
window.$gz.eventBus.$emit("notify-error", msg);
next("/applog");
}
//})();
next(false);
}

View File

@@ -1,7 +1,9 @@
<template>
<div>
<div v-if="objectType && objectId" class="mb-6">
<v-icon @click="navToTarget()" large>{{ iconForType() }}</v-icon
<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>

View File

@@ -15,6 +15,7 @@
:aya-type="ayaTypes().Customer"
:show-edit-icon="true"
:label="$ay.t('Customer')"
data-cy="clickThru"
></gz-pick-list>
</v-col>
</v-row>

View File

@@ -1,7 +1,9 @@
<template>
<div>
<div v-if="objectType && objectId" class="mb-6">
<v-icon @click="navToTarget()" large>{{ iconForType() }}</v-icon
<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>