2265 Changes to filter

modules/item/front/request/index.html

@@ -3,7 +3,7 @@
     url="TicketRequests/filter"
     limit="20"
     data="requests"
-    order="shipped DESC, isOk ASC"
+    order="shipped DESC, isOk DESC"
     auto-load="true">
 </vn-crud-model>
 <vn-portal slot="topbar">
@@ -11,6 +11,7 @@
         panel="vn-request-search-panel"
         suggested-filter="$ctrl.filter.where"
         info="Search request by id or alias"
+        filter="$ctrl.filter"
         model="model"
         auto-state="false">
     </vn-searchbar>
@@ -21,8 +22,8 @@
         <vn-thead>
             <vn-tr>
                 <vn-th field="ticketFk" number>Ticket ID</vn-th>
-                <vn-th field="shipped">Shipped</vn-th>
-                <vn-th field="description">Description</vn-th>
+                <vn-th field="shipped" expand>Shipped</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 +41,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 +54,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>
@@ -81,7 +82,7 @@
                         {{request.itemDescription}}
                     </span>
                 </vn-td>
-                <vn-td>{{$ctrl.getState(request.isOk)}}</vn-td>
+                <vn-td>{{$ctrl.getState(request.isOk)}} {{request.isOk}}</vn-td>
                 <vn-td>
                     <vn-icon
                         ng-if="request.response.length"

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

@@ -120,7 +120,7 @@ module.exports = Self => {
                 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