smarthut/frontend
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch '87-fix-thermostat' into 'dev'

Browse source 
fix thermostat

Closes #87

See merge request sa4-2020/the-sanmarinoes/frontend!102
This commit is contained in:
Andrea Brites Marto 2020-04-28 10:51:07 +02:00
commit 7135ddc588
2 changed files with 38 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
smart-hut/src/components/dashboard/devices/Light.js
View file

@ -72,18 +72,20 @@ class Light extends Component {
.saveDevice({ ...this.props.stateOrDevice, on })
.catch((err) => console.error("regular light update error", err));
} else {
this.props
.updateState(
{
id: this.props.stateOrDevice.id,
on: on,
sceneId: this.props.stateOrDevice.sceneId,
},
this.props.stateOrDevice.kind
)
.then((res) => {
console.log(res);
});
if (this.props.device.kind === "regularLight") {
this.props
.updateState(
{
id: this.props.stateOrDevice.id,
on: on,
sceneId: this.props.stateOrDevice.sceneId,
},
this.props.stateOrDevice.kind
)
.then((res) => {
console.log(res);
});
}
}
};
@ -117,10 +119,15 @@ class Light extends Component {
.saveDevice({ ...this.props.stateOrDevice, intensity })
.catch((err) => console.error("regular light update error", err));
} else {
this.props.updateState(
{ id: this.props.stateOrDevice.id, intensity: intensity },
this.props.stateOrDevice.kind
);
console.log("CIAOOOOOOOOO", this.props.stateOrDevice);
this.props
.updateState(
{ id: this.props.stateOrDevice.id, intensity: intensity },
this.props.stateOrDevice.kind
)
.then((res) => {
console.log(res, this.props.stateOrDevice.kind);
});
}
};

36
smart-hut/src/components/dashboard/devices/NewDevice.js
View file

@ -106,7 +106,7 @@ class NewDevice extends Component {
switch: "New switch",
buttonDimmer: "New button dimmer",
knobDimmer: "New knob dimmer",
securityCamera: "New security camera"
securityCamera: "New security camera",
};
if (this.state.deviceName === "") {
@ -118,13 +118,13 @@ class NewDevice extends Component {
switch (this.state.typeOfDevice) {
//trying to make securityCamera work
//case "securityCamera":
// data.path="/security_camera_videos/security_camera_1.mp4";
// data.on=false;
//break;
// data.path="/security_camera_videos/security_camera_1.mp4";
// data.on=false;
//break;
//trying to make thermostat work
case "thermostat":
data.targetTemperature=0;
data.measuredTemperuature=0;
data.targetTemperature = 0;
data.measuredTemperature = 0;
break;
case "dimmableLight":
data.intensity = 0;
@ -157,16 +157,10 @@ class NewDevice extends Component {
render() {
const deviceOptions = [
//stuff
{key:"thermostat",
text:"Thermostat",
value:"thermostat",
image:{}},
{key:"curtains",
text:"Curtain",
value:"curtains",
image:{}},
//stuff ends
//stuff
{ key: "thermostat", text: "Thermostat", value: "thermostat", image: {} },
{ key: "curtains", text: "Curtain", value: "curtains", image: {} },
//stuff ends
{
key: "light",
text: "Normal Light",
@ -210,11 +204,11 @@ class NewDevice extends Component {
image: { avatar: true, src: "/img/plusMinus.svg" },
},
{
key: "securityCamera",
text: "Security Camera",
value: "securityCamera",
image: { avatar: true, src: "/img/plusMinus.svg" },
}
key: "securityCamera",
text: "Security Camera",
value: "securityCamera",
image: { avatar: true, src: "/img/plusMinus.svg" },
},
];
const sensorOptions = [
{