Skip to content
This repository was archived by the owner on Nov 25, 2020. It is now read-only.

Commit 0decc1e

Browse files
RWOverdijkRWOverdijk
authored
Merge pull request #12 from VMBindraban/feature/styling
fix(styling): fix styling
2 parents 53ad584 + 9210ef3 commit 0decc1e

File tree

22 files changed

+286
-99
lines changed

22 files changed

+286
-99
lines changed

‎dist/amd/bootstrap/filter.html‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
<template>
3-
<div repeat.for="filter of filters" class="filters row">
3+
<div repeat.for="filter of filters" class="filters">
44
<div repeat.for="field of filter">
5-
<div class="row col-md-12">
5+
<div class="col-md-12">
66
<div class="col-md-4">
77
<form-field
88
change.delegate="onChange($parent.$index, $index) & debounce:200"
@@ -45,8 +45,16 @@
4545
</div>
4646
</div>
4747

48-
<div if.bind="field.data.operator === 'between'" class="row col-md-12">
49-
<div class="col-md-offset-8 col-md-4" style="margin-bottom: 15px;">
48+
<div if.bind="field.data.operator === 'between'" class="col-md-12">
49+
<div class="col-md-4">
50+
<input type="text" class="form-control disabled" disabled>
51+
</div>
52+
53+
<div class="col-md-4">
54+
<input type="text" class="form-control disabled" disabled value="and" t="[value]and">
55+
</div>
56+
57+
<div class="col-md-4" style="margin-bottom: 15px;">
5058
<form-field
5159
keypress.delegate="onChange($parent.$index, $index, true) & debounce:500"
5260
value.bind="field.data.between"
@@ -56,17 +64,17 @@
5664
</div>
5765
</div>
5866

59-
<div class="row col-md-12">
67+
<div class="col-md-12">
6068
<div class="col-md-offset-4 col-md-4">
6169
<div class="btn-group btn-group btn-group-justified">
6270
<a
63-
class="btn btn-primary add-block"
71+
class="btn btn-primary add-block btn-sm"
6472
if.bind="$last"
6573
click.delegate="create()"
6674
t="+ Or">+
6775
</a>
6876
<a
69-
class="btn btn-danger remove-block"
77+
class="btn btn-danger remove-block btn-sm"
7078
if.bind="filters.length > 1"
7179
click.delegate="destroy($index)"
7280
t="- Or">-;
@@ -75,8 +83,10 @@
7583
</div>
7684
</div>
7785

78-
<div class="row col-md-12" if.bind="!$last">
86+
<div class="col-md-12" if.bind="!$last">
7987
<hr>
8088
</div>
89+
90+
<div class="clearfix"></div>
8191
</div>
8292
</template>

