verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 49 Releases Wiki Activity

3927-monitor_ticket #951

Merged
carlosjr merged 2 commits from 3927-monitor_ticket into dev 2022-05-09 14:19:34 +00:00
Conversation 0 Commits 2 Files Changed 2 +5 -5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,7 +50,7 @@
<th field="salesPersonFk"> <th field="salesPersonFk">
<span translate>Salesperson</span> <span translate>Salesperson</span>
</th> </th>
<th field="shipped" shrink-date> <th field="shippedDate" shrink-date>
<span translate>Date</span> <span translate>Date</span>
</th> </th>
<th field="theoreticalHour"> <th field="theoreticalHour">
@ -153,8 +153,8 @@
</span> </span>
</td> </td>
<td> <td>
<span class="chip {{::$ctrl.compareDate(ticket.shipped)}}"> <span class="chip {{::$ctrl.compareDate(ticket.shippedDate)}}">
{{::ticket.shipped | date: 'dd/MM/yyyy'}} {{::ticket.shippedDate | date: 'dd/MM/yyyy'}}
</span> </span>
</td> </td>
<td>{{::ticket.zoneLanding | date: 'HH:mm'}}</td> <td>{{::ticket.zoneLanding | date: 'HH:mm'}}</td>

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

@ -52,7 +52,7 @@ export default class Controller extends Section {
} }
}, },
{ {
field: 'shipped', field: 'shippedDate',
searchable: false searchable: false
}, },
{ {
@ -136,7 +136,7 @@ export default class Controller extends Section {
return {'z.hour': value}; return {'z.hour': value};
case 'practicalHour': case 'practicalHour':
return {'zed.etc': value}; return {'zed.etc': value};
case 'shipped': case 'shippedDate':
return {'t.shipped': { return {'t.shipped': {
between: this.dateRange(value)} between: this.dateRange(value)}
}; };