@@ -30,4 +35,4 @@
-
+
\ No newline at end of file
diff --git a/client/client/src/index/index.js b/client/client/src/index/index.js
index 57a109c03..175ddb7d2 100644
--- a/client/client/src/index/index.js
+++ b/client/client/src/index/index.js
@@ -2,23 +2,42 @@ import ngModule from '../module';
import './item-client';
export default class Controller {
-
constructor($scope) {
- this.$scope = $scope;
+ this.$ = $scope;
this.clientSelected = null;
}
- search(index) {
- index.accept();
- /* this.clients = [];
- index.accept().then(res => {
- this.clients = res.instances;
- }); */
+ exprBuilder(param, value) {
+ switch (param) {
+ case 'search':
+ return {
+ or: [
+ {id: value},
+ {name: {regexp: value}}
+ ]
+ };
+ case 'phone':
+ return {
+ or: [
+ {phone: value},
+ {mobile: value}
+ ]
+ };
+ case 'name':
+ case 'socialName':
+ case 'city':
+ return {[param]: {regexp: value}};
+ case 'id':
+ case 'fi':
+ case 'postcode':
+ case 'email':
+ return {[param]: value};
+ }
}
openSummary(client) {
this.clientSelected = client;
- this.$scope.dialogSummaryClient.show();
+ this.$.dialogSummaryClient.show();
}
}
Controller.$inject = ['$scope'];
diff --git a/client/client/src/index/locale/es.yml b/client/client/src/index/locale/es.yml
index c221de7f6..97ad69ac3 100644
--- a/client/client/src/index/locale/es.yml
+++ b/client/client/src/index/locale/es.yml
@@ -2,4 +2,5 @@ Client id: Id cliente
Phone: Teléfono
Town/City: Ciudad
Email: Correo electrónico
-Create client: Crear cliente
\ No newline at end of file
+Create client: Crear cliente
+View client: Ver cliente
\ No newline at end of file
diff --git a/client/client/src/search-panel/index.html b/client/client/src/search-panel/index.html
index 2cb6a5aeb..de772afe3 100644
--- a/client/client/src/search-panel/index.html
+++ b/client/client/src/search-panel/index.html
@@ -1,22 +1,22 @@
\ No newline at end of file
diff --git a/client/core/src/components/pagination/pagination.js b/client/core/src/components/pagination/pagination.js
new file mode 100644
index 000000000..604e37b01
--- /dev/null
+++ b/client/core/src/components/pagination/pagination.js
@@ -0,0 +1,75 @@
+import ngModule from '../../module';
+import Component from '../../lib/component';
+import './style.scss';
+
+/**
+ * Pagination component that automatically loads more rows when
+ * the user scrolls down an element.
+ *
+ * @property {CrudModel} model The model used for pagination
+ * @property {String} scrollSelector The the scrollable element selector
+ * @property {HTMLElement} scrollElement The scrollable element
+ * @property {Number} scrollOffset The distance, in pixels, until the end that activates the loading of the next rows
+ */
+class Pagination extends Component {
+ constructor($element, $scope) {
+ super($element, $scope);
+ this.scrollOffset = 20;
+ this.scrollHandler = e => this.onScroll(e);
+ }
+
+ $onInit() {
+ if (!this._scrollElement)
+ this.scrollElement = document.body;
+ }
+
+ set scrollSelector(value) {
+ this._scrollSelector = value;
+ this.scrollElement = document.querySelector(value);
+ }
+
+ get scrollSelector() {
+ return this._scrollSelector;
+ }
+
+ set scrollElement(value) {
+ if (this._scrollElement)
+ this._scrollElement.removeEventListener('scroll', this.scrollHandler);
+
+ this._scrollElement = value;
+
+ if (value)
+ this._scrollElement.addEventListener('scroll', this.scrollHandler);
+ }
+
+ get scrollElement() {
+ return this._scrollElement;
+ }
+
+ onScroll() {
+ let scrollElement = this.scrollElement;
+ let shouldLoad =
+ scrollElement.scrollTop + scrollElement.clientHeight >= (scrollElement.scrollHeight - this.scrollOffset)
+ && !this.model.isLoading;
+
+ if (shouldLoad) {
+ this.model.loadMore();
+ this.$.$apply();
+ }
+ }
+
+ $onDestroy() {
+ this.scrollElement = null;
+ }
+}
+
+ngModule.component('vnPagination', {
+ template: require('./pagination.html'),
+ bindings: {
+ model: '<',
+ scrollSelector: '@?',
+ scrollElement: ' div > vn-icon-button {
+ font-size: 2em;
+ }
+}
\ No newline at end of file
diff --git a/client/core/src/components/rest-model/crud-model.js b/client/core/src/components/rest-model/crud-model.js
index 3133257d0..3bdac37c8 100644
--- a/client/core/src/components/rest-model/crud-model.js
+++ b/client/core/src/components/rest-model/crud-model.js
@@ -10,32 +10,80 @@ export default class CrudModel extends ModelProxy {
this.autoLoad = true;
}
+ get isLoading() {
+ return this.canceler != null;
+ }
+
$onInit() {
if (this.autoLoad)
this.refresh();
}
- refresh() {
+ refresh(usFilter, usData) {
if (!this.url) return;
+ let myFilter = {
+ fields: this.fields,
+ where: mergeWhere(this.link, this.where),
+ include: this.include,
+ order: this.order,
+ limit: this.limit,
+ userData: this.userData
+ };
+
let filter = this.filter;
+ filter = mergeFilters(myFilter, filter);
+ filter = mergeFilters(usFilter, filter);
+ return this.sendRequest(filter);
+ }
- if (!filter) {
- let where = Object.assign({}, this.link, this.where);
- filter = {
- fields: this.fields,
- where: where,
- include: this.include,
- order: this.order,
- limit: this.limit
- };
+ cancelRequest() {
+ if (this.canceler) {
+ this.canceler.resolve();
+ this.canceler = null;
}
+ }
- let urlFilter = encodeURIComponent(JSON.stringify(filter));
+ sendRequest(filter, append) {
+ this.cancelRequest();
+ this.canceler = this.$q.defer();
+ let options = {timeout: this.canceler.promise};
+ let json = encodeURIComponent(JSON.stringify(filter));
+ return this.$http.get(`${this.url}?filter=${json}`, options).then(
+ json => this.onRemoteDone(json, filter, append),
+ json => this.onRemoteError(json)
+ );
+ }
- return this.$http.get(`${this.url}?filter=${urlFilter}`).then(res => {
- this.orgData = res.data;
- });
+ onRemoteDone(json, filter, append) {
+ let data = json.data;
+
+ if (append)
+ this.orgData = this.orgData.concat(data);
+ else
+ this.orgData = data;
+
+ this.currentFilter = filter;
+ this.moreRows = filter.limit && data.length == filter.limit;
+ this.onRequestEnd();
+ this.dataChanged();
+ }
+
+ onRemoteError(err) {
+ this.onRequestEnd();
+ throw err;
+ }
+
+ onRequestEnd() {
+ this.canceler = null;
+ }
+
+ loadMore() {
+ if (this.moreRows) {
+ let filter = Object.assign({}, this.currentFilter);
+ filter.skip = (filter.skip || 0) + filter.limit;
+ this.sendRequest(filter, true);
+ }
}
getChanges() {
@@ -97,7 +145,87 @@ ngModule.component('vnCrudModel', {
order: '@?',
limit: ' 1 ? {and} : and[0];
+}
+
+/**
+ * Merges two loopback filters returning the merged filter.
+ *
+ * @param {Object} src The source filter
+ * @param {Object} dst The destination filter
+ * @return {Object} The result filter
+ */
+function mergeFilters(src, dst) {
+ let res = Object.assign({}, dst);
+
+ if (!src)
+ return res;
+
+ if (src.fields)
+ res.fields = mergeFields(src.fields, res.fields);
+ if (src.where)
+ res.where = mergeWhere(res.where, src.where);
+ if (src.include)
+ res.include = src.include;
+ if (src.order)
+ res.order = src.order;
+ if (src.limit)
+ res.limit = src.limit;
+ if (src.userData)
+ res.userData = src.userData;
+
+ return res;
+}
diff --git a/client/core/src/components/searchbar/search-panel.js b/client/core/src/components/searchbar/search-panel.js
new file mode 100644
index 000000000..96dc67ed5
--- /dev/null
+++ b/client/core/src/components/searchbar/search-panel.js
@@ -0,0 +1,18 @@
+import Component from '../../lib/component';
+
+export default class extends Component {
+ set filter(value) {
+ this.$.filter = value;
+ }
+
+ get filter() {
+ return this.$.filter;
+ }
+
+ onSearch() {
+ if (!this.onSubmit)
+ throw new Error('SearchPanel::onSubmit() method not defined');
+
+ this.onSubmit(this.filter);
+ }
+}
diff --git a/client/salix/src/components/searchbar/searchbar.html b/client/core/src/components/searchbar/searchbar.html
similarity index 73%
rename from client/salix/src/components/searchbar/searchbar.html
rename to client/core/src/components/searchbar/searchbar.html
index 72d5dad90..9bc053f1b 100644
--- a/client/salix/src/components/searchbar/searchbar.html
+++ b/client/core/src/components/searchbar/searchbar.html
@@ -5,11 +5,11 @@
ng-click="$ctrl.clearFilter(); $ctrl.onSubmit()"
style="cursor: pointer; padding-top: 23px">