added span to descriptor-popover links #637

This commit is contained in:
Joan Sanchez 2018-09-06 08:04:43 +02:00
parent 6f3140059f
commit f330c77cc6
10 changed files with 79 additions and 45 deletions

View File

@ -37,17 +37,27 @@
<vn-tr ng-class="{'warning': $ctrl.isToday(sale.date)}"
ng-repeat="sale in sales" vn-repeat-last on-last="$ctrl.scrollToActive()">
<vn-td>{{::sale.date | date:'dd/MM/yyyy HH:mm' }}</vn-td>
<vn-td ng-class="{'link pointer': sale.isTicket}"
ng-click="$ctrl.showDescriptor($event, sale)" number>
{{::sale.origin | dashIfEmpty}}</vn-td>
<vn-td number>
<span ng-class="{'link pointer': sale.isTicket}"
ng-click="$ctrl.showDescriptor($event, sale)">
{{::sale.origin | dashIfEmpty}}
</span>
</vn-td>
<vn-td>{{::sale.stateName | dashIfEmpty}}</vn-td>
<vn-td>{{::sale.reference | dashIfEmpty}}</vn-td>
<vn-td ng-class="{'link pointer': sale.isTicket}"
ng-click="$ctrl.showClientDescriptor($event, sale)">
{{sale.name | dashIfEmpty}}</vn-td>
<vn-td>
<span ng-class="{'link pointer': sale.isTicket}"
ng-click="$ctrl.showClientDescriptor($event, sale)">
{{sale.name | dashIfEmpty}}
</span>
</vn-td>
<vn-td number>{{::sale.in | dashIfEmpty}}</vn-td>
<vn-td number>{{::sale.out | dashIfEmpty}}</vn-td>
<vn-td number><span class="balance">{{::sale.balance | dashIfEmpty}}</span></vn-td>
<vn-td number>
<span class="balance">
{{::sale.balance | dashIfEmpty}}
</span>
</vn-td>
</vn-tr>
</vn-tbody>
<vn-empty-rows ng-if="model.data.length === 0" translate>

View File

@ -41,9 +41,11 @@
zoom-image="//verdnatura.es/vn-image-data/catalog/1600x900/{{::row.item.image}}"
on-error-src/>
</vn-td>
<vn-td ng-click="$ctrl.showDescriptor($event, row.itemFk)"
pointer number class="link">
{{("000000"+row.itemFk).slice(-6)}}
<vn-td>
<span ng-click="$ctrl.showDescriptor($event, row.itemFk)"
pointer number class="link">
{{("000000"+row.itemFk).slice(-6)}}
</span>
</vn-td>
<vn-td><vn-fetched-tags concept="row.item.name" tags="row.item.tags"/></vn-td>
<vn-td>{{row.warehouse.name}}</vn-td>

View File

@ -32,9 +32,12 @@
</vn-thead>
<vn-tbody>
<vn-tr ng-repeat="row in rows">
<vn-td number pointer class="link"
ng-click="$ctrl.showDescriptor($event, row.itemFk)">
{{::row.itemFk}}
<vn-td number>
<span
ng-click="$ctrl.showDescriptor($event, row.itemFk)"
pointer class="link">
{{::row.itemFk}}
</span>
</vn-td>
<vn-td><vn-fetched-tags concept="row.item.name" tags="row.item.tags"/></vn-td>
<vn-td number>{{::row.quantity}}</vn-td>

View File

@ -42,9 +42,13 @@
<tr>
<td rowspan="{{
::sale.components.length + 1
}}" number pointer
ng-click="$ctrl.showDescriptor($event, sale.itemFk)"
class="link">{{("000000"+sale.itemFk).slice(-6)}}</td>
}}" number>
<span pointer
ng-click="$ctrl.showDescriptor($event, sale.itemFk)"
class="link">
{{("000000"+sale.itemFk).slice(-6)}}
</span>
</td>
<td rowspan="{{
::sale.components.length + 1
}}"><vn-fetched-tags concept="sale.concept" tags="sale.item.tags"/></td>

View File

@ -26,17 +26,19 @@
</vn-thead>
<vn-tbody>
<vn-tr ng-repeat="expedition in expeditions">
<vn-td pad-medium-h style="color:#FFA410;">
<vn-td pad-medium-h style="width:30px;color:#FFA410;">
<i
pointer
class="material-icons"
vn-tooltip="Delete expedition"
ng-click="$ctrl.deleteExpedition(expedition)">delete</i>
</vn-td>
<vn-td pointer number
ng-click="$ctrl.showDescriptor($event, expedition.item.id)"
class="link">
{{("000000"+expedition.itemFk).slice(-6)}}
<vn-td number>
<span
ng-click="$ctrl.showDescriptor($event, expedition.item.id)"
class="link" pointer>
{{("000000"+expedition.itemFk).slice(-6)}}
</span>
</vn-td>
<vn-td>{{::expedition.item.name}}</vn-td>
<vn-td>{{::expedition.box.name}}</vn-td>

