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

leverage cash when no dates passed in

Browse Source
This commit is contained in:
Eric Hulburd
2016-02-10 19:07:37 -06:00
parent c75ae9030c
commit 347507b148
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/dashboard/layout/layout.js
View File

@@ -61,7 +61,6 @@ var Layout = React.createClass({
request = house.ensureEnergyData(); request = house.ensureEnergyData();
} }
request.then(()=>{ request.then(()=>{
console.log('data retrieved')
layout.setState({requesting_data: false}, ()=>{ layout.setState({requesting_data: false}, ()=>{
console.log(layout.state.requesting_data); console.log(layout.state.requesting_data);
}); });

2
client/models/house.js
View File

@@ -40,6 +40,7 @@ class House {
} }
query_ranges = MathUtil.minusRange([opts.start_date, opts.end_date], [min_date, max_date]); query_ranges = MathUtil.minusRange([opts.start_date, opts.end_date], [min_date, max_date]);
if (!query_ranges) return Promise.resolve(house.power_data);
cache = ArrayUtil.selectMap(date_range, (datum_time)=>{ cache = ArrayUtil.selectMap(date_range, (datum_time)=>{
return ArrayUtil.all(query_ranges, (query_range)=>{ return ArrayUtil.all(query_ranges, (query_range)=>{
@@ -83,6 +84,7 @@ class House {
if (date_range.length === 0) return house.getEnergyData({dates: [[opts.start_date, opts.end_date]]}) if (date_range.length === 0) return house.getEnergyData({dates: [[opts.start_date, opts.end_date]]})
query_ranges = MathUtil.minusRange([opts.start_date, opts.end_date], [min_date, max_date]); query_ranges = MathUtil.minusRange([opts.start_date, opts.end_date], [min_date, max_date]);
if (!query_ranges) return Promise.resolve(house.power_data);
cache = ArrayUtil.selectMap(date_range, (datum_day)=>{ cache = ArrayUtil.selectMap(date_range, (datum_day)=>{
return ArrayUtil.all(query_ranges, (query_range)=>{ return ArrayUtil.all(query_ranges, (query_range)=>{

4
shared/utils/math.js
View File

@@ -12,6 +12,10 @@ export default class {
// returns array of array length two, representing mins and maxes not within min_max2. // returns array of array length two, representing mins and maxes not within min_max2.
static minusRange(min_max1, min_max2){ static minusRange(min_max1, min_max2){
var minus = []; var minus = [];
// return undefined if min_max1 not provided
if (!min_max1 || (!min_max1[0] && !min_max2[1])) return undefined;
if (min_max1[0] >= min_max2[0]){ if (min_max1[0] >= min_max2[0]){
if (min_max1[1] > min_max2[1]) minus.push([min_max2[1], min_max1[1]]); if (min_max1[1] > min_max2[1]) minus.push([min_max2[1], min_max1[1]]);
} else if (min_max1[1] <= min_max2[1]){ } else if (min_max1[1] <= min_max2[1]){