+
+
+
Retrieving power data for the {this.props.house.name} household...
-
Select dates:
@@ -15,7 +24,7 @@
- |
+ {power_datum.data.id} |
{power_datum.time_to_s} |
{power_datum.consumption_to_s} |
{power_datum.production_to_s} |
diff --git a/client/dashboard/power/power.rt.js b/client/dashboard/power/power.rt.js
index d349a29..7927c9a 100644
--- a/client/dashboard/power/power.rt.js
+++ b/client/dashboard/power/power.rt.js
@@ -1,12 +1,24 @@
import React from 'react';
import _ from 'lodash';
-function repeatPower_datum1(power_datum, power_datumIndex) {
- return React.createElement('tr', { 'key': power_datum.scoped_id }, React.createElement('td', {}), React.createElement('td', {}, power_datum.time_to_s), React.createElement('td', {}, power_datum.consumption_to_s), React.createElement('td', {}, power_datum.production_to_s));
+function repeatMonth1(month, monthIndex) {
+ return React.createElement('button', {
+ 'data-value': month,
+ 'key': 'data-month-' + month,
+ 'className': 'btn-warning btn btn-sm' + ' ' + _.keys(_.pick({ active: month === this.props.house.current_month }, _.identity)).join(' '),
+ 'onClick': this.setMonth
+ }, month);
+}
+function repeatPower_datum2(power_datum, power_datumIndex) {
+ return React.createElement('tr', { 'key': power_datum.scoped_id }, React.createElement('td', {}, power_datum.data.id), React.createElement('td', {}, power_datum.time_to_s), React.createElement('td', {}, power_datum.consumption_to_s), React.createElement('td', {}, power_datum.production_to_s));
}
export default function () {
- return React.createElement('div', { 'id': 'power_view' }, this.state.loading_data ? React.createElement('div', { 'className': 'alert alert-warning' }, '\n Retrieving power data for the ', this.props.house.name, ' household...\n ') : null, React.createElement('h4', {}, 'Select dates:'), React.createElement('div', { 'id': 'power_date_setter' }), this.props.view === 'table' ? React.createElement('table', { 'className': 'table' }, React.createElement('thead', {}, React.createElement('tr', {}, React.createElement('th', {}), React.createElement('th', {}, 'Time'), React.createElement('th', {}, 'Consumption (W)'), React.createElement('th', {}, 'Production (W)'))), React.createElement.apply(this, [
+ return React.createElement('div', { 'id': 'power_view' }, React.createElement.apply(this, [
+ 'div',
+ { 'className': 'btn-group' },
+ this.props.house ? _.map(this.props.house.availableMonths(), repeatMonth1.bind(this)) : null
+ ]), this.state.loading_data ? React.createElement('div', { 'className': 'alert alert-warning' }, '\n Retrieving power data for the ', this.props.house.name, ' household...\n ') : null, React.createElement('div', { 'id': 'power_date_setter' }), this.props.view === 'table' ? React.createElement('table', { 'className': 'table' }, React.createElement('thead', {}, React.createElement('tr', {}, React.createElement('th', {}), React.createElement('th', {}, 'Time'), React.createElement('th', {}, 'Consumption (W)'), React.createElement('th', {}, 'Production (W)'))), React.createElement.apply(this, [
'tbody',
{},
- _.map(this.props.house.power_data, repeatPower_datum1.bind(this))
+ _.map(this.props.house.power_data, repeatPower_datum2.bind(this))
])) : null, this.props.view === 'graph' ? React.createElement('div', { 'id': 'power_graph' }) : null);
};
\ No newline at end of file
diff --git a/client/lib/databasable.js b/client/lib/databasable.js
index 9d50e32..abe6b67 100644
--- a/client/lib/databasable.js
+++ b/client/lib/databasable.js
@@ -32,18 +32,18 @@ var databasable = {
}
},
- collection: function(collection_name, options){
+ collection: function(db_name, collection_name, options){
var databasable = this;
- return databasable.accessDb()
+ return databasable.accessDb(db_name)
.then((db)=>{
var collection = db.getCollection(collection_name)
if (!collection){
collection = db.addCollection(collection_name, options);
- }
- if (options && options.unique_indices){
- options.unique_indices.forEach((field)=>{
- collection.ensureUniqueIndex(field);
- });
+ if (options && options.unique_indices){
+ options.unique_indices.forEach((field)=>{
+ collection.ensureUniqueIndex(field);
+ });
+ }
}
return collection;
});
@@ -55,12 +55,12 @@ var databasable = {
var start_condition = {},
end_condition = {};
date_params['$and'] = [start_condition, end_condition];
- start_condition[attr] = {'$gt': range[0]};
- end_condition[attr] = {'$lt': range[1]};
+ start_condition[attr] = {'$gte': range[0]};
+ end_condition[attr] = {'$lte': range[1]};
} else if (range[0] !== undefined) {
- date_params[attr] = {'$gt': range[0]}
+ date_params[attr] = {'$gte': range[0]}
} else if (range[1] !== undefined) {
- date_params[attr] = {'$lt': range[1]}
+ date_params[attr] = {'$lte': range[1]}
}
return date_params;
}
diff --git a/client/models/energy_datum.js b/client/models/energy_datum.js
index d92f062..afc5df4 100644
--- a/client/models/energy_datum.js
+++ b/client/models/energy_datum.js
@@ -10,7 +10,6 @@ class EnergyDatum {
constructor(data, house){
var energy_datum = this;
energy_datum.house = house;
- data.day = moment.tz(data.day, house.data.timezone);
energy_datum.data = data;
}
@@ -18,16 +17,16 @@ class EnergyDatum {
return `energy-datum-${this.data.id}`;
}
+ // returns a datestamp that has the client timezone, but actually is house local time.
get day_to_date(){
var energy_datum = this,
- moment_tz = moment.tz(energy_datum.data.day, energy_datum.house.data.timezone);
- // will have to do some additional math here to account for local offset.
- return moment(moment_tz.toArray()).toDate();
+ house = energy_datum.house;
+ return house.toDate(energy_datum.data.day);
}
get day_to_s(){
var energy_datum = this;
- return energy_datum.data.day.format('YYYY-MM-DD');
+ return moment.tz(energy_datum.data.day * 1000, energy_datum.house.data.timezone).format('YYYY-MM-DD');
}
get consumption_to_s(){
diff --git a/client/models/house.js b/client/models/house.js
index 2b27dc2..abfa12a 100644
--- a/client/models/house.js
+++ b/client/models/house.js
@@ -12,6 +12,8 @@ import MathUtil from './../../shared/utils/math';
import DateRange from './../../shared/utils/date_range';
import Databasable from './../lib/databasable';
+const NAME = 'House';
+
class House {
// must be initiated with a dataset already in Loki database (not directly JSON).
@@ -19,69 +21,123 @@ class House {
var house = this;
house.data = data;
Object.assign(house, Databasable);
- house.power_date_range = [house.default_power_start, house.default_power_end];
+
+ var n_years = house.data_until_moment.year() - house.data_from_moment.year() + 1;
+ house.years = [];
+ for (var year=house.data_from_moment.year(); year<=house.data_until_moment.year(); year+=1){
+ house.years.push(year);
+ }
+ house.current_month = house.data_until_moment.format('MMM');
+ house.current_year = house.data_until_moment.year();
+ house.setCurrentMonthMoment();
+ }
+
+ get data_from_moment(){
+ var house = this;
+ return moment.tz(house.data.data_from * 1000, house.data.timezone);
+ }
+
+ get data_until_moment(){
+ var house = this;
+ return moment.tz(house.data.data_until * 1000, house.data.timezone);
+ }
+
+ get end_of_current_data_moment(){
+ var house = this,
+ end_of_month = house.current_month_moment.clone().endOf('month');
+ return end_of_month > house.data_until_moment ? house.data_until_moment : end_of_month;
}
get scoped_id(){
return `house-${this.data.id}`;
}
- get default_power_start(){
- var house = this;
- // 3600 * 24 seconds * 4 = 4 days.
- return house.data.data_until - 3600 * 24 * 4;
+ availableMonths(){
+ var house = this,
+ all_months = moment.monthsShort(),
+ year = house.current_year.toString();
+ if ((year) === house.data_from_moment.format('YYYY')){
+ return all_months.slice(house.data_from_moment.month(), 12);
+ } else if (year === house.data_until_moment.format('YYYY')){
+ return all_months.slice(0, house.data_until_moment.month() + 1);
+ } else {
+ return all_months;
+ }
}
- get default_power_end(){
+ setYear(year){
var house = this;
- return house.data.data_until;
+ house.current_year = year;
+ return house.setCurrentMonthMoment();
+ }
+
+ setMonth(month){
+ var house = this;
+ house.current_month = month;
+ return house.setCurrentMonthMoment();
+ }
+
+ setCurrentMonthMoment(){
+ var house = this,
+ month_i = moment.monthsShort().indexOf(house.current_month),
+ new_month_moment = moment.tz({year: house.current_year, month: month_i, day: 1}, house.data.timezone).startOf('month');
+ if (!house.current_month_moment || new_month_moment.unix() !== house.current_month_moment.unix()){
+ house.current_month_moment = new_month_moment;
+ house.power_date_range = [house.end_of_current_data_moment.clone().subtract(4, 'days').unix(), house.end_of_current_data_moment.unix()];
+ house.energy_date_range = [house.end_of_current_data_moment.clone().startOf('year').unix(), house.end_of_current_data_moment.clone().endOf('year').unix()]
+ return true;
+ }
+ return false;
+ }
+
+ offset_diff(unix){
+ var house = this,
+ tz = moment.tz.zone(house.data.timezone);
+ return (new Date().getTimezoneOffset() - tz.offset(unix * 1000)) * 60;
}
toDate(unix){
var house = this;
- return moment.tz(unix * 1000, house.data.timezone).toDate();
+ return new Date((unix + house.offset_diff(unix)) * 1000);
+ }
+
+ formatDate(unix, format){
+ var house = this;
+ return moment.tz(unix * 1000, house.data.timezone).format(format)
}
save(){
var house = this;
- return House.collection(House.NAME)
+ return House.collection(House.NAME, House.NAME)
.then((house_collection)=>{
house_collection.update(house.data);
return House.db.save();
});
}
- setPowerData(opts){
+ setPowerData(){
var house = this;
- opts = Object.assign({
- dates: house.power_date_range
- }, opts || {});
- return house.collection(PowerDatum.NAME, PowerDatum.COLLECTION_OPTIONS)
+ return house.collection(house.scoped_id, PowerDatum.NAME, PowerDatum.COLLECTION_OPTIONS)
.then((power_collection)=>{
- return house.ensurePowerData(opts)
+ return house.ensurePowerData()
.then(()=>{
- var params = house.rangeToLokiParams('time', opts.dates);
+ var params = house.rangeToLokiParams('time', house.power_date_range);
house.power_data = power_collection.find(params)
.sort((pd1, pd2)=>{
if (pd1.time === pd2.time) return 0;
if (pd1.time > pd2.time) return 1;
if (pd1.time < pd2.time) return -1;
})
- .map((data)=>{ return new PowerDatum(data, house); })
+ .map((data)=>{ return new PowerDatum(data, house); });
});
});
}
- ensurePowerData(opts){
- opts = extend({
- start_date: undefined,
- end_date: undefined
- }, opts || {});
+ ensurePowerData(){
var house = this,
- existing_ranges = house.data.power_datum_ranges || [],
query_ranges;
- query_ranges = DateRange.addRange(opts.dates, existing_ranges);
+ query_ranges = DateRange.addRange(house.power_date_range, house.data.power_datum_ranges || []);
if (query_ranges.gaps_filled.length > 0){
var params = {dates: query_ranges.gaps_filled};
return house.getPowerData(params)
@@ -95,60 +151,42 @@ class House {
getPowerData(params){
var house = this;
params.house_id = house.data.id;
- return PowerDataApi.index(params)
- .then((power_data)=>{
- return house.collection(PowerDatum.NAME, PowerDatum.COLLECTION_OPTIONS)
- .then((power_collection)=>{
- power_collection.insert(power_data);
- house.db.save();
- });
- })
- }
-
- clearData(){
- var house = this;
- return new Promise((fnResolve, fnReject)=>{
- house.collection(PowerDatum.NAME)
- .then((power_collection)=>{
- power_collection.removeWhere({});
- house.db.save(()=>{
- House.collection(House.NAME)
- .then((house_collection)=>{
- house_collection.remove(house.data);
- House.db.save(()=>{
- fnResolve();
- })
- });
- });
- });
- });
- }
-
- setEnergyData(opts){
- var house = this;
- return house.ensureEnergyData(opts)
- .then(()=>{
- return house.collection(EnergyDatum.NAME, EnergyDatum.COLLECTION_OPTIONS)
- .then((energy_collection)=>{
- var params = house.rangeToLokiParams('day', [opts.start_date, opts.end_date]);
- house.energy_data = energy_collection.find(params).map((data)=>{ return new EnergyDatum(data, house); })
+ return house.collection(house.scoped_id, PowerDatum.NAME, PowerDatum.COLLECTION_OPTIONS)
+ .then((power_collection)=>{
+ return PowerDataApi.index(params)
+ .then((power_data)=>{
+ power_collection.insert(power_data);
+ house.db.save();
});
})
}
- ensureEnergyData(opts){
- opts = extend({
- start_date: undefined,
- end_date: undefined
- }, opts || {});
+ setEnergyData(){
+ var house = this;
+ return house.collection(house.scoped_id, EnergyDatum.NAME, EnergyDatum.COLLECTION_OPTIONS)
+ .then((energy_collection)=>{
+ return house.ensureEnergyData()
+ .then(()=>{
+ var params = house.rangeToLokiParams('day', house.energy_date_range);
+ house.energy_data = energy_collection.find(params)
+ .sort((pd1, pd2)=>{
+ if (pd1.day === pd2.day) return 0;
+ if (pd1.day > pd2.day) return 1;
+ if (pd1.day < pd2.day) return -1;
+ })
+ .map((data)=>{ return new EnergyDatum(data, house); });
+ });
+ });
+ }
+
+ ensureEnergyData(){
var house = this,
- query_ranges = DateRange.addRange([opts.start_date, opts.end_date], house.data.energy_datum_ranges);
-
+ query_ranges = DateRange.addRange(house.energy_date_range, house.data.energy_datum_ranges || []);
if (query_ranges.gaps_filled.length > 0){
- house.getEnergyData({dates: query_ranges.gaps_filled})
+ return house.getEnergyData({dates: query_ranges.gaps_filled})
.then(()=>{
house.data.energy_datum_ranges = query_ranges.new_ranges;
- return house.save();
+ house.save();
});
} else { return Promise.resolve(); }
}
@@ -156,18 +194,47 @@ class House {
getEnergyData(params){
var house = this;
params.house_id = house.data.id;
- return EnergyDataApi.index(params)
- .then((energy_data)=>{
- return house.collection(EnergyDatum.NAME, EnergyDatum.COLLECTION_OPTIONS)
- .then((energy_collection)=>{
+ return house.collection(house.scoped_id, EnergyDatum.NAME, EnergyDatum.COLLECTION_OPTIONS)
+ .then((energy_collection)=>{
+ return EnergyDataApi.index(params)
+ .then((energy_data)=>{
energy_collection.insert(energy_data);
- return house.db.save();
+ house.db.save();
});
})
}
+ // removes all energy and power data from LokiJs (memory and persisted) database.
+ clearData(){
+ var house = this,
+ all = [
+ new Promise((fnResolve, fnReject)=>{
+ house.collection(house.scoped_id, PowerDatum.NAME)
+ .then((power_collection)=>{
+ power_collection.removeWhere({});
+ house.db.save(fnResolve);
+ });
+ }),
+ new Promise((fnResolve, fnReject)=>{
+ house.collection(house.scoped_id, EnergyDatum.NAME)
+ .then((energy_collection)=>{
+ energy_collection.removeWhere({});
+ house.db.save(fnResolve);
+ });
+ }),
+ new Promise((fnResolve, fnReject)=>{
+ House.collection(House.NAME, House.NAME)
+ .then((house_collection)=>{
+ house_collection.remove(house.data);
+ House.db.save(fnResolve);
+ });
+ })
+ ]
+ return Promise.all(all)
+ }
+
static ensureHouses(ids){
- return House.collection(House.NAME)
+ return House.collection(House.NAME, House.NAME)
.then((house_collection)=>{
var houses_data = ids ? house_collection.find({id: {$in: ids}}) : house_collection.find();
if (!ids && houses_data.length === 0 || ids && houses_data.length !== ids.length){
@@ -188,5 +255,7 @@ class House {
}
+House.NAME = NAME;
+
Object.assign(House, Databasable);
export default House;
diff --git a/client/models/power_datum.js b/client/models/power_datum.js
index 0b90ed9..c53a7ac 100644
--- a/client/models/power_datum.js
+++ b/client/models/power_datum.js
@@ -20,14 +20,14 @@ class PowerDatum {
get time_to_date(){
var power_datum = this,
- moment_tz = moment.tz(power_datum.data.time, power_datum.house.data.timezone);
- // will have to do some additional math here to account for local offset.
- return moment(moment_tz.toArray()).toDate();
+ house = power_datum.house;
+ return house.toDate(power_datum.data.time);
}
get time_to_s(){
- var power_datum = this;
- return power_datum.data.time.format('YYYY-MM-DD HH:mm');
+ var power_datum = this,
+ moment_tz = moment.tz(power_datum.data.time * 1000, power_datum.house.data.timezone);
+ return moment_tz.format('YYYY-MM-DD HH:mm');
}
get consumption_to_s(){
var power_datum = this;
diff --git a/server/helpers/api_helper.js b/server/helpers/api_helper.js
index c17f5b6..964188e 100644
--- a/server/helpers/api_helper.js
+++ b/server/helpers/api_helper.js
@@ -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;
diff --git a/server/models/energy_datum.js b/server/models/energy_datum.js
index 524da39..1521c1a 100644
--- a/server/models/energy_datum.js
+++ b/server/models/energy_datum.js
@@ -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']