update development bundle

This commit is contained in:
Eric Hulburd
2016-02-22 20:02:45 -06:00
parent b8d0a9434b
commit a0cda06672
40 changed files with 356 additions and 92 deletions

View File

@@ -1,5 +1,5 @@
import React from 'react';
import energyRt from './energy.rt.js';
import Templates from 'config/templates';
import House from './../../models/house';
import CalendarGridChart from './../../d3/grid/calendar_grid';
@@ -28,11 +28,6 @@ var Energy = React.createClass({
});
},
componentWillUnmount: function(){
var energy = this;
energy.destroyGraph();
},
componentWillReceiveProps: function(new_props){
var energy = this;
if (new_props.house !== energy.props.house){
@@ -127,6 +122,7 @@ var Energy = React.createClass({
},
render: function() {
var energyRt = Templates.forComponent('energy');
return energyRt.call(this);
}
});

View File

@@ -1,5 +1,5 @@
import React from 'react';
import layoutRt from './layout.rt.js';
import Templates from 'config/templates';
import House from './../../models/house';
import PowerDatum from './../../models/power_datum';
@@ -81,6 +81,7 @@ var Layout = React.createClass({
},
render: function() {
var layoutRt = Templates.forComponent('layout');
return layoutRt.call(this);
}
});

View File

@@ -2,7 +2,7 @@ import React from 'react';
import moment from 'moment-timezone';
import _ from 'lodash';
import powerRt from './power.rt.js';
import Templates from 'config/templates';
import House from './../../models/house';
import SplineStackChart from './../../d3/line/spline_stack';
import DateRangeSlider from './../../d3/sliders/date_range';
@@ -34,11 +34,6 @@ var Power = React.createClass({
});
},
componentWillUnmount: function(){
var power = this;
power.destroyGraph();
},
componentWillReceiveProps: function(new_props){
var power = this;
if (new_props.house !== power.props.house){
@@ -192,6 +187,7 @@ var Power = React.createClass({
},
render: function() {
var powerRt = Templates.forComponent('power');
return powerRt.call(this);
}
});

View File

@@ -24,7 +24,7 @@
</thead>
<tbody>
<tr rt-repeat="power_datum in this.props.house.power_data" key="{power_datum.scoped_id}">
<td>{power_datum.data.id}</td>
<td></td>
<td>{power_datum.time_to_s}</td>
<td>{power_datum.consumption_to_s}</td>
<td>{power_datum.production_to_s}</td>

View File

@@ -9,7 +9,10 @@ function repeatMonth1(month, monthIndex) {
}, 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));
return React.createElement('tr', {
'className': 'fuck-you',
'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' }, React.createElement.apply(this, [

View File