From 73f664a153ebfad9001b0499dc4e1666ed2435ed Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Wed, 19 Feb 2020 16:01:14 +0000
Subject: [PATCH]

---
 ayanova/devdocs/todo.txt                |  3 +-
 ayanova/src/views/ay-data-list-view.vue | 63 +++++++++++++++++--------
 2 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index c614a77b..49641363 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -45,8 +45,7 @@ CURRENT TODOs
 
 TODO: ListViewBuilder
 
-TODO: DataTable listView picklist needs to handle UNSAVED -1 value, add it when it's there and remove it when user changes to other filter
-	- Can it be displayed in red like old v7?
+
 
 UI 
 	- see custom fields editor for similar setup
diff --git a/ayanova/src/views/ay-data-list-view.vue b/ayanova/src/views/ay-data-list-view.vue
index d2d593e2..84cd425f 100644
--- a/ayanova/src/views/ay-data-list-view.vue
+++ b/ayanova/src/views/ay-data-list-view.vue
@@ -12,7 +12,7 @@
       READONLY: {{ formState.readOnly }}
       <br />
     </div> -->
-    <div>
+    <!--   <div>
       ListViewId: {{ listViewId }}
       <v-divider></v-divider>
       <br />
@@ -22,16 +22,16 @@
       FormKey: {{ formKey }}
       <v-divider></v-divider>
       <br />
-      <!-- fieldDefinitions: {{ fieldDefinitions }}
+       fieldDefinitions: {{ fieldDefinitions }}
       <v-divider></v-divider>
-      <br /> -->
+      <br /> 
       effectiveListView: {{ effectiveListView }}
       <v-divider></v-divider>
       <br />
       obj: {{ obj }}
       <v-divider></v-divider>
     </div>
-
+-->
     <v-row v-if="this.formState.ready">
       <v-col>
         <v-form ref="form">
@@ -48,18 +48,41 @@
                 >{{ formState.errorBoxMessage }}</v-alert
               >
             </v-col>
-          </v-row>
-          <v-row>
-            <v-col cols="12" sm="6" lg="4" xl="3">
-              <!-- <v-select
-                v-model="listViewId"
-                :items="pickLists.availableDataListViews"
-                item-text="name"
-                item-value="id"
-                :label="lt('GridFilterName')"
-                @change="filterChanged()"
-              ></v-select> -->
-            </v-col>
+            <template v-for="item in obj">
+              <v-col :key="item.key" cols="12" sm="6" lg="4" xl="3" px-2>
+                <v-card>
+                  <v-card-title>
+                    {{ item.title }}
+                  </v-card-title>
+                  <v-card-subtitle>
+                    {{ item.key }}
+                  </v-card-subtitle>
+                  <v-card-text>
+                    <v-checkbox
+                      v-model="item.include"
+                      :label="lt('INCLUDE')"
+                      :ref="item.key"
+                      @change="includeChanged(item)"
+                    ></v-checkbox>
+                    <!-- <v-checkbox
+                      v-model="item.required"
+                      :label="lt('FormFieldEntryRequired')"
+                      :disabled="item.stockRequired"
+                      @change="requiredChanged(item)"
+                    ></v-checkbox> -->
+                    <!-- <v-select
+                      v-if="item.custom"
+                      v-model="item.type"
+                      :items="pickLists.uiFieldDataTypes"
+                      item-text="name"
+                      item-value="id"
+                      :label="lt('UiFieldDataType')"
+                      @change="dataTypeChanged(item)"
+                    ></v-select> -->
+                  </v-card-text>
+                </v-card>
+              </v-col>
+            </template>
           </v-row>
         </v-form>
       </v-col>
@@ -143,7 +166,7 @@ export default {
         appError: undefined,
         serverError: {}
       },
-      rights: window.$gz.role.getRights(window.$gz.type.DataListView)     
+      rights: window.$gz.role.getRights(window.$gz.type.DataListView)
     };
   },
 
@@ -151,7 +174,7 @@ export default {
     lt: function(ltkey) {
       return window.$gz.locale.get(ltkey);
     },
-    visibleChanged: function(item) {
+    includeChanged: function(item) {
       //Note: stock items can't be changed so no need to take that into account
       if (item.required && item.visible == false) {
         item.required = false;
@@ -442,7 +465,7 @@ function initDataObject(vm) {
     var o = {
       key: fld.fieldKey,
       title: vm.lt(fld.ltKey),
-      visible: true,
+      include: true,
       isFilterable: fld.isFilterable,
       isSortable: fld.isSortable,
       enumType: fld.enumType,
@@ -469,7 +492,7 @@ function initDataObject(vm) {
       var o = {
         key: fld.fieldKey,
         title: vm.lt(fld.ltKey),
-        visible: false,
+        include: false,
         isFilterable: fld.isFilterable,
         isSortable: fld.isSortable,
         enumType: fld.enumType,