From adf8eee4d75ddae2a20b29291923b00445fdf42c Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Tue, 1 Dec 2020 16:05:18 +0000
Subject: [PATCH]

---
 ayanova/devdocs/rando-todo.txt  |  5 ++++-
 ayanova/devdocs/todo.txt        |  8 +++++---
 ayanova/src/views/adm-user.vue  |  9 +++++++--
 ayanova/src/views/adm-users.vue | 31 +++++++++++++++++--------------
 ayanova/src/views/cust-user.vue |  8 ++++++--
 5 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/ayanova/devdocs/rando-todo.txt b/ayanova/devdocs/rando-todo.txt
index e28d5ff5..51c3b625 100644
--- a/ayanova/devdocs/rando-todo.txt
+++ b/ayanova/devdocs/rando-todo.txt
@@ -1,6 +1,9 @@
 Grab bag stuff that didn't fit into official TODO 
 
-
+todo: Users / Contacts lists not reportable from main UI
+	not using regular DataList for user lists and contact lists?
+	currently not reportable as a list easily since not a GZDataList but could probably rectify that even without switching to datalist
+	likely just a bit of code required to enable it
 
 todo: PROBABLY NOT REQUIRED SEE BOTTOM LINE BELOW: missing feature, can't filter widgetlist by User due to no UserList being available
 	Is this meant to be text only filter and we have no id filter system?
diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index 56065668..2ab60975 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -7,9 +7,11 @@ MISC ITEMS THAT CAME UP
 
 
 
-todo: User list selection checkbox is for...?
-	Report also doesn't seem to work on that form, wtf?
-	remove it if there isn't a purpose to it and bulk ops are not supported
+
+
+todo: v8migrate customer account users coming over as regular non sched users
+	though the contacts are correctly importing
+	They need to appear as contacts when imported
 
 todo: logout doesn't shut off check for notifications?
 	logout and shut down server get error appear in client??!
diff --git a/ayanova/src/views/adm-user.vue b/ayanova/src/views/adm-user.vue
index aea92eba..9f7803cc 100644
--- a/ayanova/src/views/adm-user.vue
+++ b/ayanova/src/views/adm-user.vue
@@ -913,14 +913,18 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         if (m.id != null) {
-          //last report selected
+          //last report selected is in m.id
           m.vm.$router.push({
             name: "ay-report",
             params: { recordid: m.id, ayatype: window.$gz.type.User }
           });
         } else {
           //general report selector chosen
-          let res = await m.vm.$refs.reportSelector.open();
+
+          let res = await m.vm.$refs.reportSelector.open({
+            ObjectType: window.$gz.type.User,
+            selectedRowIds: [m.vm.obj.id]
+          });
 
           //if null for no selection
           //just bail out
@@ -937,6 +941,7 @@ async function clickHandler(menuItem) {
           });
         }
         break;
+
       case "directnotify":
         //nav to direct notify with list of users appended to route
         if (m.vm.obj.id == 0) {
diff --git a/ayanova/src/views/adm-users.vue b/ayanova/src/views/adm-users.vue
index 48657efd..a16f65c1 100644
--- a/ayanova/src/views/adm-users.vue
+++ b/ayanova/src/views/adm-users.vue
@@ -11,7 +11,6 @@
       hide-default-footer
       @click:row="rowClick"
       :sort-by="['name']"
-      show-select
       :header-props="{ sortByText: $ay.t('Sort') }"
       data-cy="usersTable"
     >
@@ -223,20 +222,24 @@ function generateMenu(vm) {
   }
 
   //STUB REPORTS
-  //Report not Print, print is a further option
-  menuOptions.menuItems.push({
-    title: "Report",
-    icon: "$ayiFileAlt",
-    key: FORM_KEY + ":report",
-    vm: vm
-  });
+  //## NOTE: This form is not based on a DataList so it cannot be printed
+  //if it was a datalist then all would be as normal
+  //not sure why it's not a datalist
 
-  menuOptions.menuItems.push({
-    title: "stub: Last report used",
-    icon: "$ayiFileAlt",
-    key: FORM_KEY + ":report:STUBlastusedreportid",
-    vm: vm
-  });
+  //Report not Print, print is a further option
+  // menuOptions.menuItems.push({
+  //   title: "Report",
+  //   icon: "$ayiFileAlt",
+  //   key: FORM_KEY + ":report",
+  //   vm: vm
+  // });
+
+  // menuOptions.menuItems.push({
+  //   title: "stub: Last report used",
+  //   icon: "$ayiFileAlt",
+  //   key: FORM_KEY + ":report:STUBlastusedreportid",
+  //   vm: vm
+  // });
 
   // menuOptions.menuItems.push({
   //   title: "Extensions",
diff --git a/ayanova/src/views/cust-user.vue b/ayanova/src/views/cust-user.vue
index 98cb633b..c28d67f2 100644
--- a/ayanova/src/views/cust-user.vue
+++ b/ayanova/src/views/cust-user.vue
@@ -917,14 +917,18 @@ async function clickHandler(menuItem) {
         break;
       case "report":
         if (m.id != null) {
-          //last report selected
+          //last report selected is in m.id
           m.vm.$router.push({
             name: "ay-report",
             params: { recordid: m.id, ayatype: window.$gz.type.User }
           });
         } else {
           //general report selector chosen
-          let res = await m.vm.$refs.reportSelector.open();
+
+          let res = await m.vm.$refs.reportSelector.open({
+            ObjectType: window.$gz.type.User,
+            selectedRowIds: [m.vm.obj.id]
+          });
 
           //if null for no selection
           //just bail out