verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 61 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-06-04 11:46:37 +02:00
parent 749b4103a1 6b65aa87d8
commit 2c0fc7e45e
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,7 @@
<vn-thead> <vn-thead>
<vn-tr> <vn-tr>
<vn-th class="icon-field"></vn-th> <vn-th class="icon-field"></vn-th>
<vn-th field="nickname" expand>Client</vn-th> <vn-th field="nickname">Client</vn-th>
<vn-th field="salesPersonFk" class="expendable" shrink>Salesperson</vn-th> <vn-th field="salesPersonFk" class="expendable" shrink>Salesperson</vn-th>
<vn-th field="shipped" shrink-date>Date</vn-th> <vn-th field="shipped" shrink-date>Date</vn-th>
<vn-th>Hour</vn-th> <vn-th>Hour</vn-th>
@ -88,7 +88,7 @@
icon="icon-components"> icon="icon-components">
</vn-icon> </vn-icon>
</vn-td> </vn-td>
<vn-td expand> <vn-td>
<span <span
title="{{::ticket.nickname}}" title="{{::ticket.nickname}}"
vn-click-stop="clientDescriptor.show($event, ticket.clientFk)" vn-click-stop="clientDescriptor.show($event, ticket.clientFk)"
@ -105,7 +105,7 @@
</span> </span>
</vn-td> </vn-td>
<vn-td shrink-date> <vn-td shrink-date>
<span class="chip {{$ctrl.compareDate(ticket.shipped)}}"> <span class="chip {{::$ctrl.compareDate(ticket.shipped)}}">
{{::ticket.shipped | date: 'dd/MM/yyyy'}} {{::ticket.shipped | date: 'dd/MM/yyyy'}}
</span> </span>
</vn-td> </vn-td>
@ -122,8 +122,8 @@
</span> </span>
<span <span
ng-show="::!ticket.refFk" ng-show="::!ticket.refFk"
class="chip {{$ctrl.stateColor(ticket)}}"> class="chip {{::$ctrl.stateColor(ticket)}}">
{{ticket.state}} {{::ticket.state}}
</span> </span>
</vn-td> </vn-td>
<vn-td> <vn-td>

4
modules/monitor/front/index/tickets/style.scss
View File

@ -12,6 +12,10 @@ vn-monitor-sales-tickets {
padding: 0 padding: 0
} }
vn-th[field="nickname"] {
width: 250px
}
vn-td.icon-field > vn-icon { vn-td.icon-field > vn-icon {
margin-left: 3px; margin-left: 3px;
margin-right: 3px; margin-right: 3px;