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

rawsql with promises

This commit is contained in:
nelo 2017-06-29 11:48:57 +02:00
parent e9c0fa5cc9
commit 2e7a225249
5 changed files with 39 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/production/src/production-actions/production-actions.js
View File

@ -55,7 +55,7 @@ export default class ProductionActions {
);
}
_changeTime(ids, time, index) {
this.$http.put(`/production/api/changeTime?time=${time}`, {tickets: ids}).then(
this.$http.put(`/production/api/Tickets/${time}/changeTime`, {tickets: ids}).then(
() => {
index.forEach(
i => {

16
services/client/common/models/my-model.js
View File

@ -79,10 +79,16 @@ module.exports = function(self) {
};
self.rawSql = function(query, params, cb) {
this.dataSource.connector.execute(query, params, function(error, response) {
if (error)
cb(error, null);
return response;
var connector = this.dataSource.connector;
return new Promise(function(resolve, reject) {
connector.execute(query, params, function(error, response) {
if (error && !reject)
cb(error, null);
else if (error && reject)
reject(error);
else
resolve(response);
});
});
};
@ -163,7 +169,7 @@ module.exports = function(self) {
returnValues();
}
});
this.count(filter.where, function(err, totalCount){
this.count(filter.where, function(err, totalCount) {
if (err) {
error();
} else {

16
services/production/common/methods/ticket/change-time.js
View File

@ -20,11 +20,6 @@ module.exports = function(Ticket) {
Ticket.changeTime = function(ctx, time, cb) {
var tickets = ctx.req.body.tickets;
changeTime(tickets, time, cb);
};
var changeTime = function(tickets, time, cb){
var FakeProduction = Ticket.app.models.FakeProduction;
var hour = `${time}:00`;
@ -34,11 +29,10 @@ module.exports = function(Ticket) {
FakeProduction.updateAll({ticketFk: {inq: tickets}}, {hour: hour}, function(err, res){
if(err)
cb(err, null)
else{
var response = Ticket.rawSql(query, params, cb);
cb(null, response);
}
else
Ticket.rawSql(query, params, cb).then(function(response) {
cb(null, response);
});
});
}
};
}

16
services/production/common/models/my-model.js
View File

@ -79,10 +79,16 @@ module.exports = function(self) {
};
self.rawSql = function(query, params, cb) {
this.dataSource.connector.execute(query, params, function(error, response) {
if (error)
cb(error, null);
return response;
var connector = this.dataSource.connector;
return new Promise(function(resolve, reject) {
connector.execute(query, params, function(error, response) {
if (error && !reject)
cb(error, null);
else if (error && reject)
reject(error);
else
resolve(response);
});
});
};
@ -163,7 +169,7 @@ module.exports = function(self) {
returnValues();
}
});
this.count(filter.where, function(err, totalCount){
this.count(filter.where, function(err, totalCount) {
if (err) {
error();
} else {

16
services/service/models/my-model.js
View File

@ -79,10 +79,16 @@ module.exports = function(self) {
};
self.rawSql = function(query, params, cb) {
this.dataSource.connector.execute(query, params, function(error, response) {
if (error)
cb(error, null);
return response;
var connector = this.dataSource.connector;
return new Promise(function(resolve, reject) {
connector.execute(query, params, function(error, response) {
if (error && !reject)
cb(error, null);
else if (error && reject)
reject(error);
else
resolve(response);
});
});
};
@ -163,7 +169,7 @@ module.exports = function(self) {
returnValues();
}
});
this.count(filter.where, function(err, totalCount){
this.count(filter.where, function(err, totalCount) {
if (err) {
error();
} else {