ctdo
/
bunti
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
bunti/src/main/webapp/WEB-INF/jsp/index.jsp

211 lines
9.2 KiB
Plaintext
Raw Normal View History

changed the encoding
2012-03-20 22:14:18 +00:00
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
buzzer vorlage erstellt incl styles
2012-03-21 00:03:17 +00:00
<!DOCTYPE html>
clean up, many changes in spring. REST controller finally working with JSON Input and Output
2012-03-09 22:37:26 +00:00
<%@taglib prefix="spring" uri="http://www.springframework.org/tags"%>
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
buzzer vorlage erstellt incl styles
2012-03-21 00:03:17 +00:00
<html>
clean up, many changes in spring. REST controller finally working with JSON Input and Output
2012-03-09 22:37:26 +00:00
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>WebSockets</title>
some work on the gui
2012-03-15 00:03:45 +00:00
<link type="text/css" href="<c:url value="/resources/css/screen.css"/>" rel="stylesheet" />
backbone js added; code cleanup; reorganize slider
2012-03-20 23:45:40 +00:00
<link type="text/css" href="<c:url value="/resources/css/styles.css"/>" rel="stylesheet" />
colorpicker working for one predefined lamp
2012-03-21 21:06:16 +00:00
<link type="text/css" href="<c:url value="/resources/css/smoothness/jquery-ui-1.8.18.custom.css"/>" rel="stylesheet" />
clean up, many changes in spring. REST controller finally working with JSON Input and Output
2012-03-09 22:37:26 +00:00
<script type="text/javascript" src="<c:url value="/resources/js/jquery-1.7.1.min.js" />"></script>
<script type="text/javascript" src="<c:url value="/resources/js/jquery-ui-1.8.18.custom.min.js" />"></script>
some work on the gui
2012-03-15 00:03:45 +00:00
<script type="text/javascript" src="<c:url value="/resources/js/jquery.cookie.js" />"></script>
backbone js added; code cleanup; reorganize slider
2012-03-20 23:45:40 +00:00
<script type="text/javascript" src="<c:url value="/resources/js/backbone-min.js" />"></script>
colorpicker added, par56 licht ansicht erweitert
2012-03-21 03:19:34 +00:00
<script type="text/javascript" src="<c:url value="/resources/js/jquery.colorpicker.js" />"></script>
<script type="text/javascript" src="<c:url value="/resources/js/jquery.mousewheel.js" />"></script>
clean up, many changes in spring. REST controller finally working with JSON Input and Output
2012-03-09 22:37:26 +00:00
<script type="text/javascript">
colorpicker change does the following: updates all lamps which are selected in the select box
2012-03-21 21:56:19 +00:00
var volumes = $.parseJSON('{"room1":0,"room2":0,"room3":0,"room4":0}');
var devices = [
{"red":72,"green":69,"blue":255,"startAddress":1,"type":"Par56Spot","deviceId":0,"deviceName":"Par56 Lampe 1","picture":null},
{"red":111,"green":222,"blue":23,"startAddress":6,"type":"Par56Spot","deviceId":1,"deviceName":"Par56 Lampe 2","picture":null},
{"red":0,"green":0,"blue":0,"startAddress":11,"type":"Par56Spot","deviceId":2,"deviceName":"Par56 Lampe 3","picture":null},
{"red":0,"green":0,"blue":0,"startAddress":16,"type":"Par56Spot","deviceId":3,"deviceName":"Par56 Lampe 4","picture":null},
{"mode":0,"speed":0,"intensity":0,"startAddress":21,"type":"Strobe1500","deviceId":4,"deviceName":"Stroboskop 1","picture":null},
{"red":0,"green":0,"blue":0,"startAddress":508,"type":"Par56Spot","deviceId":5,"deviceName":"Par56 Lampe 5","picture":null}
];
clean up, many changes in spring. REST controller finally working with JSON Input and Output
2012-03-09 22:37:26 +00:00
$(document).ready(
extended controller and created a test web gui extended BuntiDevice with a picture Path
2012-03-13 23:57:00 +00:00
function() {
colorpicker change does the following: updates all lamps which are selected in the select box
2012-03-21 21:56:19 +00:00
extended controller and created a test web gui extended BuntiDevice with a picture Path
2012-03-13 23:57:00 +00:00
function sendData(data) {
$.ajax({
type: 'POST',
sending reorganized, dynamically create the first select of par56
2012-03-21 21:35:03 +00:00
url: "/control/devices",
extended controller and created a test web gui extended BuntiDevice with a picture Path
2012-03-13 23:57:00 +00:00
contentType: "application/json",
dataType: "json",
data: JSON.stringify(data)
});
colorpicker change does the following: updates all lamps which are selected in the select box
2012-03-21 21:56:19 +00:00
console.log(data);
console.log(JSON.stringify(data));
extended controller and created a test web gui extended BuntiDevice with a picture Path
2012-03-13 23:57:00 +00:00
}
clean up, many changes in spring. REST controller finally working with JSON Input and Output
2012-03-09 22:37:26 +00:00
extended controller and created a test web gui extended BuntiDevice with a picture Path
2012-03-13 23:57:00 +00:00
var senden = function sendOutAllDevices() {
sending reorganized, dynamically create the first select of par56
2012-03-21 21:35:03 +00:00
var changedDevs = new Array();
for(var i=0;i<devices.length;i++) {
if(devices[i].type=="Par56Spot" && devices[i].dirty) {
delete devices[i].dirty;
colorpicker change does the following: updates all lamps which are selected in the select box
2012-03-21 21:56:19 +00:00
var dev = {"deviceId": i, "options":{"red":devices[i].red, "green":devices[i].green, "blue":devices[i].blue}};
changedDevs.push(dev);
sending reorganized, dynamically create the first select of par56
2012-03-21 21:35:03 +00:00
}
}
if (changedDevs.length > 0) {
colorpicker change does the following: updates all lamps which are selected in the select box
2012-03-21 21:56:19 +00:00
sendData({"timeStamp": Math.round(new Date().getTime()/1000), "updates": changedDevs});
extended controller and created a test web gui extended BuntiDevice with a picture Path
2012-03-13 23:57:00 +00:00
}
colorpicker working for one predefined lamp
2012-03-21 21:06:16 +00:00
console.log("set new interval for sending");
colorpicker change does the following: updates all lamps which are selected in the select box
2012-03-21 21:56:19 +00:00
window.setTimeout(senden, 100);
extended controller and created a test web gui extended BuntiDevice with a picture Path
2012-03-13 23:57:00 +00:00
};
working on rest controller. something with Collection<DeviceUpdate> is not working...
2012-03-12 00:17:52 +00:00
changed the encoding
2012-03-20 22:14:18 +00:00
// vielleicht baut man lieber was mit setTimeout und setzt das jeweils neu wenn man daten ändert
// das könnte den Browser entlasten, sofern den das 200ms Aufrufen überhaupt stört :D
colorpicker working for one predefined lamp
2012-03-21 21:06:16 +00:00
senden();
clean up, many changes in spring. REST controller finally working with JSON Input and Output
2012-03-09 22:37:26 +00:00
some work on the gui
2012-03-15 00:03:45 +00:00
$("#slider1").slider({ min: 0, max: 100, slide: function(event, ui) {
volumes.room1 = ui.value;
extended controller and created a test web gui extended BuntiDevice with a picture Path
2012-03-13 23:57:00 +00:00
dataChanged = true;
} });
working on rest controller. something with Collection<DeviceUpdate> is not working...
2012-03-12 00:17:52 +00:00
some work on the gui
2012-03-15 00:03:45 +00:00
$("#slider2").slider({ min: 0, max: 100, slide: function(event, ui) {
volumes.room2 = ui.value;
extended controller and created a test web gui extended BuntiDevice with a picture Path
2012-03-13 23:57:00 +00:00
dataChanged = true;
} });
clean up, many changes in spring. REST controller finally working with JSON Input and Output
2012-03-09 22:37:26 +00:00
some work on the gui
2012-03-15 00:03:45 +00:00
$("#slider3").slider({ min: 0, max: 100, slide: function(event, ui) {
volumes.room3 = ui.value;
dataChanged = true;
} });
$("#slider4").slider({ min: 0, max: 100, slide: function(event, ui) {
volumes.room4 = ui.value;
dataChanged = true;
} });
sending reorganized, dynamically create the first select of par56
2012-03-21 21:35:03 +00:00
$("#tabs").tabs();
$("#v-tabs").tabs().addClass('ui-tabs-vertical');
$(".lampel .circle").click(function() {
if($(this).hasClass('black')){
$(this).removeClass('black');
} else {
$(this).addClass('black');
}
});
var colorpicker_raum1 = new jQuery.ColorPicker('#colorpicker-raum1', {
imagepath: '/resources/images/colorpicker/',
change: function(hexcolor) {
red = hexcolor.substr(1,2);
green = hexcolor.substr(3,2);
blue = hexcolor.substr(5,2);
colorpicker change does the following: updates all lamps which are selected in the select box
2012-03-21 21:56:19 +00:00
$('#par56select option:selected').each(function() {
devices[$(this).attr('name')].red = parseInt(red, 16);
devices[$(this).attr('name')].green = parseInt(green, 16);
devices[$(this).attr('name')].blue = parseInt(blue, 16);
devices[$(this).attr('name')].dirty = true;
});
sending reorganized, dynamically create the first select of par56
2012-03-21 21:35:03 +00:00
console.log("data changed");
some work on the gui
2012-03-15 00:03:45 +00:00
sending reorganized, dynamically create the first select of par56
2012-03-21 21:35:03 +00:00
}
clean up, many changes in spring. REST controller finally working with JSON Input and Output
2012-03-09 22:37:26 +00:00
});
sending reorganized, dynamically create the first select of par56
2012-03-21 21:35:03 +00:00
$.getJSON('/control/devices', function(data) {
devices = data;
for(var i=0;i<devices.length;i++) {
if(devices[i].type=="Par56Spot") {
$('#par56select').append("<option name=" + devices[i].deviceId + ">" + devices[i].deviceName + "</option>");
Styles für Schwarzen kreis und Lampel, wenn man bei Lampel auf die Kreise klickt, werden togglen sie schwarz<->farbe
2012-03-21 02:22:28 +00:00
}
sending reorganized, dynamically create the first select of par56
2012-03-21 21:35:03 +00:00
}
colorpicker working for one predefined lamp
2012-03-21 21:06:16 +00:00
vertikale tabs implementiert und testweise eingefügt
2012-03-21 01:54:33 +00:00
});
colorpicker change does the following: updates all lamps which are selected in the select box
2012-03-21 21:56:19 +00:00
$('#par56select').change(function() {
$('#par56select option:selected').each(function() {
var hexstring = '#' + devices[$(this).attr('name')].red.toString(16) + devices[$(this).attr('name')].green.toString(16) + devices[$(this).attr('name')].blue.toString(16);
console.log(hexstring);
colorpicker_raum1.hex(hexstring);
});
});
extended controller and created a test web gui extended BuntiDevice with a picture Path
2012-03-13 23:57:00 +00:00
}
);
clean up, many changes in spring. REST controller finally working with JSON Input and Output
2012-03-09 22:37:26 +00:00
</script>
</head>
<body>
main tabs container mittig, schriftart global verdana,arial,sans-serif
2012-03-21 02:02:31 +00:00
<h1>CTDO Raumsteuerung</h1>
clean up, many changes in spring. REST controller finally working with JSON Input and Output
2012-03-09 22:37:26 +00:00
some work on the gui
2012-03-15 00:03:45 +00:00
<div id="tabs">
<ul>
<li><a href="#tabs-1">Global</a></li>
<li><a href="#tabs-2">Raum 1</a></li>
<li><a href="#tabs-3">Raum 2</a></li>
<li><a href="#tabs-4">Raum 3</a></li>
<li><a href="#tabs-5">Raum 4</a></li>
</ul>
<div id="tabs-1">
colorpicker added, par56 licht ansicht erweitert
2012-03-21 03:19:34 +00:00
<div class="buzzer">
<span class="circle red">Zu</span>
<button>Buzzern</button>
</div>
<div class="buzzer">
<span class="circle green">Auf</span>
<button>Buzzern</button>
</div>
</div>
<div id="tabs-2">
vertikale tabs implementiert und testweise eingefügt
2012-03-21 01:54:33 +00:00
<div id="v-tabs" class="inner-tabs-container">
<ul>
<li><a href="#v-tabs-1">Licht</a></li>
<li><a href="#v-tabs-2">Musik</a></li>
Styles für Schwarzen kreis und Lampel, wenn man bei Lampel auf die Kreise klickt, werden togglen sie schwarz<->farbe
2012-03-21 02:22:28 +00:00
<li><a href="#v-tabs-3">Lampel</a></li>
vertikale tabs implementiert und testweise eingefügt
2012-03-21 01:54:33 +00:00
</ul>
<div id="v-tabs-1">
colorpicker added, par56 licht ansicht erweitert
2012-03-21 03:19:34 +00:00
<div id="colorpicker-raum1"></div>
sending reorganized, dynamically create the first select of par56
2012-03-21 21:35:03 +00:00
<select multiple="multiple" id="par56select">
colorpicker added, par56 licht ansicht erweitert
2012-03-21 03:19:34 +00:00
</select>
vertikale tabs implementiert und testweise eingefügt
2012-03-21 01:54:33 +00:00
</div>
<div id="v-tabs-2">
colorpicker added, par56 licht ansicht erweitert
2012-03-21 03:19:34 +00:00
<label for="slider1">Lautstärke Raum 1:</label><div id="slider1" class="slider"></div>
vertikale tabs implementiert und testweise eingefügt
2012-03-21 01:54:33 +00:00
</div>
Styles für Schwarzen kreis und Lampel, wenn man bei Lampel auf die Kreise klickt, werden togglen sie schwarz<->farbe
2012-03-21 02:22:28 +00:00
<div id="v-tabs-3">
<div class="lampel">
title zu den circles in der lampe hinzugefügt
2012-03-21 02:48:44 +00:00
<span class="circle red" title="click to toggle"></span>
<span class="circle yellow" title="click to toggle"></span>
<span class="circle green" title="click to toggle"></span>
Styles für Schwarzen kreis und Lampel, wenn man bei Lampel auf die Kreise klickt, werden togglen sie schwarz<->farbe
2012-03-21 02:22:28 +00:00
</div>
</div>
vertikale tabs implementiert und testweise eingefügt
2012-03-21 01:54:33 +00:00
</div>
some work on the gui
2012-03-15 00:03:45 +00:00
colorpicker added, par56 licht ansicht erweitert
2012-03-21 03:19:34 +00:00
<div class="switch">
Raumlicht:<br />
<input type="radio" name="raum-1-licht">An <input type="radio" name="raum-1-licht" checked="checked">Aus
</div>
some work on the gui
2012-03-15 00:03:45 +00:00
</div>
<div id="tabs-3">
backbone js added; code cleanup; reorganize slider
2012-03-20 23:45:40 +00:00
<label for="slider2">Lautstärke Raum 2:</label><div id="slider2" class="slider"></div>
some work on the gui
2012-03-15 00:03:45 +00:00
</div>
<div id="tabs-4">
backbone js added; code cleanup; reorganize slider
2012-03-20 23:45:40 +00:00
<label for="slider3">Lautstärke Raum 3:</label><div id="slider3" class="slider"></div>
some work on the gui
2012-03-15 00:03:45 +00:00
</div>
<div id="tabs-5">
backbone js added; code cleanup; reorganize slider
2012-03-20 23:45:40 +00:00
<label for="slider4">Lautstärke Raum 4:</label><div id="slider4" class="slider"></div>
some work on the gui
2012-03-15 00:03:45 +00:00
</div>
extended controller and created a test web gui extended BuntiDevice with a picture Path
2012-03-13 23:57:00 +00:00
</div>
clean up, many changes in spring. REST controller finally working with JSON Input and Output
2012-03-09 22:37:26 +00:00
some work on the gui
2012-03-15 00:03:45 +00:00
extended controller and created a test web gui extended BuntiDevice with a picture Path
2012-03-13 23:57:00 +00:00
<input type="button" value="Get Device 1" id="buttonLampe1" />
clean up, many changes in spring. REST controller finally working with JSON Input and Output
2012-03-09 22:37:26 +00:00
some work on the gui
2012-03-15 00:03:45 +00:00
<div id="messages"></div>
extended controller and created a test web gui extended BuntiDevice with a picture Path
2012-03-13 23:57:00 +00:00
clean up, many changes in spring. REST controller finally working with JSON Input and Output
2012-03-09 22:37:26 +00:00
</body>
</html>