verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

#1236 revision con pepe
gitea/salix/dev This commit looks good Details

This commit is contained in:
Gerard 2019-03-22 12:34:42 +01:00
parent e23a184166
commit 37546e7a26
7 changed files with 50 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/route/back/methods/route/summary.js
View File

@ -29,11 +29,12 @@ module.exports = Self => {
{relation: 'ticket', {relation: 'ticket',
scope: { scope: {
fields: ['id', 'packages', 'warehouseFk', 'nickname', 'clientFk', 'priority'], fields: ['id', 'packages', 'warehouseFk', 'nickname', 'clientFk', 'priority'],
order: 'priority',
include: [ include: [
{ {
relation: 'client', relation: 'client',
scope: { scope: {
fields: ['id', 'street'], fields: ['id', 'street', 'postcode'],
} }
}, },
{ {
@ -48,6 +49,12 @@ module.exports = Self => {
scope: { scope: {
fields: ['id', 'name'] fields: ['id', 'name']
} }
},
{
relation: 'notes',
scope: {
where: {observationTypeFk: 3}
}
} }
] ]
@ -73,7 +80,7 @@ module.exports = Self => {
}, { }, {
relation: 'vehicle', relation: 'vehicle',
scope: { scope: {
fields: ['id', 'm3'] fields: ['id', 'm3', 'numberPlate']
} }
} }
], ],

4
modules/route/front/index/index.html
View File

@ -18,7 +18,7 @@
</vn-searchbar> </vn-searchbar>
</vn-card> </vn-card>
</div> </div>
<vn-card margin-medium-v compact> <vn-card margin-medium-v class="index">
<vn-table model="model" auto-load="false"> <vn-table model="model" auto-load="false">
<vn-thead> <vn-thead>
<vn-tr> <vn-tr>
@ -66,7 +66,7 @@
vn-id="summary" vn-id="summary"
class="dialog-summary"> class="dialog-summary">
<tpl-body> <tpl-body>
<vn-route-summary route="$ctrl.selectedRoute"></vn-route-summary> <vn-route-summary route="$ctrl.routeSelected"></vn-route-summary>
</tpl-body> </tpl-body>
</vn-dialog> </vn-dialog>
<vn-worker-descriptor-popover <vn-worker-descriptor-popover

5
modules/route/front/index/style.scss Normal file
View File

@ -0,0 +1,5 @@
@import "./variables";
vn-route-index .index {
max-width: $width-large;
}

32
modules/route/front/summary/index.html
View File

@ -12,7 +12,7 @@
value="{{$ctrl.summary.route.agencyMode.name}}"> value="{{$ctrl.summary.route.agencyMode.name}}">
</vn-label-value> </vn-label-value>
<vn-label-value label="Vehicle" <vn-label-value label="Vehicle"
value="{{$ctrl.summary.route.vehicleFk}}"> value="{{$ctrl.summary.route.vehicle.numberPlate}}">
</vn-label-value> </vn-label-value>
<vn-label-value label="Driver" <vn-label-value label="Driver"
value="{{$ctrl.summary.route.worker.user.nickname}}"> value="{{$ctrl.summary.route.worker.user.nickname}}">
@ -26,7 +26,7 @@
value="{{$ctrl.summary.route.time | dateTime: 'HH:MM'}}"> value="{{$ctrl.summary.route.time | dateTime: 'HH:MM'}}">
</vn-label-value> </vn-label-value>
<vn-label-value label="Finished" <vn-label-value label="Finished"
value="{{$ctrl.summary.route.finished}}"> value="{{$ctrl.summary.route.finished | dateTime: 'HH:MM'}}">
</vn-label-value> </vn-label-value>
<vn-label-value label="Km Start" <vn-label-value label="Km Start"
value="{{$ctrl.summary.route.kmStart}}"> value="{{$ctrl.summary.route.kmStart}}">
@ -54,17 +54,20 @@
<vn-table model="model"> <vn-table model="model">
<vn-thead> <vn-thead>
<vn-tr> <vn-tr>
<vn-th shrink>Order</vn-th>
<vn-th number>Ticket id</vn-th> <vn-th number>Ticket id</vn-th>
<vn-th>Alias</vn-th> <vn-th>Alias</vn-th>
<vn-th number>Packages</vn-th> <vn-th number shrink>Packages</vn-th>
<vn-th number>Volume</vn-th> <vn-th shrink>m³</vn-th>
<vn-th>Warehouse</vn-th> <vn-th shrink>Warehouse</vn-th>
<vn-th >Street</vn-th> <vn-th shrink>PC</vn-th>
<vn-th>State</vn-th> <vn-th>Street</vn-th>
<vn-th shrink></vn-th>
</vn-tr> </vn-tr>
</vn-thead> </vn-thead>
<vn-tbody> <vn-tbody>
<vn-tr ng-repeat="ticket in $ctrl.summary.route.ticket"> <vn-tr ng-repeat="ticket in $ctrl.summary.route.ticket">
<vn-td shrink>{{ticket.priority}}</vn-td>
<vn-td number> <vn-td number>
<span <span
ng-click="$ctrl.showTicketDescriptor($event, ticket.id)" ng-click="$ctrl.showTicketDescriptor($event, ticket.id)"
@ -79,11 +82,18 @@
{{ticket.nickname}} {{ticket.nickname}}
</span> </span>
</vn-td> </vn-td>
<vn-td number>{{ticket.packages}}</vn-td> <vn-td number shrink>{{ticket.packages}}</vn-td>
<vn-td number>{{ticket.volume}}</vn-td> <vn-td shrink>{{ticket.volume}}</vn-td>
<vn-td>{{ticket.warehouse.name}}</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 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-tr>
</vn-tbody> </vn-tbody>
</vn-table> </vn-table>

5
modules/route/front/summary/locale/es.yml
View File

@ -1,7 +1,8 @@
Driver: Conductor Driver: Conductor
Vehicle: Vehículo Vehicle: Vehículo
Packages: Bultos Packages: Bultos
Time: F. Inicio Time: H. Inicio
Finished: F. Fin Finished: H. Fin
Km Start: Km de inicio Km Start: Km de inicio
Km End: Km de fin Km End: Km de fin
PC: CP

7
modules/route/front/summary/style.scss
View File

@ -1,5 +1,10 @@
@import "./variables"; @import "variables";
vn-route-summary .summary { vn-route-summary .summary {
max-width: $width-large; max-width: $width-large;
vn-icon[icon=insert_drive_file]{
color: $color-font-secondary;
}
} }

3
modules/ticket/back/models/ticket.json
View File

@ -36,6 +36,9 @@
}, },
"isDeleted": { "isDeleted": {
"type": "boolean" "type": "boolean"
},
"priority": {
"type": "Number"
} }
}, },
"relations": { "relations": {