[Mpuls-commits] r534 - in wasko/trunk: . waskaweb/lib

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2009-06-25 10:27:45 +0200 (Thu, 25 Jun 2009)
New Revision: 534

Modified:
   wasko/trunk/ChangeLog.txt
   wasko/trunk/waskaweb/lib/adelexml.py
Log:
Fixed evaluation "Art der Beendigung" (Part 1)


Modified: wasko/trunk/ChangeLog.txt
===================================================================
--- wasko/trunk/ChangeLog.txt	2009-06-23 07:30:17 UTC (rev 533)
+++ wasko/trunk/ChangeLog.txt	2009-06-25 08:27:45 UTC (rev 534)
@@ -1,3 +1,12 @@
+2009-06-25	Torsten Irlaender  <torsten.irlaender at intevation.de> 
+
+	Fixed evaluation "Art der Beendigung": Values have changed for
+	"Abbruch" and "Vorzeitige Beendigung
+
+	* lib/adelexml.py: TODO: Check "Vorzeitige Beendigung". Maybe remove
+	this evaluation as there is no option for the user to set a case as
+	"vorzeitig beendet".
+
 2009-06-23	Torsten Irlaender  <torsten.irlaender at intevation.de> 
 
 	Tagged version 1.0.3

Modified: wasko/trunk/waskaweb/lib/adelexml.py
===================================================================
--- wasko/trunk/waskaweb/lib/adelexml.py	2009-06-23 07:30:17 UTC (rev 533)
+++ wasko/trunk/waskaweb/lib/adelexml.py	2009-06-25 08:27:45 UTC (rev 534)
@@ -88,7 +88,7 @@
 SQL_EINTRITTE_GESAMT           = """('%s'::date <= datum_cm_start and '%s'::date >= datum_cm_start)"""
 SQL_AUSTRITTE_GESAMT           = """('%s'::date <= datum_cm_ende and '%s'::date >= datum_cm_ende)"""
 SQL_AUSTRITTE_VORZEITIG        = """(cm_end_art = 2 and '%s'::date <= datum_cm_ende and '%s'::date >= datum_cm_ende)"""
-SQL_AUSTRITTE_ABBRUCH          = """(cm_end_art = 1 and '%s'::date <= datum_cm_ende and '%s'::date >= datum_cm_ende)"""
+SQL_AUSTRITTE_ABBRUCH          = """(cm_end_art = 3 and '%s'::date <= datum_cm_ende and '%s'::date >= datum_cm_ende)"""
 SQL_CMKUNDEN                   = """TRUE"""
 SQL_ALTER_15_24                = """(date_part('year', age(geburtsdatum)) >= 14 and date_part('year', age(geburtsdatum)) <= 24)"""
 SQL_ALTER                      = """(date_part('year', age(geburtsdatum)) < 15 or date_part('year', age(geburtsdatum)) >= 25 and date_part('year', age(geburtsdatum)) <= 54 or date_part('year', age(geburtsdatum)) > 64)"""