From ca4d8d71b7432f31324ec5c842e16c1a904a0f07 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Tue, 18 Feb 2020 00:00:45 +0000
Subject: [PATCH]

---
 ayanova/src/components/gz-data-table.vue | 53 ++++++++++--------------
 ayanova/src/views/ay-data-list-view.vue  | 39 ++++++++---------
 2 files changed, 43 insertions(+), 49 deletions(-)

diff --git a/ayanova/src/components/gz-data-table.vue b/ayanova/src/components/gz-data-table.vue
index 9b72f75e..ce766386 100644
--- a/ayanova/src/components/gz-data-table.vue
+++ b/ayanova/src/components/gz-data-table.vue
@@ -3,10 +3,12 @@
     <v-card>
       <v-card-title>
         <v-select
+          v-model="listViewId"
           :items="pickLists.listViews"
           item-text="name"
           item-value="id"
           :label="lt('DataListView')"
+          @change="listViewChanged"
         >
         </v-select>
         <v-spacer></v-spacer
@@ -69,7 +71,7 @@
                     <!-- TEXT (also maybe openable)-->
                     <template v-if="c.i">
                       <!-- openable object with an ID -->
-                      <v-btn depressed small @click="btnClick(c.key, c.i)">{{
+                      <v-btn depressed small @click="gridCellButtonClick(c.key, c.i)">{{
                         c.v
                       }}</v-btn>
                     </template>
@@ -214,7 +216,7 @@
                             <template v-if="c.i">
                               <!-- openable object with an ID -->
                               <span
-                                @click="btnClick(c.key, c.i)"
+                                @click="gridCellButtonClick(c.key, c.i)"
                                 class="primary--text subtitle-1 font-weight-bold"
                                 style="cursor:pointer"
                                 >{{ c.v }}
@@ -373,7 +375,10 @@ export default {
       });
     },
 
-    btnClick(key, i) {
+    listViewChanged: function() {
+      alert("STUB:ListView Changed: " + this.listViewId);
+    },
+    gridCellButtonClick(key, i) {
       //translate key to actual object type from header data
       //key format is row-column e.g."500-2"
       //get the datatype of the column which matches the server columns array index
@@ -457,34 +462,23 @@ export default {
     //get pick lists
     var vm = this;
 
-    initForm(vm)
-      .then(() => {
-        //  path: "/ay-data-list-view/:listViewId/:dataListKey",
+    initForm(vm).then(() => {
+      //  path: "/ay-data-list-view/:listViewId/:dataListKey",
 
-        //rehydrate last form settings
-        var formSettings = window.$gz.form.getFormSettings(this.formKey);
-        if (formSettings.saved && formSettings.saved.itemsPerPage) {
-          this.dataTablePagingOptions.itemsPerPage =
-            formSettings.saved.itemsPerPage;
-        }
-        if (formSettings.temp && formSettings.temp.page) {
-          this.dataTablePagingOptions.page = formSettings.temp.page;
-        }
+      //rehydrate last form settings
+      var formSettings = window.$gz.form.getFormSettings(this.formKey);
+      if (formSettings.saved && formSettings.saved.itemsPerPage) {
+        this.dataTablePagingOptions.itemsPerPage =
+          formSettings.saved.itemsPerPage;
+      }
+      if (formSettings.temp && formSettings.temp.page) {
+        this.dataTablePagingOptions.page = formSettings.temp.page;
+      }
 
-        vm.formState.ready = true;
-        vm.dataListKey = this.$route.params.dataListKey;
-        vm.listViewId = this.$route.params.listViewId;
-        window.$gz.eventBus.$on("menu-click", clickHandler);
-        //NOTE: this would normally be in getDataFromAPI but this form doesn't really need that function so doing it here
-        //modify the menu as necessary
-        generateMenu(this, false); //default is never read only and passing in this vm
-        //init disable save button so it can be enabled only on edit to show dirty form
-        window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
-      })
-      .catch(err => {
-        vm.formState.ready = true;
-        window.$gz.errorHandler.handleFormError(err);
-      });
+      // vm.formState.ready = true;
+      // vm.dataListKey = this.$route.params.dataListKey;
+      // vm.listViewId = this.$route.params.listViewId;
+    });
   }
 };
 
@@ -644,7 +638,6 @@ async function fetchEnums(columnData) {
   }
 }
 
-
 /////////////////////////////////
 //
 //
diff --git a/ayanova/src/views/ay-data-list-view.vue b/ayanova/src/views/ay-data-list-view.vue
index 762c685d..eb2aba4a 100644
--- a/ayanova/src/views/ay-data-list-view.vue
+++ b/ayanova/src/views/ay-data-list-view.vue
@@ -42,14 +42,14 @@
           </v-row>
           <v-row>
             <v-col cols="12" sm="6" lg="4" xl="3">
-              <v-select
+              <!-- <v-select
                 v-model="listViewId"
                 :items="pickLists.availableDataListViews"
                 item-text="name"
                 item-value="id"
                 :label="lt('GridFilterName')"
                 @change="filterChanged()"
-              ></v-select>
+              ></v-select> -->
             </v-col>
           </v-row>
         </v-form>
@@ -336,7 +336,8 @@ function generateMenu(vm) {
 //
 //
 function initForm(vm) {
-  return populatePickLists(vm);
+  return Promise.resolve();
+  //return populatePickLists(vm);
   //If need to call more then...:
   //   .then(() => {
   //     //Must use return here
@@ -344,22 +345,22 @@ function initForm(vm) {
   //   });
 }
 
-////////////////////
-//
-function populatePickLists(vm) {
-  //http://localhost:7575/api/v8/DataListView/PickList?ListKey=TestWidgetDataList
-  return window.$gz.api
-    .get("DataListView/PickList?ListKey=" + vm.$route.params.dataListKey)
-    .then(res => {
-      if (res.error != undefined) {
-        window.$gz.errorHandler.handleFormError(res.error, vm);
-      } else {
-        vm.pickLists.availableDataListViews = res.data;
-        window.$gz.form.addNoSelectionItem(vm.pickLists.availableDataListViews);
-        //vm.pickLists.availableDataListViews.unshift({ name: "-", id: 0 });
-      }
-    });
-}
+// ////////////////////
+// //
+// function populatePickLists(vm) {
+//   //http://localhost:7575/api/v8/DataListView/PickList?ListKey=TestWidgetDataList
+//   return window.$gz.api
+//     .get("DataListView/PickList?ListKey=" + vm.$route.params.dataListKey)
+//     .then(res => {
+//       if (res.error != undefined) {
+//         window.$gz.errorHandler.handleFormError(res.error, vm);
+//       } else {
+//         vm.pickLists.availableDataListViews = res.data;
+//         window.$gz.form.addNoSelectionItem(vm.pickLists.availableDataListViews);
+//         //vm.pickLists.availableDataListViews.unshift({ name: "-", id: 0 });
+//       }
+//     });
+// }
 
 ////////////////////
 //