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

Merge pull request #11 from senaduka/improved_icon_handling_and_pump_management

Browse Source 
Added 4 new images for opening and closing out valve while barrell is…
This commit is contained in:
Senad Uka
2016-03-19 04:33:23 +01:00
parent 24a1b81b92 5cd8420bcf
commit 21d364bf52
6 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/client/state.js
View File

@@ -46,11 +46,15 @@ Template.state.helpers({
var sensor = last_sensor_reading(); var sensor = last_sensor_reading();
var stateObject = controller_state(); var stateObject = controller_state();
if (sensor) { if (sensor) {
if (sensor.tankFull === 1 && (stateObject.state.out_valve === 'closed' || stateObject.state.out_valve === 'opening')) return "/images/barellFull.png"; if (sensor.tankFull === 0 && stateObject.state.in_valve === 'open' && stateObject.state.out_valve === 'closed') return "/images/barellFillingUp.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 === 'closed')) return "/images/barellFull.png";
else if (sensor.tankFull === 1 && (stateObject.state.out_valve === 'open' || stateObject.state.out_valve === 'closing')) return "/images/barellWateringFull.png"; else if (sensor.tankFull === 1 && (stateObject.state.out_valve === 'opening')) return "/images/barellStartWateringFull.png";
else if (sensor.tankFull === 0 && (stateObject.state.out_valve === 'open' || stateObject.state.out_valve === 'closing')) return "/images/barellWateringNotFull.png" else if (sensor.tankFull === 1 && (stateObject.state.out_valve === 'open')) return "/images/barellWateringFull.png";
else if (sensor.tankFull === 0 && stateObject.state.in_valve === 'open') return "/images/barellFillingUp.png"; else if (sensor.tankFull === 1 && (stateObject.state.out_valve === 'closing')) return "/images/barellStopWateringFull.png";
else if (sensor.tankFull === 0 && (stateObject.state.out_valve === 'closed')) return "/images/barellNotFull.png";
else if (sensor.tankFull === 0 && (stateObject.state.out_valve === 'opening')) return "/images/barellStartWateringNotFull.png";
else if (sensor.tankFull === 0 && (stateObject.state.out_valve === 'open')) return "/images/barellWateringNotFull.png"
else if (sensor.tankFull === 0 && (stateObject.state.out_valve === 'closing')) return "/images/barellStopWateringNotFull.png"
else return "/images/statusAmber.png"; else return "/images/statusAmber.png";
} }
else return "/images/statusRed.png"; else return "/images/statusRed.png";

BIN
app/public/images/barellStartWateringFull.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 75 KiB

BIN
app/public/images/barellStartWateringNotFull.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 69 KiB

BIN
app/public/images/barellStopWateringFull.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 109 KiB

BIN
app/public/images/barellStopWateringNotFull.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 103 KiB

6
app/server/api.js
View File

@@ -27,7 +27,7 @@ function reactToSensorData(nextSensorReading) {
console.log("reacting to sensor"); console.log("reacting to sensor");
var controllerId = nextSensorReading.controllerId; var controllerId = nextSensorReading.controllerId;
var state = stateOrDefault(controllerId).state; var state = stateOrDefault(controllerId).state;
var shouldStartPumping = (parseInt(nextSensorReading.tankFull) === 0 && (!state.in_valve || state.in_valve === 'closed')); var shouldStartPumping = (!state.in_valve || state.in_valve === 'closed') && ((parseInt(nextSensorReading.tankFull) === 0) && (state.out_valve === 'closed' || state.out_valve === 'closing'));
if (shouldStartPumping) { if (shouldStartPumping) {
ControllerState.update({ ControllerState.update({
@@ -40,7 +40,7 @@ function reactToSensorData(nextSensorReading) {
} }
}); });
} }
var shouldStopPumping = parseInt(nextSensorReading.tankFull) === 1 && (state.in_valve === 'open' || state.in_valve === 'opening'); var shouldStopPumping = (state.in_valve === 'open' || state.in_valve === 'opening') && (parseInt(nextSensorReading.tankFull) === 1 || state.out_valve === 'open' || state.out_valve === 'opening');
if (shouldStopPumping) { if (shouldStopPumping) {
ControllerState.update({ ControllerState.update({
@@ -91,7 +91,7 @@ function stateOrDefault(id) {
}, },
time: new Date(), time: new Date(),
config: { config: {
draining_period_amount: 5, draining_period_amount: 60,
draining_period_unit: 'minutes' draining_period_unit: 'minutes'
}, },
set_by: 'server' set_by: 'server'