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

#2540 - Added entry descriptor popover to referenced places
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Joan Sanchez 2020-10-27 12:02:49 +01:00
parent 866032b346
commit 3d86e59890
7 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/item/front/diary/index.html
View File

@ -55,8 +55,8 @@
</span>
</vn-td>
<vn-td number>
<span ng-class="::{link: sale.isTicket}"
ng-click="$ctrl.showTicketDescriptor($event, sale)"
<span class="link"
ng-click="$ctrl.showDescriptor($event, sale)"
name="origin">
{{::sale.origin | dashIfEmpty}}
</span>
@ -94,3 +94,7 @@
<vn-client-descriptor-popover
vn-id="clientDescriptor">
</vn-client-descriptor-popover>
<vn-entry-descriptor-popover
vn-id="entryDescriptor">
</vn-entry-descriptor-popover>

8
modules/item/front/diary/index.js
View File

@ -58,10 +58,12 @@ class Controller extends Section {
this.$anchorScroll();
}
showTicketDescriptor(event, sale) {
if (!sale.isTicket) return;
showDescriptor(event, sale) {
let descriptor = 'entryDescriptor';
if (sale.isTicket)
descriptor = 'ticketDescriptor';
this.$.ticketDescriptor.show(event.target, sale.origin);
this.$[descriptor].show(event.target, sale.origin);
}
}

2
modules/item/front/routes.json
View File

@ -3,7 +3,7 @@
"name": "Items",
"icon": "icon-item",
"validations" : true,
"dependencies": ["worker", "client", "ticket"],
"dependencies": ["worker", "client", "ticket", "entry"],
"menus": {
"main": [
{"state": "item.index", "icon": "icon-item"},

2
modules/travel/front/routes.json
View File

@ -3,7 +3,7 @@
"name": "Travels",
"icon": "local_airport",
"validations": true,
"dependencies": ["worker"],
"dependencies": ["worker", "entry"],
"menus": {
"main": [
{"state": "travel.index", "icon": "local_airport"}

16
modules/travel/front/summary/index.html
View File

@ -41,7 +41,7 @@
value="{{$ctrl.travelData.ref}}">
</vn-label-value>
<vn-label-value
label="m3"
label="m³"
value="{{$ctrl.travelData.m3}}">
</vn-label-value>
<vn-label-value
@ -63,7 +63,7 @@
<vn-th shrink>Package</vn-th>
<vn-th shrink>CC</vn-th>
<vn-th shrink>Pallet</vn-th>
<vn-th shrink>m3</vn-th>
<vn-th shrink>m³</vn-th>
<vn-th shrink></vn-th>
</vn-tr>
</vn-thead>
@ -75,7 +75,12 @@
disabled="true">
</vn-check>
</vn-td>
<vn-td shrink>{{entry.id}} </vn-td>
<vn-td shrink>
<span class="link"
vn-click-stop="entryDescriptor.show($event, entry.id)">
{{entry.id}}
</span>
</vn-td>
<vn-td expand>{{entry.supplierName}}</vn-td>
<vn-td shrink>{{entry.ref}}</vn-td>
<vn-td shrink>{{entry.hb}}</vn-td>
@ -141,4 +146,7 @@
</vn-table>
</vn-auto>
</vn-horizontal>
</vn-card>
</vn-card>
<vn-entry-descriptor-popover
vn-id="entryDescriptor">
</vn-entry-descriptor-popover>

2
modules/travel/front/summary/locale/es.yml
View File

@ -9,7 +9,7 @@ Received: Recibida
Agency: Agencia
Entries: Entradas
Confirmed: Confirmada
Entry Id: Entrada Id
Entry Id: Id entrada
Supplier: Proveedor
Pallet: Pallet
Freight: Porte

4
modules/zone/front/events/index.html
View File

@ -73,7 +73,7 @@
value="{{::row.bonus | currency:'EUR':2}}">
</vn-label-value>
<vn-label-value
label="Max m3"
label="Max m³"
value="{{::row.m3Max}}">
</vn-label-value>
</vn-item-section>
@ -166,7 +166,7 @@
</vn-input-number>
</vn-horizontal>
<vn-input-number
label="Max m3"
label="Max m³"
ng-model="$ctrl.selected.m3Max"
min="0"
step="0.01">