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

This commit is contained in:
Joan Sanchez 2019-02-05 11:32:37 +01:00
parent fa47c15d7a edd433561b
commit 391a092754
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/ticket/front/data/step-one/index.html
View File

@ -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
modules/ticket/front/data/step-one/index.js
View File

@ -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) {

13
modules/ticket/front/data/step-one/style.scss Normal file
View File

@ -0,0 +1,13 @@
@import 'colors';
tpl-item{
&.notActive {
background-color: $main-bg;
color: $secondary-font-color;
width: 100%;
}
& > .inactive {
text-transform: uppercase;
}
}