Commit graph

535 commits

Author SHA1 Message Date
Steffen Vogel
282c2c309a vzlogger is proceeding.. 2011-05-18 19:42:13 +02:00
Steffen Vogel
672bff6efa stripped 3rd party libs for unsupported protocols 2011-05-18 19:41:29 +02:00
Steffen Vogel
478b97c5f7 updated submodules 2011-05-12 18:08:40 +02:00
Justin Otherguy
cf4ed60122 more s/backend/middleware/ 2011-04-29 03:42:23 +02:00
Justin Otherguy
68c596636a added copyright notice 2011-04-24 21:48:37 +02:00
Justin Otherguy
d2e681666d more s/backend/middleware/ ... 2011-04-15 21:36:06 +02:00
Steffen Vogel
0ffc82ba43 updated git submodules 2011-04-07 22:49:21 +02:00
Steffen Vogel
669256f071 added vz.org logo 2011-04-07 22:40:45 +02:00
Steffen Vogel
0279272535 removes refresh upon startup 2011-04-07 01:16:28 +02:00
Steffen Vogel
98fa92f957 updated year 2010 -> 2011 2011-04-07 00:01:41 +02:00
Steffen Vogel
3245609b5b some fixes for JpGraph 2011-04-06 23:51:55 +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
eddc778504 stripped a bit 2011-04-05 04:19:14 +02:00
Steffen Vogel
21fb3cb629 added first draft of SML library 2011-04-05 04:14:12 +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
0c872e1d78 removed outdated php controller 2011-03-26 12:16:33 +01:00
SvenPeitz
8623eab826 Eingabeformular um eine uuid zu erstellen 2011-03-25 17:30:23 +01:00
Steffen Vogel
08221f7d24 proceding with vzlogger... 2011-03-25 14:36:51 +01:00
Steffen Vogel
8b068bb44d updated fnordlicht submodule 2011-03-25 11:40:37 +01:00
Steffen Vogel
91431e4dc3 updated licence 2011-03-25 09:24:51 +01:00
Steffen Vogel
dca9b59fa8 some smaller changes in the frontend 2011-03-25 09:24:00 +01:00
Steffen Vogel
f8ed63b034 added skeleton of vzlogger utility 2011-03-25 01:01:30 +01:00
Steffen Vogel
82b670c152 specified git ref for doc generation script 2011-03-25 00:04:16 +01:00
Steffen Vogel
fee25b43a0 renamed "backend" to "middleware" 2011-03-24 23:23:10 +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
e622671936 removed obsolete prerequisite testing script 2011-03-24 22:43:03 +01:00
Steffen Vogel
1ceb297a6a updated tests and added hint 2011-03-24 22:42:39 +01:00
Steffen Vogel
4dc269c8e8 renamed "backend" to "middleware" 2011-03-24 22:39:26 +01:00
Steffen Vogel
aca8c2fc21 fixed bug in XML view 2011-03-24 22:16:30 +01:00
Steffen Vogel
3551c924bd improved handling when no public entities are available 2011-03-24 22:13:37 +01:00
Steffen Vogel
549c3a8cef fixed backend response if no public entities are available 2011-03-24 00:11:59 +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
d87218c571 Merge remote branch 'upstream/master' 2011-03-22 13:01:22 +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
804a01f6cb use custom RewriteBase 2011-03-22 11:36:57 +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
Justin Otherguy
baa7ab92bf changed unit for water meter from m^3 to l 2011-03-19 02:09:15 +01:00
Justin Otherguy
f6f81f5ae0 corrected unit for water meter 2011-03-19 01:39:10 +01:00
Steffen Vogel
816ff0129f typo in new classloader improvements 2011-03-17 12:29:21 +01:00
Steffen Vogel
855655931d set lib.doctrine = NULL to use php's include path, thx to jahir 2011-03-17 11:43:09 +01:00
Steffen Vogel
fd6dc000d3 fixed typo 2011-03-17 11:22:24 +01:00
Steffen Vogel
01d39068b9 moved doctrine path to config file 2011-03-17 11:18:42 +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
d7192c2b7f adapted Views to new DataController
improved debugging and entity defintion
2011-03-16 14:45:43 +01:00
Steffen Vogel
71bfe883d6 changed default behavior of DataController 2011-03-16 14:45:22 +01:00
Steffen Vogel
2fe3bc7f59 beautified radioactivity icon 2011-03-16 14:21:51 +01:00