Skip to content
Snippets Groups Projects
Commit 0e4a2237 authored by jkerdreu's avatar jkerdreu
Browse files

Last push before migration 

git-svn-id: https://redmine.imt-atlantique.fr/svn/xaal/code/Python/branches/fork@1834 b32b6428-25c9-4566-ad07-03861ab6144f
parent 6bbdd445
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
apps/dashboard/xaal/dashboard/core/sio.py
+ 4
− 2
View file @ 0e4a2237
......@@ -9,11 +9,13 @@ def setup(wsgi_app):
app = socketio.Middleware(socket, wsgi_app)
return app
def remote_addr(sid):
env = socket.environ[sid]
return env['REMOTE_ADDR']
def broadcast(event,sio_msg):
socket.emit(event,sio_msg)
@socket.on('send_request')
def send_xaal_request(sid,addr,action,body):
xaal_core.send_request(addr,action,body)
......@@ -22,7 +24,6 @@ def send_xaal_request(sid,addr,action,body):
def query_attributes(sid,addr):
#env = socket.environ[sid]
#print('Quering cache for %s for %s/%s' % (addr,env['REMOTE_ADDR'],sid))
print("foo")
dev = xaal_core.get_device(str(addr))
if dev:
msg = { 'address': dev.address,'attributes':dev.attributes}
......@@ -30,6 +31,7 @@ def query_attributes(sid,addr):
@socket.on('refresh_attributes')
def refresh_attributes(sid,addrs):
print("[%s] Refresh attributes" % remote_addr(sid))
for addr in addrs:
dev = xaal_core.get_device(str(addr))
if dev:
......
apps/dashboard/xaal/dashboard/static/css/site.css
+ 4
− 3
View file @ 0e4a2237
......@@ -154,7 +154,7 @@ ul.menu li a:hover {
.grid-background {
//background-image: url("https://wallpaperscraft.com/image/spruce_shadow_dark_background_branch_68089_1920x1200.jpg");
//background-image: url("https://wallpaperlayer.com/img/2015/9/dark-background-images-5549-5809-hd-wallpapers.jpg");
background-image: url("/static/imgs/bg2.jpg");
background-image: url("/static/imgs/bg3.jpg");
min-height: 900px;
padding: 0.5em;
}
......@@ -164,7 +164,7 @@ ul.menu li a:hover {
color: #EEE;
border-radius: 3px;
padding: 8px;
font-size: 130%;
font-size: 120%;
height: 200px;
border: 1px solid var(--color2);
......@@ -195,6 +195,7 @@ ul.menu li a:hover {
padding: 0.5em 1.5em;
}
.button:hover {
background-color : var(--color3);
}
......@@ -228,7 +229,7 @@ ul.menu li a:hover {
}
.ripple:active:after {
transform: scale(0, 0);
opacity: .2;
opacity: .5;
transition: 0s;
}
......
apps/dashboard/xaal/dashboard/templates/base.mako
+ 1
− 1
View file @ 0e4a2237
......@@ -31,7 +31,7 @@
</ul>
</div>
<div id="messages"></div>
<!-- <div id="messages"></div> -->
<div id="main">
${self.body()}
......
apps/dashboard/xaal/dashboard/templates/grid.mako
+ 59
− 38
View file @ 0e4a2237
<%inherit file="base.mako"/>
<%namespace name="devices" file="device_def.mako" />
<div class="grid-background">
<div class="grid">
<div class="grid-box">
<b>Eclairage salon</b><br/><br/>
<div style="text-align:center;">
<span data-is="powerrelay" xaal_addr="092725ef-ca87-45d5-a619-9d7680046c93"/>
<b>Eclairage salon</b>
<span data-is="powerrelay" xaal_addr="ccc44227-d4fc-46eb-8578-159e2c47da02"></span>
<b>Eclairage SDB</b>
<span data-is="powerrelay" xaal_addr="ccc44227-d4fc-46eb-8578-159e2c47da03"></span>
</div>
</div>
<div class="grid-box">
<div style="text-align:center;">
<b>Test</b>
<span data-is="powerrelay" xaal_addr="8b71f050-b334-11e7-bca7-00fec8f7138c"></span>
<br/>
${devices.thermometer("c1c955a1-8bd3-4c37-b31c-047da2bbd3fa")}
</div>
</div>
<div class="grid-box">
<div>
<b>Temperature</b> <i class="fa fa-thermometer-half temperature" aria-hidden="true"></i>
<b>Température</b> <i class="fa fa-thermometer-half temperature" aria-hidden="true"></i>
<table>
<tr>
<td>Exterieur</td>
<td>Extérieur</td>
<td>
<a href="/generic/5fcc6ad1-804d-49cb-b66c-e877f2374905">
<span data-is="thermometer" xaal_addr="5fcc6ad1-804d-49cb-b66c-e877f2374905"></span>
<a href="/generic/c1c955a1-8bd3-4c37-b31c-047da2bbd3fa">
<span data-is="thermometer" xaal_addr="c1c955a1-8bd3-4c37-b31c-047da2bbd3fa"></span>
</a>
</td>
</tr>
<tr>
<td>Bureau</td>
<td>
<a href="/generic/2f31c922-01b2-4097-bfae-5753dde2cd42">
<span data-is="thermometer" xaal_addr="2f31c922-01b2-4097-bfae-5753dde2cd42"></span>
<a href="/generic/b4cec9fa-7513-4d87-bfc1-ee1107176cf0">
<span data-is="thermometer" xaal_addr="b4cec9fa-7513-4d87-bfc1-ee1107176cf0"></span>
</a>
</td>
</tr>
......@@ -41,7 +54,16 @@
</tr>
<tr>
<td>Chambre</td>
<td>Ch1</td>
<td>
<a href="/generic/2f31c933-01b2-4097-bfae-5753dde2cd42">
<span data-is="thermometer" xaal_addr="2f31c933-01b2-4097-bfae-5753dde2cd42"></span>
</a>
</td>
</tr>
<tr>
<td>Ch2</td>
<td>
<a href="/generic/2f31c933-01b2-4097-bfae-5753dde2cd42">
<span data-is="thermometer" xaal_addr="2f31c933-01b2-4097-bfae-5753dde2cd42"></span>
......@@ -50,6 +72,8 @@
</tr>
</table>
</div>
</div>
......@@ -57,13 +81,13 @@
<div class="grid-box">
<div>
<b>Humidite</b>
<b>Humidité</b>
<table>
<tr>
<td>Exterieur</td>
<td>
<a href="/generic/5fcc6ad2-804d-49cb-b66c-e877f2374905">
<span data-is="hygrometer" xaal_addr="5fcc6ad2-804d-49cb-b66c-e877f2374905"></span>
<a href="/generic/c1c955a2-8bd3-4c37-b31c-047da2bbd3fa">
<span data-is="hygrometer" xaal_addr="c1c955a2-8bd3-4c37-b31c-047da2bbd3fa"></span>
</a>
</td>
</tr>
......@@ -71,8 +95,8 @@
<tr>
<td>Bureau</td>
<td>
<a href="/generic/2f31c922-01b2-4097-bfae-5753dde2cd43">
<span data-is="hygrometer" xaal_addr="2f31c922-01b2-4097-bfae-5753dde2cd43"></span>
<a href="/generic/b4cec9fa-7513-4d87-bfc1-ee1107176cf1">
<span data-is="hygrometer" xaal_addr="b4cec9fa-7513-4d87-bfc1-ee1107176cf1"></span>
</a>
</td>
</tr>
......@@ -102,27 +126,24 @@
</div>
<div class="grid-box">
<div class="tooltip" >
<div>
<b>EDF</b><br/><br/><br/>
<b>EDF</b><br/>
O kW
</div>
<span class="tooltiptext">Tooltip text</span>
</div>
</div>
<div class="grid-box two">
<div data-is="generic-attrs" xaal_addr="092725ef-ca87-45d5-a619-9d7680046c93"></div>
<div data-is="generic-attrs" xaal_addr="8b71f050-b334-11e7-bca7-00fec8f7138c"></div>
</div>
<div class="grid-box">Foo</div>
</div>
</div>
</div> <!-- end of grid -->
</div><!-- end of grib background -->
<script type="riot/tag" src="/static/tags/powerrelay.tag"></script>
<script type="riot/tag" src="/static/tags/hygrometer.tag"></script>
<script type="riot/tag" src="/static/tags/thermometer.tag"></script>
<script type="riot/tag" src="/static/tags/clock.tag"></script>
<script type="riot/tag" src="/static/tags/generic_attrs.tag"></script>
<script type="riot/tag" src="/static/tags/clock.tag"></script>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment