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
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
ca92eaa5e7
removed namespace from exception type
2011-03-16 12:11:52 +01:00
Steffen Vogel
b783573d9e
added translations to definitions
2011-03-16 12:09:22 +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
3aa02568ee
fixed 'division by zero' issue
2011-03-15 10:10:52 +01:00
Steffen Vogel
7176e4a728
applied new DataIterator to Sensors
2011-03-14 16:20:18 +01:00
Steffen Vogel
73255c6698
removed debugging & smaller bugs
2011-03-14 16:18:03 +01:00
Steffen Vogel
e5a9b706b2
simplified data processing
2011-03-14 15:58:03 +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
3259c3d9e3
backend accepts now parameters via POST
2011-03-11 00:07:40 +01:00
