Skip to content

Commit 456efcf

Browse files
odedtgrodedtgr
authored
new release
1 parent 7f9f9a0 commit 456efcf

18 files changed

+586
-333
lines changed

‎templates/AirConditioner.html‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
<div id="{{device.id}}" class="row" device-name="{{ device.name }}" device-type="{{device.type}}">
2+
{% if context == 'devices'%}
3+
<div class="col-xs-12 col-lg-2">
4+
{{ device.name }}
5+
</div>
6+
{% endif %}
7+
8+
<div class="col-xs-5 col-lg-1 toggle_div">
9+
<input class="toggle deviceOn" id="toggle-event" type="checkbox" data-toggle="toggle" data-onstyle="danger" data-offstyle="primary" val="device_on" hidden {{'checked' if (device.last_config['device_on'] == 'true' or device.last_config['device_on'] == True)}}>
10+
</div>
11+
12+
<div class="col-xs-7 col-lg-2">
13+
<div class="btn-group pull-right" role="group" aria-label="Fan" val="fan">
14+
<button type="button" class="btn btn-default {{'active' if device.last_config['fan'] == '1'}}" val="1">1</button>
15+
<button type="button" class="btn btn-default {{'active' if device.last_config['fan'] == '2'}}" val="2">2</button>
16+
<button type="button" class="btn btn-default {{'active' if device.last_config['fan'] == '3'}}" val="3">3</button>
17+
<button type="button" class="btn btn-default {{'active' if device.last_config['fan'] == 'A'}}" val="A">A</button>
18+
</div>
19+
</div>
20+
21+
22+
<div class="col-xs-12 col-lg-1" style="height:10px;"></div>
23+
24+
<div class="col-xs-7 col-lg-1 selectContainer">
25+
<div class="input-group ac-temp">
26+
<select name="temp" class="form-control" value="18">
27+
<option value="16" {{'selected' if device.last_config['temp'] == '16'}}>16</option>
28+
<option value="17" {{'selected' if device.last_config['temp'] == '17'}}>17</option>
29+
<option value="18" {{'selected' if device.last_config['temp'] == '18'}}>18</option>
30+
<option value="19" {{'selected' if device.last_config['temp'] == '19'}}>19</option>
31+
<option value="20" {{'selected' if device.last_config['temp'] == '20'}}>20</option>
32+
<option value="21" {{'selected' if device.last_config['temp'] == '21'}}>21</option>
33+
<option value="22" {{'selected' if device.last_config['temp'] == '22'}}>22</option>
34+
<option value="23" {{'selected' if device.last_config['temp'] == '23'}}>23</option>
35+
<option value="24" {{'selected' if device.last_config['temp'] == '24'}}>24</option>
36+
<option value="25" {{'selected' if device.last_config['temp'] == '25'}}>25</option>
37+
<option value="26" {{'selected' if device.last_config['temp'] == '26'}}>26</option>
38+
<option value="27" {{'selected' if device.last_config['temp'] == '27'}}>27</option>
39+
<option value="28" {{'selected' if device.last_config['temp'] == '28'}}>28</option>
40+
<option value="29" {{'selected' if device.last_config['temp'] == '29'}}>29</option>
41+
<option value="30" {{'selected' if device.last_config['temp'] == '30'}}>30</option>
42+
</select>
43+
<span class="input-group-addon">
44+
<i class="fa fa-thermometer-full fa-lg"></i>
45+
</span>
46+
</div>
47+
</div>
48+
49+
<div class="col-xs-5 col-lg-2">
50+
<div class="btn-group pull-right" role="group" aria-label="Mode" val="mode">
51+
<button type="button" class="btn btn-default {{'active' if device.last_config['mode'] == 'cool'}}" val="cool">
52+
<i class="fa fa-snowflake-o fa-lg" aria-hidden="true" {{'style=color:#337ab7' if device.last_config['mode'] == 'cool'}} ></i>
53+
</button>
54+
<button type="button" class="btn btn-default {{'active' if device.last_config['mode'] == 'heat'}}" val="heat">
55+
<i class="fa fa-sun-o fa-lg" aria-hidden="true" {{'style=color:red' if device.last_config['mode'] == 'heat'}}></i>
56+
</button>
57+
</div>
58+
</div>
59+
</div>
60+

