From 37546e7a26496c2803370cdc1dac67f61148e825 Mon Sep 17 00:00:00 2001
From: Gerard <gerard@verdnatura.es>
Date: Fri, 22 Mar 2019 12:34:42 +0100
Subject: [PATCH] #1236 revision con pepe

---
 modules/route/back/methods/route/summary.js | 11 +++++--
 modules/route/front/index/index.html        |  4 +--
 modules/route/front/index/style.scss        |  5 ++++
 modules/route/front/summary/index.html      | 32 ++++++++++++++-------
 modules/route/front/summary/locale/es.yml   |  7 +++--
 modules/route/front/summary/style.scss      |  7 ++++-
 modules/ticket/back/models/ticket.json      |  3 ++
 7 files changed, 50 insertions(+), 19 deletions(-)
 create mode 100644 modules/route/front/index/style.scss

diff --git a/modules/route/back/methods/route/summary.js b/modules/route/back/methods/route/summary.js
index 0aad8f6bb..ee36d4647 100644
--- a/modules/route/back/methods/route/summary.js
+++ b/modules/route/back/methods/route/summary.js
@@ -29,11 +29,12 @@ module.exports = Self => {
                 {relation: 'ticket',
                     scope: {
                         fields: ['id', 'packages', 'warehouseFk', 'nickname', 'clientFk', 'priority'],
+                        order: 'priority',
                         include: [
                             {
                                 relation: 'client',
                                 scope: {
-                                    fields: ['id', 'street'],
+                                    fields: ['id', 'street', 'postcode'],
                                 }
                             },
                             {
@@ -48,6 +49,12 @@ module.exports = Self => {
                                 scope: {
                                     fields: ['id', 'name']
                                 }
+                            },
+                            {
+                                relation: 'notes',
+                                scope: {
+                                    where: {observationTypeFk: 3}
+                                }
                             }
 
                         ]
@@ -73,7 +80,7 @@ module.exports = Self => {
                 }, {
                     relation: 'vehicle',
                     scope: {
-                        fields: ['id', 'm3']
+                        fields: ['id', 'm3', 'numberPlate']
                     }
                 }
             ],
diff --git a/modules/route/front/index/index.html b/modules/route/front/index/index.html
index 5d46af81d..cada445ca 100644
--- a/modules/route/front/index/index.html
+++ b/modules/route/front/index/index.html
@@ -18,7 +18,7 @@
             </vn-searchbar>
         </vn-card>
     </div>
-    <vn-card margin-medium-v compact>
+    <vn-card margin-medium-v class="index">
         <vn-table model="model" auto-load="false">
             <vn-thead>
                 <vn-tr>
@@ -66,7 +66,7 @@
     vn-id="summary"
     class="dialog-summary">
     <tpl-body>
-        <vn-route-summary route="$ctrl.selectedRoute"></vn-route-summary>
+        <vn-route-summary route="$ctrl.routeSelected"></vn-route-summary>
     </tpl-body>
 </vn-dialog>
 <vn-worker-descriptor-popover 
diff --git a/modules/route/front/index/style.scss b/modules/route/front/index/style.scss
new file mode 100644
index 000000000..bbf7d6fa8
--- /dev/null
+++ b/modules/route/front/index/style.scss
@@ -0,0 +1,5 @@
+@import "./variables";
+
+vn-route-index .index {
+    max-width: $width-large;
+}
\ No newline at end of file
diff --git a/modules/route/front/summary/index.html b/modules/route/front/summary/index.html
index 1680b6e52..450276a24 100644
--- a/modules/route/front/summary/index.html
+++ b/modules/route/front/summary/index.html
@@ -12,7 +12,7 @@
                 value="{{$ctrl.summary.route.agencyMode.name}}">
             </vn-label-value>
             <vn-label-value label="Vehicle" 
-                value="{{$ctrl.summary.route.vehicleFk}}">
+                value="{{$ctrl.summary.route.vehicle.numberPlate}}">
             </vn-label-value>
             <vn-label-value label="Driver" 
                 value="{{$ctrl.summary.route.worker.user.nickname}}">
@@ -26,7 +26,7 @@
                 value="{{$ctrl.summary.route.time | dateTime: 'HH:MM'}}">
             </vn-label-value>
             <vn-label-value label="Finished" 
-                value="{{$ctrl.summary.route.finished}}">
+                value="{{$ctrl.summary.route.finished | dateTime: 'HH:MM'}}">
             </vn-label-value>
             <vn-label-value label="Km Start" 
                 value="{{$ctrl.summary.route.kmStart}}">
@@ -54,17 +54,20 @@
             <vn-table model="model">
                 <vn-thead>
                     <vn-tr>
+                        <vn-th shrink>Order</vn-th>
                         <vn-th number>Ticket id</vn-th>
                         <vn-th>Alias</vn-th>
-                        <vn-th number>Packages</vn-th>
-                        <vn-th number>Volume</vn-th>
-                        <vn-th>Warehouse</vn-th>
-                        <vn-th >Street</vn-th>
-                        <vn-th>State</vn-th>
+                        <vn-th number shrink>Packages</vn-th>
+                        <vn-th shrink>m³</vn-th>
+                        <vn-th shrink>Warehouse</vn-th>
+                        <vn-th shrink>PC</vn-th>
+                        <vn-th>Street</vn-th>
+                        <vn-th shrink></vn-th>
                     </vn-tr>
                 </vn-thead>
                 <vn-tbody>
                     <vn-tr ng-repeat="ticket in $ctrl.summary.route.ticket">
+                        <vn-td shrink>{{ticket.priority}}</vn-td>
                         <vn-td number>
                             <span 
                                 ng-click="$ctrl.showTicketDescriptor($event, ticket.id)"
@@ -79,11 +82,18 @@
                                 {{ticket.nickname}}
                             </span>
                        </vn-td>
-                        <vn-td number>{{ticket.packages}}</vn-td>
-                        <vn-td number>{{ticket.volume}}</vn-td>
-                        <vn-td>{{ticket.warehouse.name}}</vn-td>
+                        <vn-td number shrink>{{ticket.packages}}</vn-td>
+                        <vn-td shrink>{{ticket.volume}}</vn-td>
+                        <vn-td shrink>{{ticket.warehouse.name}}</vn-td>
+                        <vn-td shrink>{{ticket.client.postcode}}</vn-td>
                         <vn-td expand title="{{ticket.client.street}}">{{ticket.client.street}}</vn-td>
-                        <vn-td>{{ticket.state.state.name}}</vn-td>
+                        <vn-td shrink> 
+                            <vn-icon
+                                ng-if="ticket.notes.length"
+                                vn-tooltip="{{ticket.notes[0].description}}"
+                                icon="insert_drive_file">
+                            </vn-icon>
+                        </vn-td>
                     </vn-tr>
                 </vn-tbody>
             </vn-table>
diff --git a/modules/route/front/summary/locale/es.yml b/modules/route/front/summary/locale/es.yml
index 0853f047c..2ea8ec25a 100644
--- a/modules/route/front/summary/locale/es.yml
+++ b/modules/route/front/summary/locale/es.yml
@@ -1,7 +1,8 @@
 Driver: Conductor
 Vehicle: Vehículo
 Packages: Bultos
-Time: F. Inicio
-Finished: F. Fin
+Time: H. Inicio
+Finished: H. Fin
 Km Start: Km de inicio
-Km End: Km de fin
\ No newline at end of file
+Km End: Km de fin
+PC: CP
\ No newline at end of file
diff --git a/modules/route/front/summary/style.scss b/modules/route/front/summary/style.scss
index 7ff8b3056..aef44fbf9 100644
--- a/modules/route/front/summary/style.scss
+++ b/modules/route/front/summary/style.scss
@@ -1,5 +1,10 @@
-@import "./variables";
+@import "variables";
+
 
 vn-route-summary .summary {
     max-width: $width-large;
+
+    vn-icon[icon=insert_drive_file]{
+        color: $color-font-secondary;
+    }
 }
\ No newline at end of file
diff --git a/modules/ticket/back/models/ticket.json b/modules/ticket/back/models/ticket.json
index beb9cdbd0..c60b98364 100644
--- a/modules/ticket/back/models/ticket.json
+++ b/modules/ticket/back/models/ticket.json
@@ -36,6 +36,9 @@
         },
         "isDeleted": {
             "type": "boolean"
+        },
+        "priority": {
+            "type": "Number"
         }
     },
     "relations": {