From 681c74d73d974da02f3424cd7f08e823dd8a41e5 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Tue, 28 Dec 2021 15:14:18 +0000
Subject: [PATCH]

---
 ayanova/devdocs/todo.txt                  |  3 ++-
 ayanova/src/components/report-control.vue |  5 -----
 ayanova/src/views/ay-report-edit.vue      | 21 +++++++++++++++++++++
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index 2493e043..76508a72 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -301,7 +301,8 @@ TESTING INFO:
 		set to 1m timeout and then run a ginormous report or temp set server to always timeout is probably better for testing purposes
 	- report designer print needs to be fixed to use new system	
 	- direct print report from url must be tested and fixed up
-
+	- upload and test on devops
+	- give to Joyce to mangle
 
 - 1 todo: add the caching technique to *all* the other getreportdata methods as was done with workorder 
 
diff --git a/ayanova/src/components/report-control.vue b/ayanova/src/components/report-control.vue
index 0c35f692..048fcffa 100644
--- a/ayanova/src/components/report-control.vue
+++ b/ayanova/src/components/report-control.vue
@@ -170,16 +170,11 @@ export default {
             const jobLogRes = await window.$gz.api.get(
               `job-operations/logs/${jobId}`
             );
-            //console.log(jobLogRes);
-            //todo:look for reportfilename property in job log here and then put in reportUrl
-            //debugger;
             if (Array.isArray(jobLogRes.data)) {
               //walk the array backwards as it's probably the final entry in the log
               for (var i = jobLogRes.data.length - 1; i >= 0; i--) {
                 var v = jobLogRes.data[i].statusText;
-                //console.log("value type is:", typeof v);
                 if (v.includes("reportfilename")) {
-                  console.log("Parsing:", v);
                   const o = JSON.parse(v);
                   reportUrl = window.$gz.api.reportDownloadUrl(
                     o.reportfilename
diff --git a/ayanova/src/views/ay-report-edit.vue b/ayanova/src/views/ay-report-edit.vue
index fda47a7d..4aa735db 100644
--- a/ayanova/src/views/ay-report-edit.vue
+++ b/ayanova/src/views/ay-report-edit.vue
@@ -307,6 +307,7 @@
         </v-form>
       </v-col>
     </v-row>
+    <gz-report-selector ref="reportSelector"></gz-report-selector>
   </div>
 </template>
 <script>
@@ -852,6 +853,26 @@ export default {
       });
     },
     async render() {
+      // console.log(JSON.stringify(this.$route.params.reportDataOptions));
+      const vm = this;
+      if (vm.$route.params.recordid == 0) {
+        return;
+      }
+      const reportDataOptions = vm.$route.params.reportDataOptions;
+      if (!reportDataOptions) {
+        throw new Error(
+          "Missing report data: to view report must come here from an object edit form or list so data can be provided for viewing the report"
+        );
+      }
+      reportDataOptions.ReportId = vm.obj.id;
+      //Meta data from client for use by report script
+      reportDataOptions.ClientMeta = window.$gz.api.reportClientMetaData();
+      const res = await vm.$refs.reportSelector.open(
+        reportDataOptions,
+        vm.obj.id
+      );
+    },
+    async xxrender() {
       const vm = this;
       if (vm.$route.params.recordid == 0) {
         return;