‎dist/amd/criteriaBuilder.js‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ define(['exports', 'extend'], function (exports, _extend) {
2626

2727
var blocks = [];
2828

29+
this.populate = [];
30+
2931
this.filters.forEach(function (block, index) {
3032
var filtersParsed = {};
3133

@@ -43,7 +45,9 @@ define(['exports', 'extend'], function (exports, _extend) {
4345
var criteriaWhere = blocks.length > 1 ? { where: { or: blocks } } : { where: blocks[0] };
4446
var currentSort = this.criteria.sort || {};
4547

46-
this.criteria = Object.assign(criteriaWhere, { sort: currentSort });
48+
this.criteria = Object.assign(criteriaWhere, { sort: currentSort, populate: this.populate.join(',') });
49+
50+
console.log(this.criteria);
4751
};
4852

4953
CriteriaBuilder.prototype.parseOperator = function parseOperator(filter) {
@@ -81,17 +85,21 @@ define(['exports', 'extend'], function (exports, _extend) {
8185
};
8286

8387
CriteriaBuilder.prototype.parseField = function parseField(fieldName, data) {
84-
var _ref4;
88+
var _fieldName$, _ref4;
8589

8690
fieldName = fieldName.split('.');
8791

88-
if (fieldName.length > 1) {
89-
var _fieldName$, _ref3;
92+
if (fieldName.length === 1) {
93+
var _ref3;
94+
95+
return _ref3 = {}, _ref3[fieldName[0]] = data, _ref3;
96+
}
9097

91-
return _ref3 = {}, _ref3[fieldName[0]] = (_fieldName$ = {}, _fieldName$[fieldName[1]] = data, _fieldName$), _ref3;
98+
if (this.populate.indexOf(fieldName[0]) < 0) {
99+
this.populate.push(fieldName[0]);
92100
}
93101

94-
return _ref4 = {}, _ref4[fieldName[0]] = data, _ref4;
102+
return _ref4 = {}, _ref4[fieldName[0]] = (_fieldName$ = {}, _fieldName$[fieldName[1]] = data, _fieldName$), _ref4;
95103
};
96104

97105
CriteriaBuilder.prototype.toArray = function toArray(value) {

‎dist/amd/filter.js‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ define(['exports', 'aurelia-framework', 'aurelia-view-manager', './criteriaBuild
7575
throw new Error('Decorating class property failed. Please ensure that transform-class-properties is enabled.');
7676
}
7777

78-
var _dec, _dec2, _dec3, _class, _desc, _value, _class2, _descriptor, _descriptor2, _descriptor3;
78+
var _dec, _dec2, _dec3, _class, _desc, _value, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4;
7979

8080
var Filter = exports.Filter = (_dec = (0, _aureliaFramework.customElement)('filter'), _dec2 = (0, _aureliaViewManager.resolvedView)('spoonx/filter', 'filter'), _dec3 = (0, _aureliaFramework.bindable)({ defaultBindingMode: _aureliaFramework.bindingMode.twoWay }), _dec(_class = _dec2(_class = (_class2 = function (_CriteriaBuilder) {
8181
_inherits(Filter, _CriteriaBuilder);
@@ -91,6 +91,8 @@ define(['exports', 'aurelia-framework', 'aurelia-view-manager', './criteriaBuild
9191

9292
_initDefineProp(_this, 'entity', _descriptor3, _this);
9393

94+
_initDefineProp(_this, 'excludeColumns', _descriptor4, _this);
95+
9496
_this.filters = [];
9597
_this.fieldElement = {
9698
key: 'field',
@@ -276,9 +278,15 @@ define(['exports', 'aurelia-framework', 'aurelia-view-manager', './criteriaBuild
276278
};
277279

278280
Filter.prototype.generateFields = function generateFields(columns, entityName) {
281+
var excludeColumns = this.excludeColumns ? this.excludeColumns.replace(/\s/g, '').split(',') : [];
282+
279283
for (var column in columns) {
280284
var columnName = entityName ? entityName + '.' + column : column;
281285

286+
if (excludeColumns.indexOf(columnName) > -1) {
287+
continue;
288+
}
289+
282290
this.columns.push({
283291
name: columnName,
284292
value: columnName,
@@ -303,5 +311,8 @@ define(['exports', 'aurelia-framework', 'aurelia-view-manager', './criteriaBuild
303311
initializer: function initializer() {
304312
return null;
305313
}
314+
}), _descriptor4 = _applyDecoratedDescriptor(_class2.prototype, 'excludeColumns', [_aureliaFramework.bindable], {
315+
enumerable: true,
316+
initializer: null
306317
})), _class2)) || _class) || _class);
307318
});

‎dist/aurelia-filter.d.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ export declare class Filter extends CriteriaBuilder {
1414
criteria: any;
1515
columns: any;
1616
entity: any;
17+
excludeColumns: any;
1718
filters: any;
1819
fieldElement: any;
1920
operatorElement: any;

‎dist/bootstrap/filter.html‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
<template>
3-
<div repeat.for="filter of filters" class="filters row">
3+
<div repeat.for="filter of filters" class="filters">
44
<div repeat.for="field of filter">
5-
<div class="row col-md-12">
5+
<div class="col-md-12">
66
<div class="col-md-4">
77
<form-field
88
change.delegate="onChange($parent.$index, $index) & debounce:200"
@@ -45,8 +45,16 @@
4545
</div>
4646
</div>
4747

48-
<div if.bind="field.data.operator === 'between'" class="row col-md-12">
49-
<div class="col-md-offset-8 col-md-4" style="margin-bottom: 15px;">
48+
<div if.bind="field.data.operator === 'between'" class="col-md-12">
49+
<div class="col-md-4">
50+
<input type="text" class="form-control disabled" disabled>
51+
</div>
52+
53+
<div class="col-md-4">
54+
<input type="text" class="form-control disabled" disabled value="and" t="[value]and">
55+
</div>
56+
57+
<div class="col-md-4" style="margin-bottom: 15px;">
5058
<form-field
5159
keypress.delegate="onChange($parent.$index, $index, true) & debounce:500"
5260
value.bind="field.data.between"
@@ -56,17 +64,17 @@
5664
</div>
5765
</div>
5866

59-
<div class="row col-md-12">
67+
<div class="col-md-12">
6068
<div class="col-md-offset-4 col-md-4">
6169
<div class="btn-group btn-group btn-group-justified">
6270
<a
63-
class="btn btn-primary add-block"
71+
class="btn btn-primary add-block btn-sm"
6472
if.bind="$last"
6573
click.delegate="create()"
6674
t="+ Or">+
6775
</a>
6876
<a
69-
class="btn btn-danger remove-block"
77+
class="btn btn-danger remove-block btn-sm"
7078
if.bind="filters.length > 1"
7179
click.delegate="destroy($index)"
7280
t="- Or">-;
@@ -75,8 +83,10 @@
7583
</div>
7684
</div>
7785

78-
<div class="row col-md-12" if.bind="!$last">
86+
<div class="col-md-12" if.bind="!$last">
7987
<hr>
8088
</div>
89+
90+
<div class="clearfix"></div>
8191
</div>
8292
</template>

‎dist/commonjs/bootstrap/filter.html‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
<template>
3-
<div repeat.for="filter of filters" class="filters row">
3+
<div repeat.for="filter of filters" class="filters">
44
<div repeat.for="field of filter">
5-
<div class="row col-md-12">
5+
<div class="col-md-12">
66
<div class="col-md-4">
77
<form-field
88
change.delegate="onChange($parent.$index, $index) & debounce:200"
@@ -45,8 +45,16 @@
4545
</div>
4646
</div>
4747

48-
<div if.bind="field.data.operator === 'between'" class="row col-md-12">
49-
<div class="col-md-offset-8 col-md-4" style="margin-bottom: 15px;">
48+
<div if.bind="field.data.operator === 'between'" class="col-md-12">
49+
<div class="col-md-4">
50+
<input type="text" class="form-control disabled" disabled>
51+
</div>
52+
53+
<div class="col-md-4">
54+
<input type="text" class="form-control disabled" disabled value="and" t="[value]and">
55+
</div>
56+
57+
<div class="col-md-4" style="margin-bottom: 15px;">
5058
<form-field
5159
keypress.delegate="onChange($parent.$index, $index, true) & debounce:500"
5260
value.bind="field.data.between"
@@ -56,17 +64,17 @@
5664
</div>
5765
</div>
5866

59-
<div class="row col-md-12">
67+
<div class="col-md-12">
6068
<div class="col-md-offset-4 col-md-4">
6169
<div class="btn-group btn-group btn-group-justified">
6270
<a
63-
class="btn btn-primary add-block"
71+
class="btn btn-primary add-block btn-sm"
6472
if.bind="$last"
6573
click.delegate="create()"
6674
t="+ Or">+
6775
</a>
6876
<a
69-
class="btn btn-danger remove-block"
77+
class="btn btn-danger remove-block btn-sm"
7078
if.bind="filters.length > 1"
7179
click.delegate="destroy($index)"
7280
t="- Or">-;
@@ -75,8 +83,10 @@
7583
</div>
7684
</div>
7785

78-
<div class="row col-md-12" if.bind="!$last">
86+
<div class="col-md-12" if.bind="!$last">
7987
<hr>
8088
</div>
89+
90+
<div class="clearfix"></div>
8191
</div>
8292
</template>

‎dist/commonjs/criteriaBuilder.js‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ var CriteriaBuilder = exports.CriteriaBuilder = function () {
2323

2424
var blocks = [];
2525

26+
this.populate = [];
27+
2628
this.filters.forEach(function (block, index) {
2729
var filtersParsed = {};
2830

@@ -40,7 +42,9 @@ var CriteriaBuilder = exports.CriteriaBuilder = function () {
4042
var criteriaWhere = blocks.length > 1 ? { where: { or: blocks } } : { where: blocks[0] };
4143
var currentSort = this.criteria.sort || {};
4244

43-
this.criteria = Object.assign(criteriaWhere, { sort: currentSort });
45+
this.criteria = Object.assign(criteriaWhere, { sort: currentSort, populate: this.populate.join(',') });
46+
47+
console.log(this.criteria);
4448
};
4549

4650
CriteriaBuilder.prototype.parseOperator = function parseOperator(filter) {
@@ -78,17 +82,21 @@ var CriteriaBuilder = exports.CriteriaBuilder = function () {
7882
};
7983

8084
CriteriaBuilder.prototype.parseField = function parseField(fieldName, data) {
81-
var _ref4;
85+
var _fieldName$, _ref4;
8286

8387
fieldName = fieldName.split('.');
8488

85-
if (fieldName.length > 1) {
86-
var _fieldName$, _ref3;
89+
if (fieldName.length === 1) {
90+
var _ref3;
91+
92+
return _ref3 = {}, _ref3[fieldName[0]] = data, _ref3;
93+
}
8794

88-
return _ref3 = {}, _ref3[fieldName[0]] = (_fieldName$ = {}, _fieldName$[fieldName[1]] = data, _fieldName$), _ref3;
95+
if (this.populate.indexOf(fieldName[0]) < 0) {
96+
this.populate.push(fieldName[0]);
8997
}
9098

91-
return _ref4 = {}, _ref4[fieldName[0]] = data, _ref4;
99+
return _ref4 = {}, _ref4[fieldName[0]] = (_fieldName$ = {}, _fieldName$[fieldName[1]] = data, _fieldName$), _ref4;
92100
};
93101

94102
CriteriaBuilder.prototype.toArray = function toArray(value) {

‎dist/commonjs/filter.js‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
55
});
66
exports.Filter = undefined;
77

8-
var _dec, _dec2, _dec3, _class, _desc, _value, _class2, _descriptor, _descriptor2, _descriptor3;
8+
var _dec, _dec2, _dec3, _class, _desc, _value, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4;
99

1010
var _aureliaFramework = require('aurelia-framework');
1111

@@ -76,6 +76,8 @@ var Filter = exports.Filter = (_dec = (0, _aureliaFramework.customElement)('filt
7676

7777
_initDefineProp(_this, 'entity', _descriptor3, _this);
7878

79+
_initDefineProp(_this, 'excludeColumns', _descriptor4, _this);
80+
7981
_this.filters = [];
8082
_this.fieldElement = {
8183
key: 'field',
@@ -261,9 +263,15 @@ var Filter = exports.Filter = (_dec = (0, _aureliaFramework.customElement)('filt
261263
};
262264

263265
Filter.prototype.generateFields = function generateFields(columns, entityName) {
266+
var excludeColumns = this.excludeColumns ? this.excludeColumns.replace(/\s/g, '').split(',') : [];
267+
264268
for (var column in columns) {
265269
var columnName = entityName ? entityName + '.' + column : column;
266270

271+
if (excludeColumns.indexOf(columnName) > -1) {
272+
continue;
273+
}
274+
267275
this.columns.push({
268276
name: columnName,
269277
value: columnName,
@@ -288,4 +296,7 @@ var Filter = exports.Filter = (_dec = (0, _aureliaFramework.customElement)('filt
288296
initializer: function initializer() {
289297
return null;
290298
}
299+
}), _descriptor4 = _applyDecoratedDescriptor(_class2.prototype, 'excludeColumns', [_aureliaFramework.bindable], {
300+
enumerable: true,
301+
initializer: null
291302
})), _class2)) || _class) || _class);

0 commit comments

Comments
 (0)