Commit Graph

123 Commits

Author SHA1 Message Date
Lucas Pleß c0cd519a4f working on cache and controllers 2012-05-26 01:56:44 +02:00
Lucas Pleß 892a7e6905 working on ethersex stuff 2012-05-25 18:02:59 +02:00
Lucas Ple� 8c363fbf64 Anderungen am Controller. Die Kanalwerte werden nicht in der DB gespeichert, deswegen bekommt man immer 0 zurueck wenn man sich die Geräte holt.
Leider nicht funktional soweit
2012-05-25 15:52:42 +02:00
Lucas Pleß f98ab7c225 blau 2012-05-11 00:44:30 +02:00
Lucas Pleß 6b41c9cb92 Merge remote-tracking branch 'remotes/origin/maint/henne' into maint/lp 2012-05-11 00:43:07 +02:00
Hendrik Fellerhoff f1bae83556 merge complete 2012-05-10 17:05:04 +02:00
Hendrik Fellerhoff 8248804ac7 diverse fortschritte, page für crashtest 2012-05-10 17:03:33 +02:00
Lucas Pleß 0c356f3bdb corrected buntiethersexdevice. 2012-03-30 17:14:29 +02:00
Lucas Pleß 2c7694036d clean up 2012-03-30 17:00:30 +02:00
Lucas Pleß a5329a0bcc moved model classes, extended Ethersex Device section 2012-03-26 23:21:44 +02:00
Lucas Pleß ed69f6a0e3 removed Devices classes 2012-03-26 23:02:58 +02:00
Lucas Pleß 4f288256e8 moved model classes to their packages 2012-03-26 23:02:42 +02:00
Lucas Pleß 41bfcd33c3 first approach to connect to ethersex devices like lampel 2012-03-26 01:26:52 +02:00
Lucas Pleß 53f6e29eb3 added devices to rooms 2012-03-25 19:56:09 +02:00
Lucas Pleß b224e1b0ba changed dao dependencies from hibernate to JPA api. 2012-03-25 19:47:16 +02:00
Lucas Pleß 8f2610314e moved devicechange event and the webmodel to web.model 2012-03-25 18:30:51 +02:00
Lucas Pleß 1921417667 Merge branch 'maint/jjg' into maint/lp 2012-03-25 18:17:57 +02:00
Lucas Pleß 03ed17d10d refactoring of the controllers and some cleanup 2012-03-25 17:58:07 +02:00
Lucas Pleß 0cb8e585af jpa+hibernate basically working 2012-03-25 16:23:45 +02:00
Lucas Pleß ec3620df77 Merge branch 'maint/henne' into maint/lp 2012-03-24 22:00:51 +01:00
Hendrik Fellerhoff 60d5fc8323 devices view/models created 2012-03-23 03:13:44 +01:00
Hendrik Fellerhoff 4e26793524 views.js wasn't added to git - dunno why ;D 2012-03-23 02:59:58 +01:00
Hendrik Fellerhoff b11e96dc64 first routes added 2012-03-23 02:57:42 +01:00
Hendrik Fellerhoff d6b7f80c93 buzzer is now a template 2012-03-23 02:57:18 +01:00
Hendrik Fellerhoff b21670aea2 now using template and json object to generate room tabs 2012-03-23 02:41:15 +01:00
Hendrik Fellerhoff 274fdf53c1 prototype javascript removed 2012-03-23 00:54:41 +01:00
Hendrik Fellerhoff efb07b64da main.js included in index.jsp 2012-03-23 00:53:01 +01:00
Hendrik Fellerhoff 51005c7f7b first two templates added, javascript now in a seperate file 2012-03-23 00:52:33 +01:00
Hendrik Fellerhoff c0782344e7 added handlebars.js templating system 2012-03-23 00:41:02 +01:00
Hendrik Fellerhoff 594e545080 rooms.json added, it includes sample json for a roomlist 2012-03-22 14:58:09 +01:00
Hendrik Fellerhoff 67d82c4af6 some code removed 2012-03-22 14:57:18 +01:00
Hendrik Fellerhoff 855efcd572 buzzer works, some code removed 2012-03-22 14:53:01 +01:00
Lucas Pleß 55fe1dca17 annotation based hibernate. but relations are still broken and the inheritance (Device) is not working correctly 2012-03-21 23:43:00 +01:00
Hendrik Fellerhoff a833a3b6a4 interval instead of timeout 2012-03-21 23:42:49 +01:00
Hendrik Fellerhoff e49a0ddbab colorpicker change does the following: updates all lamps which are selected in the select box 2012-03-21 22:56:19 +01:00
Hendrik Fellerhoff e60ffe6360 sending reorganized, dynamically create the first select of par56 2012-03-21 22:35:03 +01:00
Lucas Pleß 04f77c6553 renamed controller and removed duplicate function to update device data. 2012-03-21 22:17:40 +01:00
Hendrik Fellerhoff 7d2fe8fd04 colorpicker working for one predefined lamp 2012-03-21 22:06:16 +01:00
Lucas Pleß c09e08200f tried to make hibernate work with h2 and annotations 2012-03-21 21:23:16 +01:00
Lucas Pleß 793cb2a940 renamed getDeviceID to getId 2012-03-21 21:22:53 +01:00
Lucas Pleß 351f1b1816 Merge branch 'maint/lp' 2012-03-21 19:52:44 +01:00
Hendrik Fellerhoff 620796248b colorpicker added, par56 licht ansicht erweitert 2012-03-21 04:19:34 +01:00
Hendrik Fellerhoff 56293334e5 title zu den circles in der lampe hinzugefügt 2012-03-21 03:48:44 +01:00
Hendrik Fellerhoff b8d6002f1b diverse style anpassungen:
hintergrund bei lampel
vertical tabs navi bar verkleinert und border-bottom radius entfernt
2012-03-21 03:46:48 +01:00
Hendrik Fellerhoff e0cd2112ed Merge branch 'master' of git.ctdo.de:bunti 2012-03-21 03:26:21 +01:00
Hendrik Fellerhoff 493231cd0d Styles für Schwarzen kreis und Lampel, wenn man bei Lampel auf die Kreise klickt, werden togglen sie schwarz<->farbe 2012-03-21 03:22:28 +01:00
Hendrik Fellerhoff 129c0d53bd Styles für grünen kreis hinzugefügt 2012-03-21 03:05:23 +01:00
Hendrik Fellerhoff 4ad6fe2a5b main tabs container mittig, schriftart global verdana,arial,sans-serif 2012-03-21 03:02:31 +01:00
Hendrik Fellerhoff 7c554a610d vertikale tabs implementiert und testweise eingefügt 2012-03-21 02:54:33 +01:00
Hendrik Fellerhoff 5820b94859 model js angelegt, model für räume angelegt 2012-03-21 02:11:50 +01:00