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

refs #4770 añadido supplier-popover
gitea/salix/pipeline/head There was a failure building this commit Details

This commit is contained in:
Vicent Llopis 2023-05-02 15:14:24 +02:00
parent 057151eda0
commit cf37dda044
4 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/route/front/roadmap/basic-data/index.html
View File

@ -52,7 +52,7 @@
<vn-horizontal> <vn-horizontal>
<vn-autocomplete <vn-autocomplete
vn-one vn-one
ng-model="$ctrl.entry.supplierFk" ng-model="$ctrl.roadmap.supplierFk"
url="Suppliers" url="Suppliers"
show-field="nickname" show-field="nickname"
search-function="{or: [{id: $search}, {nickname: {like: '%'+ $search +'%'}}]}" search-function="{or: [{id: $search}, {nickname: {like: '%'+ $search +'%'}}]}"

11
modules/route/front/roadmap/descriptor/index.html
View File

@ -12,10 +12,15 @@
label="ETD" label="ETD"
value="{{$ctrl.roadmap.etd | date:'dd/MM/yyyy HH:mm'}}"> value="{{$ctrl.roadmap.etd | date:'dd/MM/yyyy HH:mm'}}">
</vn-label-value> </vn-label-value>
<vn-label-value <vn-label-value label="Carrier">
label="Carrier" <span ng-click="supplierDescriptor.show($event, $ctrl.roadmap.supplier.id)" class="link">
value="{{$ctrl.roadmap.supplier.nickname}}"> {{$ctrl.roadmap.supplier.nickname}}
</span>
</vn-label-value> </vn-label-value>
</div> </div>
</slot-body> </slot-body>
</vn-descriptor-content> </vn-descriptor-content>
<vn-supplier-descriptor-popover
vn-id="supplierDescriptor">
</vn-supplier-descriptor-popover>

11
modules/route/front/roadmap/index/index.html
View File

@ -42,7 +42,13 @@
</vn-td> </vn-td>
<vn-td>{{::roadmap.trunk | dashIfEmpty}}</vn-td> <vn-td>{{::roadmap.trunk | dashIfEmpty}}</vn-td>
<vn-td expand date>{{::roadmap.etd | date:'dd/MM/yyyy HH:mm'}}</vn-td> <vn-td expand date>{{::roadmap.etd | date:'dd/MM/yyyy HH:mm'}}</vn-td>
<vn-td>{{::roadmap.supplier.nickname | dashIfEmpty}}</vn-td> <vn-td expand>
<span
class="link"
vn-click-stop="supplierDescriptor.show($event, roadmap.supplierFk)">
{{::roadmap.supplier.nickname}}
</span>
</vn-td>
<vn-td>{{::roadmap.tractorPlate | dashIfEmpty}}</vn-td> <vn-td>{{::roadmap.tractorPlate | dashIfEmpty}}</vn-td>
<vn-td expand>{{::roadmap.price | currency: 'EUR':2 | dashIfEmpty}}</vn-td> <vn-td expand>{{::roadmap.price | currency: 'EUR':2 | dashIfEmpty}}</vn-td>
<vn-td expand>{{::roadmap.observations | dashIfEmpty}}</vn-td> <vn-td expand>{{::roadmap.observations | dashIfEmpty}}</vn-td>
@ -70,6 +76,9 @@
roadmap="$ctrl.roadmapSelected"> roadmap="$ctrl.roadmapSelected">
</vn-roadmap-summary> </vn-roadmap-summary>
</vn-popup> </vn-popup>
<vn-supplier-descriptor-popover
vn-id="supplierDescriptor">
</vn-supplier-descriptor-popover>
<!-- Clonation dialog --> <!-- Clonation dialog -->
<vn-dialog class="edit" <vn-dialog class="edit"

10
modules/route/front/roadmap/summary/index.html
View File

@ -4,9 +4,10 @@
</h5> </h5>
<vn-horizontal class="vn-pa-md"> <vn-horizontal class="vn-pa-md">
<vn-one> <vn-one>
<vn-label-value <vn-label-value label="Carrier">
label="Carrier" <span ng-click="supplierDescriptor.show($event, summary.supplier.id)" class="link">
value="{{summary.supplier.nickname}}"> {{summary.supplier.nickname}}
</span>
</vn-label-value> </vn-label-value>
<vn-label-value <vn-label-value
label="ETD" label="ETD"
@ -60,3 +61,6 @@
</vn-auto> </vn-auto>
</vn-horizontal> </vn-horizontal>
</vn-card> </vn-card>
<vn-supplier-descriptor-popover
vn-id="supplierDescriptor">
</vn-supplier-descriptor-popover>