This commit is contained in:
2020-04-07 18:06:39 +00:00
parent 74476c3dec
commit 167357a0bd
4 changed files with 64 additions and 39 deletions

View File

@@ -70,63 +70,67 @@ export default new Router({
name: "login",
meta: { scrollToTop: true }, //KEEP THIS AS AN EXAMPLE OF HOW TO USE WITH CODE ABOVE
component: () =>
import(/* webpackChunkName: "home" */ "./views/login.vue")
import(/* webpackChunkName: "ay-common" */ "./views/login.vue")
},
{
path: "/home-dashboard",
name: "home-dashboard",
component: () =>
import(/* webpackChunkName: "home" */ "./views/home-dashboard.vue")
import(/* webpackChunkName: "ay-common" */ "./views/home-dashboard.vue")
},
{
path: "/home-search/:ayatype?",
name: "home-search",
component: () =>
import(/* webpackChunkName: "home" */ "./views/home-search.vue")
import(/* webpackChunkName: "ay-common" */ "./views/home-search.vue")
},
{ path: "/", redirect: "/login" }, //If someone goes blindly to the root of the app, then it should go to login
{
path: "/home-schedule",
name: "home-schedule",
component: () =>
import(/* webpackChunkName: "home" */ "./views/home-schedule.vue")
import(/* webpackChunkName: "ay-common" */ "./views/home-schedule.vue")
},
{
path: "/home-memos",
name: "home-memos",
component: () =>
import(/* webpackChunkName: "home" */ "./views/home-memos.vue")
import(/* webpackChunkName: "ay-common" */ "./views/home-memos.vue")
},
{
path: "/home-reminders",
name: "home-reminders",
component: () =>
import(/* webpackChunkName: "home" */ "./views/home-reminders.vue")
import(/* webpackChunkName: "ay-common" */ "./views/home-reminders.vue")
},
{
path: "/home-user-settings",
name: "home-user-settings",
component: () =>
import(/* webpackChunkName: "home" */ "./views/home-user-settings.vue")
import(
/* webpackChunkName: "ay-common" */ "./views/home-user-settings.vue"
)
},
{
path: "/home-translation",
name: "home-translation",
component: () =>
import(/* webpackChunkName: "home" */ "./views/home-translation.vue")
import(
/* webpackChunkName: "ay-common" */ "./views/home-translation.vue"
)
},
{
path: "/home-password",
name: "home-password",
component: () =>
import(/* webpackChunkName: "home" */ "./views/home-password.vue")
import(/* webpackChunkName: "ay-common" */ "./views/home-password.vue")
},
{
path: "/home-notify-subscriptions",
name: "home-notify-subscriptions",
component: () =>
import(
/* webpackChunkName: "home" */ "./views/home-notify-subscriptions.vue"
/* webpackChunkName: "ay-common" */ "./views/home-notify-subscriptions.vue"
)
},
{
@@ -404,48 +408,57 @@ export default new Router({
// this generates a separate chunk (about.[hash].js) for this route
// which is lazy-loaded when the route is visited.
component: () =>
import(/* webpackChunkName: "ay" */ "./views/ay-about.vue")
import(/* webpackChunkName: "ay-common" */ "./views/ay-about.vue")
},
{
path: "/applog",
name: "ay-log",
component: () => import(/* webpackChunkName: "ay" */ "./views/ay-log.vue")
component: () =>
import(/* webpackChunkName: "ay-common" */ "./views/ay-log.vue")
},
{
path: "/customize/:formCustomTemplateKey",
name: "ay-customize",
component: () =>
import(/* webpackChunkName: "ay" */ "./views/ay-customize.vue")
import(/* webpackChunkName: "ay-common" */ "./views/ay-customize.vue")
},
{
path: "/data-list-view/:dataListKey/:formKey/:listViewId",
name: "ay-data-list-view",
component: () =>
import(/* webpackChunkName: "ay" */ "./views/ay-data-list-view.vue")
import(
/* webpackChunkName: "ay-common" */ "./views/ay-data-list-view.vue"
)
},
{
path: "/attachments/:ayatype/:recordid",
name: "ay-attachments",
component: () =>
import(/* webpackChunkName: "home" */ "./views/ay-attachments.vue")
import(/* webpackChunkName: "ay-common" */ "./views/ay-attachments.vue")
},
{
path: "/wiki/:ayatype/:recordid",
name: "ay-wiki",
component: () =>
import(/* webpackChunkName: "home" */ "./views/ay-wiki.vue")
import(/* webpackChunkName: "ay-common" */ "./views/ay-wiki.vue")
},
{
path: "/review/:ayatype/:recordid",
name: "ay-review",
component: () =>
import(/* webpackChunkName: "home" */ "./views/ay-review.vue")
import(/* webpackChunkName: "ay-common" */ "./views/ay-review.vue")
},
{
path: "/history/:ayatype/:recordid",
name: "ay-history",
component: () =>
import(/* webpackChunkName: "home" */ "./views/ay-history.vue")
import(/* webpackChunkName: "ay-common" */ "./views/ay-history.vue")
},
{
path: "/report/:ayatype/:recordid",
name: "ay-report",
component: () =>
import(/* webpackChunkName: "ay-common" */ "./views/ay-report.vue")
},
//TEST TEST TEST TEST TEST
@@ -469,7 +482,7 @@ export default new Router({
path: "*",
name: "notfound",
component: () =>
import(/* webpackChunkName: "home" */ "./views/notfound.vue")
import(/* webpackChunkName: "ay-common" */ "./views/notfound.vue")
}
]
});

View File

@@ -0,0 +1,21 @@
<template>
<UnderConstruction />
</template>
<script>
import UnderConstruction from "../components/underconstruction.vue";
export default {
components: {
UnderConstruction
},
beforeCreate() {
window.$gz.eventBus.$emit("menu-change", {
isMain: true,
icon: "fa-file-alt",
title: this.$ay.t("Report"),
helpUrl: "form-ay-report"
});
}
};
</script>

View File

@@ -575,7 +575,12 @@ function clickHandler(menuItem) {
case "report":
if (m.id != null) {
//last report selected
alert("STUB: last report selected for " + m.id);
//alert("STUB: last report selected for " + m.id);
// /report/:ayatype/:recordid
m.vm.$router.push({
name: "ay-report",
params: { recordid: m.id, ayatype: window.$gz.type.Widget }
});
} else {
//finally, make a fake report viewer view to go to with choices set
m.vm.$refs.reportSelector.open().then(res => {
@@ -588,7 +593,10 @@ function clickHandler(menuItem) {
window.$gz.form.setLastReport(FORM_KEY, res);
//Now open the report viewer...
alert("STUB: view report " + res.name);
m.vm.$router.push({
name: "ay-report",
params: { recordid: res.id, ayatype: window.$gz.type.Widget }
});
});
}