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

render power data in table format

Browse Source
This commit is contained in:
Eric Hulburd
2016-02-10 16:11:56 -06:00
parent b14c266de3
commit 9996dfc54e
26 changed files with 424 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/controllers/energy_controller.js
View File

@@ -5,10 +5,8 @@ const NAME = 'EnergyController';
class EnergyController{
static index(req, res){
DB.House.findOne({where: {name: req.housename}}).then((house)=>{
house.getEnergyDataByTime(req.params.start_time, req.params.end_time).then((energy_data)=>{
req.json(energy_data);
});
DB.EnergyDatum.exposeForHouseAtDates(req.query.house_id, req.query.dates).then((energy_data)=>{
req.json({data: energy_data});
});
}

10
server/controllers/houses_controller.js
View File

@@ -1,12 +1,14 @@
import DB from './../config/database.js';
const NAME = HousesController;
const NAME = 'HousesController';
class HousesController{
class HousesController {
static index(req, res){
DB.House.findAll({attributes: ['id', 'name']}).then((houses)=>{
res.json(houses);
var params = {};
if (req.query.ids) query.id = ids;
DB.House.findAll({where: params, attributes: ['id', 'name', 'timezone']}).then((houses)=>{
res.json({data: houses.map((house)=>{ return house.dataValues; })});
});
}

7
server/controllers/power_controller.js
View File

@@ -5,10 +5,9 @@ const NAME = 'PowerController';
class PowerController{
static index(req, res){
DB.House.findOne({where: {name: req.housename}}).then((house)=>{
house.getPowerDataByTime(req.params.start_time, req.params.end_time).then((power_data)=>{
res.json(power_data);
});
console.log(req.query);
DB.PowerDatum.exposeForHouseAtDates(req.query.house_id, req.query.dates).then((power_data)=>{
res.json({data: power_data});
});
}