[Mpuls-commits] r199 - in waska/trunk: . waskaweb/lib waskaweb/templates/casemanagement/evaluation

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Fri Sep 26 10:58:17 CEST 2008 

Author: torsten
Date: 2008-09-26 10:58:16 +0200 (Fri, 26 Sep 2008)
New Revision: 199

Added:
   waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_esfstammblatt.mako
Modified:
   waska/trunk/ChangeLog.txt
   waska/trunk/waskaweb/lib/evaluation.py
Log:
Finished ESF-Stammblatt


Modified: waska/trunk/ChangeLog.txt
===================================================================
--- waska/trunk/ChangeLog.txt	2008-09-25 13:43:28 UTC (rev 198)
+++ waska/trunk/ChangeLog.txt	2008-09-26 08:58:16 UTC (rev 199)
@@ -1,3 +1,11 @@
+2008-09-26	Torsten Irlaender  <torsten.irlaender at intevation.de>
+
+	Completed ESF-Stammblatt evaluation. Small fix on evaluation
+
+	* waskaweb/lib/evaluation.py: Fixed false counting 
+	* waskaweb/templates/casemanagement/evaluation/evaluation_esfstammblatt.mako:
+	  Added missing template.
+
 2008-09-25	Sascha L. Teichmann <sascha.teichmann at intevation.de>
 
 	* waskaweb/controllers/agency_overview.py: Link back to download

Modified: waska/trunk/waskaweb/lib/evaluation.py
===================================================================
--- waska/trunk/waskaweb/lib/evaluation.py	2008-09-25 13:43:28 UTC (rev 198)
+++ waska/trunk/waskaweb/lib/evaluation.py	2008-09-26 08:58:16 UTC (rev 199)
@@ -715,7 +715,7 @@
                 months_abr += int(r[0]) * int(r[3])
                 anz_abr += int(r[3])
                 months_abg +=  int(r[0]) * int(r[1])
-                anz_vz += int(r[1])
+                anz_abg += int(r[1])
                 months_vz +=  int(r[0]) * int(r[5])
                 anz_vz += int(r[5])
             except:
@@ -1166,10 +1166,14 @@
 
             # Austritte
             austritte = self.austritte.perform()
+            #austritte= [avg_month_abg, anz_abg, avg_month_vz, anz_vz, avg_month_abr, anz_abr]
+            # Vorzeitig
             result['austritte'][2] = austritte[3]
             result['austritte'][3] = h.formatNumber(float(result['austritte'][2])/ divisor*100)
+            # Abgesch. 
             result['austritte'][4] = austritte[1]
             result['austritte'][5] = h.formatNumber(float(result['austritte'][4])/ divisor*100)
+            # Abbruch
             result['austritte'][6] = austritte[5]
             result['austritte'][7] = h.formatNumber(float(result['austritte'][6])/ divisor*100)
             result['austritte'][0] = austritte[1]+austritte[3]+austritte[5]

