From 6ecf595a1124b574f78a2afa3fec6575f1be37bf Mon Sep 17 00:00:00 2001
From: joan <joan@verdnatura.es>
Date: Tue, 6 Oct 2020 08:52:11 +0200
Subject: [PATCH] 2486 - Changed date filter

---
 modules/item/front/last-entries/index.html | 24 +++++++++++-----------
 modules/item/front/last-entries/index.js   | 11 +++++++++-
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/modules/item/front/last-entries/index.html b/modules/item/front/last-entries/index.html
index f306fb4f0..1f7c3c364 100644
--- a/modules/item/front/last-entries/index.html
+++ b/modules/item/front/last-entries/index.html
@@ -7,25 +7,25 @@
     order="landed DESC, buyFk DESC"
     limit="20">
 </vn-crud-model>
+<vn-card class="vn-mb-md vn-w-xl vn-pa-lg">
+    <vn-date-picker
+        vn-none 
+        label="Since" 
+        ng-model="$ctrl.date">
+    </vn-date-picker>
+</vn-card>
+
 <vn-data-viewer
     model="model"
     class="vn-mb-xl vn-w-xl">
     <vn-card class="vn-pa-lg">
         <vn-vertical>
-            <vn-horizontal>
-                <vn-date-picker
-                    vn-one 
-                    label="Since" 
-                    ng-model="$ctrl.date">
-                </vn-date-picker>
-                <!--datepicker-->
-            </vn-horizontal>
             <vn-table model="model">
                 <vn-thead>
                     <vn-tr>
                         <vn-th vn-tooltip="Ignored" center>Ig</vn-th>
                         <vn-th field="warehouseFk">Warehouse</vn-th>
-                        <vn-th field="landed">Landed</vn-th>
+                        <vn-th field="landed" expand>Landed</vn-th>
                         <vn-th number>Entry</vn-th>
                         <vn-th number vn-tooltip="Price Per Unit">P.P.U</vn-th>
                         <vn-th number vn-tooltip="Price Per Package">P.P.P</vn-th>
@@ -48,8 +48,8 @@
                                 disabled="true">
                             </vn-check>
                         </vn-td>
-                        <vn-td>{{::entry.warehouse| dashIfEmpty}}</vn-td>
-                        <vn-td>{{::entry.landed | date:'dd/MM/yyyy HH:mm'}}</vn-td>
+                        <vn-td title="{{::entry.warehouse| dashIfEmpty}}">{{::entry.warehouse| dashIfEmpty}}</vn-td>
+                        <vn-td expand>{{::entry.landed | date:'dd/MM/yyyy HH:mm'}}</vn-td>
                         <vn-td number>{{::entry.entryFk | dashIfEmpty}}</vn-td>
                         <vn-td number>{{::entry.price2 | dashIfEmpty}}</vn-td>
                         <vn-td number>{{::entry.price3 | dashIfEmpty}}</vn-td>
@@ -69,7 +69,7 @@
                         <vn-td number class="expendable">{{::entry.buyingValue | dashIfEmpty}}</vn-td>
                         <vn-td number>{{::entry.weight | dashIfEmpty}}</vn-td>
                         <vn-td number>{{::entry.packageFk | dashIfEmpty}}</vn-td>
-                        <vn-td class="expendable">{{::entry.supplier | dashIfEmpty}}</vn-td>
+                        <vn-td class="expendable" title="{{::entry.supplier | dashIfEmpty}}">{{::entry.supplier | dashIfEmpty}}</vn-td>
                     </vn-tr>
                 </vn-tbody>
             </vn-table>
diff --git a/modules/item/front/last-entries/index.js b/modules/item/front/last-entries/index.js
index 11a2bf20e..4a72c0caa 100644
--- a/modules/item/front/last-entries/index.js
+++ b/modules/item/front/last-entries/index.js
@@ -30,7 +30,16 @@ class Controller extends Section {
 
         if (!value) return;
 
-        this.filter.where.date = value;
+        const from = new Date(value);
+        from.setHours(0, 0, 0, 0);
+
+        const to = new Date();
+        to.setDate(to.getDate() + 10);
+        to.setHours(23, 59, 59, 59);
+
+        this.filter.where.shipped = {
+            between: [from, to]
+        };
         this.$.model.refresh();
     }