Commit graph

28 commits

Author SHA1 Message Date
Justin Otherguy
cf4ed60122 more s/backend/middleware/ 2011-04-29 03:42:23 +02:00
Steffen Vogel
98fa92f957 updated year 2010 -> 2011 2011-04-07 00:01:41 +02:00
Steffen Vogel
18a7078d33 added more options to configuration
added snapshot button
2011-04-06 23:49:54 +02:00
Steffen Vogel
b91ecd1a19 removed firebug-lite (we dont need it) 2011-03-28 15:17:02 +02:00
Steffen Vogel
60900666ee Merge branch 'master' of git://github.com/svenp/volkszaehler.org
Added form to create new entities (thx to paepke)

Conflicts:
	misc/controller/bash/log_i2c_ds1631_ecmd.sh
2011-03-26 13:19:02 +01:00
Steffen Vogel
12a41612b3 Merge branch 'master' of git://github.com/jahir/volkszaehler.org 2011-03-24 23:22:37 +01:00
Steffen Vogel
4dc269c8e8 renamed "backend" to "middleware" 2011-03-24 22:39:26 +01:00
Jakob Hirsch
ee788774ec reworked auto-refresh
- re-calculate refresh time after zooming or selecting
- calculate refresh time according to number of tuples
- use wrappers for setting/clearing refresh time
2011-03-22 12:54:35 +01:00
Steffen Vogel
b886d84802 added channel type dependend rendering as proposed by jahir 2011-03-17 11:01:19 +01:00
Jakob Hirsch
98300a7aa0 added "steps" display
this should much better represent the output from s0 electricity meters
and water meters, where we get one impuls per energy or volume unit and
(more important) the time interval depends on the throughput.
this does not make much sense for temperature, though. unfortunately,
we have currently no means to select different chart types depending
on the entity type.
also, I had to change the backend to output the starting time of the
interval (flot needs that) instead of the ending time, which changes
the "lines" chart. but since this chart is wrong for electricity and
water anyway, it doesn't realy matter, though.
2011-03-17 03:11:24 +01:00
Steffen Vogel
77fcc7cfb4 added extra column for costs 2011-03-16 17:51:54 +01:00
Steffen Vogel
7aea1823e9 repalced own ajax queue by jquery news deferred objects 2011-03-14 13:48:16 +01:00
Steffen Vogel
30729337e7 replaced minified javascript libs by full versions to make debugging easier
(we should minify all scripts, including ours, before the final release)
2011-03-11 17:15:09 +01:00
Steffen Vogel
d3398f870e upgraded third party javascript libraries 2011-03-11 00:11:54 +01:00
Justin Otherguy
5b36c5fea1 corrected path to flot for IE 2011-03-01 23:16:32 +01:00
Steffen Vogel
8f7683bf39 fixes #54 (double slash after redirection)
added check for javascript
2011-02-27 14:54:57 +01:00
Steffen Vogel
6fa845ed3e fixed overlay and zoom issue 2011-02-25 17:52:32 +01:00
Steffen Vogel
8eff32104e added colum to show energy consumption in kWh (unit stil missing) 2011-02-25 00:34:58 +01:00
Steffen Vogel
35cf7ed47e added label to jump to present 2011-02-24 17:55:36 +01:00
Justin Otherguy
62f1b5bc3f deactivated option "number of tuples" for now, since we probably do not need it anymore with the dynamic setting of the tuples following the window width 2011-01-30 00:07:08 +01:00
Justin Otherguy
57a5447b50 disabled option for setting a cookie (until the function behind it is implemented) 2011-01-16 23:42:13 +01:00
Justin Otherguy
3070c5337c Merge branch 'master' of github.com:volkszaehler/volkszaehler.org 2011-01-16 23:16:42 +01:00
Justin Otherguy
dc10346875 removed unused options (for now - we'll reenable them once they're implemented) 2011-01-16 23:16:17 +01:00
Steffen Vogel
9986e7b222 added favicon and apple touch icon 2011-01-16 09:44:58 +01:00
Justin Otherguy
66abec39f7 minor beautification (removed trailing ".") 2011-01-07 16:06:02 +01:00
Justin Otherguy
b5f8ae7d91 renamed "current" to "last"; more precise (and: "current" is ambiguous; particularly in a project that deals with electricity...) 2011-01-07 15:42:51 +01:00
Justin Otherguy
627813ac35 added display for the current value to the frontend (side-by-side to max., min. and avg.) 2011-01-07 15:18:31 +01:00
Steffen Vogel
d5d782aebb closes #39 (new directory structure) 2010-12-27 16:06:03 +01:00
Renamed from frontend/index.html (Browse further)