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

Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev

Browse source
This commit is contained in:
britea 2020-05-02 17:10:45 +02:00
commit 8e3a9a57e0
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
smart-hut/src/components/dashboard/devices/DeviceSettingsModal.js
View file

@ -98,7 +98,7 @@ class DeviceSettingsModal extends Component {
deleteDevice() { deleteDevice() {
this.props this.props
.deleteDevice(this.props.device) .deleteDevice(this.props.device)
.then(() => this.setState({ open: false })) .then(() => this.setState({ openModal: false }))
.catch((err) => .catch((err) =>
console.error( console.error(
`settings modal for device ${this.props.id} deletion error`, `settings modal for device ${this.props.id} deletion error`,

3
smart-hut/src/components/dashboard/devices/Thermostats.js
View file

@ -153,7 +153,8 @@ class Thermostats extends Component {
<div style={targetTemperature}> <div style={targetTemperature}>
<Icon name="thermometer half" />{" "} <Icon name="thermometer half" />{" "}
{this.props.device.measuredTemperature} ºC <br /> {this.props.device.measuredTemperature} ºC <br />
<Icon name="target" /> {this.state.targetTemperature.toFixed(1)} ºC <Icon name="target" />{" "}
{this.props.device.targetTemperature.toFixed(1)} ºC
</div> </div>
{this.props.tab === "Devices" ? ( {this.props.tab === "Devices" ? (
<Slider <Slider