From 95f86f7676bd2afe7366ba3f799ec704dda081a8 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Wed, 3 Feb 2021 18:56:05 +0000
Subject: [PATCH]

---
 ayanova/devdocs/todo.txt                       |  4 ++++
 .../components/data-table-filter-control.vue   | 18 +++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index fc1a08f5..fd5af507 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -28,6 +28,10 @@ LISTVIEW REPLACE CURRENT <----HERE not THERE ---v
            filter:[{column:"PartPartNumber",any:true/false,items:[{op: "=",value: "400735"}]}],
            clientCriteria:"2" //could be anything here that makes sense to the list, in this case an example customer id for customernotedatalist
 
+			CURRENTLY IN BUILDER:
+			editItemFilter:{ "any": true, "items": [ { "op": "=", "value": "*thisweek*", "display": "= Week - Current", "token": true }, { "op": "=", "value": "*lastmonth*", "display": "= Month - Previous", "token": true } ] } 
+
+
            columns are represented in a higher level object DataListTableOptions 
            sort and filter are in here
 
diff --git a/ayanova/src/components/data-table-filter-control.vue b/ayanova/src/components/data-table-filter-control.vue
index 525536a6..c8bd8e7f 100644
--- a/ayanova/src/components/data-table-filter-control.vue
+++ b/ayanova/src/components/data-table-filter-control.vue
@@ -9,7 +9,8 @@
       <v-card-title>{{ tableColumnData.text }}</v-card-title>
       <!-- <v-card-subtitle class="mt-1">sub title text</v-card-subtitle> -->
       <v-card-text>
-        activefilter:{{ activeFilter }} editItem:{{ editItem }}
+        activefilter:{{ activeFilter }} <br /><br />
+        editItemFilter:{{ editItem.filter }}
         <!-- FILTER CONTROL -->
         <template v-if="editItem.isFilterable">
           <div class="pt-6">
@@ -362,6 +363,21 @@ export default {
       //upsert conditions for this column
       //save filter
       //let grid do it's thing
+
+      /*
+ filter:[{column:"PartPartNumber",any:true/false,items:[{op: "=",value: "400735"}]}],
+           clientCriteria:"2" //could be anything here that makes sense to the list, in this case an example customer id for customernotedatalist
+
+			CURRENTLY IN BUILDER:
+			editItemFilter:{ "any": true, "items": [ { "op": "=", "value": "*thisweek*", "display": "= Week - Current", "token": true }, { "op": "=", "value": "*lastmonth*", "display": "= Month - Previous", "token": true } ] } 
+
+*/
+      //turn activeFilter into object json.parse
+
+      //todo: iterate this.activeFilter see if this.tableColumnData.fk is there, if it is, replace it with editItemFilter if it isn't then push it into collection
+
+      //turn activeFilter back into json and send back to server to save
+
       this.close({ refresh: true });
     },
     addFilterCondition(editItem) {