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

Merge branch 'dev' of https://git.verdnatura.es/salix into dev

This commit is contained in:
nelo 2017-06-29 14:09:11 +02:00
parent c5363155c4 372cfe718b
commit 8e177fcb2d
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/production/src/index/index.html
View File

@ -17,14 +17,15 @@
</vn-two> </vn-two>
<vn-one vn-horizontal> <vn-one vn-horizontal>
<vn-one></vn-one> <vn-one></vn-one>
<vn-autocomplete vn-two <vn-autocomplete vn-two
initial-value="$ctrl.filter.warehouseFk"
show-field="name" show-field="name"
value-field="id" value-field="id"
field="$ctrl.warehouseFk" field="$ctrl.filter.warehouseFk"
url="/production/api/Warehouses/production" url="/production/api/Warehouses/production"
label="Store"> label="Store">
</vn-autocomplete> </vn-autocomplete>
<vn-icon-button vn-none pad-ten-top icon="refresh"></vn-icon-button> <vn-icon-button vn-none pad-ten-top icon="refresh" ng-click="$ctrl.searchTickets()"></vn-icon-button>
</vn-one> </vn-one>
</vn-horizontal> </vn-horizontal>
<vn-horizontal vn-one margin-large-bottom> <vn-horizontal vn-one margin-large-bottom>

10
client/production/src/index/index.js
View File

@ -2,7 +2,7 @@ import ngModule from '../module';
import './style.scss'; import './style.scss';
export default class ProductionIndex { export default class ProductionIndex {
constructor($element, $scope, $http, vnPopover) { constructor($element, $scope, $http, vnPopover, aclConstant) {
this.$element = $element; this.$element = $element;
this.$ = $scope; this.$ = $scope;
this.$http = $http; this.$http = $http;
@ -17,10 +17,8 @@ export default class ProductionIndex {
}; };
this.hourItems = []; this.hourItems = [];
this.child = undefined; this.child = undefined;
this.warehouse = { this.userProfile = aclConstant.userProfile;
id: 1, this.filter.warehouseFk = this.userProfile.warehouseId;
name: "Silla FV"
};
} }
// Actions Callbacks // Actions Callbacks
@ -101,7 +99,7 @@ export default class ProductionIndex {
this.searchTickets(); this.searchTickets();
} }
} }
ProductionIndex.$inject = ['$element', '$scope', '$http', 'vnPopover']; ProductionIndex.$inject = ['$element', '$scope', '$http', 'vnPopover', 'aclConstant'];
ngModule.component('vnProductionIndex', { ngModule.component('vnProductionIndex', {
template: require('./index.html'), template: require('./index.html'),