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

Merge branch '1985-apply_item_type_filter' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details

This commit is contained in:
Carlos Jimenez Ruiz 2020-01-09 10:50:26 +00:00 committed by Gitea
parent 369f08ed94 6f3359c76e
commit 83d2ec40d4
8 changed files with 92 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
db/dump/fixtures.sql
View File

@ -643,7 +643,8 @@ INSERT INTO `vn`.`itemType`(`id`, `code`, `name`, `categoryFk`, `life`,`workerFk
(2, 'ITG', 'Anthurium', 1, 31, 5, 0),
(3, 'WPN', 'Paniculata', 2, 31, 5, 0),
(4, 'PRT', 'Delivery ports', 3, NULL, 5, 1),
(5, 'CON', 'Container', 3, NULL, 5, 1);
(5, 'CON', 'Container', 3, NULL, 5, 1),
(6, 'ALS', 'Alstroemeria', 1, 31, 5, 0);
INSERT INTO `vn`.`ink`(`id`, `name`, `picture`, `showOrder`)
VALUES

2
e2e/helpers/selectors.js
View File

@ -605,7 +605,7 @@ export default {
orderByAutocomplete: 'vn-autocomplete[label="Order by"]',
plantRealmButton: 'vn-order-catalog > vn-side-menu vn-icon[icon="icon-plant"]',
typeAutocomplete: 'vn-autocomplete[data="$ctrl.itemTypes"]',
itemIdInput: 'vn-catalog-filter vn-textfield[ng-model="$ctrl.itemFk"] input',
itemIdInput: 'vn-catalog-filter vn-textfield[ng-model="$ctrl.itemId"] input',
itemTagValueInput: 'vn-catalog-filter vn-textfield[ng-model="$ctrl.value"] input',
openTagSearch: 'vn-catalog-filter > div > vn-vertical > vn-textfield[ng-model="$ctrl.value"] .append i',
tagAutocomplete: 'vn-order-catalog-search-panel vn-autocomplete[ng-model="filter.tagFk"]',

17
modules/order/front/catalog/index.js
View File

@ -20,7 +20,7 @@ class Controller {
];
this.orderFields = [].concat(this.defaultOrderFields);
this._orderWay = this.orderWays[0].way;
this._orderField = this.orderFields[0].field;
this.orderField = this.orderFields[0].field;
}
/**
@ -76,15 +76,13 @@ class Controller {
if (value) this.applyOrder();
}
/**
* Get order fields
*/
get orderField() {
return this._orderField;
get orderSelection() {
return this._orderSelection;
}
set orderField(value) {
this._orderField = value;
set orderSelection(value) {
this._orderSelection = value;
if (value) this.applyOrder();
}
@ -94,10 +92,11 @@ class Controller {
* @return {Object} - Order param
*/
getOrderBy() {
const isTag = !!(this.orderSelection && this.orderSelection.isTag);
return {
field: this.orderField,
way: this.orderWay,
isTag: !!(this.orderSelection && this.orderSelection.isTag)
isTag: isTag
};
}

40
modules/order/front/filter/index.html
View File

@ -6,27 +6,26 @@
</vn-crud-model>
<div>
<vn-horizontal class="item-category">
<vn-autocomplete vn-id="category"
data="categories"
ng-model="$ctrl.categoryId"
show-field="name"
value-field="id"
label="Category">
</vn-autocomplete>
<vn-one ng-repeat="category in categories">
<vn-icon
ng-class="{'active': $ctrl.category.id == category.id}"
ng-class="{'active': $ctrl.categoryId == category.id}"
icon="{{::category.icon}}"
vn-tooltip="{{::category.name}}"
ng-click="$ctrl.category = {
id: category.id,
value: category.name
}">
ng-click="$ctrl.categoryId = category.id">
</vn-icon>
</vn-one>
</vn-horizontal>
<vn-vertical class="input">
<vn-autocomplete
vn-id="type"
<vn-autocomplete vn-id="type"
data="$ctrl.itemTypes"
on-change="$ctrl.type = {
id: value,
value: type.selection.name
}"
ng-model="$ctrl.type.id"
ng-model="$ctrl.typeId"
show-field="name"
value-field="id"
label="Type"
@ -38,9 +37,6 @@
{{categoryName}}
</div>
</tpl-item>
<prepend>
<vn-icon icon="search"></vn-icon>
</prepend>
</vn-autocomplete>
</vn-vertical>
<vn-vertical class="input vn-pt-md">
@ -73,7 +69,7 @@
<vn-textfield
ng-keyUp="$ctrl.onSearchById($event)"
label="Item id"
ng-model="$ctrl.itemFk">
ng-model="$ctrl.itemId">
<prepend>
<vn-icon icon="icon-item"></vn-icon>
</prepend>
@ -106,20 +102,20 @@
</vn-popover>
<div class="chips">
<vn-chip
ng-if="$ctrl.category"
ng-if="category.selection"
removable="true"
translate-attr="{title: 'Category'}"
on-remove="$ctrl.category = null"
on-remove="$ctrl.categoryId = null"
class="colored">
<span translate>{{$ctrl.category.value}}</span>
<span translate>{{category.selection.name}}</span>
</vn-chip>
<vn-chip
ng-if="$ctrl.type"
ng-if="type.selection"
removable="true"
translate-attr="{title: 'Type'}"
on-remove="$ctrl.type = null"
on-remove="$ctrl.typeId = null"
class="colored">
<span translate>{{$ctrl.type.value}}</span>
<span translate>{{type.selection.name}}</span>
</vn-chip>
<vn-chip
ng-repeat="tag in $ctrl.tags"

91
modules/order/front/filter/index.js
View File

@ -24,65 +24,50 @@ class Controller {
* @param {Object} value - Order data
*/
set order(value) {
if (!value || !value.id || this._order) return;
this._order = value;
if (!value) return;
this.$.$applyAsync(() => {
let category;
let type;
if (this.$stateParams.categoryId)
this.categoryId = this.$stateParams.categoryId;
if (this.$stateParams.category)
category = JSON.parse(this.$stateParams.category);
if (this.$stateParams.type)
type = JSON.parse(this.$stateParams.type);
if (category && category.id)
this.category = category;
if (type && type.id)
this.type = type;
if (this.$stateParams.typeId)
this.typeId = this.$stateParams.typeId;
});
}
get category() {
return this._category;
get categoryId() {
return this._categoryId;
}
set category(value) {
this.catalog.$scope.model.data = [];
this.itemTypes = [];
this.type = null;
set categoryId(value) {
if (!value || (this.categoryId == value))
value = null;
if (!value || (this.category && this.category.id == value.id))
this._category = null;
else
this._category = value;
this._categoryId = value;
this.itemTypes = [];
this.typeId = null;
this.updateStateParams();
if (this.tags.length > 0)
this.applyFilters();
if (this._category)
if (value)
this.updateItemTypes();
}
get type() {
return this._type;
get typeId() {
return this._typeId;
}
set type(value) {
if (value && this.type && this.type.id == value.id) return;
this._type = value;
if (!value || !value.id)
this._type = null;
set typeId(value) {
this._typeId = value;
this.updateStateParams();
if ((value && value.id) || this.tags.length > 0)
if ((value) || this.tags.length > 0)
this.applyFilters();
}
@ -91,17 +76,17 @@ class Controller {
*/
updateItemTypes() {
let params = {
itemCategoryId: this.category.id
itemCategoryId: this.categoryId
};
const query = `Orders/${this.order.id}/getItemTypeAvailable`;
this.$http.get(query, {params}).then(res => {
this.itemTypes = res.data;
});
this.$http.get(query, {params}).then(res =>
this.itemTypes = res.data);
}
onSearchById(event) {
if (event.key === 'Enter' && (this.tags.length > 0 || this.itemFk || this.type))
const hasValue = this.tags.length > 0 || this.itemId || this.typeId;
if (event.key === 'Enter' && hasValue)
this.applyFilters();
}
@ -117,7 +102,7 @@ class Controller {
remove(index) {
this.tags.splice(index, 1);
if (this.tags.length >= 0 || this.itemFk || this.type)
if (this.tags.length >= 0 || this.itemId || this.typeId)
this.applyFilters();
}
@ -126,14 +111,14 @@ class Controller {
let newFilter = {};
const model = this.catalog.$scope.model;
if (this.category)
newFilter.categoryFk = this.category.id;
if (this.categoryId)
newFilter.categoryFk = this.categoryId;
if (this.type)
newFilter.typeFk = this.type.id;
if (this.typeId)
newFilter.typeFk = this.typeId;
if (this.itemFk)
newFilter = {'i.id': this.itemFk};
if (this.itemId)
newFilter = {'i.id': this.itemId};
newParams = {
orderFk: this.order.id,
@ -164,13 +149,13 @@ class Controller {
updateStateParams() {
const params = {};
if (this.category)
params.category = JSON.stringify(this.category);
if (this.categoryId)
params.categoryId = this.categoryId;
else params.categoryId = undefined;
if (this.type)
params.type = JSON.stringify(this.type);
else
params.type = undefined;
if (this.typeId)
params.typeId = this.typeId;
else params.typeId = undefined;
this.$state.go(this.$state.current.name, params);
}

40
modules/order/front/filter/index.spec.js
View File

@ -16,8 +16,8 @@ describe('Order', () => {
$scope.model = crudModel;
$scope.search = {};
$state = _$state_;
$state.params.category = '{"id": 1, "value": "My Category"}';
$state.params.type = '{"id": 1, "value": "My type"}';
$state.params.categoryId = 1;
$state.params.typeId = 2;
$state.current.name = 'my.current.state';
controller = $componentController('vnCatalogFilter', {$element: null, $scope, $state});
controller.catalog = {
@ -35,15 +35,15 @@ describe('Order', () => {
$scope.$apply();
expect(controller.category).toEqual({id: 1, value: 'My Category'});
expect(controller.type).toEqual({id: 1, value: 'My type'});
expect(controller.categoryId).toEqual(1);
expect(controller.typeId).toEqual(2);
});
});
describe('category() setter', () => {
describe('categoryId() setter', () => {
it(`should set category property to null, call updateStateParams() method and not call applyFilters()`, () => {
spyOn(controller, 'updateStateParams');
controller.category = null;
controller.categoryId = null;
expect(controller.updateStateParams).toHaveBeenCalledWith();
});
@ -51,17 +51,17 @@ describe('Order', () => {
it(`should set category property and then call updateStateParams() and applyFilters() methods`, () => {
spyOn(controller, 'updateStateParams');
controller._order = {id: 4};
controller.category = {id: 2, value: 'My category'};
controller.categoryId = 2;
expect(controller.updateStateParams).toHaveBeenCalledWith();
});
});
describe('type() setter', () => {
describe('typeId() setter', () => {
it(`should set type property to null, call updateStateParams() method and not call applyFilters()`, () => {
spyOn(controller, 'updateStateParams');
spyOn(controller, 'applyFilters');
controller.type = null;
controller.typeId = null;
expect(controller.updateStateParams).toHaveBeenCalledWith();
expect(controller.applyFilters).not.toHaveBeenCalledWith();
@ -70,7 +70,7 @@ describe('Order', () => {
it(`should set category property and then call updateStateParams() and applyFilters() methods`, () => {
spyOn(controller, 'updateStateParams');
spyOn(controller, 'applyFilters');
controller.type = {id: 2, value: 'My type'};
controller.typeId = 2;
expect(controller.updateStateParams).toHaveBeenCalledWith();
expect(controller.applyFilters).toHaveBeenCalledWith();
@ -101,7 +101,7 @@ describe('Order', () => {
describe('onSearchById()', () => {
it(`should not filter by id if the event key code doesn't equals to 'Enter'`, () => {
spyOn(controller, 'applyFilters');
controller.itemFk = 1;
controller.itemId = 1;
controller.onSearchById({key: 'Tab'});
expect(controller.applyFilters).not.toHaveBeenCalledWith();
@ -109,7 +109,7 @@ describe('Order', () => {
it(`should filter by id if the event key code equals to 'Enter' an then call applyFilters()`, () => {
spyOn(controller, 'applyFilters');
controller.itemFk = 1;
controller.itemId = 1;
controller.onSearchById({key: 'Enter'});
@ -121,14 +121,14 @@ describe('Order', () => {
it(`should call model applyFilter() method with a new filter`, () => {
let model = controller.catalog.$scope.model;
spyOn(model, 'applyFilter');
controller._category = {id: 1, value: 'My Category'};
controller._type = {id: 1, value: 'My type'};
controller._categoryId = 2;
controller._typeId = 4;
controller._order = {id: 4};
controller.applyFilters();
expect(model.applyFilter).toHaveBeenCalledWith(
{where: {categoryFk: 1, typeFk: 1}},
{where: {categoryFk: 2, typeFk: 4}},
{orderFk: 4, orderBy: controller.catalog.getOrderBy(), tags: []});
});
});
@ -146,8 +146,8 @@ describe('Order', () => {
it(`should remove a tag from tags property and call applyFilters() if there's no more tags`, () => {
spyOn(controller, 'applyFilters');
controller._category = {id: 1, value: 'My Category'};
controller._type = {id: 1, value: 'My type'};
controller._categoryId = 1;
controller._typeId = 1;
controller.tags = [{tagFk: 1, value: 'Blue'}];
controller.remove(0);
@ -159,9 +159,9 @@ describe('Order', () => {
describe('updateStateParams()', () => {
it(`should call state go() method passing category and type state params`, () => {
spyOn(controller.$state, 'go');
controller._category = {id: 1, value: 'My Category'};
controller._type = {id: 1, value: 'My type'};
let result = {category: '{"id":1,"value":"My Category"}', type: '{"id":1,"value":"My type"}'};
controller._categoryId = 2;
controller._typeId = 4;
let result = {categoryId: 2, typeId: 4};
controller.updateStateParams();
expect(controller.$state.go).toHaveBeenCalledWith('my.current.state', result);

4
modules/order/front/filter/style.scss
View File

@ -14,6 +14,10 @@ vn-catalog-filter > div {
align-items: flex-start;
flex-wrap: wrap;
vn-autocomplete[vn-id="category"] {
display: none
}
& > vn-one {
padding: $spacing-sm;
min-width: 33.33%;

2
modules/order/front/routes.json
View File

@ -41,7 +41,7 @@
"order": "$ctrl.order"
}
}, {
"url": "/catalog?category&type",
"url": "/catalog?categoryId&typeId",
"state": "order.card.catalog",
"component": "vn-order-catalog",
"description": "Catalog",