From 16d7186829e19dd63c3dc173024412e001461889 Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Tue, 2 Jun 2020 14:42:58 +0200
Subject: [PATCH] Fixed initial filters

---
 front/core/components/searchbar/searchbar.js         |  2 +-
 modules/item/front/request-search-panel/index.html   |  7 +++++--
 .../item/front/request-search-panel/locale/es.yml    |  3 ++-
 modules/item/front/request/index.html                |  9 +++++----
 modules/item/front/request/index.js                  | 12 +++++-------
 5 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/front/core/components/searchbar/searchbar.js b/front/core/components/searchbar/searchbar.js
index d1d8a57f3..287db0775 100644
--- a/front/core/components/searchbar/searchbar.js
+++ b/front/core/components/searchbar/searchbar.js
@@ -78,7 +78,7 @@ export default class Searchbar extends Component {
     }
 
     fetchStateFilter(autoLoad) {
-        let filter = null;
+        let filter = this.filter ? this.filter : null;
 
         if (this.$state.is(this.searchState)) {
             if (this.$params.q) {
diff --git a/modules/item/front/request-search-panel/index.html b/modules/item/front/request-search-panel/index.html
index 4f95abf77..453f3105b 100644
--- a/modules/item/front/request-search-panel/index.html
+++ b/modules/item/front/request-search-panel/index.html
@@ -51,8 +51,11 @@
             </vn-date-picker>
         </vn-horizontal>
         <vn-horizontal>
-            <vn-one>
-            </vn-one>
+            <vn-check vn-one 
+                triple-state="true" 
+                label="For me" 
+                ng-model="filter.mine">
+            </vn-check>
             <vn-check 
                 vn-one 
                 triple-state="true" 
diff --git a/modules/item/front/request-search-panel/locale/es.yml b/modules/item/front/request-search-panel/locale/es.yml
index 1411cc42d..8d5276194 100644
--- a/modules/item/front/request-search-panel/locale/es.yml
+++ b/modules/item/front/request-search-panel/locale/es.yml
@@ -1,3 +1,4 @@
 Ink: Tinta
 Origin: Origen
-Producer: Productor
\ No newline at end of file
+Producer: Productor
+For me: Para mi
\ No newline at end of file
diff --git a/modules/item/front/request/index.html b/modules/item/front/request/index.html
index 73f8cfdc8..51216af13 100644
--- a/modules/item/front/request/index.html
+++ b/modules/item/front/request/index.html
@@ -1,6 +1,7 @@
 <vn-crud-model
     vn-id="model"
     url="TicketRequests/filter"
+    user-params="::$ctrl.filterParams"
     limit="20"
     data="requests"
     order="shipped DESC, isOk ASC"
@@ -9,16 +10,16 @@
 <vn-portal slot="topbar">
     <vn-searchbar
         panel="vn-request-search-panel"
-        suggested-filter="$ctrl.filter.where"
+        suggested-filter="$ctrl.filterParams"
         info="Search request by id or alias"
-        filter="$ctrl.filter"
+        filter="$ctrl.filterParams"
         model="model"
         auto-state="false">
     </vn-searchbar>
 </vn-portal>
 <vn-data-viewer model="model">
     <vn-card>
-    <vn-table model="model">
+    <vn-table model="model" auto-load="false">
         <vn-thead>
             <vn-tr>
                 <vn-th field="ticketFk" number>Ticket ID</vn-th>
@@ -82,7 +83,7 @@
                         {{request.itemDescription}}
                     </span>
                 </vn-td>
-                <vn-td>{{$ctrl.getState(request.isOk)}} {{request.isOk}}</vn-td>
+                <vn-td>{{$ctrl.getState(request.isOk)}}</vn-td>
                 <vn-td>
                     <vn-icon
                         ng-if="request.response.length"
diff --git a/modules/item/front/request/index.js b/modules/item/front/request/index.js
index 8383343de..f329d604c 100644
--- a/modules/item/front/request/index.js
+++ b/modules/item/front/request/index.js
@@ -14,13 +14,11 @@ export default class Controller extends Section {
             lastWeek.setHours(0, 0, 0, 0);
             lastWeek.setDate(lastWeek.getDate() - 7);
 
-            this.filter = {
-                where: {
-                    isOk: false,
-                    mine: true,
-                    from: lastWeek,
-                    to: today
-                }
+            this.filterParams = {
+                isOk: null,
+                mine: true,
+                from: lastWeek,
+                to: today
             };
         }
     }