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

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

This commit is contained in:
Carlos Jimenez Ruiz 2021-06-28 16:45:19 +02:00
parent 7e4e6fae21 c6504140af
commit 8ca3e0d120
2 changed files with 10 additions and 8 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

@ -33,14 +33,14 @@
<vn-table model="model"> <vn-table model="model">
<vn-thead> <vn-thead>
<vn-tr> <vn-tr>
<vn-th class="icon-field" shrink></vn-th> <vn-th class="icon-field"></vn-th>
<vn-th field="nickname">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>
<vn-th field="zoneHour" shrink>Closure</vn-th> <vn-th field="zoneHour" shrink>Closure</vn-th>
<vn-th field="provinceFk" class="expendable">Province</vn-th> <vn-th field="provinceFk" class="expendable">Province</vn-th>
<vn-th field="stateFk" shrink>State</vn-th> <vn-th field="stateFk">State</vn-th>
<vn-th field="zoneFk">Zone</vn-th> <vn-th field="zoneFk">Zone</vn-th>
<vn-th shrink>Total</vn-th> <vn-th shrink>Total</vn-th>
<vn-th></vn-th> <vn-th></vn-th>
@ -50,7 +50,7 @@
<a ng-repeat="ticket in model.data" <a ng-repeat="ticket in model.data"
class="clickable vn-tr search-result" class="clickable vn-tr search-result"
ui-sref="ticket.card.summary({id: {{::ticket.id}}})" target="_blank"> ui-sref="ticket.card.summary({id: {{::ticket.id}}})" target="_blank">
<vn-td class="icon-field" shrink> <vn-td class="icon-field">
<vn-icon <vn-icon
ng-show="::ticket.isTaxDataChecked === 0" ng-show="::ticket.isTaxDataChecked === 0"
translate-attr="{title: 'No verified data'}" translate-attr="{title: 'No verified data'}"
@ -88,7 +88,7 @@
icon="icon-components"> icon="icon-components">
</vn-icon> </vn-icon>
</vn-td> </vn-td>
<vn-td> <vn-td name="nickname">
<span <span
title="{{::ticket.nickname}}" title="{{::ticket.nickname}}"
vn-click-stop="clientDescriptor.show($event, ticket.clientFk)" vn-click-stop="clientDescriptor.show($event, ticket.clientFk)"
@ -112,7 +112,7 @@
<vn-td shrink>{{::ticket.shipped | date: 'HH:mm'}}</vn-td> <vn-td shrink>{{::ticket.shipped | date: 'HH:mm'}}</vn-td>
<vn-td shrink>{{::ticket.zoneLanding | date: 'HH:mm'}}</vn-td> <vn-td shrink>{{::ticket.zoneLanding | date: 'HH:mm'}}</vn-td>
<vn-td class="expendable">{{::ticket.province}}</vn-td> <vn-td class="expendable">{{::ticket.province}}</vn-td>
<vn-td class="expendable" shrink> <vn-td class="expendable">
<span <span
ng-show="::ticket.refFk" ng-show="::ticket.refFk"
title="{{::ticket.refFk}}" title="{{::ticket.refFk}}"

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

@ -11,11 +11,13 @@ vn-monitor-sales-tickets {
vn-th.icon-field *, vn-th.icon-field *,
vn-td.icon-field, vn-td.icon-field,
vn-td.icon-field * { vn-td.icon-field * {
padding: 0 padding: 0;
max-width: 50px
} }
vn-th[field="nickname"] { vn-th[field="nickname"],
width: 250px vn-td[name="nickname"] {
min-width: 250px
} }
vn-td.icon-field > vn-icon { vn-td.icon-field > vn-icon {