render daily energy graphs

client/dashboard/layout/layout.js

@@ -13,7 +13,7 @@ var Layout = React.createClass({
       views: VIEWS,
       houses: null,
       house: null,
-      view: 'power',
+      view: 'energy',
       requesting_data: true
     };
   },
@@ -26,8 +26,7 @@ var Layout = React.createClass({
     var layout = this;
     // window.addEventListener('resize', this.handleResize);
     House.ensureHouses().then((houses)=>{
-      layout.setState({houses: houses, house: houses[0]});
-      layout.ensureHouseViewData();
+      layout.setState({houses: houses, house: houses[0], requesting_data: false});
     });
   },
 
@@ -35,37 +34,14 @@ var Layout = React.createClass({
     var layout = this,
       view = event.target.value;
     layout.view_name = event.target.innerText;
-    layout.setState({view: view}, function(){
-      layout.ensureHouseViewData();
-    });
+    layout.setState({view: view});
   },
 
   setHouse: function(event){
     var layout = this,
       house_id = event.target.value,
       house = layout.state.houses.find((house)=>{ return house.data.id == house_id });
-    layout.setState({house: house}, function(){
-      layout.ensureHouseViewData();
-    });
-  },
-
-  ensureHouseViewData: function(){
-    var layout = this,
-      house = layout.state.house,
-      view = layout.state.view,
-      request;
-    layout.setState({requesting_data: true}, ()=>{
-      if (view === 'power'){
-        request = house.ensurePowerData();
-      } else {
-        request = house.ensureEnergyData();
-      }
-      request.then(()=>{
-        layout.setState({requesting_data: false}, ()=>{
-          console.log(layout.state.requesting_data);
-        });
-      });
-    });
+    layout.setState({house: house});
   },
 
   render: function() {