diff --git a/client/client/src/credit/index/index.html b/client/client/src/credit/index/index.html
index 4e1b0e03f..06e87036e 100644
--- a/client/client/src/credit/index/index.html
+++ b/client/client/src/credit/index/index.html
@@ -23,7 +23,6 @@
-
diff --git a/client/client/src/greuge/index/index.html b/client/client/src/greuge/index/index.html
index eafd04ef8..7a9f7dc2e 100644
--- a/client/client/src/greuge/index/index.html
+++ b/client/client/src/greuge/index/index.html
@@ -31,7 +31,6 @@
-
diff --git a/client/client/src/invoice/index.html b/client/client/src/invoice/index.html
index 5650a193a..5930e6ce8 100644
--- a/client/client/src/invoice/index.html
+++ b/client/client/src/invoice/index.html
@@ -31,5 +31,4 @@
-
\ No newline at end of file
diff --git a/client/client/src/mandate/index.html b/client/client/src/mandate/index.html
index 429d8eb93..2feadb886 100644
--- a/client/client/src/mandate/index.html
+++ b/client/client/src/mandate/index.html
@@ -27,5 +27,4 @@
-
\ No newline at end of file
diff --git a/client/client/src/recovery/index/index.html b/client/client/src/recovery/index/index.html
index 985fd42a2..cabbf4ce9 100644
--- a/client/client/src/recovery/index/index.html
+++ b/client/client/src/recovery/index/index.html
@@ -31,7 +31,6 @@
-
diff --git a/client/core/src/components/auto-paging/auto-paging.html b/client/core/src/components/auto-paging/auto-paging.html
deleted file mode 100644
index eee5ec1f4..000000000
--- a/client/core/src/components/auto-paging/auto-paging.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/client/core/src/components/auto-paging/auto-paging.js b/client/core/src/components/auto-paging/auto-paging.js
deleted file mode 100644
index 3278e6869..000000000
--- a/client/core/src/components/auto-paging/auto-paging.js
+++ /dev/null
@@ -1,123 +0,0 @@
-import ngModule from '../../module';
-import getWatchers from '../../lib/get-watchers';
-
-class AutoPaging {
- constructor($http, $window, $element, $timeout, vnApp, $translate, $scope) {
- this.$http = $http;
- this.$window = $window;
- this.$element = $element;
- this.$timeout = $timeout;
- this.vnApp = vnApp;
- this.$translate = $translate;
- this.$scope = $scope;
-
- this.numPerPage = null;
- this.maxItems = 0;
- this.watchScroll = false;
- this.waitingNewPage = false;
-
- this.handlerScroll = this.onScroll.bind(this);
- }
-
- get numPages() {
- return this.numPerPage ? Math.ceil(this.maxItems / this.numPerPage) : 0;
- }
-
- loadNewPage() {
- this.index.filter.page++;
- this.waitingNewPage = true;
-
- this.index.accept().then(res => {
- this.$timeout(() => {
- res.instances.forEach(item => {
- this.items.push(item);
- });
- this.$scope.$apply();
- this.checkWatchers();
- });
- if (this.index.filter.page == this.numPages) {
- this.cancelScroll();
- }
- this.waitingNewPage = false;
- });
- }
-
- checkPosition() {
- let element = this.$element[0].querySelector('vn-spinner');
- let position = element.getBoundingClientRect();
- let isVisible = position.y < document.body.offsetHeight + 150;
- if (this.currentPage < this.numPages && isVisible && !this.waitingNewPage) {
- this.loadNewPage();
- }
- }
-
- onScroll() {
- this.checkPosition();
- }
-
- startScroll() {
- this.watchScroll = true;
- this.checkPosition();
- let mainView = this.$window.document.querySelector('.main-view > ui-view.ng-scope');
- angular.element(mainView).bind("scroll", this.handlerScroll);
- }
-
- cancelScroll() {
- this.watchScroll = false;
- let mainView = this.$window.document.querySelector('.main-view > ui-view.ng-scope');
- angular.element(mainView).unbind("scroll", this.handlerScroll);
- }
-
- checkScroll() {
- if (this.numPages > this.currentPage && !this.watchScroll) {
- this.startScroll();
- } else if (this.numPages <= this.currentPage && this.watchScroll) {
- this.cancelScroll();
- }
- }
-
- checkWatchers() {
- let watchers = getWatchers();
- if (watchers > 3000 && this.watchScroll) {
- this.cancelScroll();
- this.vnApp.showMessage(
- this.$translate.instant('Auto-scroll interrupted, please adjust the search')
- );
- }
- }
-
- $onChanges(changes) {
- if (!this.index) return;
-
- this.numPerPage = this.index.filter.size;
- this.currentPage = this.index.filter.page;
- this.currentInstances = this.items;
- if (changes.total)
- this.maxItems = changes.total.currentValue;
-
- this.checkScroll();
- }
-
- $postLink() {
- this.checkScroll();
- }
-
- $doCheck() {
- if (this.index && this.index.filter && this.index.filter.page && this.index.filter.page != this.currentPage) {
- this.currentPage = this.index.filter.page;
- this.checkScroll();
- }
- }
-}
-
-AutoPaging.$inject = ['$http', '$window', '$element', '$timeout', 'vnApp', '$translate', '$scope'];
-
-ngModule.component('vnAutoPaging', {
- template: require('./auto-paging.html'),
- bindings: {
- index: '<',
- total: '<',
- items: '<'
- },
- controller: AutoPaging
-});
diff --git a/client/core/src/components/auto-paging/auto-paging.spec.js b/client/core/src/components/auto-paging/auto-paging.spec.js
deleted file mode 100644
index e5070ffbb..000000000
--- a/client/core/src/components/auto-paging/auto-paging.spec.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import './auto-paging.js';
-import template from './auto-paging.html';
-
-describe('Component vnAutoPaging', () => {
- let $http;
- let $window;
- let $element;
- let $timeout;
- let controller;
-
- beforeEach(() => {
- angular.mock.module('client');
- });
-
- beforeEach(angular.mock.inject((_$componentController_, _$httpBackend_, _$window_, _$timeout_) => {
- $http = _$httpBackend_;
- $window = _$window_;
- $timeout = _$timeout_;
- $element = angular.element(`${template}
`);
-
- controller = _$componentController_('vnAutoPaging', {$http, $window, $element, $timeout});
- }));
-
- describe('onChanges: actions when index object changes', () => {
- beforeEach(() => {
- controller.index = {
- filter: {
- size: 5,
- page: 1
- }
- };
- controller.items = [1, 2, 3, 4, 5];
- });
-
- it('call startScroll() if there are pages to load', () => {
- let changes = {
- total: {
- currentValue: 20
- }
- };
- spyOn(controller, 'startScroll');
-
- controller.$onChanges(changes);
-
- expect(controller.startScroll).toHaveBeenCalled();
- });
-
- it('call stopScroll() if there are not pages to load', () => {
- let changes = {
- total: {
- currentValue: 5
- }
- };
- controller.watchScroll = true;
- spyOn(controller, 'cancelScroll');
- controller.$onChanges(changes);
-
- expect(controller.cancelScroll).toHaveBeenCalled();
- });
- });
-});
diff --git a/client/core/src/components/index.js b/client/core/src/components/index.js
index 9bb724773..b1e5ed252 100644
--- a/client/core/src/components/index.js
+++ b/client/core/src/components/index.js
@@ -34,7 +34,6 @@ import './float-button/float-button';
import './step-control/step-control';
import './label-value/label-value';
import './paging/paging';
-import './auto-paging/auto-paging';
import './pagination/pagination';
import './searchbar/searchbar';
import './table';
diff --git a/client/core/src/components/pagination/pagination.js b/client/core/src/components/pagination/pagination.js
index 604e37b01..68c1b3d71 100644
--- a/client/core/src/components/pagination/pagination.js
+++ b/client/core/src/components/pagination/pagination.js
@@ -14,7 +14,7 @@ import './style.scss';
class Pagination extends Component {
constructor($element, $scope) {
super($element, $scope);
- this.scrollOffset = 20;
+ this.scrollOffset = 150;
this.scrollHandler = e => this.onScroll(e);
}
diff --git a/client/item/src/diary/index.html b/client/item/src/diary/index.html
index 321082d40..3cb1a22da 100644
--- a/client/item/src/diary/index.html
+++ b/client/item/src/diary/index.html
@@ -45,5 +45,4 @@
-
diff --git a/client/item/src/history/index.html b/client/item/src/history/index.html
index f6bdc9ae2..fe975966d 100644
--- a/client/item/src/history/index.html
+++ b/client/item/src/history/index.html
@@ -25,5 +25,4 @@
-
diff --git a/client/item/src/last-entries/index.html b/client/item/src/last-entries/index.html
index 1a2735a32..cabf821b3 100644
--- a/client/item/src/last-entries/index.html
+++ b/client/item/src/last-entries/index.html
@@ -64,5 +64,4 @@
-
diff --git a/client/ticket/src/component/index.html b/client/ticket/src/component/index.html
index 11d600bb7..67af10bd9 100644
--- a/client/ticket/src/component/index.html
+++ b/client/ticket/src/component/index.html
@@ -67,7 +67,6 @@
-
diff --git a/client/ticket/src/expedition/index.html b/client/ticket/src/expedition/index.html
index 8da3bbfb5..a7908559a 100644
--- a/client/ticket/src/expedition/index.html
+++ b/client/ticket/src/expedition/index.html
@@ -40,6 +40,5 @@
-
-
+
diff --git a/client/ticket/src/sale-checked/index.html b/client/ticket/src/sale-checked/index.html
index 00de7cec2..6d68a0d7d 100644
--- a/client/ticket/src/sale-checked/index.html
+++ b/client/ticket/src/sale-checked/index.html
@@ -33,6 +33,5 @@
-
-
+
diff --git a/client/ticket/src/tracking/index/index.html b/client/ticket/src/tracking/index/index.html
index 0f7f4af2e..4372c4ade 100644
--- a/client/ticket/src/tracking/index/index.html
+++ b/client/ticket/src/tracking/index/index.html
@@ -23,8 +23,7 @@
-
-
+
\ No newline at end of file
diff --git a/client/ticket/src/volume/index.html b/client/ticket/src/volume/index.html
index 9bab229d6..011cd41aa 100644
--- a/client/ticket/src/volume/index.html
+++ b/client/ticket/src/volume/index.html
@@ -37,7 +37,6 @@
-
-
+
diff --git a/services/loopback/common/locale/en.json b/services/loopback/common/locale/en.json
index be28c8810..99a93c53a 100644
--- a/services/loopback/common/locale/en.json
+++ b/services/loopback/common/locale/en.json
@@ -22,5 +22,6 @@
"Name cannot be blank": "Name cannot be blank",
"Phone cannot be blank": "Phone cannot be blank",
"ValidationError: La instancia `ClientContact` no es válida. Detalles: `name` Name cannot be blank (value: null).": "ValidationError: La instancia `ClientContact` no es válida. Detalles: `name` Name cannot be blank (value: null).",
- "La instancia `ClientContact` no es válida. Detalles: `name` Name cannot be blank (value: null).": "La instancia `ClientContact` no es válida. Detalles: `name` Name cannot be blank (value: null)."
+ "La instancia `ClientContact` no es válida. Detalles: `name` Name cannot be blank (value: null).": "La instancia `ClientContact` no es válida. Detalles: `name` Name cannot be blank (value: null).",
+ "Observation type cannot be blank": "Observation type cannot be blank"
}
\ No newline at end of file