Merge branch 'dev' of https://git.verdnatura.es/salix into dev
This commit is contained in:
commit
80a3f0a914
|
|
@ -14,11 +14,11 @@
|
|||
<vn-horizontal
|
||||
class="list list-element text-center"
|
||||
pad-small-bottom
|
||||
ng-repeat="greuge in index.model.instances track by greuge.id">
|
||||
<vn-one pad-medium-h>{{::greuge.shipped | date:'dd/MM/yyyy HH:mm' }}</vn-one>
|
||||
<vn-two pad-medium-h>{{::greuge.description}}</vn-two>
|
||||
<vn-one pad-medium-h>{{::greuge.amount | number:2}} €</vn-one>
|
||||
<vn-one pad-medium-h>{{::greuge.greugeType.name}}</vn-one>
|
||||
ng-repeat="greuge in $ctrl.instances track by $index">
|
||||
<vn-one pad-medium-h>{{greuge.shipped | date:'dd/MM/yyyy HH:mm' }}</vn-one>
|
||||
<vn-two pad-medium-h>{{greuge.description}}</vn-two>
|
||||
<vn-one pad-medium-h>{{greuge.amount | number:2}} €</vn-one>
|
||||
<vn-one pad-medium-h>{{greuge.greugeType.name}}</vn-one>
|
||||
</vn-horizontal>
|
||||
</vn-one>
|
||||
<vn-one class="text-center pad-small-v" ng-if="index.model.count === 0" translate>No results</vn-one>
|
||||
|
|
@ -28,7 +28,8 @@
|
|||
<vn-one pad-medium-h ng-if="index.model.count > 0">{{edit.model.sumAmount | number:2}} €</vn-one>
|
||||
<vn-one pad-medium-h></vn-one>
|
||||
</vn-horizontal>
|
||||
<vn-paging margin-large-top vn-one index="index" total="index.model.count"></vn-paging>
|
||||
<!--<vn-paging margin-large-top vn-one index="index" total="index.model.count"></vn-paging>-->
|
||||
<vn-auto-paging margin-large-top vn-one index="index" total="index.model.count" items="$ctrl.instances"></vn-auto-paging>
|
||||
</vn-vertical>
|
||||
</vn-card>
|
||||
</vn-vertical>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
<vn-horizontal margin-medium-top>
|
||||
<vn-one></vn-one>
|
||||
<vn-auto>
|
||||
<vn-spinner enable="$ctrl.watchScroll"></vn-spinner>
|
||||
</vn-auto>
|
||||
<vn-one></vn-one>
|
||||
</vn-horizontal>
|
||||
|
|
@ -0,0 +1,119 @@
|
|||
import ngModule from '../../module';
|
||||
import getWatchers from '../../lib/get-watchers';
|
||||
|
||||
class AutoPaging {
|
||||
constructor($http, $window, $element, $timeout, vnApp, $translate) {
|
||||
this.$http = $http;
|
||||
this.$window = $window;
|
||||
this.$element = $element;
|
||||
this.$timeout = $timeout;
|
||||
this.vnApp = vnApp;
|
||||
this.$translate = $translate;
|
||||
|
||||
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.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();
|
||||
angular.element(this.$window).bind("wheel", this.handlerScroll);
|
||||
}
|
||||
|
||||
cancelScroll() {
|
||||
this.watchScroll = false;
|
||||
angular.element(this.$window).unbind("wheel", 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'];
|
||||
|
||||
ngModule.component('vnAutoPaging', {
|
||||
template: require('./auto-paging.html'),
|
||||
bindings: {
|
||||
index: '<',
|
||||
total: '<',
|
||||
items: '<'
|
||||
},
|
||||
controller: AutoPaging
|
||||
});
|
||||
|
|
@ -0,0 +1,61 @@
|
|||
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(`<div>${template}</div>`);
|
||||
|
||||
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();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
@ -31,3 +31,4 @@ import './switch/switch';
|
|||
import './float-button/float-button';
|
||||
import './step-control/step-control';
|
||||
import './label-value/label-value';
|
||||
import './auto-paging/auto-paging';
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ export default class FilterList {
|
|||
|
||||
this.waitingMgCrud = 0;
|
||||
this.modelId = $state.params.id;
|
||||
this.instances = [];
|
||||
}
|
||||
onOrder(field, order) {
|
||||
this.filter(`${field} ${order}`);
|
||||
|
|
@ -27,7 +28,9 @@ export default class FilterList {
|
|||
this.$.index.filter.order = order;
|
||||
}
|
||||
|
||||
this.$.index.accept();
|
||||
this.$.index.accept().then(res => {
|
||||
this.instances = res.instances;
|
||||
});
|
||||
} else if (!this.modelId || !this.modelName) {
|
||||
throw new Error('Error: model not found');
|
||||
} else if (this.waitingMgCrud > 3) {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,22 @@
|
|||
function getWatchers(root) {
|
||||
root = angular.element(root || document.documentElement);
|
||||
|
||||
function getElemWatchers(element) {
|
||||
let isolateWatchers = getWatchersFromScope(element.data().$isolateScope);
|
||||
let scopeWatchers = getWatchersFromScope(element.data().$scope);
|
||||
let watchers = scopeWatchers.concat(isolateWatchers);
|
||||
angular.forEach(element.children(), childElement => {
|
||||
watchers = watchers.concat(getElemWatchers(angular.element(childElement)));
|
||||
});
|
||||
return watchers;
|
||||
}
|
||||
|
||||
function getWatchersFromScope(scope) {
|
||||
if (scope)
|
||||
return scope.$$watchers || [];
|
||||
return [];
|
||||
}
|
||||
|
||||
return getElemWatchers(root).length;
|
||||
}
|
||||
export default getWatchers;
|
||||
|
|
@ -12,3 +12,4 @@ import './copy';
|
|||
import './equals';
|
||||
import './modified';
|
||||
import './key-codes';
|
||||
import './get-watchers';
|
||||
|
|
|
|||
|
|
@ -11,3 +11,4 @@ Hide: Hide
|
|||
Next: Next
|
||||
Finalize: Finalize
|
||||
Previous: Back
|
||||
Auto-scroll interrupted, please adjust the search: Auto-scroll interrupted, please adjust the search
|
||||
|
|
@ -11,3 +11,4 @@ Hide: Ocultar
|
|||
Next: Siguiente
|
||||
Finalize: Finalizar
|
||||
Previous: Anterior
|
||||
Auto-scroll interrupted, please adjust the search: Auto-scroll interrumpido, por favor ajusta la búsqueda
|
||||
|
|
@ -15,11 +15,12 @@
|
|||
</vn-card>
|
||||
<vn-card margin-medium-top>
|
||||
<vn-item-product
|
||||
ng-repeat="item in index.model.instances"
|
||||
ng-repeat="item in $ctrl.items track by $index"
|
||||
item="item">
|
||||
</vn-item-product>
|
||||
</vn-card>
|
||||
<vn-paging index="index" total="index.model.count"></vn-paging>
|
||||
<!-- <vn-paging index="index" total="index.model.count"></vn-paging> -->
|
||||
<vn-auto-paging index="index" total="index.model.count" items="$ctrl.items"></vn-auto-paging>
|
||||
</div>
|
||||
</div>
|
||||
<a ui-sref="item.create" vn-bind="+" fixed-bottom-right>
|
||||
|
|
|
|||
|
|
@ -9,9 +9,12 @@ class ItemList {
|
|||
this.$scope = $scope;
|
||||
this.model = {};
|
||||
this.itemSelected = null;
|
||||
this.items = [];
|
||||
}
|
||||
search(index) {
|
||||
index.accept();
|
||||
index.accept().then(res => {
|
||||
this.items = res.instances;
|
||||
});
|
||||
}
|
||||
cloneItem(item) {
|
||||
this.itemSelected = item;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<mg-ajax path="/ticket/api/sales/filter" options="vnIndex"></mg-ajax>
|
||||
<mg-ajax path="/ticket/api/sales/filter" options="vnIndexNonAuto"></mg-ajax>
|
||||
<vn-vertical>
|
||||
<vn-card pad-large>
|
||||
<vn-vertical>
|
||||
|
|
|
|||
|
|
@ -1,9 +1,12 @@
|
|||
import ngModule from '../module';
|
||||
import FilterTicketList from '../filter-ticket-list';
|
||||
|
||||
class Controller {
|
||||
constructor($scope, $timeout) {
|
||||
class Controller extends FilterTicketList {
|
||||
constructor($scope, $timeout, $stateParams) {
|
||||
super($scope, $timeout, $stateParams);
|
||||
this.$ = $scope;
|
||||
this.$timeout = $timeout;
|
||||
this.onOrder('itemFk', 'ASC');
|
||||
}
|
||||
|
||||
showDescriptor(event, itemFk) {
|
||||
|
|
@ -16,7 +19,7 @@ class Controller {
|
|||
}
|
||||
}
|
||||
|
||||
Controller.$inject = ['$scope', '$timeout'];
|
||||
Controller.$inject = ['$scope', '$timeout', '$state'];
|
||||
|
||||
ngModule.component('vnTicketSale', {
|
||||
template: require('./sale.html'),
|
||||
|
|
|
|||
|
|
@ -16,7 +16,11 @@ describe('ticket', () => {
|
|||
$componentController = _$componentController_;
|
||||
$httpBackend = _$httpBackend_;
|
||||
$scope = $rootScope.$new();
|
||||
$scope.index = {model: {instances: [{id: 1}, {id: 2}]}, accept: () => {}};
|
||||
$scope.index = {model: {instances: [{id: 1}, {id: 2}]}, accept: () => {
|
||||
return {
|
||||
then: () => {}
|
||||
};
|
||||
}};
|
||||
$state = _$state_;
|
||||
$state.params.id = 101;
|
||||
controller = $componentController('vnTicketVolume', {$scope: $scope}, {$httpBackend: $httpBackend}, {$state: $state});
|
||||
|
|
|
|||
|
|
@ -52,10 +52,10 @@ describe('Ticket', () => {
|
|||
.getInnerText(selectors.ticketSales.firstSaleText)
|
||||
.then(value => {
|
||||
expect(value).toContain('Color Yellow');
|
||||
expect(value).toContain('2');
|
||||
expect(value).toContain('5');
|
||||
expect(value).toContain('€1.50');
|
||||
expect(value).toContain('0 %');
|
||||
expect(value).toContain('€3.00');
|
||||
expect(value).toContain('€7.50');
|
||||
});
|
||||
});
|
||||
|
||||
|
|
@ -65,10 +65,10 @@ describe('Ticket', () => {
|
|||
.getInnerText(selectors.ticketSales.secondSaleText)
|
||||
.then(value => {
|
||||
expect(value).toContain('Color Yellow');
|
||||
expect(value).toContain('5');
|
||||
expect(value).toContain('2');
|
||||
expect(value).toContain('€1.50');
|
||||
expect(value).toContain('0 %');
|
||||
expect(value).toContain('€7.50');
|
||||
expect(value).toContain('€3.00');
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -435,7 +435,7 @@ gulp.task('docker-build', async () => {
|
|||
} catch (e) {}
|
||||
|
||||
log('Building image...');
|
||||
await execP('docker build -t dblocal:latest ./services/db');
|
||||
log(await execP('docker build -t dblocal:latest ./services/db > ./services/db/docker.log'));
|
||||
});
|
||||
|
||||
/**
|
||||
|
|
@ -472,7 +472,7 @@ gulp.task('docker-run', async () => {
|
|||
await execP('docker run -d --name dblocal -p 3306:3306 dblocal');
|
||||
await runSequenceP('docker-wait');
|
||||
} catch (err) {
|
||||
await runSequenceP('docker-image');
|
||||
await runSequenceP('docker-build');
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@ module.exports = Self => {
|
|||
where: {
|
||||
clientFk: params.clientFk
|
||||
},
|
||||
skip: (params.page - 1) * params.size,
|
||||
limit: params.size,
|
||||
order: params.order || 'shipped DESC',
|
||||
skip: (params.page - 1) * parseInt(params.size),
|
||||
limit: parseInt(params.size),
|
||||
order: `${params.order}, id ASC` || 'shipped DESC',
|
||||
include: {
|
||||
relation: "greugeType",
|
||||
scope: {
|
||||
|
|
|
|||
|
|
@ -4,8 +4,7 @@ WORKDIR /docker-entrypoint-initdb.d
|
|||
COPY install/ ./
|
||||
RUN chmod -R 777 .
|
||||
RUN ./install.sh
|
||||
USER mysql
|
||||
CMD ["mysqld"]
|
||||
CMD ./boot.sh
|
||||
#HEALTHCHECK --interval=5s --timeout=10s --retries=200 \
|
||||
# CMD mysqladmin ping -h 127.0.0.1 -u root || exit 1
|
||||
EXPOSE 3306
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
#!/bin/bash
|
||||
|
||||
find /var/lib/mysql -type f -exec touch {} \; && service mysql start
|
||||
|
||||
# Disable SQL strict mode
|
||||
mysql -u root -proot -e "SET GLOBAL sql_mode='NO_ENGINE_SUBSTITUTION';"
|
||||
|
||||
sleep infinity
|
||||
|
|
@ -115,6 +115,14 @@ INSERT INTO `vn`.`province`(`id`, `name`, `countryFk`, `warehouseFk`, `zoneFk`)
|
|||
(4, 'Province four', 1, NULL, 2),
|
||||
(5, 'Province five', 1, NULL, 1);
|
||||
|
||||
INSERT INTO `vn`.`agencyHour`(`id`, `agencyFk`, `weekDay`, `warehouseFk`, `provinceFk`, `maxHour`)
|
||||
VALUES
|
||||
( 1, 2, 0, 1, 1, 13),
|
||||
( 2, 2, 1, 1, 1, 14),
|
||||
( 3, 2, 2, 1, 1, 15),
|
||||
( 4, 2, 3, 1, 1, 16),
|
||||
( 5, 2, 4, 1, 1, 17);
|
||||
|
||||
INSERT INTO `vn`.`clientType`(`id`, `code`, `type`)
|
||||
VALUES
|
||||
(1, 'normal', 'Normal'),
|
||||
|
|
@ -578,7 +586,4 @@ INSERT INTO `cache`.`cache_calc`(`id`, `cache_id`, `cacheName`, `params`, `last_
|
|||
INSERT INTO `bs`.`workerMana`(`workerFk`, `amount`)
|
||||
VALUES
|
||||
( 1, -500),
|
||||
( 3, 0),
|
||||
( 5, 250),
|
||||
( 6, 1000),
|
||||
( 9, 1500);
|
||||
|
||||
|
|
@ -1,28 +1,27 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Start MySQL service
|
||||
service mysql start
|
||||
find /var/lib/mysql -type f -exec touch {} \; && service mysql start
|
||||
|
||||
# Disable SQL strict mode
|
||||
mysql -u root -proot -e "SET GLOBAL sql_mode='NO_ENGINE_SUBSTITUTION';"
|
||||
|
||||
# Dump structure
|
||||
for file in dump/*-*.sql; do
|
||||
echo "Imported $file" >> log.txt
|
||||
echo "Imported $file"
|
||||
mysql -u root -proot < $file
|
||||
done
|
||||
|
||||
# Import changes
|
||||
for file in changes/*/*.sql; do
|
||||
echo "Imported $file" >> log.txt
|
||||
mysql -u root -proot < $file
|
||||
echo "Imported $file"
|
||||
mysql -u root -proot < $file
|
||||
done
|
||||
|
||||
# Import fixtures
|
||||
echo "Imported fixtures.sql" >> log.txt
|
||||
mysql -u root -proot < dump/fixtures.sql >> log.txt
|
||||
echo "Imported fixtures.sql"
|
||||
mysql -u root -proot < dump/fixtures.sql
|
||||
|
||||
|
||||
# Remove installation
|
||||
#rm -rf /docker-entrypoint-initdb.d
|
||||
|
||||
|
||||
rm -rf changes dump install.sh
|
||||
|
|
@ -6,7 +6,7 @@ module.exports = Self => {
|
|||
where: {},
|
||||
skip: (params.page - 1) * params.size,
|
||||
limit: params.size,
|
||||
order: params.order || 'name, relevancy DESC',
|
||||
order: params.order || 'name ASC', // name, relevancy DESC
|
||||
include: {
|
||||
relation: 'itemType',
|
||||
scope: {
|
||||
|
|
|
|||
Loading…
Reference in New Issue