Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
This commit is contained in:
commit
391a092754
|
@ -16,9 +16,11 @@
|
||||||
label="Address"
|
label="Address"
|
||||||
show-field="nickname"
|
show-field="nickname"
|
||||||
value-field="id"
|
value-field="id"
|
||||||
field="$ctrl.ticket.addressFk">
|
field="$ctrl.ticket.addressFk"
|
||||||
<tpl-item>{{::nickname}}
|
order="isActive DESC">
|
||||||
<span ng-show="city || province || street">- {{::street}} - {{::city}} - {{::province.name}} - {{::agencyMode.name}}</span>
|
<tpl-item ng-class="::{notActive: isActive === false}">
|
||||||
|
<span class="inactive" translate>{{::isActive ? '' : 'INACTIVE'}}</span> {{::nickname}}
|
||||||
|
<span ng-show="::{{city || province || street}}">- {{::street}} - {{::city}} - {{::province.name}} - {{::agencyMode.name}}</span>
|
||||||
</tpl-item>
|
</tpl-item>
|
||||||
</vn-autocomplete>
|
</vn-autocomplete>
|
||||||
<vn-autocomplete vn-one
|
<vn-autocomplete vn-one
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
import ngModule from '../../module';
|
import ngModule from '../../module';
|
||||||
import {toJsonDate} from 'core/lib/date';
|
import {toJsonDate} from 'core/lib/date';
|
||||||
|
import './style.scss';
|
||||||
|
|
||||||
class Controller {
|
class Controller {
|
||||||
constructor($scope, $http, $translate, vnApp) {
|
constructor($scope, $http, $translate, vnApp) {
|
||||||
|
|
|
@ -0,0 +1,13 @@
|
||||||
|
@import 'colors';
|
||||||
|
|
||||||
|
tpl-item{
|
||||||
|
&.notActive {
|
||||||
|
background-color: $main-bg;
|
||||||
|
color: $secondary-font-color;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
& > .inactive {
|
||||||
|
text-transform: uppercase;
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue