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

Merge branch 'dev' of https://git.verdnatura.es/salix into dev

This commit is contained in:
Joan Sanchez 2018-05-11 11:34:20 +02:00
parent a990a950a1 f841e25b7f
commit 35735c15a3
11 changed files with 220 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/client/src/credit-create/credit-create.html
View File

@ -5,7 +5,7 @@
form="form"
save="patch">
</vn-watcher>
<form name="form" ng-submit="watcher.submitGo('clientCard.credit.list')">
<form name="form" ng-submit="$ctrl.onSubmit()">
<vn-card pad-large>
<vn-title>Add credit</vn-title>
<vn-horizontal>
@ -16,3 +16,9 @@
<vn-submit label="Save"></vn-submit>
</vn-button-bar>
</form>
<vn-confirm
vn-id="confirmation"
on-response="$ctrl.returnDialog(response)"
question="Esta modificación retrasará el plazo del próximo recobro"
message="¿Desea continuar?">
</vn-confirm>

37
client/client/src/credit-create/credit-create.js
View File

@ -1,7 +1,44 @@
import ngModule from '../module';
class Controller {
constructor($http, $scope, $state) {
this.$http = $http;
this.$scope = $scope;
this.$state = $state;
}
onSubmit() {
this.$http.get(`/client/api/Recoveries/${this.$state.params.id}/hasActiveRecovery`).then(res => {
let activeRecovery = res.data;
if (activeRecovery)
this.$scope.confirmation.show();
else
this.addCredit();
});
}
returnDialog(response) {
if (response === 'CANCEL')
return;
this.addCredit();
}
addCredit() {
this.$scope.watcher.submit().then(
() => {
this.$state.go('clientCard.credit.list');
}
);
}
}
Controller.$inject = ['$http', '$scope', '$state'];
ngModule.component('vnClientCreditCreate', {
template: require('./credit-create.html'),
controller: Controller,
bindings: {
client: '<'
}

85
client/client/src/credit-create/credit-create.spec.js Normal file
View File

@ -0,0 +1,85 @@
import './credit-create.js';
describe('Client', () => {
describe('Component vnClientCreditCreate', () => {
let $componentController;
let controller;
let $httpBackend;
let $state;
let $scope;
let client;
beforeEach(() => {
angular.mock.module('client');
});
beforeEach(angular.mock.inject((_$componentController_, _$httpBackend_, $rootScope, _$state_) => {
$componentController = _$componentController_;
$scope = $rootScope.$new();
$scope.confirmation = {show: () => {
return {
then: () => {}
};
}};
$scope.watcher = {
submit: () => {
return {
then: callback => {
callback();
}
};
}
};
client = {credit: 0};
$state = _$state_;
$state.params.id = 101;
$httpBackend = _$httpBackend_;
controller = $componentController('vnClientCreditCreate', {$scope: $scope}, {$state: $state});
}));
describe('onSubmit()', () => {
it('should perform a query to check (GET) if the client has an active recovery', () => {
$httpBackend.whenGET(`/client/api/Recoveries/101/hasActiveRecovery`).respond(true);
$httpBackend.expectGET(`/client/api/Recoveries/101/hasActiveRecovery`);
controller.onSubmit();
$httpBackend.flush();
});
it('should call show() method when the client have a recovery', () => {
spyOn(controller.$scope.confirmation, 'show');
$httpBackend.whenGET(`/client/api/Recoveries/101/hasActiveRecovery`).respond(true);
$httpBackend.expectGET(`/client/api/Recoveries/101/hasActiveRecovery`);
controller.onSubmit();
$httpBackend.flush();
expect(controller.$scope.confirmation.show).toHaveBeenCalledWith();
});
it('should call addCredit() method when the client doesnt have a recovery', () => {
spyOn(controller, 'addCredit');
$httpBackend.whenGET(`/client/api/Recoveries/101/hasActiveRecovery`).respond(false);
$httpBackend.expectGET(`/client/api/Recoveries/101/hasActiveRecovery`);
controller.onSubmit();
$httpBackend.flush();
expect(controller.addCredit).toHaveBeenCalledWith();
});
});
describe('returnDialog()', () => {
it('should call addCredit() when is called with a param disctint from CANCEL', () => {
spyOn(controller, 'addCredit');
controller.returnDialog('Manzano');
expect(controller.addCredit).toHaveBeenCalledWith();
});
});
describe('addCredit()', () => {
it('should call the function go() on $state to go to the credit list', () => {
spyOn($state, 'go');
client.credit = 1;
controller.addCredit();
expect(controller.$state.go).toHaveBeenCalledWith('clientCard.credit.list');
});
});
});
});

8
client/core/src/components/watcher/watcher.js
View File

@ -153,18 +153,18 @@ export default class Watcher extends Component {
resolve(json);
}
noChanges(resolve) {
noChanges(reject) {
this.vnApp.showMessage(
this.$translate.instant('No changes to save')
);
resolve();
reject(new Error('No changes to save'));
}
invalidForm(resolve) {
invalidForm(reject) {
this.vnApp.showMessage(
this.$translate.instant('Some fields are invalid')
);
resolve();
reject(new Error('Some fields are invalid'));
}
updateOriginalData() {

11
client/salix/src/module.js
View File

@ -16,6 +16,17 @@ export function config($translatePartialLoaderProvider, $httpProvider, $qProvide
}
ngModule.config(config);
/*
// FIXME: Handle unhandled exceptions
exceptionHandler.$inject = ['vnApp'];
function exceptionHandler(vnApp) {
return function(exception, cause) {
console.error(exception);
};
}
ngModule.factory('$exceptionHandler', exceptionHandler);
*/
const HOOK_ABORTED_TRANSITION = 3;
run.$inject = ['$window', '$rootScope', 'vnApp', '$state'];

6
e2e/paths/client-module/09_add_credit.spec.js
View File

@ -22,10 +22,10 @@ describe('Client', () => {
});
});
it('should search for the user Petter Parker', () => {
it('should search for the user Ororo Munroe', () => {
return nightmare
.wait(selectors.clientsIndex.searchResult)
.type(selectors.clientsIndex.searchClientInput, 'Petter Parker')
.type(selectors.clientsIndex.searchClientInput, 'Ororo Munroe')
.click(selectors.clientsIndex.searchButton)
.waitForNumberOfElements(selectors.clientsIndex.searchResult, 1)
.countSearchResults(selectors.clientsIndex.searchResult)
@ -36,7 +36,7 @@ describe('Client', () => {
it(`should click on the search result to access to the client's credit`, () => {
return nightmare
.waitForTextInElement(selectors.clientsIndex.searchResult, 'Petter Parker')
.waitForTextInElement(selectors.clientsIndex.searchResult, 'Ororo Munroe')
.waitToClick(selectors.clientsIndex.searchResult)
.waitToClick(selectors.clientCredit.creditButton)
.waitForURL('credit/list')

34
services/client/common/methods/recovery/hasActiveRecovery.js Normal file
View File

@ -0,0 +1,34 @@
module.exports = Self => {
Self.remoteMethod('hasActiveRecovery', {
description: 'Returns a boolean that is true when a client has an active recovery',
accessType: 'READ',
accepts: [
{
arg: 'clientFk',
type: 'number',
required: true,
description: 'The id of a client',
http: {source: 'path'}
}
],
returns: {
type: 'boolean',
root: true
},
http: {
path: `/:clientFk/hasActiveRecovery`,
verb: 'GET'
}
});
Self.hasActiveRecovery = async id => {
let result = await Self.rawSql(
`SELECT count(*) AS hasActiveRecovery
FROM vn.recovery
WHERE clientFk = ?
AND IFNULL(finished,CURDATE()) >= CURDATE();`,
[id]
);
return result[0].hasActiveRecovery != 0;
};
};

1
services/client/common/models/recovery.js
View File

@ -1,3 +1,4 @@
module.exports = function(Self) {
require('../methods/recovery/filter')(Self);
require('../methods/recovery/hasActiveRecovery')(Self);
};

24
services/loopback/common/methods/item/filter.js
View File

@ -7,16 +7,22 @@ module.exports = Self => {
skip: (params.page - 1) * params.size,
limit: params.size,
order: params.order || 'name ASC', // name, relevancy DESC
include: {
relation: 'itemType',
scope: {
fields: ['id', 'name', 'workerFk'],
include: {
relation: 'worker',
fields: ['firstName', 'name']
include: [
{relation: 'itemType',
scope: {
fields: ['name', 'workerFk'],
include: {
relation: 'worker',
fields: ['firstName', 'name']
}
}
}
}
},
{relation: 'origin'},
{relation: 'ink'},
{relation: 'producer'},
{relation: 'intrastat'},
{relation: 'expence'}
]
};
delete params.page;

20
services/loopback/common/methods/workerMana/getCurrentWorkerMana.js Normal file
View File

@ -0,0 +1,20 @@
module.exports = Self => {
Self.remoteMethodCtx('getCurrentWorkerMana', {
description: 'Returns the mana of the logged worker',
accessType: 'READ',
accepts: [],
returns: {
type: 'number',
root: true
},
http: {
path: `/getCurrentWorkerMana`,
verb: 'GET'
}
});
Self.getCurrentWorkerMana = async ctx => {
let loggedWorkerId = ctx.req.accessToken.userId;
return await Self.rawSql(`SELECT used AS mana FROM vn.manaSpellers WHERE worker = ?`, [loggedWorkerId]);
};
};

3
services/loopback/common/models/workerMana.js Normal file
View File

@ -0,0 +1,3 @@
module.exports = Self => {
require('../methods/workerMana/getCurrentWorkerMana')(Self);
};