Fixed order

modules/item/front/request/index.html

@@ -4,7 +4,7 @@
     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">

modules/item/front/request/index.js

@@ -8,16 +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.filterParams = {
                 mine: true,
-                from: lastWeek,
+                from: today,
-                to: today
+                to: nextWeek
             };
         }
     }

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

@@ -115,6 +115,7 @@ module.exports = Self => {
                 s.itemFk,
                 i.name AS itemDescription,
                 t.shipped,
+                DATE(t.shipped) AS shippedDate,
                 t.nickname,
                 t.warehouseFk,
                 t.clientFk,