Commit graph

47 commits

Author SHA1 Message Date
Steffen Vogel
98fa92f957 updated year 2010 -> 2011 2011-04-07 00:01:41 +02:00
Steffen Vogel
ef6fbc3d91 replace json parser by jquery 2011-04-06 23:50:58 +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
dca9b59fa8 some smaller changes in the frontend 2011-03-25 09:24:00 +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
00c24ec2d1 don't auto-refresh if we want to see old data 2011-03-22 15:16:56 +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
Jakob Hirsch
f690c269c4 use flot 0.7 (svn r324)
fixes several issues, most important the plot() memory leak
2011-03-22 11:35:24 +01:00
Steffen Vogel
fd6dc000d3 fixed typo 2011-03-17 11:22:24 +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
55b54b0dcf fixed automatic refresh and options saving (broken by scope issues) 2011-03-16 12:13:27 +01:00
Steffen Vogel
79db3f6c19 improved exception handling in frontend 2011-03-16 12:13:08 +01:00
Steffen Vogel
d5406c3424 added icons per entity type 2011-03-16 12:08:25 +01:00
Steffen Vogel
2e48407cef fixed smaller issues, added comments 2011-03-15 11:52:42 +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
bae8262524 too much to sumarize ;) 2011-03-11 00:13:23 +01:00
Steffen Vogel
c979bcea8e renamed frontend.js 2011-03-11 00:12:39 +01:00
Steffen Vogel
d3398f870e upgraded third party javascript libraries 2011-03-11 00:11:54 +01:00
Steffen Vogel
c4c34308d3 finally using our definitions to translate entity type & properties 2011-03-07 17:31:28 +01:00
Steffen Vogel
9d962df9ac fixes #62 (yet another autoscaling issue) 2011-03-07 02:34:21 +01:00
Steffen Vogel
fb3bfe8b24 fixed autoscaling 2011-03-02 14:27:54 +01:00
Steffen Vogel
a4c1094466 fixed #35 (fetch more data to avoid paddings in frontend) 2011-03-02 01:55:45 +01:00
Steffen Vogel
e1ecd428ae changed default color for plots 2011-03-01 23:51:26 +01:00
Steffen Vogel
db9aeb37b0 added tuple count to json output 2011-02-27 15:50:04 +01:00
Steffen Vogel
e8c47dc899 fixed #44 (allows negative values for temperature sensors) 2011-02-25 21:32:04 +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
cad41b1804 fixed #41 (display current value) 2011-02-24 17:58:16 +01:00
Justin Otherguy
03848bee36 fixes #44 2011-01-18 00:41:43 +01:00
Steffen Vogel
4a7323998b added dynamic refresh interval depending on zoom 2011-01-16 00:12:22 +01:00
Steffen Vogel
1549eb00c9 add unique uuids to permalink
introduced unique() to Array.prototype
2011-01-15 23:51:38 +01:00
Steffen Vogel
a43f9a6744 closes #38 (toggling group visibility) 2011-01-15 23:21:46 +01:00
Steffen Vogel
c3903262dc added uuids to permalink 2011-01-15 23:07:15 +01:00
Steffen Vogel
a6daca00f6 fixed bug on duplicate uuids via url parameter
adding multiple uuids per url
2011-01-15 21:46:01 +01:00
Justin Otherguy
aa184b785c adapted value rounding in options.js (due to modied interpretation) 2011-01-09 22:02:49 +01:00
Justin Otherguy
01a150adf5 better rounding 2011-01-09 22:00:00 +01:00
Justin Otherguy
929a4f7c39 relocated rounding from backend to frontend 2011-01-09 21:42:27 +01:00
Justin Otherguy
b5f7ffcf35 filled display for "average" for meters 2011-01-08 01:43:16 +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
Justin Otherguy
543c0c3de3 updatet default backend path 2010-12-28 01:19:14 +01:00
Steffen Vogel
d5d782aebb closes #39 (new directory structure) 2010-12-27 16:06:03 +01:00