From 89c1cd7fb592dcfd41bc722b9757c2afccdbd7b7 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 31 Dec 2021 21:39:30 +0000 Subject: [PATCH] case 4061 --- ayanova/devdocs/todo.txt | 5 ++-- .../src/views/svc-workorder-item-loans.vue | 24 +++--------------- .../svc-workorder-item-outside-services.vue | 25 ++++--------------- .../svc-workorder-item-part-requests.vue | 24 +++--------------- .../src/views/svc-workorder-item-parts.vue | 25 ++++--------------- .../svc-workorder-item-scheduled-users.vue | 24 +++--------------- .../src/views/svc-workorder-item-tasks.vue | 25 ++++--------------- 7 files changed, 30 insertions(+), 122 deletions(-) diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt index 5ff164c1..697dd40e 100644 --- a/ayanova/devdocs/todo.txt +++ b/ayanova/devdocs/todo.txt @@ -876,8 +876,8 @@ BUILD 8.0.0-beta.0.8 CHANGES OF NOTE There is a (very low) chance that some viz fields might show the wrong data, I don't think there is any but wanted you to be aware in case you see something odd, let me know - removed un-implemented "report" menu item from admin->attachments data table form - case 4038 -- case 4039 I have misgivings, see my notes -- case 4040 '' +- case 4039 see notes +- case 4040 see notes - case 4041 both fixed and no fault found (two cases in one) see notes - case 4042 see notes / by design - case 4044 fixed @@ -895,6 +895,7 @@ BUILD 8.0.0-beta.0.8 CHANGES OF NOTE - case 4058 implemented see notes for other ones too - case 4059 fixed - case 4060 see notes +- case 4061 fixed diff --git a/ayanova/src/views/svc-workorder-item-loans.vue b/ayanova/src/views/svc-workorder-item-loans.vue index 2d87c308..56d13148 100644 --- a/ayanova/src/views/svc-workorder-item-loans.vue +++ b/ayanova/src/views/svc-workorder-item-loans.vue @@ -105,34 +105,18 @@ async function clickHandler(menuItem) { } break; case "report": - if (m.id != null) { - m.vm.$router.push({ - name: "ay-report", - params: { - recordid: m.id, - ayatype: window.$gz.type.WorkOrderItemLoan - } - }); - } else { + { const res = await m.vm.$refs.reportSelector.open( m.vm.$refs.gzdatatable.getDataListSelection( window.$gz.type.WorkOrderItemLoan - ) + ), + m.id ); - if (res == null) { return; } - window.$gz.form.setLastReport(FORM_KEY, res); - - m.vm.$router.push({ - name: "ay-report", - params: { - recordid: res.id, - ayatype: window.$gz.type.WorkOrderItemLoan - } - }); + generateMenu(m.vm); } break; case "WorkOrderList": diff --git a/ayanova/src/views/svc-workorder-item-outside-services.vue b/ayanova/src/views/svc-workorder-item-outside-services.vue index c20a832f..6618013e 100644 --- a/ayanova/src/views/svc-workorder-item-outside-services.vue +++ b/ayanova/src/views/svc-workorder-item-outside-services.vue @@ -72,36 +72,21 @@ async function clickHandler(menuItem) { } break; case "report": - if (m.id != null) { - m.vm.$router.push({ - name: "ay-report", - params: { - recordid: m.id, - ayatype: window.$gz.type.WorkOrderItemOutsideService - } - }); - } else { + { const res = await m.vm.$refs.reportSelector.open( m.vm.$refs.gzdatatable.getDataListSelection( window.$gz.type.WorkOrderItemOutsideService - ) + ), + m.id ); - if (res == null) { return; } - window.$gz.form.setLastReport(FORM_KEY, res); - - m.vm.$router.push({ - name: "ay-report", - params: { - recordid: res.id, - ayatype: window.$gz.type.WorkOrderItemOutsideService - } - }); + generateMenu(m.vm); } break; + case "WorkOrderList": m.vm.$router.push({ name: "svc-workorders" diff --git a/ayanova/src/views/svc-workorder-item-part-requests.vue b/ayanova/src/views/svc-workorder-item-part-requests.vue index 55e9a826..14a6b348 100644 --- a/ayanova/src/views/svc-workorder-item-part-requests.vue +++ b/ayanova/src/views/svc-workorder-item-part-requests.vue @@ -72,34 +72,18 @@ async function clickHandler(menuItem) { } break; case "report": - if (m.id != null) { - m.vm.$router.push({ - name: "ay-report", - params: { - recordid: m.id, - ayatype: window.$gz.type.WorkOrderItemPartRequest - } - }); - } else { + { const res = await m.vm.$refs.reportSelector.open( m.vm.$refs.gzdatatable.getDataListSelection( window.$gz.type.WorkOrderItemPartRequest - ) + ), + m.id ); - if (res == null) { return; } - window.$gz.form.setLastReport(FORM_KEY, res); - - m.vm.$router.push({ - name: "ay-report", - params: { - recordid: res.id, - ayatype: window.$gz.type.WorkOrderItemPartRequest - } - }); + generateMenu(m.vm); } break; case "WorkOrderList": diff --git a/ayanova/src/views/svc-workorder-item-parts.vue b/ayanova/src/views/svc-workorder-item-parts.vue index bceccf1f..e9890702 100644 --- a/ayanova/src/views/svc-workorder-item-parts.vue +++ b/ayanova/src/views/svc-workorder-item-parts.vue @@ -105,36 +105,21 @@ async function clickHandler(menuItem) { } break; case "report": - if (m.id != null) { - m.vm.$router.push({ - name: "ay-report", - params: { - recordid: m.id, - ayatype: window.$gz.type.WorkOrderItemPart - } - }); - } else { + { const res = await m.vm.$refs.reportSelector.open( m.vm.$refs.gzdatatable.getDataListSelection( window.$gz.type.WorkOrderItemPart - ) + ), + m.id ); - if (res == null) { return; } - window.$gz.form.setLastReport(FORM_KEY, res); - - m.vm.$router.push({ - name: "ay-report", - params: { - recordid: res.id, - ayatype: window.$gz.type.WorkOrderItemPart - } - }); + generateMenu(m.vm); } break; + case "WorkOrderList": m.vm.$router.push({ name: "svc-workorders" diff --git a/ayanova/src/views/svc-workorder-item-scheduled-users.vue b/ayanova/src/views/svc-workorder-item-scheduled-users.vue index 816a74be..22f41e44 100644 --- a/ayanova/src/views/svc-workorder-item-scheduled-users.vue +++ b/ayanova/src/views/svc-workorder-item-scheduled-users.vue @@ -105,34 +105,18 @@ async function clickHandler(menuItem) { } break; case "report": - if (m.id != null) { - m.vm.$router.push({ - name: "ay-report", - params: { - recordid: m.id, - ayatype: window.$gz.type.WorkOrderItemScheduledUser - } - }); - } else { + { const res = await m.vm.$refs.reportSelector.open( m.vm.$refs.gzdatatable.getDataListSelection( window.$gz.type.WorkOrderItemScheduledUser - ) + ), + m.id ); - if (res == null) { return; } - window.$gz.form.setLastReport(FORM_KEY, res); - - m.vm.$router.push({ - name: "ay-report", - params: { - recordid: res.id, - ayatype: window.$gz.type.WorkOrderItemScheduledUser - } - }); + generateMenu(m.vm); } break; case "WorkOrderList": diff --git a/ayanova/src/views/svc-workorder-item-tasks.vue b/ayanova/src/views/svc-workorder-item-tasks.vue index 8d907958..8af67223 100644 --- a/ayanova/src/views/svc-workorder-item-tasks.vue +++ b/ayanova/src/views/svc-workorder-item-tasks.vue @@ -72,36 +72,21 @@ async function clickHandler(menuItem) { } break; case "report": - if (m.id != null) { - m.vm.$router.push({ - name: "ay-report", - params: { - recordid: m.id, - ayatype: window.$gz.type.WorkOrderItemTask - } - }); - } else { + { const res = await m.vm.$refs.reportSelector.open( m.vm.$refs.gzdatatable.getDataListSelection( window.$gz.type.WorkOrderItemTask - ) + ), + m.id ); - if (res == null) { return; } - window.$gz.form.setLastReport(FORM_KEY, res); - - m.vm.$router.push({ - name: "ay-report", - params: { - recordid: res.id, - ayatype: window.$gz.type.WorkOrderItemTask - } - }); + generateMenu(m.vm); } break; + case "WorkOrderList": m.vm.$router.push({ name: "svc-workorders"