Merge pull request '2265-item_request_filters' (#289) from 2265-item_request_filters into dev

Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

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) {

modules/item/front/request-search-panel/index.html

@@ -51,8 +51,11 @@
             </vn-date-picker>
         </vn-horizontal>
         <vn-horizontal>
-            <vn-one>
+            <vn-check vn-one 
-            </vn-one>
+                triple-state="true" 
+                label="For me" 
+                ng-model="filter.mine">
+            </vn-check>
             <vn-check 
                 vn-one 
                 triple-state="true" 

modules/item/front/request-search-panel/locale/es.yml

@@ -1,3 +1,4 @@
 Ink: Tinta
 Origin: Origen
 Producer: Productor
+For me: Para mi

modules/item/front/request/index.html

@@ -1,28 +1,30 @@
 <vn-crud-model
     vn-id="model"
     url="TicketRequests/filter"
+    user-params="::$ctrl.filterParams"
     limit="20"
     data="requests"
-    order="shipped DESC, isOk ASC"
+    order="shippedDate ASC, isOk ASC"
     auto-load="true">
 </vn-crud-model>
 <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.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>
-                <vn-th field="shipped">Shipped</vn-th>
+                <vn-th field="shipped" expand>Shipped</vn-th>
-                <vn-th field="description">Description</vn-th>
+                <vn-th field="description" expand>Description</vn-th>
                 <vn-th field="quantity" number editable>Requested</vn-th>
                 <vn-th field="price" number>Price</vn-th>
                 <vn-th field="atenderNickname">Atender</vn-th>
@@ -40,7 +42,7 @@
                         {{request.ticketFk}}
                     </span>
                 </vn-td>
-                <vn-td>
+                <vn-td expand>
                     <span title="{{::request.shipped | date: 'dd/MM/yyyy'}}"
                         class="chip {{$ctrl.compareDate(request.shipped)}}">
                         {{::request.shipped | date: 'dd/MM/yyyy'}}
@@ -53,7 +55,7 @@
                     <span
                     class="link"
                     ng-click="workerDescriptor.show($event, request.attenderFk)">
-                    {{::request.atenderNickname}}
+                    {{::request.attenderName}}
                     </span>
                 </vn-td>
                 <vn-td-editable disabled="request.isOk != null" number>

modules/item/front/request/index.js

@@ -8,19 +8,16 @@ export default class Controller extends Section {
 
         if (!this.$state.q) {
             const today = new Date();
-            today.setHours(23, 59, 59, 59);
+            today.setHours(0, 0, 0, 0);
 
-            const lastWeek = new Date();
+            const nextWeek = new Date();
-            lastWeek.setHours(0, 0, 0, 0);
+            nextWeek.setHours(23, 59, 59, 59);
-            lastWeek.setDate(lastWeek.getDate() - 7);
+            nextWeek.setDate(nextWeek.getDate() + 7);
 
-            this.filter = {
+            this.filterParams = {
-                where: {
-                    isOk: false,
                 mine: true,
-                    from: lastWeek,
+                from: today,
-                    to: today
+                to: nextWeek
-                }
             };
         }
     }

modules/ticket/back/methods/ticket-request/filter.js

@@ -115,12 +115,13 @@ module.exports = Self => {
                 s.itemFk,
                 i.name AS itemDescription,
                 t.shipped,
+                DATE(t.shipped) AS shippedDate,
                 t.nickname,
                 t.warehouseFk,
                 t.clientFk,
                 w.name AS warehouse,
                 u.nickname AS salesPersonNickname,
-                ua.nickname AS atenderNickname,
+                ua.name AS attenderName,
                 c.salesPersonFk
             FROM ticketRequest tr
                 LEFT JOIN ticketWeekly tw on tw.ticketFk = tr.ticketFk