From 74cfadc430ffb4d892d564ae9d5493c37db01a94 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Thu, 3 Sep 2020 21:58:58 +0000
Subject: [PATCH]

---
 ayanova/src/views/ay-report-edit.vue | 66 +++++++++++++++++-----------
 1 file changed, 41 insertions(+), 25 deletions(-)

diff --git a/ayanova/src/views/ay-report-edit.vue b/ayanova/src/views/ay-report-edit.vue
index c69444fd..9dfca76d 100644
--- a/ayanova/src/views/ay-report-edit.vue
+++ b/ayanova/src/views/ay-report-edit.vue
@@ -2,6 +2,7 @@
   <div v-resize="onResize">
     <!-- {{ formState }} -->
     <v-row>
+      <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
       <v-col cols="12" sm="6" class="py-2">
         <v-btn-toggle
           v-model="activeTab"
@@ -198,7 +199,7 @@ export default {
       //Created editor models for each type of report element that can be edited
       vm.editData.template.model = monaco.editor.createModel(
         vm.obj.template,
-        "javascript"
+        "html"
       );
 
       vm.editData.style.model = monaco.editor.createModel(vm.obj.style, "css");
@@ -696,48 +697,63 @@ Handlebars.registerHelper('loud', function (aString) {
     },
     async render() {
       let vm = this;
-      //test open new window for test url
-      // window.open("http://localhost:7575/api/v8/report/poc", "_blank");
+      // //test open new window for test url
+      // // window.open("http://localhost:7575/api/v8/report/poc", "_blank");
 
-      let pdf = await window.$gz.api.upsert("report/post-poc", {
-        name: "TheSnatcher"
-      });
+      // let pdf = await window.$gz.api.upsert("report/post-poc", {
+      //   name: "TheSnatcher"
+      // });
 
-      console.log("PDF: ", pdf);
-      let reportUrl = window.$gz.api.reportDownloadUrl(pdf.data);
-      console.log("Report url:", reportUrl);
-      if (window.open(reportUrl, "ayreport") == null) {
-        //window open failed, maybe popup blocker
-        //show error to user
-        //alert("ERROR OPENING REPORT WINDOW IN BROWSER");
-      }
+      // console.log("PDF: ", pdf);
+      // let reportUrl = window.$gz.api.reportDownloadUrl(pdf.data);
+      // console.log("Report url:", reportUrl);
+      // if (window.open(reportUrl, "ayreport") == null) {
+      //   //window open failed, maybe popup blocker
+      //   //show error to user
+      //   //alert("ERROR OPENING REPORT WINDOW IN BROWSER");
+      // }
       //
+      // return;
 
-      return;
       if (vm.$route.params.recordid == 0) {
         return;
       }
+
+      /*
+  public class RenderReportParameter
+    {
+        public long ReportId { get; set; }
+        public long[] SelectedRowIds { get; set; }
+        public string DataListKey { get; set; }
+        public string ListView { get; set; }//optional, if null or empty will use default list view built into DataList
+    }
+*/
+      let reportDataOptions = vm.$route.params.reportDataOptions;
+      if (!reportDataOptions) {
+        throw "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;
+
       window.$gz.form.setFormState({
         vm: vm,
         loading: true
       });
-      let url = "report/duplicate/" + vm.$route.params.recordid;
+      let url = "report/render";
 
       try {
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-        let res = await window.$gz.api.upsert(url);
+        let res = await window.$gz.api.upsert(url, reportDataOptions);
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-          //Navigate to new record
-          this.$router.push({
-            name: "ay-report-edit",
-            params: {
-              recordid: res.data.id,
-              obj: res.data // Pass data object to new form
-            }
-          });
+          let reportUrl = window.$gz.api.reportDownloadUrl(res.data);
+          //console.log("Report url:", reportUrl);
+          if (window.open(reportUrl, "Report") == null) {
+            vm.formState.serverError =
+              "Problem displaying report in new window.  Browser must allow pop-ups to view reports; check your browser setting";
+            window.$gz.form.setErrorBoxErrors(vm);
+          }
         }
       } catch (ex) {
         window.$gz.errorHandler.handleFormError(ex, vm);