verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 65 Releases Wiki Activity

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

This commit is contained in:
Dani Herrero 2017-06-21 09:46:36 +02:00
parent 3796741371 a4d9c3008a
commit 8046c434fe
13 changed files with 124 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,9 @@ module.exports = function(self) {
for(let method in disableMethods) {
//this.disableRemoteMethod(method, disableMethods[method]);
}
};
self.defineScope = function(serverFilter) {
this.remoteMethod('list', {
accepts: [
{
@ -43,10 +45,23 @@ module.exports = function(self) {
path: '/list'
}
});
};
self.list = function(filter, cb) {};
this.list = function(clientFilter, cb) {
var where = {"and": []};
(clientFilter) ? where.and.push(clientFilter.where) : undefined;
(serverFilter) ? where.and.push(serverFilter.where) : undefined;
var order = (clientFilter && clientFilter.order) ? clientFilter.order : (serverFilter && serverFilter.order) ? serverFilter.order : undefined;
var limit = (serverFilter && serverFilter.limit) ? serverFilter.limit : (clientFilter && clientFilter.limit) ? clientFilter.limit : undefined;
var filter = {"where": where, "order": order, "limit": limit};
filter = removeEmpty(filter);
this.find(filter, function(err, states) {
(!err) ? cb(null, states) : cb(err, null);
});
};
};
self.rawSql = function(query, params, cb) {
this.dataSource.connector.execute(query, params, function(error, response) {

7
services/production/common/methods/agency/list.js Normal file
View File

@ -0,0 +1,7 @@
module.exports = function(Agency) {
var serverFilter = {"where": {"tpv": {"neq": 0}}};
Agency.defineScope(serverFilter);
}

26
services/production/common/methods/state/find.js
View File

@ -1,26 +0,0 @@
module.exports = function(State) {
State.list = function(filter, cb) {
State.find(where(filter), function(err, states) {
if(!err){
cb(null, states);
}
});
};
function where(filter) {
if(!filter)
return {
where: {
"order": {gt: 0 }
},
order: "order, name"
}
else{
filter.where.order = {gt: 0 };
filter.order = "order, name";
return filter;
}
}
}

7
services/production/common/methods/state/list.js Normal file
View File

@ -0,0 +1,7 @@
module.exports = function(State) {
var serverFilter = {where: { "order": {gt: 0 }}, order: "order, name"};
State.defineScope(serverFilter);
}

19
services/production/common/methods/warehouse/list-warehouses.js
View File

@ -1,19 +0,0 @@
module.exports = function(Warehouse) {
Warehouse.list = function(filter, cb) {
Warehouse.find(where(filter), function(err, warehouses){
if(!err)
cb(null, warehouses);
else
cb(err, null);
});
};
var where = function(filter){
if(!filter)
return {"where": {"tpv": {"neq": 0}}}
else {
filter.where.tpv = {"neq": 0}
return filter;
}
}
}

7
services/production/common/methods/warehouse/list.js Normal file
View File

@ -0,0 +1,7 @@
module.exports = function(Warehouse) {
var serverFilter = {"where": {"tpv": {"neq": 0}}};
Warehouse.defineScope(serverFilter);
}

9
services/production/common/models/agency.js Normal file
View File

@ -0,0 +1,9 @@
var app = require('../../server/server');
module.exports = function(Agency) {
var models = app.models;
// Methods
require('../methods/agency/list.js')(Agency);
};

34
services/production/common/models/agency.json Normal file
View File

@ -0,0 +1,34 @@
{
"name": "Agency",
"base": "MyModel",
"validateUpsert": true,
"properties": {
"id": {
"id": true,
"type": "Number",
"forceId": false
},
"name": {
"type": "String",
"required": false
},
"tpv":{
"type": "Number",
"required": false
}
},
"acls": [
{
"accessType": "*",
"principalType": "ROLE",
"principalId": "$everyone",
"permission": "DENY"
},
{
"accessType": "*",
"principalType": "ROLE",
"principalId": "root",
"permission": "ALLOW"
}
]
}

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

@ -25,7 +25,9 @@ module.exports = function(self) {
for(let method in disableMethods) {
//this.disableRemoteMethod(method, disableMethods[method]);
}
};
self.defineScope = function(serverFilter) {
this.remoteMethod('list', {
accepts: [
{
@ -43,10 +45,23 @@ module.exports = function(self) {
path: '/list'
}
});
};
self.list = function(filter, cb) {};
this.list = function(clientFilter, cb) {
var where = {"and": []};
(clientFilter) ? where.and.push(clientFilter.where) : undefined;
(serverFilter) ? where.and.push(serverFilter.where) : undefined;
var order = (clientFilter && clientFilter.order) ? clientFilter.order : (serverFilter && serverFilter.order) ? serverFilter.order : undefined;
var limit = (serverFilter && serverFilter.limit) ? serverFilter.limit : (clientFilter && clientFilter.limit) ? clientFilter.limit : undefined;
var filter = {"where": where, "order": order, "limit": limit};
filter = removeEmpty(filter);
this.find(filter, function(err, states) {
(!err) ? cb(null, states) : cb(err, null);
});
};
};
self.rawSql = function(query, params, cb) {
this.dataSource.connector.execute(query, params, function(error, response) {

2
services/production/common/models/state.js
View File

@ -5,5 +5,5 @@ module.exports = function(State) {
// Methods
require('../methods/state/find.js')(State);
require('../methods/state/list.js')(State);
};

2
services/production/common/models/warehouse.js
View File

@ -5,5 +5,5 @@ module.exports = function(Warehouse) {
// Methods
require('../methods/warehouse/list-warehouses.js')(Warehouse);
require('../methods/warehouse/list.js')(Warehouse);
};

4
services/production/server/model-config.json
View File

@ -60,5 +60,9 @@
"Employee":{
"dataSource": "client",
"public": true
},
"Agency": {
"dataSource": "vn",
"public": true
}
}

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

@ -25,7 +25,9 @@ module.exports = function(self) {
for(let method in disableMethods) {
//this.disableRemoteMethod(method, disableMethods[method]);
}
};
self.defineScope = function(serverFilter) {
this.remoteMethod('list', {
accepts: [
{
@ -43,10 +45,23 @@ module.exports = function(self) {
path: '/list'
}
});
};
self.list = function(filter, cb) {};
this.list = function(clientFilter, cb) {
var where = {"and": []};
(clientFilter) ? where.and.push(clientFilter.where) : undefined;
(serverFilter) ? where.and.push(serverFilter.where) : undefined;
var order = (clientFilter && clientFilter.order) ? clientFilter.order : (serverFilter && serverFilter.order) ? serverFilter.order : undefined;
var limit = (serverFilter && serverFilter.limit) ? serverFilter.limit : (clientFilter && clientFilter.limit) ? clientFilter.limit : undefined;
var filter = {"where": where, "order": order, "limit": limit};
filter = removeEmpty(filter);
this.find(filter, function(err, states) {
(!err) ? cb(null, states) : cb(err, null);
});
};
};
self.rawSql = function(query, params, cb) {
this.dataSource.connector.execute(query, params, function(error, response) {