ticket.index show zone hour & minute. Show only tickets from today
gitea/salix/dev There was a failure building this commit Details

This commit is contained in:
Joan Sanchez 2019-07-12 08:49:44 +02:00
parent 62ef2dccd8
commit 2a6de77e17
4 changed files with 25 additions and 3 deletions

View File

@ -196,8 +196,12 @@ module.exports = Self => {
ts.alertLevel as alertLevel,
ts.code as alertLevelCode,
u.nickname userNickname,
c.salesPersonFk
c.salesPersonFk,
z.hour zoneLanding,
HOUR(z.hour) zoneHour,
MINUTE(z.hour) zoneMinute
FROM ticket t
LEFT JOIN zone z ON z.id = t.zoneFk
LEFT JOIN address a ON a.id = t.addressFk
LEFT JOIN province p ON p.id = a.provinceFk
LEFT JOIN warehouse w ON w.id = t.warehouseFk

View File

@ -2,8 +2,9 @@
vn-id="model"
url="/ticket/api/Tickets/filter"
limit="20"
params="::$ctrl.params"
data="tickets"
order="shipped DESC, clientFk"
order="shipped DESC, zoneHour ASC, zoneMinute ASC, clientFk"
auto-load="false">
</vn-crud-model>
<div class="content-block">
@ -50,6 +51,8 @@
<vn-th field="agencyMode">Agency</vn-th>
<vn-th field="warehouse">Warehouse</vn-th>
<vn-th field="refFk">Invoice</vn-th>
<vn-th field="zoneHour" shrink>Zone Hour</vn-th>
<vn-th field="zoneMinute" shrink>Zone Minute</vn-th>
<vn-th number>Total</vn-th>
<vn-th></vn-th>
</vn-tr>
@ -120,6 +123,8 @@
<vn-td>{{::ticket.agencyMode}}</vn-td>
<vn-td>{{::ticket.warehouse}}</vn-td>
<vn-td>{{::ticket.refFk | dashIfEmpty}}</vn-td>
<vn-td shrink>{{::ticket.zoneLanding | dateTime: 'HH'}}</vn-td>
<vn-td shrink>{{::ticket.zoneLanding | dateTime: 'mm'}}</vn-td>
<vn-td number>{{::ticket.total | currency: 'EUR': 2}}</vn-td>
<vn-td actions>
<vn-icon-button

View File

@ -19,6 +19,17 @@ export default class Controller {
}, name: 'Payment on account...', always: true}
];
const morning = new Date();
morning.setHours(0, 0, 0, 0);
const tonight = new Date();
tonight.setHours(23, 59, 59, 999);
this.params = {
from: morning,
to: tonight
};
if (!$stateParams.q)
this.getScopeDays();
}

View File

@ -1,4 +1,6 @@
Turns: Turnos
Go to lines: Ir a lineas
Not available: No disponible
Payment on account...: Pago a cuenta...
Payment on account...: Pago a cuenta...
Zone Hour: Hora zona
Zone Minute: Minuto zona