feat(route_ticket): add column province and change order other columns
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Vicent Llopis 2021-11-26 10:06:13 +01:00
parent 9f8d2c7350
commit e13f2d4ae3
3 changed files with 20 additions and 7 deletions

View File

@ -55,7 +55,13 @@ module.exports = Self => {
{
relation: 'address',
scope: {
fields: ['id', 'street', 'postalCode', 'city'],
fields: ['street', 'city', 'provinceFk', 'phone', 'nickname', 'postalCode'],
include: {
relation: 'province',
scope: {
fields: ['name']
}
}
}
},
]

View File

@ -142,10 +142,15 @@
</vn-th>
<vn-th number>Ticket</vn-th>
<vn-th>Client</vn-th>
<vn-th number shrink>Packages</vn-th>
<vn-th shrink>Warehouse</vn-th>
<vn-th expand>Postcode</vn-th>
<vn-th shrink>Province</vn-th>
<vn-th shrink>
<span translate>
Population
</span>
</vn-th>
<vn-th expand>PC</vn-th>
<vn-th>Address</vn-th>
<vn-th shrink>Warehouse</vn-th>
</vn-tr>
</vn-thead>
<vn-tbody>
@ -165,10 +170,11 @@
{{::ticket.nickname}}
</span>
</vn-td>
<vn-td number shrink>{{::ticket.packages}}</vn-td>
<vn-td expand>{{::ticket.warehouse.name}}</vn-td>
<vn-td shrink>{{::ticket.address.province.name}}</vn-td>
<vn-td shrink>{{::ticket.address.city}}</vn-td>
<vn-td number shrink>{{::ticket.address.postalCode}}</vn-td>
<vn-td expand title="{{::ticket.address.street}}">{{::ticket.address.street}}</vn-td>
<vn-td expand>{{::ticket.warehouse.name}}</vn-td>
</vn-tr>
</vn-tbody>
</vn-table>

View File

@ -10,4 +10,5 @@ Ticket not found: No se ha encontrado el ticket
The selected ticket is not suitable for this route: El ticket seleccionado no es apto para esta ruta
PC: CP
The route's vehicle doesn't have a departing warehouse: El vehículo de la ruta no tiene un almacén de salida
The route doesn't have a vehicle: La ruta no tiene un vehículo
The route doesn't have a vehicle: La ruta no tiene un vehículo
Population: Población