From c5ff23a25cbcc686268d27e969d7d27e7cc83309 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Thu, 13 Feb 2020 00:02:03 +0000
Subject: [PATCH]

---
 ayanova/src/api/gzform.js            | 10 ++++++++++
 ayanova/src/views/ay-sort-filter.vue | 15 ++++++++++++++-
 ayanova/src/views/test-widgets.vue   |  2 +-
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/ayanova/src/api/gzform.js b/ayanova/src/api/gzform.js
index e0b541fd..2dbec8ec 100644
--- a/ayanova/src/api/gzform.js
+++ b/ayanova/src/api/gzform.js
@@ -681,5 +681,15 @@ export default {
     if (formSettings.temp) {
       sessionStorage.setItem(formKey, JSON.stringify(formSettings.temp));
     }
+  }, ////////////////////////////////////
+  //  Add no selection item
+  // Used by forms that need the option of an unselected
+  // item in a pick list
+  //
+  addNoSelectionItem(listArray) {
+    if (listArray == undefined || listArray == null) {
+      listArray = [];
+    }
+    listArray.unshift({ name: "-", id: 0 });
   }
 };
diff --git a/ayanova/src/views/ay-sort-filter.vue b/ayanova/src/views/ay-sort-filter.vue
index 937110a2..ba59859e 100644
--- a/ayanova/src/views/ay-sort-filter.vue
+++ b/ayanova/src/views/ay-sort-filter.vue
@@ -43,7 +43,7 @@
           <v-row>
             <v-col cols="12" sm="6" lg="4" xl="3">
               <v-select
-                v-model="selectedDataListSortFilter"
+                v-model="recordid"
                 :items="pickLists.availableDataListSortFilters"
                 item-text="name"
                 item-value="id"
@@ -102,6 +102,15 @@ export default {
   },
   created() {
     var vm = this;
+    //  //rehydrate last form settings
+    //     var formSettings = window.$gz.form.getFormSettings(this.formKey);
+
+    //     window.$gz.form.setFormSettings(that.formKey, {
+    //               temp: { page: that.dataTablePagingOptions.page },
+    //               saved: {
+    //                 itemsPerPage: that.dataTablePagingOptions.itemsPerPage
+    //               }
+    //             });
 
     initForm(vm)
       .then(() => {
@@ -345,6 +354,10 @@ function populatePickLists(vm) {
         window.$gz.errorHandler.handleFormError(res.error, vm);
       } else {
         vm.pickLists.availableDataListSortFilters = res.data;
+        window.$gz.form.addNoSelectionItem(
+          vm.pickLists.availableDataListSortFilters
+        );
+        //vm.pickLists.availableDataListSortFilters.unshift({ name: "-", id: 0 });
       }
     });
 }
diff --git a/ayanova/src/views/test-widgets.vue b/ayanova/src/views/test-widgets.vue
index e490cd3e..155c65a7 100644
--- a/ayanova/src/views/test-widgets.vue
+++ b/ayanova/src/views/test-widgets.vue
@@ -43,7 +43,7 @@ export default {
   },
   data() {
     return {
-      currentDataFilterId: 0,
+      currentDataFilterId: 1,
       dataListKey: "TestWidgetDataList",
       dataListFilter: "",
       dataListSort: ""