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

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details

This commit is contained in:
Juan Ferrer 2019-10-05 00:17:10 +02:00
parent b12a666653 4fa532abb8
commit eeef468964
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/item/front/last-entries/style.scss
View File

@ -21,7 +21,7 @@ vn-item-last-entries {
} }
} }
@media screen and (max-width: 1440px) { @media screen and (max-width: 1440px) {
.expendable{ .expendable {
display: none; display: none;
} }
} }

12
modules/ticket/front/index/index.html
View File

@ -41,15 +41,15 @@
</vn-th> </vn-th>
<vn-th></vn-th> <vn-th></vn-th>
<vn-th field="id" number>Id</vn-th> <vn-th field="id" number>Id</vn-th>
<vn-th field="salesPerson">Salesperson</vn-th> <vn-th field="salesPerson" class="expendable">Salesperson</vn-th>
<vn-th field="shipped">Date</vn-th> <vn-th field="shipped">Date</vn-th>
<vn-th>Hour</vn-th> <vn-th>Hour</vn-th>
<vn-th field="nickname">Alias</vn-th> <vn-th field="nickname">Alias</vn-th>
<vn-th field="province">Province</vn-th> <vn-th field="province" class="expendable">Province</vn-th>
<vn-th field="state" >State</vn-th> <vn-th field="state" >State</vn-th>
<vn-th field="agencyMode">Agency</vn-th> <vn-th field="agencyMode">Agency</vn-th>
<vn-th field="warehouse">Warehouse</vn-th> <vn-th field="warehouse">Warehouse</vn-th>
<vn-th field="refFk">Invoice</vn-th> <vn-th field="refFk" class="expendable">Invoice</vn-th>
<vn-th field="zoneHour" shrink>Closure</vn-th> <vn-th field="zoneHour" shrink>Closure</vn-th>
<vn-th number>Total</vn-th> <vn-th number>Total</vn-th>
<vn-th></vn-th> <vn-th></vn-th>
@ -92,7 +92,7 @@
</vn-icon> </vn-icon>
</vn-td> </vn-td>
<vn-td number>{{::ticket.id}}</vn-td> <vn-td number>{{::ticket.id}}</vn-td>
<vn-td expand> <vn-td expand class="expendable">
<span <span
class="link" class="link"
ng-click="$ctrl.showWorkerDescriptor($event, ticket.salesPersonFk)"> ng-click="$ctrl.showWorkerDescriptor($event, ticket.salesPersonFk)">
@ -112,7 +112,7 @@
{{::ticket.nickname}} {{::ticket.nickname}}
</span> </span>
</vn-td> </vn-td>
<vn-td>{{::ticket.province}}</vn-td> <vn-td class="expendable">{{::ticket.province}}</vn-td>
<vn-td> <vn-td>
<span class="chip {{$ctrl.stateColor(ticket)}}"> <span class="chip {{$ctrl.stateColor(ticket)}}">
{{::ticket.state}} {{::ticket.state}}
@ -120,7 +120,7 @@
</vn-td> </vn-td>
<vn-td>{{::ticket.agencyMode}}</vn-td> <vn-td>{{::ticket.agencyMode}}</vn-td>
<vn-td>{{::ticket.warehouse}}</vn-td> <vn-td>{{::ticket.warehouse}}</vn-td>
<vn-td>{{::ticket.refFk | dashIfEmpty}}</vn-td> <vn-td class="expendable">{{::ticket.refFk | dashIfEmpty}}</vn-td>
<vn-td shrink>{{::ticket.zoneLanding | dateTime: 'HH:mm'}}</vn-td> <vn-td shrink>{{::ticket.zoneLanding | dateTime: 'HH:mm'}}</vn-td>
<vn-td number> <vn-td number>
<span class="chip {{$ctrl.totalPriceColor(ticket)}}"> <span class="chip {{$ctrl.totalPriceColor(ticket)}}">

6
modules/ticket/front/index/style.scss
View File

@ -13,4 +13,10 @@ vn-ticket-index {
vn-searchbar { vn-searchbar {
width: 100% width: 100%
} }
@media screen and (max-width: 1440px) {
.expendable {
display: none;
}
}
} }