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

Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Joan Sanchez 2021-10-13 15:09:34 +02:00
parent b09e3ad72b c0e1f2f0dc
commit d06385fc73
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/monitor/back/methods/sales-monitor/salesFilter.js
View File

@ -219,7 +219,7 @@ module.exports = Self => {
z.hour AS zoneLanding,
z.name AS zoneName,
z.id AS zoneFk,
th.preparationHour,
TIME_FORMAT(t.shipped, '%H:%i') AS preparationHour,
TIME_FORMAT(z.hour, '%H:%i') AS theoreticalhour,
TIME_FORMAT(zed.etc, '%H:%i') AS practicalHour
FROM ticket t
@ -234,11 +234,7 @@ module.exports = Self => {
LEFT JOIN client c ON c.id = t.clientFk
LEFT JOIN worker wk ON wk.id = c.salesPersonFk
LEFT JOIN account.user u ON u.id = wk.userFk
LEFT JOIN zoneEstimatedDelivery zed ON zed.zoneFk = t.zoneFk
JOIN (
SELECT t.id, TIME_FORMAT(t.shipped, '%H:%i') AS preparationHour
FROM ticket AS t
) AS th ON th.id = t.id`);
LEFT JOIN zoneEstimatedDelivery zed ON zed.zoneFk = t.zoneFk`);
if (args.orderFk) {
stmt.merge({

2
modules/monitor/front/index/tickets/index.html
View File

@ -37,7 +37,7 @@
<vn-th field="nickname">Client</vn-th>
<vn-th field="salesPersonFk" class="expendable" shrink>Salesperson</vn-th>
<vn-th field="shipped" shrink-date>Date</vn-th>
<vn-th field="preparationHour">Prep.</vn-th>
<vn-th field="preparationHour" filter-enabled="false">Prep.</vn-th>
<vn-th field="theoreticalHour">Theoretical</vn-th>
<vn-th field="practicalHour">Practical</vn-th>
<vn-th field="provinceFk" class="expendable">Province</vn-th>

2
modules/monitor/front/index/tickets/index.js
View File

@ -72,8 +72,6 @@ export default class Controller extends Section {
return {'z.hour': value};
case 'practicalHour':
return {'zed.etc': value};
case 'preparationHour':
return {'th.preparationHour': value};
case 'shipped':
return {'t.shipped': {
between: this.dateRange(value)}