[Mpuls-commits] r541 - wasko/trunk/waskaweb/lib

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2009-07-14 15:16:19 +0200 (Tue, 14 Jul 2009)
New Revision: 541

Modified:
   wasko/trunk/waskaweb/lib/adelexml.py
Log:
Fixed issue342


Modified: wasko/trunk/waskaweb/lib/adelexml.py
===================================================================
--- wasko/trunk/waskaweb/lib/adelexml.py	2009-07-14 07:33:55 UTC (rev 540)
+++ wasko/trunk/waskaweb/lib/adelexml.py	2009-07-14 13:16:19 UTC (rev 541)
@@ -90,7 +90,7 @@
 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 = 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_15_24                = """(date_part('year', age(geburtsdatum)) >= 15 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)"""
 SQL_ALTER_55_64                = """(date_part('year', age(geburtsdatum)) >= 55 and date_part('year', age(geburtsdatum)) <= 64)"""
 SQL_ERWERBSTAETIG              = """(erwerbstaetigkeit_job = 1)"""
@@ -102,9 +102,9 @@
 SQL_ARBEITSLOSIGKEIT_SGBIII    = """(arbeitslosigkeit_1 = 1 and bezug_alg1 = 1)"""
 SQL_NICHTERWERBSTAETIG         = """(erwerbstaetigkeit_job = 0 and arbeitslosigkeit_1 = 0)"""
 SQL_NICHTERWERBSTAETIG_SCHULE  = """(erwerbstaetigkeit_job = 0 and arbeitslosigkeit_1 = 0 and bei_eintritt_ist_der_jugendliche = 1)"""
-SQL_MIGRATIONSHINTERGRUND      = """(nat_muspra not in (18,-1) or nat_staat not in (29,-1) or vater_land not in (1, -1) or mutter_land not in (1,-1))"""
+SQL_MIGRATIONSHINTERGRUND      = """(nat_muspra not in (18,-1) or nat_staat not in (1,-1) or vater_land not in (29, -1) or mutter_land not in (29,-1))"""
 SQL_BEHINDERUNG                = """(entw_beh = 1)"""
-SQL_SONST_BEEINTRAECHTIGUNG    = """(entw_h_1= 1 or entw_j_1= 1)"""
+SQL_SONST_BEEINTRAECHTIGUNG    = """(entw_h_1= 1 or entw_i_1= 1)"""
 SQL_OHNEABSCHLUSS              = """(schulabschluss_1 = 1)"""
 SQL_ISCED1_2                   = """(schulabschluss_1 in (3,4,5,9,10))"""
 SQL_ISCED3                     = """(schulabschluss_1 in (6))"""