Merge pull request '4033-route' (#1050) from 4033-route into dev

Reviewed-on: #1050
Reviewed-by: Joan Sanchez <joan@verdnatura.es>

e2e/helpers/selectors.js

@@ -835,14 +835,16 @@ export default {
         confirmButton: '.vn-confirm.shown button[response="accept"]',
     },
     routeIndex: {
-        anyResult: 'vn-table a',
+        anyResult: 'vn-route-index tbody > tr',
-        firstRouteCheckbox: 'a:nth-child(1) vn-td:nth-child(1) > vn-check',
+        firstRouteCheckbox: 'vn-route-index tbody > tr:nth-child(1) > td:nth-child(1) > vn-check',
         addNewRouteButton: 'vn-route-index a[ui-sref="route.create"]',
         cloneButton: 'vn-route-index button > vn-icon[icon="icon-clone"]',
         submitClonationButton: 'tpl-buttons > button[response="accept"]',
         openAdvancedSearchButton: 'vn-searchbar .append vn-icon[icon="arrow_drop_down"]',
         searchAgencyAutocomlete: 'vn-route-search-panel vn-autocomplete[ng-model="filter.agencyModeFk"]',
         advancedSearchButton: 'vn-route-search-panel button[type=submit]',
+        previewButton: 'vn-route-index tbody > tr:nth-child(7) > td:nth-child(11) > vn-icon-button[icon="preview"]',
+
     },
     createRouteView: {
         worker: 'vn-route-create vn-autocomplete[ng-model="$ctrl.route.workerFk"]',
@@ -862,6 +864,8 @@ export default {
         firstTicketDescriptor: '.vn-popover.shown vn-ticket-descriptor',
         firstAlias: 'vn-route-summary vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(3) > span',
         firstClientDescriptor: '.vn-popover.shown vn-client-descriptor',
+        goToRouteSummaryButton: 'vn-route-summary > vn-card > h5 > a',
+
     },
     routeBasicData: {
         worker: 'vn-route-basic-data vn-autocomplete[ng-model="$ctrl.route.workerFk"]',

e2e/paths/08-route/01_summary.spec.js

@@ -9,7 +9,8 @@ describe('Route summary path', () => {
         browser = await getBrowser();
         page = browser.page;
         await page.loginAndModule('employee', 'route');
-        await page.waitToClick('vn-route-index vn-tbody > a:nth-child(7)');
+        await page.waitToClick(selectors.routeIndex.previewButton);
+        await page.waitToClick(selectors.routeSummary.goToRouteSummaryButton);
     });
 
     afterAll(async() => {
@@ -34,6 +35,8 @@ describe('Route summary path', () => {
     });
 
     it('should click on the first ticket ID making the descriptor popover visible', async() => {
+        await page.waitForState('route.card.summary');
+        await page.waitForTimeout(250);
         await page.waitToClick(selectors.routeSummary.firstTicketID);
         await page.waitForSelector(selectors.routeSummary.firstTicketDescriptor);
         const visible = await page.isVisible(selectors.routeSummary.firstTicketDescriptor);

modules/item/back/models/item.json

@@ -143,9 +143,6 @@
         },
         "packingShelve": {
             "type": "number"
-        },
-        "weightByPiece": {
-            "type": "number"
         }
     },
     "relations": {

modules/route/back/methods/route/getTickets.js

@@ -49,7 +49,8 @@ module.exports = Self => {
                     a.city,
                     am.name AS agencyModeName,
                     u.nickname AS userNickname,
-                    vn.ticketTotalVolume(t.id) AS volume
+                    vn.ticketTotalVolume(t.id) AS volume,
+                    tob.description
                 FROM route r
                     JOIN ticket t ON t.routeFk = r.id
                     LEFT JOIN ticketState ts ON ts.ticketFk = t.id

modules/route/back/models/route.json

@@ -48,6 +48,9 @@
         "description": {
             "type": "string"
         },
+        "isOk": {
+            "type": "boolean"
+        },
         "commissionWorkCenterFk": {
             "type": "number"
         }

modules/route/front/basic-data/index.html

@@ -68,6 +68,11 @@
                 label="Hour finished"
                 ng-model="$ctrl.route.finished">
         </vn-input-time>
+        <vn-check
+            class="vn-mr-md"
+            label="Is served"
+            ng-model="$ctrl.route.isOk">
+        </vn-check>
         </vn-horizontal>
         <vn-horizontal>
             <vn-textArea

modules/route/front/basic-data/locale/es.yml

@@ -5,3 +5,4 @@ Km end: Km de fin
 Description: Descripción
 Hour started: Hora inicio
 Hour finished: Hora fin
+Is served: Se ha servido

modules/route/front/card/index.js

@@ -18,7 +18,8 @@ class Controller extends ModuleCard {
                 'started',
                 'finished',
                 'cost',
-                'zoneFk'
+                'zoneFk',
+                'isOk'
             ],
             include: [
                 {

modules/route/front/descriptor/index.js

@@ -22,6 +22,8 @@ class Controller extends Descriptor {
             recipient: workerUser.emailUser.email,
             id: this.id
         });
+        const params = {isOk: true};
+        return this.$http.patch(`Routes/${this.id}`, params);
     }
 
     updateVolume() {

modules/route/front/index/index.html

@@ -1,53 +1,146 @@
 <vn-auto-search
     model="model">
 </vn-auto-search>
-<vn-data-viewer
+<div class="vn-w-xl">
-    model="model"
-    class="vn-w-lg vn-mb-xl">
     <vn-card>
-    <vn-table model="model">
+        <smart-table 
-        <vn-thead>
+            model="model"
-            <vn-tr>
+            options="$ctrl.smartTableOptions" 
-                <vn-th shrink>
+            expr-builder="$ctrl.exprBuilder(param, value)">
+            <slot-actions>
+                <section class="header">
+                    <vn-tool-bar class="vn-mb-md">
+                        <vn-button
+                            icon="icon-clone"
+                            ng-show="$ctrl.totalChecked > 0"
+                            ng-click="$ctrl.openClonationDialog()"
+                            vn-tooltip="Clone selected routes">
+                        </vn-button>
+                        <vn-button
+                            icon="cloud_download"
+                            ng-show="$ctrl.totalChecked > 0"
+                            ng-click="$ctrl.showRouteReport()"
+                            vn-tooltip="Download selected routes as PDF">
+                        </vn-button>
+                        <vn-button
+                            icon="check"
+                            ng-show="$ctrl.totalChecked > 0"
+                            ng-click="$ctrl.markAsServed()"
+                            vn-tooltip="Mark as served">
+                        </vn-button>
+                </section>
+            </slot-actions>
+            <slot-table>
+                <table model="model">
+                    <thead>
+                        <tr>
+                            <th shrink>
                                 <vn-multi-check 
                                     model="model">
                                 </vn-multi-check>
-                </vn-th>
+                            </th>
-                <vn-th field="id" number>Id</vn-th>
+                            <th field="id" number>
-                <vn-th th-id="worker">Worker</vn-th>
+                                <span translate>Id</span>
-                <vn-th th-id="agency">Agency</vn-th>
+                            </th>
-                <vn-th th-id="vehicle">Vehicle</vn-th>
+                            <th field="workerFk">
-                <vn-th th-id="created" shrink-date>Date</vn-th>
+                                <span translate>Worker</span>
-                <vn-th th-id="m3" number>m³</vn-th>
+                            </th>
-                <vn-th th-id="description">Description</vn-th>
+                            <th field="agencyName">
-                <vn-th shrink></vn-th>
+                                <span translate>Agency</span>
-            </vn-tr>
+                            </th>
-        </vn-thead>
+                            <th field="vehiclePlateNumber">
-        <vn-tbody>
+                                <span translate>Vehicle</span>
-            <a ng-repeat="route in model.data"
+                            </th>
+                            <th field="created" shrink-date>
+                                <span translate>Date</span>                                
+                            </th>
+                            <th field="m3" number>
+                                <span translate>m³</span>                                
+                            </th>
+                            <th field="description">
+                                <span translate>Description</span>                                
+                            </th>
+                            <th field="started">
+                                <span translate>Hour started</span>                                
+                            </th>
+                            <th field="finished">
+                                <span translate>Hour finished</span>                                
+                            </th>
+                            <th shrink></th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr ng-repeat="route in model.data"
                             class="clickable vn-tr search-result"
-                ui-sref="route.card.summary({id: {{::route.id}}})"
                             ng-attr-id="{{::route.id}}" vn-droppable="$ctrl.onDrop($event)">
-                <vn-td shrink>
+                            <td shrink>
                                 <vn-check 
                                     ng-model="route.checked"
                                     vn-click-stop>
                                 </vn-check>
-                </vn-td>
+                            </td>
-                <vn-td number>{{::route.id | dashIfEmpty}}</vn-td>
+                            <td number>{{::route.id | dashIfEmpty}}</td>
-                <vn-td expand>
+                            <td>
-                    <span 
+                                <vn-autocomplete
-                        class="link" 
+                                    ng-model="route.workerFk"
-                        vn-click-stop="workerDescriptor.show($event, route.workerFk)">
+                                    url="Workers/activeWithInheritedRole"
-                        {{::route.workerUserName}}
+                                    show-field="nickname"
-                    </span>
+                                    search-function="{firstName: $search}"
-                </vn-td>
+                                    value-field="id"
-                <vn-td>{{::route.agencyName | dashIfEmpty}}</vn-td>
+                                    where="{role: 'employee'}"
-                <vn-td>{{::route.vehiclePlateNumber | dashIfEmpty}}</vn-td>
+                                    on-change="$ctrl.updateAttributes(route)"
-                <vn-td shrink-date>{{::route.created | dashIfEmpty | date:'dd/MM/yyyy'}}</vn-td>
+                                    vn-click-stop>
-                <vn-td number>{{::route.m3 | dashIfEmpty}}</vn-td>
+                                    <tpl-item>
-                <vn-td>{{::route.description | dashIfEmpty}}</vn-td>
+                                        <div>{{name}} - {{nickname}}</div>
-                <vn-td>
+                                    </tpl-item>
+                                </vn-autocomplete>
+                            </td>
+                            <td expand>
+                                <vn-autocomplete
+                                    ng-model="route.agencyModeFk"
+                                    url="AgencyModes"
+                                    show-field="name"
+                                    value-field="id"
+                                    on-change="$ctrl.updateAttributes(route)"
+                                    vn-click-stop>
+                                </vn-autocomplete>
+                            </td>                        
+                            <td expand>
+                                <vn-autocomplete 
+                                    ng-model="route.vehicleFk"
+                                    url="Vehicles"
+                                    show-field="numberPlate"
+                                    value-field="id"
+                                    on-change="$ctrl.updateAttributes(route)"
+                                    vn-click-stop>
+                                </vn-autocomplete>
+                            </td >
+                            <td> 
+                                <vn-date-picker 
+                                    ng-model="route.created"
+                                    on-change="$ctrl.updateAttributes(route)">
+                            </vn-horizontal>
+                            </td>
+                            <td number>{{::route.m3 | dashIfEmpty}}</td>
+                            <td>
+                                <vn-textfield
+                                    ng-model="route.description"
+                                    on-change="$ctrl.updateAttributes(route)">
+                                </vn-textfield>
+                            </td>
+                            <td expand>
+                                <vn-input-time
+                                    ng-model="route.started"
+                                    on-change="$ctrl.updateAttributes(route)">
+                                </vn-input-time>
+                            </td>
+                            <td expand>
+                                <vn-input-time
+                                    ng-model="route.finished"
+                                    on-change="$ctrl.updateAttributes(route)">
+                                </vn-input-time>
+                            </td>
+                            <td>
                                 <vn-icon-button
                                     vn-click-stop="$ctrl.showTicketPopup(route)"
                                     vn-tooltip="Añadir tickets"
@@ -58,12 +151,14 @@
                                     vn-tooltip="Preview"
                                     icon="preview">
                                 </vn-icon-button>
-                </vn-td>
+                            </td>
-            </a>
+                        </tr>
-        </vn-tbody>
+                    </tbody>
-    </vn-table>
+                </table>
+            </slot-table>
+        </smart-table>  
     </vn-card>
-</vn-data-viewer>
+</div>
 
 <vn-popup vn-id="summary">
     <vn-route-summary
@@ -88,20 +183,6 @@
 
 <div fixed-bottom-right>
     <vn-vertical style="align-items: center;">
-        <vn-button class="round sm vn-mb-sm"
-            icon="icon-clone"
-            ng-show="$ctrl.totalChecked > 0"
-            ng-click="$ctrl.openClonationDialog()"
-            vn-tooltip="Clone selected routes"
-            tooltip-position="left">
-        </vn-button>
-        <vn-button class="round sm vn-mb-sm"
-            icon="cloud_download"
-            ng-show="$ctrl.totalChecked > 0"
-            ng-click="$ctrl.showRouteReport()"
-            vn-tooltip="Download selected routes as PDF"
-            tooltip-position="left">
-        </vn-button>
         <a ui-sref="route.create" vn-bind="+">
             <vn-button class="round md vn-mb-sm"
                 icon="add"

modules/route/front/index/index.js

@@ -102,6 +102,36 @@ export default class Controller extends Section {
             throw error;
         });
     }
+
+    updateAttributes(route) {
+        if (route.started == null || route.finished == null)
+            return this.vnApp.showError(this.$t('You must select a valid time'));
+        if (route.created == null)
+            return this.vnApp.showError(this.$t('You must select a valid date'));
+        const params = {
+            workerFk: route.workerFk,
+            agencyModeFk: route.agencyModeFk,
+            vehicleFk: route.vehicleFk,
+            created: route.created,
+            description: route.description,
+            started: route.started,
+            finished: route.finished
+        };
+        const query = `Routes/${route.id}/`;
+        this.$http.patch(query, params).then(res => {
+            this.vnApp.showSuccess(this.$t('Data saved!'));
+        });
+    }
+
+    markAsServed() {
+        const routes = [];
+        for (let route of this.checked)
+            routes.push(route.id);
+
+        const params = {isOk: true};
+        for (let routeId of routes)
+            this.$http.patch(`Routes/${routeId}`, params);
+    }
 }
 
 Controller.$inject = ['$element', '$scope', 'vnReport'];

modules/route/front/index/index.spec.js

@@ -12,7 +12,7 @@ describe('Component vnRouteIndex', () => {
         const $element = angular.element('<vn-route-index></vn-route-index>');
         controller = $componentController('vnRouteIndex', {$element});
         controller.$.model = crudModel;
-        controller.$.model.data = [{id: 1}, {id: 2}, {id: 3}];
+        controller.$.model.data = [{id: 1, checked: true}, {id: 2}, {id: 3}];
     }));
 
     describe('checked() getter', () => {
@@ -148,4 +148,13 @@ describe('Component vnRouteIndex', () => {
             expect(controller.$.model.refresh).toHaveBeenCalledWith();
         });
     });
+
+    describe('markAsServed()', () => {
+        it('should perform a HTTP patch query', () => {
+            const data = {isOk: true};
+            $httpBackend.expect('PATCH', `Routes/1`, data).respond();
+            controller.markAsServed();
+            $httpBackend.flush();
+        });
+    });
 });

modules/route/front/index/locale/es.yml

@@ -3,3 +3,9 @@ Download selected routes as PDF: Descargar rutas seleccionadas como PDF
 Clone selected routes: Clonar rutas seleccionadas
 The date can't be empty: La fecha no puede estar vacía
 Starting date: Fecha de inicio
+Hour started: Hora inicio
+Hour finished: Hora fin
+Go to route: Ir a la ruta
+You must select a valid time: Debe seleccionar una hora válida
+You must select a valid date: Debe seleccionar una fecha válida
+Mark as served: Marcar como servidas

modules/route/front/tickets/index.html

@@ -11,7 +11,8 @@
     <form 
         class="vn-w-xl"
         name="form">
-        <vn-card class="vn-pa-lg">
+        <vn-card>
+        <section class="vn-pa-md">
             <vn-tool-bar>
                 <vn-button
                     icon="icon-wand"
@@ -24,10 +25,19 @@
                     vn-tooltip="Open buscaman"
                     icon="icon-buscaman">
                 </vn-button>
+                <vn-button 
+                    disabled="!$ctrl.isChecked"
+                    ng-click="$ctrl.deletePriority()"
+                    vn-tooltip="Delete priority"
+                    icon="filter_alt_off">
+                </vn-button>
+                <vn-button 
+                    ng-click="$ctrl.setOrderedPriority($ctrl.tickets)"
+                    vn-tooltip="Renumber all tickets in the order you see on the screen"
+                    icon="format_list_numbered">
+                </vn-button>
             </vn-tool-bar>
-        </vn-card>
+            <vn-table class="vn-pt-md" model="model" auto-load="false" vn-droppable="$ctrl.onDrop($event)">
-        <vn-card class="vn-mt-lg">
-            <vn-table model="model" auto-load="false" vn-droppable="$ctrl.onDrop($event)">
                 <vn-thead>
                     <vn-tr>
                         <vn-th shrink>
@@ -35,6 +45,7 @@
                                 model="model">
                             </vn-multi-check>
                         </vn-th>
+                        <vn-th shrink></vn-th>
                         <vn-th field="priority">Order</vn-th>
                         <vn-th field="street" expand>Street</vn-th>
                         <vn-th field="city">City</vn-th>
@@ -45,6 +56,7 @@
                         <vn-th field="id" number>Ticket</vn-th>
                         <vn-th shrink></vn-th>
                         <vn-th shrink></vn-th>
+                        <vn-th shrink></vn-th>
                     </vn-tr>
                 </vn-thead>
                 <vn-tbody>
@@ -54,13 +66,20 @@
                                 ng-model="ticket.checked">
                             </vn-check>
                         </vn-td>
+                        <vn-td>
+                            <vn-icon-button
+                                icon="low_priority"
+                                ng-click="$ctrl.setHighestPriority(ticket)"
+                                vn-tooltip="Assign highest priority"
+                                tabindex="-1">
+                            </vn-icon-button>
+                        </vn-td>
                         <vn-td>
                             <vn-input-number
                                 on-change="$ctrl.setPriority(ticket.id, ticket.priority)"
                                 ng-model="ticket.priority"
                                 rule="Ticket"
-                                class="dense"
+                                class="dense">
-                                display-controls=true>
                             </vn-input-number>
                         </vn-td>
                         <vn-td expand title="{{::ticket.street}}">{{::ticket.street}}</vn-td>
@@ -98,9 +117,18 @@
                                 tabindex="-1">
                             </vn-icon-button>
                         </vn-td>
-                    </vn-tr>
+                        <vn-td>
+                            <vn-icon-button
+                                ng-if="::ticket.description"
+                                vn-tooltip="{{::ticket.description}}"
+                                icon="icon-notes"
+                                tabindex="-1">
+                            </vn-icon-button>
+                        </vn-td>
+                    </a>
                 </vn-tbody>
             </vn-table>
+        </section>
         </vn-card>
     </form>
 </vn-data-viewer>

modules/route/front/tickets/index.js

@@ -20,14 +20,47 @@ class Controller extends Section {
         return highestPriority + 1;
     }
 
+    setHighestPriority(ticket) {
+        const highestPriority = this.getHighestPriority();
+        if (highestPriority - 1 != ticket.priority) {
+            const params = {priority: highestPriority};
+            const query = `Tickets/${ticket.id}/`;
+            this.$http.patch(query, params).then(res => {
+                ticket.priority = res.data.priority;
+                this.vnApp.showSuccess(this.$t('Data saved!'));
+            });
+        }
+    }
+
     setPriority(id, priority) {
         let params = {priority: priority};
         let query = `Tickets/${id}/`;
         this.$http.patch(query, params).then(() => {
             this.vnApp.showSuccess(this.$t('Data saved!'));
+        });
+    }
+
+    deletePriority() {
+        const lines = this.getSelectedItems(this.tickets);
+
+        for (const line of lines) {
+            this.$http.patch(`Tickets/${line.id}/`, {priority: null}).then(() => {
+                this.vnApp.showSuccess(this.$t('Data saved!'));
                 this.$.model.refresh();
             });
         }
+    }
+
+    setOrderedPriority(lines) {
+        let priority = 1;
+        for (const line of lines) {
+            this.$http.patch(`Tickets/${line.id}/`, {priority: priority}).then(() => {
+                this.vnApp.showSuccess(this.$t('Data saved!'));
+                this.$.model.refresh();
+            });
+            priority++;
+        }
+    }
 
     getSelectedItems(items) {
         const selectedItems = [];
@@ -57,7 +90,9 @@ class Controller extends Section {
             let lines = this.getSelectedItems(this.tickets);
 
             let url = 'http://gps.buscalia.com/usuario/localizar.aspx?bmi=true&addr=';
-            lines.forEach(line => {
+            lines.forEach((line, index) => {
+                const previusLine = lines[index - 1] ? lines[index - 1].street : null;
+                if (previusLine != line.street)
                     addresses = addresses + '+to:' + line.postalCode + ' ' + line.city + ' ' + line.street;
             });
 

modules/route/front/tickets/index.spec.js

@@ -58,9 +58,23 @@ describe('Route', () => {
         });
     });
 
+    describe('setHighestPriority()', () => {
+        it('should set a ticket highest priority', () => {
+            jest.spyOn(controller.vnApp, 'showSuccess');
+            controller.$.model.data = [{priority: 3}];
+            const ticket = {id: 1, priority: 2};
+            const res = {data: {priority: 4}};
+
+            $httpBackend.expectPATCH(`Tickets/${ticket.id}/`).respond(res);
+            controller.setHighestPriority(ticket);
+            $httpBackend.flush();
+
+            expect(controller.vnApp.showSuccess).toHaveBeenCalled();
+        });
+    });
+
     describe('setPriority()', () => {
         it('should set a ticket priority', () => {
-            jest.spyOn(controller.$.model, 'refresh');
             jest.spyOn(controller.vnApp, 'showSuccess');
             const ticketId = 1;
             const priority = 999;
@@ -69,6 +83,35 @@ describe('Route', () => {
             controller.setPriority(ticketId, priority);
             $httpBackend.flush();
 
+            expect(controller.vnApp.showSuccess).toHaveBeenCalled();
+        });
+    });
+
+    describe('deletePriority()', () => {
+        it('should delete priority of all tickets', () => {
+            jest.spyOn(controller.$.model, 'refresh');
+            jest.spyOn(controller.vnApp, 'showSuccess');
+            controller.tickets = [{id: 1, checked: true}];
+
+            $httpBackend.expectPATCH(`Tickets/${controller.tickets[0].id}/`).respond();
+            controller.deletePriority();
+            $httpBackend.flush();
+
+            expect(controller.vnApp.showSuccess).toHaveBeenCalled();
+            expect(controller.$.model.refresh).toHaveBeenCalledWith();
+        });
+    });
+
+    describe('setOrderedPriority()', () => {
+        it('should set priority of all tickets starting by 1', () => {
+            jest.spyOn(controller.$.model, 'refresh');
+            jest.spyOn(controller.vnApp, 'showSuccess');
+            const tickets = [{id: 1, checked: true}];
+
+            $httpBackend.expectPATCH(`Tickets/${tickets[0].id}/`).respond();
+            controller.setOrderedPriority(tickets);
+            $httpBackend.flush();
+
             expect(controller.vnApp.showSuccess).toHaveBeenCalled();
             expect(controller.$.model.refresh).toHaveBeenCalledWith();
         });

modules/route/front/tickets/locale/es.yml

@@ -13,3 +13,6 @@ The route's vehicle doesn't have a delivery point: El vehículo de la ruta no ti
 The route doesn't have a vehicle: La ruta no tiene un vehículo
 Population: Población
 Unlink selected zone?: Desvincular zona seleccionada?
+Delete priority: Borrar orden
+Renumber all tickets in the order you see on the screen: Renumerar todos los tickets con el orden que ves por pantalla
+Assign highest priority: Asignar máxima prioridad