Added: waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_esfstammblatt.mako
===================================================================
--- waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_esfstammblatt.mako	2008-09-25 13:43:28 UTC (rev 198)
+++ waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_esfstammblatt.mako	2008-09-26 08:58:16 UTC (rev 199)
@@ -0,0 +1,101 @@
+## -*- coding: utf-8 -*-
+<%!  import waskaweb.lib.filters as F %>
+<table class="evaluation">
+  <tr>
+    <th class="table_header_h table_width_long">Kategorie</th>
+    <th class="table_header_h table_width_mid_s num">Anzahl</th>
+    <th class="table_header_h table_width_mid_s num">Prozent</th>
+  </tr>
+  <tr>
+    <td><b>Vorhabeneintritte gesamt</b></td>
+    <td class="num"><b>${c.eval_21['eintritte'][0]}</b></td>
+    <td class="num"><b>(${c.eval_21['eintritte'][1]}%)</b></td>
+  </tr>
+  <tr>
+    <td class="table_row_v_12"><b>Vorhabeneintritte</b></td>
+    <td class="table_row_v_12 num"></td>
+    <td class="table_row_v_12 num"></td>
+  </tr>
+  ## Aufschluesselung nach Alter
+  % for result in c.eval_21['eintritte_alter']:
+  <tr>
+    <td class="table_row_v_12">&nbsp;&nbsp;${result[0]}</td>
+    <td class="table_row_v_12 num">${result[1]}</td>
+    <td class="table_row_v_12 num">(${result[2]}%)</td>
+  </tr>
+  % endfor
+  ## Migrationshintergrund 
+  <tr>
+    <td><b>Migrantionshintergrund</b></td>
+    <td class="num"><b>${c.eval_21['migrationshintergrund'][0]}</b></td>
+    <td class="num"><b>(${c.eval_21['migrationshintergrund'][1]}%)</b></td>
+  </tr>
+  ## Arbeitslosigkeit
+  <tr>
+    <td class="table_row_v_12"><b>Arbeitslos gemeldet</b></td>
+    <td class="table_row_v_12 num"><b>${c.eval_21['arbeitslos']['gesamt'][0]}</b></td>
+    <td class="table_row_v_12 num"><b>(${c.eval_21['arbeitslos']['gesamt'][1]}%)</b></td>
+  </tr>
+  <tr>
+    <td class="table_row_v_12">&nbsp;&nbsp;davon langzeitarbeitslos</td>
+    <td class="table_row_v_12 num">${c.eval_21['arbeitslos']['lza'][0]| F.NA, h}</td>
+    <td class="table_row_v_12 num">(${c.eval_21['arbeitslos']['lza'][1]| F.NA, h}%)</td>
+  </tr>
+  <tr>
+    <td class="table_row_v_12">&nbsp;&nbsp;davon aus Regelkreis SGBII</td>
+    <td class="table_row_v_12 num">${c.eval_21['arbeitslos']['alg1'][0]| F.NA, h}</td>
+    <td class="table_row_v_12 num">(${c.eval_21['arbeitslos']['alg1'][1]| F.NA, h}%)</td>
+  </tr>
+  <tr>
+    <td class="table_row_v_12">&nbsp;&nbsp;davon aus Regelkreis SGBIII</td>
+    <td class="table_row_v_12 num">${c.eval_21['arbeitslos']['alg2'][0]| F.NA, h}</td>
+    <td class="table_row_v_12 num">(${c.eval_21['arbeitslos']['alg2'][1]| F.NA, h}%)</td>
+  </tr>
+  ## Nicht Erwerbstaetig
+  <tr>
+    <td class=""><b>Nicht-Erwerbstätig</b></td>
+    <td class="num"><b>${c.eval_21['nichterwerb']['gesamt'][0]}</b></td>
+    <td class="num"><b>(${c.eval_21['nichterwerb']['gesamt'][1]}%)</b></td>
+  </tr>
+  <tr>
+    <td class="">&nbsp;&nbsp;davon in schulischer Ausbildung</td>
+    <td class="num">${c.eval_21['nichterwerb']['schule'][0]| F.NA, h}</td>
+    <td class="num">(${c.eval_21['nichterwerb']['schule'][1]| F.NA, h}%)</td>
+  </tr>
+  ## Schulabschlüsse 
+  <tr>
+    <td class="table_row_v_12"><b>Angaben zum Abschluss</b></td>
+    <td class="table_row_v_12 num"></td>
+    <td class="table_row_v_12 num"></td>
+  </tr>
+  <tr>
+    <td class="table_row_v_12">&nbsp;&nbsp;Keinen Abschluss</td>
+    <td class="table_row_v_12 num">${c.eval_21['abschluss']['kein'][0] | F.NA, h}</td>
+    <td class="table_row_v_12 num">(${c.eval_21['abschluss']['kein'][1] | F.NA, h}%)</td>
+  </tr>
+  <tr>
+    <td class="table_row_v_12">&nbsp;&nbsp;ausschließlich Hauptschulabschluss, Realschulabschluss , BGJ oder BVJ</td>
+    <td class="table_row_v_12 num">${c.eval_21['abschluss']['hauptreal'][0] | F.NA, h}</td>
+    <td class="table_row_v_12 num">(${c.eval_21['abschluss']['hauptreal'][1] | F.NA, h}%)</td>
+  </tr>
+  <tr>
+    <td class=""><b>Vorhabenaustritte gesamt</b></td>
+    <td class="num"><b>${c.eval_21['austritte'][0]}</b></td>
+    <td class="num"><b>(${c.eval_21['austritte'][1]}%)</b></td>
+  </tr>
+  <tr>
+    <td class="">&nbsp;&nbsp;Reguläre Austritte</td>
+    <td class="num">${c.eval_21['austritte'][4]}</td>
+    <td class="num">(${c.eval_21['austritte'][5]}%)</td>
+  </tr>
+  <tr>
+    <td class="">&nbsp;&nbsp;Vorzeitige Austritte</td>
+    <td class="num">${c.eval_21['austritte'][2]}</td>
+    <td class="num">(${c.eval_21['austritte'][3]}%)</td>
+  </tr>
+  <tr>
+    <td class="">&nbsp;&nbsp;Abbrüche</td>
+    <td class="num">${c.eval_21['austritte'][6]}</td>
+    <td class="num">(${c.eval_21['austritte'][7]}%)</td>
+  </tr>
+</table>

More information about the Mpuls-commits mailing list