[Mpuls-commits] r1590 - wasko/branches/2.0

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-02-16 11:00:57 +0100 (Tue, 16 Feb 2010)
New Revision: 1590

Modified:
   wasko/branches/2.0/ChangeLog
Log:
Updated ChangeLog


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-02-16 09:58:55 UTC (rev 1589)
+++ wasko/branches/2.0/ChangeLog	2010-02-16 10:00:57 UTC (rev 1590)
@@ -1,3 +1,18 @@
+2010-02-16  Torsten Irländer <torsten.irlaender at intevation.de>
+
+	* waskaweb/lib/evaluation.py (Evaluation_14.perform): Evaluation is
+	now done dynamically based on configuration.
+	* waskaweb/templates/evaluation/logbook.mako: Template for logbook
+	evaluation is now build dynamically based on configuration.
+	* waskaweb/lib/evaluation.py (Evaluation.export): Deleted, as no
+	export will be done for logbook evaluation.
+	* waskaweb/lib/evaluation.py: General cleanup. Removed unused code und
+	not used imports.
+	* waskaweb/lib/evaluation.py (LogbookEvaluation.__init__): Renamed
+	Evaluation_18 to LogbookEvaluation 
+	* waskaweb/model/logbook.py (Logbook.getEvaluation): Build
+	LogbookEvaluation instead of Evaluation_18. Fixed import.
+
 2010-02-15  Bernhard Herzog  <bh at intevation.de>
 
 	* waskaweb/controllers/evaluate.py: The base package is called
@@ -68,6 +83,7 @@
 	be loaded, the application will not work correctly anyway, so it's
 	better to fail early and noisily.
 
+>>>>>>> .r1589
 2010-02-15  Torsten Irländer <torsten.irlaender at intevation.de>
 
 	* waskaweb/controllers/case.py: Import CaseAppointmentFactory from
@@ -85,6 +101,19 @@
 	sql_helpers.
 	* waskaweb/model/logbook.py: Deleted import of CaseBundle
 	* waskaweb/lib/sql_helper.py: Deleted. Not imported from anywhere.
+	* waskaweb/model/logbook.py: Get type descriptions of logbook entries
+	from mpuls_config.
+	* waskaweb/model/logbook.py: Deleted var AVGKIND2TEXT. Is not used
+	anywhere.
+	* waskaweb/lib/evaluation.py: Do not import SUMKIND2TEXT and KIND2TEXT
+	from model.logbook. Get them from mpuls_config or define them in
+	lib.evaluation as this is the only place where they are used.
+	* waskaweb/model/logbook.py: Deleted SUMKIND2TEX. Not used in
+	model.loogbook anymore. 
+	* mpulsweb/lib/config.py: Added new config vars for logbook types and
+	descriptions
+	* waskaweb/templates/logbook/edit_body.mako: Build select box for type
+	of logbook entry dynamically from configuration.
 
 2010-02-15  Bernhard Herzog  <bh at intevation.de>