From aa6923af96d11685f5e39a745f2dfffcca49e96e Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Thu, 20 Feb 2020 22:51:16 +0000
Subject: [PATCH]

---
 ayanova/src/views/ay-data-list-view.vue | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/ayanova/src/views/ay-data-list-view.vue b/ayanova/src/views/ay-data-list-view.vue
index eaca4422..8ad26af7 100644
--- a/ayanova/src/views/ay-data-list-view.vue
+++ b/ayanova/src/views/ay-data-list-view.vue
@@ -89,40 +89,42 @@
                       v-model="item.include"
                       :label="lt('Include')"
                       :ref="item.key"
-                      :disabled="item.sort != null || item.filter != null"
+                      :disabled="
+                        item.sort != null || item.filter.items.length > 0
+                      "
                       @change="includeChanged(item)"
                     ></v-switch>
 
                     <div class="d-flex justify-space-between">
-                      <v-btn text large @click="move('start', index)"
+                      <v-btn outlined large @click="move('start', index)"
                         ><v-icon light Large>fa-step-backward</v-icon></v-btn
                       >
-                      <v-btn text Large @click="move('left', index)"
+                      <v-btn outlined Large @click="move('left', index)"
                         ><v-icon Large>fa-backward</v-icon></v-btn
                       >
-                      <v-btn text Large @click="move('right', index)"
+                      <v-btn outlined Large @click="move('right', index)"
                         ><v-icon Large>fa-forward</v-icon></v-btn
                       >
-                      <v-btn text Large @click="move('end', index)"
+                      <v-btn outlined Large @click="move('end', index)"
                         ><v-icon Large>fa-step-forward</v-icon></v-btn
                       >
                     </div>
 
                     <template v-if="item.isSortable">
                       <div @click="toggleSort(item)" class="pl-2 pt-2">
-                        <v-btn v-if="item.sort == null" text Large>
+                        <v-btn v-if="item.sort == null" outlined Large>
                           <v-icon large>fa-sort</v-icon>{{ lt("Sort") }}</v-btn
                         >
                         <v-btn
                           v-if="item.sort != null && item.sort == '-'"
-                          text
+                          outlined
                           Large
                           ><v-icon large>fa-sort-amount-down</v-icon
                           >{{ lt("Sort") }}</v-btn
                         >
                         <v-btn
                           v-if="item.sort != null && item.sort == '+'"
-                          text
+                          outlined
                           Large
                           ><v-icon large>fa-sort-amount-up</v-icon
                           >{{ lt("Sort") }}</v-btn
@@ -178,7 +180,6 @@
                             @click="addFilterCondition(item)"
                             ><v-icon>fa-plus</v-icon></v-btn
                           >
-                          {{ item }}
                         </div>
 
                         <!-- STRING(text-4, emailaddress-11, http-12) BUILDER  -->
@@ -221,6 +222,8 @@
                         <div>
                           TODO: STATIC list of items with delete button on each
                           one
+                          <v-divider></v-divider>
+                          {{ item }}
                         </div>
                       </div>
                     </template>
@@ -352,6 +355,10 @@ export default {
       } else {
         item.sort = null;
       }
+      //make sure sorted fields are INCLUDED
+      if (item.sort) {
+        item.include = true;
+      }
     },
     move: function(direction, index) {
       var totalItems = this.obj.length;