app/client/state.js

@@ -44,11 +44,16 @@ Template.state.helpers({
 
   bucket_image: function() {
     var sensor = last_sensor_reading();
-    if (sensor && sensor.tankFull === "1") {
-      return "/images/barell_full.png";
-    } else {
-      return "/images/barell_draining.png";
+    var stateObject = controller_state();
+    if (sensor) {
+      if (sensor.tankFull === 1 && (stateObject.state.out_valve === 'closed' || stateObject.state.out_valve === 'opening')) return "/images/barellFull.png";
+      else if (sensor.tankFull === 0 && (stateObject.state.out_valve === 'closed' || stateObject.state.out_valve === 'opening')) return "/images/barellNotFull.png";
+      else if (sensor.tankFull === 1 && (stateObject.state.out_valve === 'open' || stateObject.state.out_valve === 'closing')) return "/images/barellWateringFull.png";
+      else if (sensor.tankFull === 0 && (stateObject.state.out_valve === 'open' || stateObject.state.out_valve === 'closing')) return "/images/barellWateringNotFull.png"
+      else if (sensor.tankFull === 0 && stateObject.state.in_valve === 'open') return "/images/barellFillingUp.png";
+      else return "/images/statusAmber.png";
     }
+    else return "/images/statusRed.png";
   },
 
   last_sensor_reading: last_sensor_reading,