View File

@ -27,10 +27,12 @@
disabled="true">
</vn-check>
</vn-td>
<vn-td number pointer
ng-click="$ctrl.showDescriptor($event, sale.itemFk)"
class="link">
{{("000000"+sale.itemFk).slice(-6)}}
<vn-td number>
<span
ng-click="$ctrl.showDescriptor($event, sale.itemFk)"
class="link" pointer>
{{("000000"+sale.itemFk).slice(-6)}}
</span>
</vn-td>
<vn-td><vn-fetched-tags concept="sale.concept" tags="sale.item.tags"/></vn-td>
<vn-td number>{{::sale.quantity}}</vn-td>

View File

@ -33,10 +33,12 @@
ng-if="sale.quantity != sale.originalQuantity"
vn-tooltip="The quantity do not match"></vn-icon>
</vn-td>
<vn-td number pointer
ng-click="$ctrl.showDescriptor($event, sale.itemFk)"
class="link">
{{("000000"+sale.itemFk).slice(-6)}}
<vn-td number>
<span
ng-click="$ctrl.showDescriptor($event, sale.itemFk)"
class="link" pointer>
{{("000000"+sale.itemFk).slice(-6)}}
</span>
</vn-td>
<vn-td><vn-fetched-tags concept="sale.concept" tags="sale.item.tags"/></vn-td>
<vn-td>{{::sale.quantity}}</vn-td>

View File

@ -84,9 +84,12 @@
zoom-image="//verdnatura.es/vn-image-data/catalog/1600x900/{{::sale.image}}"
on-error-src/>
</vn-td>
<vn-td ng-click="$ctrl.showDescriptor($event, sale.itemFk)"
pointer number class="link">
{{("000000"+sale.itemFk).slice(-6)}}
<vn-td number>
<span
ng-click="$ctrl.showDescriptor($event, sale.itemFk)"
pointer class="link">
{{("000000"+sale.itemFk).slice(-6)}}
</span>
</vn-td>
<vn-td><vn-fetched-tags concept="sale.concept" tags="sale.item.tags"/></vn-td>
<vn-td ng-if="!$ctrl.isEditable" number>{{sale.quantity}}</vn-td>

View File

@ -67,16 +67,20 @@
<tbody>
<tr ng-repeat="sale in $ctrl.summary.sales track by sale.id">
<td>
<!-- <i pointer
class="material-icons"
vn-tooltip="delete expedition"
ng-click="$ctrl.deleteExpedition(expedition)">warning</i> -->
<vn-icon ng-show="sale.reserved" icon="icon-reserved"></vn-icon>
<vn-icon
ng-show="sale.visible || sale.available"
orange
icon="warning"
vn-tooltip="Visible: {{::sale.visible || 0}} <br> {{::$ctrl.translate.instant('Available')}} {{::sale.available || 0}}">
</vn-icon>
<vn-icon ng-show="sale.reserved" icon="icon-reserva"></vn-icon>
</td>
<td number pointer
ng-click="$ctrl.showDescriptor($event, sale.itemFk)"
class="link">
{{("000000"+sale.itemFk).slice(-6)}}
<td number>
<span
ng-click="$ctrl.showDescriptor($event, sale.itemFk)"
class="link" pointer>
{{("000000"+sale.itemFk).slice(-6)}}
</span>
</td>
<td><vn-fetched-tags concept="sale.concept" tags="sale.item.tags"/></td>
<td number>{{::sale.quantity}}</td>

View File

@ -32,10 +32,12 @@
</vn-thead>
<vn-tbody>
<vn-tr ng-repeat="sale in sales">
<vn-td number pointer
ng-click="$ctrl.showDescriptor($event, sale.itemFk)"
class="link">
{{("000000"+sale.itemFk).slice(-6)}}
<vn-td number>
<span
ng-click="$ctrl.showDescriptor($event, sale.itemFk)"
class="link" pointer>
{{("000000"+sale.itemFk).slice(-6)}}
</span>
</vn-td>
<vn-td><vn-fetched-tags concept="sale.concept" tags="sale.item.tags"/></vn-td>
<vn-td number>{{::sale.quantity}}</vn-td>