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

Merge remote-tracking branch 'upstream/dev' into dev
gitea/salix/PR-9 Build queued... Details
gitea/salix/test This commit looks good Details

This commit is contained in:
Juan Ferrer 2019-02-18 08:56:16 +01:00
parent a1364c653c 2fc36e1f40
commit 89468bf375
6 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
front/core/directives/uvc.html
View File

@ -1,5 +1,5 @@
<div style="position: relative;"> <div style="position: relative;">
<div style="position: absolute; top: 0; left: 0; padding: .5em; z-index: 1"> <div style="position: absolute; top: 0; left: 0; padding: .3em; z-index: 1">
<vn-icon-button <vn-icon-button
icon="menu" icon="menu"
style="font-size: .4em;" style="font-size: .4em;"
@ -15,14 +15,16 @@
<div pad-medium> <div pad-medium>
<vn-horizontal ng-repeat="field in fields"> <vn-horizontal ng-repeat="field in fields">
<vn-check <vn-check
vn-one label="{{field}}" vn-one label="{{titles[field]}}"
field="tableConfiguration.configuration[field]"> field="tableConfiguration.configuration[field]">
</vn-check> </vn-check>
</vn-horizontal> </vn-horizontal>
<vn-button <vn-horizontal>
label="Save" <vn-button
ng-click="$ctrl.saveConfiguration(tableConfiguration)"> label="Save"
</vn-button> ng-click="$ctrl.saveConfiguration(tableConfiguration)">
</vn-button>
</vn-horizontal>
</div> </div>
</tpl-body> </tpl-body>
</vn-dialog> </vn-dialog>

7
front/core/directives/uvc.js
View File

@ -1,5 +1,6 @@
import ngModule from '../module'; import ngModule from '../module';
import template from './uvc.html'; import template from './uvc.html';
import './uvc.scss';
directive.$inject = ['$http', '$compile', 'vnApp', '$translate']; directive.$inject = ['$http', '$compile', 'vnApp', '$translate'];
export function directive($http, $compile, vnApp, $translate) { export function directive($http, $compile, vnApp, $translate) {
@ -7,12 +8,16 @@ export function directive($http, $compile, vnApp, $translate) {
let allHeaders = $element[0].querySelectorAll(`vn-th[field], vn-th[th-id]`); let allHeaders = $element[0].querySelectorAll(`vn-th[field], vn-th[th-id]`);
let headerList = Array.from(allHeaders); let headerList = Array.from(allHeaders);
let ids = []; let ids = [];
let titles = {};
headerList.forEach(header => { headerList.forEach(header => {
ids.push(header.getAttribute('th-id') || header.getAttribute('field')); let id = header.getAttribute('th-id') || header.getAttribute('field');
ids.push(id);
titles[id] = header.innerText || id;
}); });
$scope.fields = ids; $scope.fields = ids;
$scope.titles = titles;
return headerList; return headerList;
} }

11
front/core/directives/uvc.scss Normal file
View File

@ -0,0 +1,11 @@
vn-table vn-dialog[vn-id="uvc"]{
& > div {
min-width: 18em;
align-items: center;
}
vn-button[label="Save"] {
margin: 0 auto;
}
}

2
modules/item/front/index/index.html
View File

@ -61,7 +61,7 @@
<vn-td>{{::item.intrastat}}</vn-td> <vn-td>{{::item.intrastat}}</vn-td>
<vn-td>{{::item.origin}}</vn-td> <vn-td>{{::item.origin}}</vn-td>
<vn-td>{{::item.userNickname}}</vn-td> <vn-td>{{::item.userNickname}}</vn-td>
<vn-td>{{::item.density}}</vn-td> <vn-td number>{{::item.density}}</vn-td>
<vn-td>{{::item.taxClass}}</vn-td> <vn-td>{{::item.taxClass}}</vn-td>
<vn-td> <vn-td>
<vn-check <vn-check

1
modules/item/front/index/locale/es.yml Normal file
View File

@ -0,0 +1 @@
picture: Foto

3
modules/ticket/front/search-panel/index.html
View File

@ -96,7 +96,8 @@
<vn-check <vn-check
vn-one vn-one
label="My team" label="My team"
field="filter.myTeam"> field="filter.myTeam"
triple-state="true">
</vn-check> </vn-check>
</vn-horizontal> </vn-horizontal>
<vn-horizontal margin-large-top> <vn-horizontal margin-large-top>