senaduka/old-spike
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

polish energy/power data view interactions

Browse Source
This commit is contained in:
Eric Hulburd
2016-02-22 13:45:43 -06:00
parent c1fddd944e
commit df3152443a
16 changed files with 338 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/helpers/api_helper.js
View File

@@ -10,15 +10,15 @@ class ApiHelper {
dates.forEach((min_max)=>{
var condition_n = {};
condition_n[field_name] = {};
if (min_max[0]) condition_n[field_name]['$gt'] = min_max[0];
if (min_max[1]) condition_n[field_name]['$lt'] = min_max[1];
if (min_max[0]) condition_n[field_name]['$gte'] = min_max[0];
if (min_max[1]) condition_n[field_name]['$lte'] = min_max[1];
if (Object.keys(condition_n).length) params['$or'].push(condition_n);
});
} else {
var min_max = dates[0],
condition = {}
if (min_max[0]) condition['$gt'] = min_max[0];
if (min_max[1]) condition['$lt'] = min_max[1];
if (min_max[0]) condition['$gte'] = min_max[0];
if (min_max[1]) condition['$lte'] = min_max[1];
if (Object.keys(condition).length) params[field_name] = condition;
}
return params;

2
server/models/energy_datum.js
View File

@@ -34,6 +34,8 @@ var EnergyDatum = DB.sequelize.define(NAME, {
exposeForHouseAtDates: (house_id, dates)=>{
var params = {house_id: house_id};
extend(params, ApiHelper.datesParamToSequelize(dates, 'day'));
console.log('EnergyDatum#exposeForHouseAtDates')
console.log(params, dates)
return EnergyDatum.findAll({
where: params,
attributes: ['id', 'production', 'consumption', 'day']