‎templates/Boiler.html‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
<div id="{{device.id}}" class="row" device-name="{{ device.name }}" device-type="{{device.type}}">
2+
{% if context == 'devices'%}
3+
<div class="col-xs-5 col-lg-2">
4+
{{ device.name }}
5+
</div>
6+
{% endif %}
7+
8+
{% if context == 'devices'%}
9+
<div class="col-xs-7 col-lg-12">
10+
<script>
11+
//Display the time the water heater was on, but only if it was today.
12+
var today = new Date();
13+
today = today.getFullYear() + '-' + ('0' + (today.getMonth()+1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2);
14+
var yesterday = new Date();
15+
yesterday.setDate(yesterday.getDate()-1);
16+
yesterday = yesterday.getFullYear() + '-' + ('0' + (yesterday.getMonth()+1)).slice(-2) + '-' + ('0' + yesterday.getDate()).slice(-2);
17+
var boiler_date = '{{device.last_config['date']}}'
18+
var mode = {{device.last_config['mode']}}
19+
if (today.localeCompare(boiler_date)==0)
20+
{
21+
if (mode == 0){
22+
document.write('{{"Last on at {}".format(device.last_config['time'])}}')
23+
}else{
24+
document.write('{{"Started on {}".format(device.last_config['time'])}}')
25+
}
26+
}
27+
else if (yesterday.localeCompare(boiler_date)==0)
28+
{
29+
if (mode == 0){
30+
document.write('{{"Last on yesterday at {}".format(device.last_config['time'])}}')
31+
}
32+
}
33+
</script>
34+
</div>
35+
{% endif %}
36+
37+
<div class="col-xs-12 col-lg-12"></div>
38+
39+
<div class="col-xs-6 col-lg-2">
40+
<div class="btn-group" role="group" aria-label="Mode" val="mode">
41+
<button type="button" class="btn btn-primary {{'active' if device.last_config['mode'] == '0'}}" aria-label="0" val="0">Off</button>
42+
<button type="button" class="btn btn-alert {{'active' if (device.last_config['mode'] == '3' or device.last_config['mode'] == '4' or device.last_config['mode'] == '5' or device.last_config['mode'] == '6')}}" aria-label="4" val="4">Auto</button>
43+
<button type="button" class="btn btn-alert {{'active' if (device.last_config['mode'] == '1' or device.last_config['mode'] == '2')}}" aria-label="2" val="2">On</button>
44+
</div>
45+
</div>
46+
47+
{% if context == 'devices'%}
48+
<div class="col-xs-3 col-lg-1">
49+
<i class="fa fa-thermometer-full fa-lg"></i>
50+
<i class="T">{{" {}".format(device.last_config['Temp'])}}</i>
51+
</div>
52+
53+
<div class="col-xs-3 col-lg-1">
54+
<button class="btn btn-primary" data-toggle="collapse" data-target="#boiler_stats" ignore="true">
55+
<i class="fa fa-line-chart" aria-hidden="true"></i>
56+
</button>
57+
</div>
58+
<div id="boiler_stats" class="collapse {{'in' if (device.last_config['visible'] == 'false')}}">
59+
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
60+
<script src="{{release}}js/highstock.min.js"></script>
61+
<!--<script src="js/highcharts.js?v=6"></script>-->
62+
<script src="{{release}}js/highcharts.min.js?id=1234"></script>
63+
64+
<div class="col-xs-12 col-lg-12">
65+
<div id="chart-container" style="height: 400px;">
66+
<br>Loading...<br>
67+
</div>
68+
</div>
69+
</div>
70+
{% endif %}
71+
72+
{% if context == 'scheduler'%}
73+
<div class="col-xs-5 col-lg-1 selectContainer">
74+
<div class="input-group target-temp">
75+
<select name="temp" class="form-control" value="50">
76+
<option value="Off" {{'selected' if device.last_config['target_temp'] == 'Off'}}>Off</option>
77+
<option value="50" {{'selected' if device.last_config['target_temp'] == '50'}}>50</option>
78+
<option value="55" {{'selected' if device.last_config['target_temp'] == '55'}}>55</option>
79+
<option value="60" {{'selected' if device.last_config['target_temp'] == '60'}}>60</option>
80+
<option value="65" {{'selected' if device.last_config['target_temp'] == '65'}}>65</option>
81+
<option value="70" {{'selected' if device.last_config['target_temp'] == '70'}}>70</option>
82+
</select>
83+
<span class="input-group-addon">
84+
<i class="fa fa-thermometer-full fa-lg"></i>
85+
</span>
86+
</div>
87+
</div>
88+
{% endif %}
89+
90+
91+
</div>
92+
93+
94+

‎templates/Light.html‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<div id="{{device.id}}" class="row" device-name="{{ device.name }}" device-type="{{device.type}}">
2+
{% if context == 'devices'%}
3+
<div class="col-xs-12 col-lg-2">
4+
{{ device.name }}
5+
</div>
6+
{% endif %}
7+
8+
<div class="col-xs-5 col-lg-1 toggle_div">
9+
<input class="toggle deviceOn" id="toggle-event" type="checkbox" data-toggle="toggle" data-onstyle="danger" data-offstyle="primary" val="device_on" hidden {{'checked' if (device.last_config['device_on'] == 'true')}}>
10+
</div>
11+
</div>
12+

‎templates/ShutterNew.html‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<div id="{{device.id}}" class="row" device-name="{{ device.name }}" device-type="{{device.type}}">
2+
{% if context == 'devices'%}
3+
<div class="col-xs-12 col-lg-2">
4+
{{ device.name }}
5+
</div>
6+
{% endif %}
7+
8+
<div class="col-xs-10 col-lg-6">
9+
<div class="btn-group" role="group" aria-label="Mode" val="mode">
10+
<button type="button" class="btn btn-primary {{'active' if device.last_config['mode'] == '100'}}" aria-label="100" val="100">
11+
<i class="fa fa-arrow-up" aria-hidden="true"></i>
12+
</button>
13+
<button type="button" class="btn fraction btn-primary {{'active' if device.last_config['mode'] == '75'}}" aria-label="75" val="75"><sup>3</sup>&frasl;<sub>4</sub></button>
14+
<button type="button" class="btn fraction btn-primary {{'active' if device.last_config['mode'] == '50'}}" aria-label="50" val="50"><sup>1</sup>&frasl;<sub>2</sub></button>
15+
<button type="button" class="btn fraction btn-primary {{'active' if device.last_config['mode'] == '25'}}" aria-label="25" val="25"><sup>1</sup>&frasl;<sub>4</sub></button>
16+
<button type="button" class="btn fraction btn-primary {{'active' if device.last_config['mode'] == '0'}}" aria-label="0" val="0">
17+
<i class="fa fa-arrow-down" aria-hidden="true"></i>
18+
</button>
19+
<button type="button" class="btn btn-primary {{'active' if device.last_config['mode'] == 'pause'}}" aria-label="Pause" val="pause">
20+
<i class="fa fa-stop" aria-hidden="true"></i>
21+
</button>
22+
</div>
23+
</div>
24+
{% if context == 'devices' %}
25+
<div class="col-xs-2 col-lg-6">
26+
<div class="status">{{"{}% Open".format(device.last_config['mode']) if device.last_config['mode'] not in ['0', '25', '50', '75', '100', 'pause']}}</div>
27+
</div>
28+
{% endif %}
29+
30+
<!--
31+
<div class="col-xs-9 col-lg-12">
32+
<div class="progress">
33+
<div class="progress-bar" role="progressbar" aria-valuenow="70" aria-valuemin="0" aria-valuemax="100" style="width:{{device.last_config['mode']}}%">
34+
{{"{}%".format(device.last_config['mode'])}}
35+
</div>
36+
</div>
37+
</div>
38+
-->
39+
40+
</div>

‎templates/Temperature.html‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<div id="{{device.id}}" class="row" device-type="{{device.type}}">
2+
{% if context == 'devices'%}
3+
<div class="col-xs-3 col-lg-2">
4+
{{ device.name }}
5+
</div>
6+
{% endif %}
7+
8+
<div class="col-xs-3 col-lg-1 T">
9+
{{"T= {} C".format(device.last_config['Temp'])}}
10+
</div>
11+
<div class="col-xs-3 col-lg-1 RH">
12+
{{"RH= {}".format(device.last_config['Rh'])}}
13+
</div>
14+
15+
<div class="col-xs-3 col-lg-1">
16+
<button class="btn btn-primary" data-toggle="collapse" data-target="#temperature_stats" ignore="true" onclick="setTimeRange({{device.last_config['timeRange']}})">
17+
<i class="fa fa-line-chart" aria-hidden="true"></i>
18+
</button>
19+
</div>
20+
<div id="temperature_stats" class="collapse {{'in' if (device.last_config['visible'] == 'false')}}">
21+
<script>
22+
function setURL(url){
23+
document.getElementById('iframe').src = url;
24+
}
25+
</script>
26+
<iframe id="iframe" width="390" height="200" style="border: 1px solid #cccccc;" ></iframe>
27+
<div class="btn-group" role="group" ignore="true">
28+
<button class="btn-default" onclick="setTimeRange(1)">Hour</button>
29+
<button class="btn-default" onclick="setTimeRange(4)">4 Hours</button>
30+
<button class="btn-default active" onclick="setTimeRange(24)">Day</button>
31+
<button class="btn-default" onclick="setTimeRange(24*7)">Week</button>
32+
</div>
33+
</div>
34+
<script>
35+
function setTimeRange(hours) {
36+
var now = new Date();
37+
localOffset = now.getTimezoneOffset() / 60;
38+
now.setHours(now.getHours()- hours + localOffset);
39+
var MyDateString;
40+
MyDateString = now.getFullYear() + '-' + ('0' + (now.getMonth() + 1)).slice(-2) + '-' + ('0' + now.getDate()).slice(-2) + '%20' + ('0' + now.getHours()).slice(-2) + ':' + ('0' + (now.getMinutes())).slice(-2) + ':' + ('0' + (now.getSeconds())).slice(-2);
41+
setURL("http://api.thingspeak.com/channels/112955/charts/1?width=auto&height=auto&dynamic=true&title=&start="+MyDateString)
42+
43+
//update the device config to server memory for reload.
44+
attributes = new Object();
45+
//while($( "#{{device.id}}" ).find('.collapse').hasClass( "collapsing" ));
46+
//attributes['visible'] = $( "#{{device.id}}" ).find('.collapse').hasClass( "in" );
47+
attributes['timeRange'] = hours;
48+
update_device({{ device.id }}, attributes);
49+
}
50+
</script>
51+
</div>

‎templates/api_error.html‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
<!DOCTYPE html>
2-
<html lang="en">
3-
<head>
4-
<meta charset="utf-8">
5-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6-
<meta name="viewport" content="width=device-width, initial-scale=1">
7-
<title>HomeWise - Hershko Corp. &copy;</title>
8-
<link rel="shortcut icon" href="/img/favicon.ico" />
9-
<link href="/css/app.css" rel="stylesheet">
10-
</head>
11-
<body class="api-error-body">
12-
<div class="api-image">
13-
<img src="/img/error.png"/>
14-
</div>
15-
<div class="api-message">
16-
Error!
17-
<br><br>
18-
{{ error_message }}
19-
</div>
20-
<script src="/js/api.js"></script>
21-
</body>
22-
</html>
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8">
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6+
<meta name="viewport" content="width=device-width, initial-scale=1">
7+
<title>HomeWise - Hershko Corp. &copy;</title>
8+
<link rel="shortcut icon" href="/img/favicon.ico" />
9+
<link href="/css/app.css" rel="stylesheet">
10+
</head>
11+
<body class="api-error-body">
12+
<div class="api-image">
13+
<img src="/img/error.png"/>
14+
</div>
15+
<div class="api-message">
16+
Error!
17+
<br><br>
18+
{{ error_message }}
19+
</div>
20+
<script src="/js/api.js"></script>
21+
</body>
22+
</html>

‎templates/api_ok.html‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
<!DOCTYPE html>
2-
<html lang="en">
3-
<head>
4-
<meta charset="utf-8">
5-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6-
<meta name="viewport" content="width=device-width, initial-scale=1">
7-
<title>HomeWise - Hershko Corp. &copy;</title>
8-
<link rel="shortcut icon" href="/img/favicon.ico" />
9-
<link href="/css/app.css" rel="stylesheet">
10-
</head>
11-
<body class="api-ok-body">
12-
<div class="api-image">
13-
<img src="/img/ok.png"/>
14-
</div>
15-
<div class="api-message">
16-
{{ device_name }} updated successfully!
17-
</div>
18-
<script src="/js/api.js"></script>
19-
</body>
20-
</html>
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8">
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6+
<meta name="viewport" content="width=device-width, initial-scale=1">
7+
<title>HomeWise - Hershko Corp. &copy;</title>
8+
<link rel="shortcut icon" href="/img/favicon.ico" />
9+
<link href="/css/app.css" rel="stylesheet">
10+
</head>
11+
<body class="api-ok-body">
12+
<div class="api-image">
13+
<img src="/img/ok.png"/>
14+
</div>
15+
<div class="api-message">
16+
{{ device_name }} updated successfully!
17+
</div>
18+
<script src="/js/api.js"></script>
19+
</body>
20+
</html>

‎templates/devices.html‎

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,20 @@
1-
<!DOCTYPE html>
2-
<html lang="en">
3-
{% include "head.html" %}
4-
<body>
5-
{% set active_link = 'devices' %}
6-
{% include "menu.html" %}
7-
8-
{% for device in devices %}
9-
{% if 'show_in_devices' in device %}
10-
{% if 'show_in_devices'=='true' %}
11-
{% include "{}.html".format(device.type) %}
12-
{% endif %}
13-
{% else %}
14-
{% include "{}.html".format(device.type) %}
15-
{% endif %}
16-
{% endfor %}
17-
18-
<div id="log"></div>
19-
20-
{% include "javascripts.html" %}
21-
<!--<script src="js/devices.js"></script>-->
22-
<script src="{{release}}js/devices.min.js"></script>
23-
</body>
24-
</html>
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
{% include "head.html" %}
4+
<body>
5+
{% set active_link = 'devices' %}
6+
{% include "menu.html" %}
7+
8+
{% for device in devices %}
9+
{% if device.show_in_devices %}
10+
{% include "{}.html".format(device.type) %}
11+
{% endif %}
12+
{% endfor %}
13+
14+
<div id="log"></div>
15+
16+
{% include "javascripts.html" %}
17+
<!--<script src="js/devices.js"></script>-->
18+
<script src="{{release}}js/devices.min.js"></script>
19+
</body>
20+
</html>

0 commit comments

Comments
 (0)