[Mpuls-commits] r187 - in waska/trunk: . waskaweb/controllers waskaweb/i18n waskaweb/i18n/de/LC_MESSAGES waskaweb/lib waskaweb/templates/casemanagement/evaluation
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Sep 23 11:24:11 CEST 2008
Author: torsten
Date: 2008-09-23 11:24:10 +0200 (Tue, 23 Sep 2008)
New Revision: 187
Modified:
waska/trunk/ChangeLog.txt
waska/trunk/waskaweb/controllers/evaluate.py
waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
waska/trunk/waskaweb/i18n/waskaweb.pot
waska/trunk/waskaweb/lib/evaluation.py
waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako
waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako
Log:
Added two new evaluations
Modified: waska/trunk/ChangeLog.txt
===================================================================
--- waska/trunk/ChangeLog.txt 2008-09-22 13:14:33 UTC (rev 186)
+++ waska/trunk/ChangeLog.txt 2008-09-23 09:24:10 UTC (rev 187)
@@ -1,3 +1,16 @@
+2008-09-23 Torsten Irlaender <torsten.irlaender at intevation.de>
+
+ Added two new evaluations
+
+ * waskaweb/i18n/waskaweb.pot,
+ waskaweb/i18n/de/LC_MESSAGES/waskaweb.po,
+ waskaweb/controllers/evaluate.py,
+ waskaweb/lib/evaluation.py,
+ waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako,
+ waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:
+ Added two new evaluations on unemployment over kids in
+ case-management.
+
2008-09-22 Torsten Irlaender <torsten.irlaender at intevation.de>
Set Version number to 1.4.0
Modified: waska/trunk/waskaweb/controllers/evaluate.py
===================================================================
--- waska/trunk/waskaweb/controllers/evaluate.py 2008-09-22 13:14:33 UTC (rev 186)
+++ waska/trunk/waskaweb/controllers/evaluate.py 2008-09-23 09:24:10 UTC (rev 187)
@@ -197,6 +197,12 @@
# Geschlecht
e2 = Evaluation_2(self._getCompressedIds(reset))
c.eval_2_t, c.eval_2_m, c.eval_2_w, c.eval_2_i, c.eval_2_u = e2.perform()
+ # Arbeitslose
+ e19 = Evaluation_19(self._getCompressedIds(reset))
+ c.eval_19 = e19.perform()
+ # Nicht-Erwerbspersonen
+ e20 = Evaluation_20(self._getCompressedIds(reset))
+ c.eval_20 = e20.perform()
page = render('casemanagement/evaluation/evaluation_result_2.mako')
elif id == '3':
# Vermittlung
@@ -383,4 +389,22 @@
traceback.print_exc(file=sys.stderr)
raise HTTPNotFound()
+ @checkRole(('admin_ka', 'cm_ka', 'pt_dlr', 'pb_ka'))
+ def exportEvaluation_19(self):
+ try:
+ e = Evaluation_19(self._getCompressedIds())
+ return self._export(e)
+ except:
+ traceback.print_exc(file=sys.stderr)
+ raise HTTPNotFound()
+
+ @checkRole(('admin_ka', 'cm_ka', 'pt_dlr', 'pb_ka'))
+ def exportEvaluation_20(self):
+ try:
+ e = Evaluation_20(self._getCompressedIds())
+ return self._export(e)
+ except:
+ traceback.print_exc(file=sys.stderr)
+ raise HTTPNotFound()
+
# vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8:
Modified: waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
===================================================================
--- waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po 2008-09-22 13:14:33 UTC (rev 186)
+++ waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po 2008-09-23 09:24:10 UTC (rev 187)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: waskaweb 0.0.0\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2008-08-27 14:34+0200\n"
+"POT-Creation-Date: 2008-09-22 17:49+0200\n"
"PO-Revision-Date: 2007-10-14 20:33+0200\n"
"Last-Translator: Torsten Irländer<torsten.irlaender at intevation.de>\n"
"Language-Team: de <LL at li.org>\n"
@@ -188,111 +188,115 @@
"Ihre Standard-Vertretung wurde gespeichert. Bitte klicken Sie auf OK, um "
"fortzufahren."
-#: waskaweb/lib/evaluation.py:171
+#: waskaweb/lib/evaluation.py:178
#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:37
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:15
msgid "cm_eval_summary_header_1"
msgstr "1.1. Verhältnis Beratungskunden/Aufnahmen in das Case-Management (CM)"
-#: waskaweb/lib/evaluation.py:227
+#: waskaweb/lib/evaluation.py:234
#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:44
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:67
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:73
msgid "cm_eval_summary_header_4"
msgstr "2.2. Alters- und Geschlechterstruktur in %"
-#: waskaweb/lib/evaluation.py:271
+#: waskaweb/lib/evaluation.py:285
#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:45
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:134
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:140
msgid "cm_eval_summary_header_5"
msgstr "2.3. Migrationshintergrund"
-#: waskaweb/lib/evaluation.py:321
+#: waskaweb/lib/evaluation.py:335
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:45
msgid "cm_eval_header_access_youngster_to_agency"
msgstr "1.2.1. Zugang des Jugendlichen zur Kompetenzagentur"
-#: waskaweb/lib/evaluation.py:366
+#: waskaweb/lib/evaluation.py:380
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:75
msgid "cm_eval_head_law_access_agency"
msgstr "1.2.2. Angaben zum Rechtskreis beim Zugang zur Kompetenzagentur"
-#: waskaweb/lib/evaluation.py:417
+#: waskaweb/lib/evaluation.py:431
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:16
msgid "cm_eval_head_where_to_place_youngster"
msgstr "3.1.1. Wohin wurden die Jugendlichen vermittlelt?"
-#: waskaweb/lib/evaluation.py:463
+#: waskaweb/lib/evaluation.py:477
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:46
msgid "cm_eval_header_law_changed_after_place"
msgstr "3.1.2. Angaben zum Rechtskreis nach der Vermittlung"
-#: waskaweb/lib/evaluation.py:538
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:102
+#: waskaweb/lib/evaluation.py:552
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:108
msgid "cm_eval_header_on_age"
msgstr "2.2.2. Angaben zur Altersverteilung"
-#: waskaweb/lib/evaluation.py:603
+#: waskaweb/lib/evaluation.py:617
#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:46
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:164
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:170
msgid "cm_eval_summary_header_6"
msgstr "2.4. Förderbedarf"
-#: waskaweb/lib/evaluation.py:667
+#: waskaweb/lib/evaluation.py:686
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:14
msgid "cm_eval_length_cm"
msgstr "2.1.1. Verweildauer im CM"
-#: waskaweb/lib/evaluation.py:708
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:41
+#: waskaweb/lib/evaluation.py:734
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:44
msgid "cm_eval_avg_length_cm"
msgstr "2.1.2. Durchschnittliche Verweildauer in Wochen"
-#: waskaweb/lib/evaluation.py:758
+#: waskaweb/lib/evaluation.py:784
msgid "cm_eval_header_graduation"
msgstr "1.3. Höchster erreichte Schulanbschluss"
-#: waskaweb/lib/evaluation.py:808
+#: waskaweb/lib/evaluation.py:834
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:105
msgid "cm_eval_header_work"
msgstr "1.2.3. Status des Jugendlichen beim Zugang zur Kompetenzagentur"
-#: waskaweb/lib/evaluation.py:817 waskaweb/lib/evaluation.py:964
+#: waskaweb/lib/evaluation.py:843 waskaweb/lib/evaluation.py:989
msgid "cm_eval_header_effort"
msgstr "Aufschlüsselung der einzelnen Tätigkeiten"
-#: waskaweb/lib/evaluation.py:924
+#: waskaweb/lib/evaluation.py:949
msgid "cm_eval_header_effort2"
msgstr "Aufschlüsselung der einzelnen Tätigkeiten"
-#: waskaweb/lib/evaluation.py:941
+#: waskaweb/lib/evaluation.py:966
msgid "cm_eval_header_avg_effort"
msgstr "Durchschnittliche Dauer der Tätigkeiten"
-#: waskaweb/lib/evaluation.py:957
+#: waskaweb/lib/evaluation.py:982
msgid "cm_eval_header_avg_effort2"
msgstr "Durchschnittliche Dauer der Tätigkeiten"
-#: waskaweb/lib/renderer.py:244
+#: waskaweb/lib/evaluation.py:1057 waskaweb/lib/evaluation.py:1100
+msgid "cm_eval_header_enemployed"
+msgstr ""
+
+#: waskaweb/lib/renderer.py:251
msgid "cm_rg_aid_overview_table_institution"
msgstr "Institution"
-#: waskaweb/lib/renderer.py:245
+#: waskaweb/lib/renderer.py:252
msgid "cm_rg_aid_overview_table_offer_type"
msgstr "Form"
-#: waskaweb/lib/renderer.py:246
+#: waskaweb/lib/renderer.py:253
msgid "cm_rg_aid_overview_table_actions"
msgstr "Aktionen"
-#: waskaweb/lib/renderer.py:248
+#: waskaweb/lib/renderer.py:255
msgid "cm_rg_aid_overview_table_edit"
msgstr "Bearbeiten"
-#: waskaweb/lib/renderer.py:249
+#: waskaweb/lib/renderer.py:256
msgid "cm_rg_aid_overview_table_goal"
msgstr "Zielsetzung"
-#: waskaweb/lib/renderer.py:250 waskaweb/lib/renderer.py:251
+#: waskaweb/lib/renderer.py:257 waskaweb/lib/renderer.py:258
#: waskaweb/templates/administration/overview_user.mako:43
#: waskaweb/templates/administration/overview_user.mako:60
#: waskaweb/templates/administration/overview_usergroups.mako:34
@@ -316,7 +320,7 @@
msgid "cm_overview_a_show"
msgstr "Anzeigen"
-#: waskaweb/lib/renderer.py:252 waskaweb/lib/renderer.py:253
+#: waskaweb/lib/renderer.py:259 waskaweb/lib/renderer.py:260
#: waskaweb/templates/administration/overview_user.mako:45
#: waskaweb/templates/administration/overview_user.mako:62
#: waskaweb/templates/administration/overview_usergroups.mako:35
@@ -337,65 +341,65 @@
msgid "cm_overview_a_delete"
msgstr "Löschen"
-#: waskaweb/lib/renderer.py:254
+#: waskaweb/lib/renderer.py:261
msgid "cm_rg_aid_overview_table_no_offer_found"
msgstr "Keine Angebote gefunden"
-#: waskaweb/lib/renderer.py:255
+#: waskaweb/lib/renderer.py:262
msgid "cm_rg_aid_overview_legend_legend"
msgstr "Legende:"
-#: waskaweb/lib/renderer.py:256
+#: waskaweb/lib/renderer.py:263
msgid "cm_rg_aid_overview_legend_bb"
msgstr "(BB)"
-#: waskaweb/lib/renderer.py:257
+#: waskaweb/lib/renderer.py:264
msgid "cm_rg_aid_overview_legend_common_educational_area"
msgstr "Allgemein bildenden Bereich"
-#: waskaweb/lib/renderer.py:258
+#: waskaweb/lib/renderer.py:265
msgid "cm_rg_aid_overview_legend_bv"
msgstr "(BV)"
-#: waskaweb/lib/renderer.py:259
+#: waskaweb/lib/renderer.py:266
msgid "cm_rg_aid_overview_legend_vocational_preparation"
msgstr "Bereich der Berufsvorbereitung"
-#: waskaweb/lib/renderer.py:260
+#: waskaweb/lib/renderer.py:267
msgid "cm_rg_aid_overview_legend_bq"
msgstr "(BQ)"
-#: waskaweb/lib/renderer.py:261
+#: waskaweb/lib/renderer.py:268
msgid "cm_rg_aid_overview_legend_qualifications"
msgstr "Berufliche Qualifizierung"
-#: waskaweb/lib/renderer.py:262
+#: waskaweb/lib/renderer.py:269
msgid "cm_rg_aid_overview_legend_lb"
msgstr "(LB)"
-#: waskaweb/lib/renderer.py:263
+#: waskaweb/lib/renderer.py:270
msgid "cm_rg_aid_overview_legend_life_skills"
msgstr "Lebensbewältigung"
-#: waskaweb/lib/renderer.py:264
+#: waskaweb/lib/renderer.py:271
msgid "cm_rg_aid_overview_legend_new_offer"
msgstr "Neues Angebot hinzufügen"
-#: waskaweb/model/case.py:1081 waskaweb/model/case.py:1082
+#: waskaweb/model/case.py:1117 waskaweb/model/case.py:1118
#: waskaweb/templates/casemanagement/caselist.mako:64
#: waskaweb/templates/casemanagement/caselist.mako:123
msgid "case_state_label_open"
msgstr "Bearbeitbar"
-#: waskaweb/model/case.py:1083
+#: waskaweb/model/case.py:1119
msgid "case_state_label_outstanding_delete"
msgstr "Schwebend gelöscht"
-#: waskaweb/model/case.py:1084
+#: waskaweb/model/case.py:1120
msgid "case_state_label_outstanding_anon"
msgstr "Schwebend anonymisiert"
-#: waskaweb/model/case.py:1085
+#: waskaweb/model/case.py:1121
msgid "case_state_label_anon"
msgstr "Anonymisiert"
@@ -533,12 +537,11 @@
msgstr "22.09.2008 | Version 1.4.0"
#: waskaweb/templates/main_login.mako:38
-#: waskaweb/templates/start/responsible.mako:149
msgid "main_login_bmf_phrase"
msgstr ""
-"Das Programm "Kompetenzagenturen" wird vom "
-"Bundesministerium für Familie, Senioren, Frauen und Jugend aus Mitteln des "
-"Europäischen Sozialfonds gefördert."
+"Das Programm \"Kompetenzagenturen\" wird vom Bundesministerium für Familie, "
+"Senioren, Frauen und Jugend aus Mitteln des Europäischen Sozialfonds "
+"gefördert."
#: waskaweb/templates/main_login.mako:59
msgid "main_login_formular_input_error"
@@ -1472,7 +1475,7 @@
msgid "cm_header_overview"
msgstr "Fallaktenübersicht"
-#: waskaweb/templates/casemanagement/agency_search.mako:55
+#: waskaweb/templates/casemanagement/agency_search.mako:57
#: waskaweb/templates/casemanagement/search.mako:6
msgid "cm_form_overview_search_submit"
msgstr "Suchen"
@@ -1514,6 +1517,8 @@
#: waskaweb/templates/casemanagement/dialogs/confirm_open.mako:5
#: waskaweb/templates/casemanagement/dialogs/delete_attachment_success.mako:6
#: waskaweb/templates/casemanagement/dialogs/failed_delete_appointment.mako:5
+#: waskaweb/templates/casemanagement/dialogs/failed_markanonymize_phase_incomplete.mako:5
+#: waskaweb/templates/casemanagement/dialogs/failed_markanonymize_phase_incomplete_from_overview.mako:5
#: waskaweb/templates/casemanagement/dialogs/success_anonymize.mako:5
#: waskaweb/templates/casemanagement/dialogs/success_case_close.mako:5
#: waskaweb/templates/casemanagement/dialogs/success_create_appointment.mako:5
@@ -1521,6 +1526,7 @@
#: waskaweb/templates/casemanagement/dialogs/success_delete_appointment.mako:5
#: waskaweb/templates/casemanagement/dialogs/success_edit_appointment.mako:5
#: waskaweb/templates/casemanagement/dialogs/success_markanonymize.mako:5
+#: waskaweb/templates/casemanagement/dialogs/success_set_phase.mako:6
#: waskaweb/templates/documents/case_new.mako:5
#: waskaweb/templates/documents/case_overview.mako:5
#: waskaweb/templates/documents/dialogs/delete_attachment_success.mako:4
@@ -1793,90 +1799,91 @@
msgid "cm_help_header_help_for_dossier"
msgstr "Hilfe zum Fallakten-Formular"
-#: waskaweb/templates/casemanagement/main.mako:18
+#: waskaweb/templates/casemanagement/main.mako:19
msgid "cm_info_name"
msgstr "Name"
-#: waskaweb/templates/casemanagement/main.mako:21
-#: waskaweb/templates/casemanagement/phase.mako:14
+#: waskaweb/templates/casemanagement/main.mako:22
+#: waskaweb/templates/casemanagement/phase.mako:16
msgid "cm_info_phase"
msgstr "Phase"
-#: waskaweb/templates/casemanagement/main.mako:22
+#: waskaweb/templates/casemanagement/main.mako:23
msgid "cm_info_status"
msgstr "Status"
-#: waskaweb/templates/casemanagement/main.mako:24
+#: waskaweb/templates/casemanagement/main.mako:25
msgid "cm_info_nr"
msgstr "Kundennr."
-#: waskaweb/templates/casemanagement/main.mako:30
+#: waskaweb/templates/casemanagement/main.mako:31
msgid "cm_main_header_data_protection"
msgstr "Datenschutz"
-#: waskaweb/templates/casemanagement/main.mako:35
+#: waskaweb/templates/casemanagement/main.mako:36
msgid "cm_main_set_statement"
msgstr "Erklärung Status setzen"
-#: waskaweb/templates/casemanagement/main.mako:37
+#: waskaweb/templates/casemanagement/main.mako:38
msgid "cm_main_revoke_statement"
msgstr "Erklärung zurückziehen"
-#: waskaweb/templates/casemanagement/main.mako:40
+#: waskaweb/templates/casemanagement/main.mako:41
msgid "cm_main_anonymize_case"
msgstr "Fallakte anonymisieren"
-#: waskaweb/templates/casemanagement/main.mako:41
+#: waskaweb/templates/casemanagement/main.mako:42
msgid "statement_list_statement"
msgstr "Verfügbare Erklärungen"
-#: waskaweb/templates/casemanagement/main.mako:51
+#: waskaweb/templates/casemanagement/main.mako:52
msgid "cm_menu_header_cases"
msgstr "Fallakte"
-#: waskaweb/templates/casemanagement/main.mako:56
+#: waskaweb/templates/casemanagement/main.mako:57
msgid "cm_menu_link_backtooverview"
msgstr "Zurück zur Übersicht"
-#: waskaweb/templates/casemanagement/main.mako:57
+#: waskaweb/templates/casemanagement/main.mako:58
msgid "cm_menu_link_print"
msgstr "Akte drucken"
-#: waskaweb/templates/casemanagement/main.mako:58
+#: waskaweb/templates/casemanagement/main.mako:59
msgid "cm_menu_link_printempty"
msgstr "Akte leer drucken"
-#: waskaweb/templates/casemanagement/main.mako:60
+#: waskaweb/templates/casemanagement/main.mako:61
msgid "cm_menu_link_create_reminder"
msgstr "Wiedervorlage anlegen"
-#: waskaweb/templates/casemanagement/main.mako:67
+#: waskaweb/templates/casemanagement/main.mako:68
msgid "cm_menu_header_seperator"
msgstr "Überblick"
-#: waskaweb/templates/casemanagement/main.mako:70
+#: waskaweb/templates/casemanagement/main.mako:71
msgid "cm_menu_link_digest"
msgstr "Zusammenfassung"
-#: waskaweb/templates/casemanagement/main.mako:72
+#: waskaweb/templates/casemanagement/main.mako:73
#: waskaweb/templates/casemanagement/phase.mako:7
#: waskaweb/templates/casemanagement/phase.mako:10
+#: waskaweb/templates/casemanagement/dialogs/success_set_phase.mako:7
msgid "case_cm_phase"
msgstr "Phase im CM"
-#: waskaweb/templates/casemanagement/main.mako:73
+#: waskaweb/templates/casemanagement/main.mako:74
msgid "cm_menu_link_organisation"
msgstr "Organisation"
-#: waskaweb/templates/casemanagement/main.mako:74
+#: waskaweb/templates/casemanagement/main.mako:75
msgid "cm_menu_link_appointment"
msgstr "Termine"
-#: waskaweb/templates/casemanagement/main.mako:76
+#: waskaweb/templates/casemanagement/main.mako:77
msgid "cm_menu_link_documents"
msgstr "Anlagen"
-#: waskaweb/templates/casemanagement/main.mako:82
+#: waskaweb/templates/casemanagement/main.mako:83
msgid "cm_menu_header_structure"
msgstr "Gliederung"
@@ -1947,15 +1954,15 @@
msgstr ""
"Hier wird eine Auflistung der Fälle des angemeldeten Benutzers angezeigt"
-#: waskaweb/templates/casemanagement/phase.mako:16
+#: waskaweb/templates/casemanagement/phase.mako:18
msgid "case_cm_phase_required_fields"
msgstr "Pflichtfelder"
-#: waskaweb/templates/casemanagement/phase.mako:17
+#: waskaweb/templates/casemanagement/phase.mako:19
msgid "case_cm_phase_time"
msgstr "Zeitpunkt"
-#: waskaweb/templates/casemanagement/phase.mako:18
+#: waskaweb/templates/casemanagement/phase.mako:22
msgid "case_cm_phase_change"
msgstr "Phasenwechsel"
@@ -1990,6 +1997,8 @@
#: waskaweb/templates/casemanagement/dialogs/confirm_markanonymizeFromOverview.mako:6
#: waskaweb/templates/casemanagement/dialogs/failed_anonymize.mako:5
#: waskaweb/templates/casemanagement/dialogs/failed_markanonymize.mako:5
+#: waskaweb/templates/casemanagement/dialogs/failed_markanonymize_phase_incomplete.mako:6
+#: waskaweb/templates/casemanagement/dialogs/failed_markanonymize_phase_incomplete_from_overview.mako:6
#: waskaweb/templates/casemanagement/dialogs/failed_xml_import.mako:5
#: waskaweb/templates/casemanagement/dialogs/success_anonymize.mako:6
#: waskaweb/templates/casemanagement/dialogs/success_bundle_anonymize.mako:6
@@ -2125,27 +2134,37 @@
msgid "cm_eval_summary_header_3"
msgstr "2.1. Verweildauer im CM"
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:47
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:202
+msgid "cm_eval_summary_header_19"
+msgstr "2.5. Gemeldete Arbeitslose"
+
#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:48
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:238
+msgid "cm_eval_summary_header_20"
+msgstr "2.6. Angaben zu Nicht-Erwerbspersonen"
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:50
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:10
msgid "eval_group_header_finished"
msgstr "3. Auswertungen über Jugendliche, die das CM abgeschlossen haben"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:50
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:52
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:15
msgid "cm_eval_summary_header_7"
msgstr "3.1. Vermittlung"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:52
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:54
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:78
msgid "cm_eval_summary_header_15"
msgstr "3.2. Zeitaufwände"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:56
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:58
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_0.mako:10
msgid "eval_group_header_finished2"
msgstr "4. Auswertung über abgeschlossene Beratungsfälle"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:58
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:60
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_0.mako:15
msgid "cm_eval_summary_header_14"
msgstr "4.1. Zeitaufwände"
@@ -2171,12 +2190,14 @@
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:104
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:134
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:166
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:40
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:64
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:101
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:131
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:161
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:193
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:43
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:70
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:107
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:137
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:167
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:199
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:235
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:259
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:45
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:75
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:81
@@ -2191,12 +2212,14 @@
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:104
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:134
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:166
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:40
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:64
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:101
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:131
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:161
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:193
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:43
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:70
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:107
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:137
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:167
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:199
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:235
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:259
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:45
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:75
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:81
@@ -2221,10 +2244,12 @@
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:79
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:109
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:141
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:72
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:106
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:138
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:168
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:78
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:112
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:144
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:174
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:206
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:242
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:20
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:50
msgid "cm_eval_table_number"
@@ -2235,10 +2260,12 @@
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:80
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:110
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:142
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:73
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:107
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:139
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:169
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:79
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:113
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:145
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:175
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:207
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:243
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:21
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:51
msgid "cm_eval_table_percent"
@@ -2286,60 +2313,67 @@
msgstr "Woche"
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:18
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:44
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:47
msgid "cm_eval_table_completed"
msgstr "Abgeschlossen"
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:19
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:45
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:48
+msgid "cm_eval_table_early_completed"
+msgstr "vorz. Abgeschlossen"
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:20
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:49
msgid "cm_eval_table_aborted"
msgstr "Abgebrochen"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:68
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:74
msgid "cm_eval_header_on_gender"
msgstr "2.2.1. Angaben zur Geschlechtsstruktur"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:71
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:77
msgid "cm_eval_table_gender"
msgstr "Geschlecht"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:77
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:83
msgid "cm_eval_label_male"
msgstr "männlich"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:83
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:89
msgid "cm_eval_label_female"
msgstr "weiblich"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:89
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:95
msgid "cm_eval_label_intersexual"
msgstr "intersexuell"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:95
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:101
msgid "cm_eval_label_unknown"
msgstr "Keine Angabe"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:105
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:111
msgid "cm_eval_table_age"
msgstr "Alter"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:137
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:143
msgid "cm_eval_table_category"
msgstr "Kategorie"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:143
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:149
msgid "cm_eval_label_migration_background"
msgstr "Migrationshintergrund"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:149
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:155
msgid "cm_eval_label_no_migration_background"
msgstr "Kein Migrationshintergrund"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:155
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:161
msgid "cm_eval_label_ka_migration_background"
msgstr "Keine Angabe"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:167
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:173
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:205
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:241
msgid "cm_eval_table_offer"
msgstr "Angebot"
@@ -2501,10 +2535,6 @@
msgid "cm_overview_a_keepactive"
msgstr "Aufbewahrung verlängern"
-#: waskaweb/templates/start/responsible.mako:126
-msgid "responsible_realisation"
-msgstr "Realisation"
-
#: waskaweb/templates/start/start.mako:6
msgid "start_header_blackboard"
msgstr "Schwarzes Brett"
@@ -2652,7 +2682,7 @@
msgid "adm_form_newuser_passwd_confirm"
msgstr "Neues Passwort wiederholen"
-#: waskaweb/templates/usersettings/change_password.mako:50
+#: waskaweb/templates/usersettings/change_password.mako:51
#: waskaweb/templates/usersettings/change_password_login.mako:38
msgid "adm_form_changepassword_submit"
msgstr "Speichern"
@@ -2723,6 +2753,15 @@
msgid "adm_np_changepassword"
msgstr "Benutzerpasswort geändert!"
+#~ msgid "responsible_info_sponsorship"
+#~ msgstr "Information zur Trägerschaft"
+
+#~ msgid "responsible_project_sponsorship"
+#~ msgstr "Projektträger"
+
+#~ msgid "responsible_realisation"
+#~ msgstr "Realisation"
+
#~ msgid "case_cm_phase_number"
#~ msgstr "Nummer"
@@ -2738,12 +2777,6 @@
#~ msgid "adm_form_user_passwd_confirm"
#~ msgstr "Passwortwiederholung"
-#~ msgid "responsible_info_sponsorship"
-#~ msgstr "Information zur Trägerschaft"
-
-#~ msgid "responsible_project_sponsorship"
-#~ msgstr "Projektträger"
-
#~ msgid "app_con_list_all_appointments"
#~ msgstr "Hier wird eine Auflistung aller Termine angezeigt"
Modified: waska/trunk/waskaweb/i18n/waskaweb.pot
===================================================================
--- waska/trunk/waskaweb/i18n/waskaweb.pot 2008-09-22 13:14:33 UTC (rev 186)
+++ waska/trunk/waskaweb/i18n/waskaweb.pot 2008-09-23 09:24:10 UTC (rev 187)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: waskaweb 0.0.0\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2008-08-27 14:34+0200\n"
+"POT-Creation-Date: 2008-09-22 17:49+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -159,111 +159,115 @@
msgid "adm_edit_standin_success_text"
msgstr ""
-#: waskaweb/lib/evaluation.py:171
+#: waskaweb/lib/evaluation.py:178
#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:37
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:15
msgid "cm_eval_summary_header_1"
msgstr ""
-#: waskaweb/lib/evaluation.py:227
+#: waskaweb/lib/evaluation.py:234
#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:44
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:67
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:73
msgid "cm_eval_summary_header_4"
msgstr ""
-#: waskaweb/lib/evaluation.py:271
+#: waskaweb/lib/evaluation.py:285
#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:45
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:134
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:140
msgid "cm_eval_summary_header_5"
msgstr ""
-#: waskaweb/lib/evaluation.py:321
+#: waskaweb/lib/evaluation.py:335
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:45
msgid "cm_eval_header_access_youngster_to_agency"
msgstr ""
-#: waskaweb/lib/evaluation.py:366
+#: waskaweb/lib/evaluation.py:380
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:75
msgid "cm_eval_head_law_access_agency"
msgstr ""
-#: waskaweb/lib/evaluation.py:417
+#: waskaweb/lib/evaluation.py:431
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:16
msgid "cm_eval_head_where_to_place_youngster"
msgstr ""
-#: waskaweb/lib/evaluation.py:463
+#: waskaweb/lib/evaluation.py:477
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:46
msgid "cm_eval_header_law_changed_after_place"
msgstr ""
-#: waskaweb/lib/evaluation.py:538
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:102
+#: waskaweb/lib/evaluation.py:552
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:108
msgid "cm_eval_header_on_age"
msgstr ""
-#: waskaweb/lib/evaluation.py:603
+#: waskaweb/lib/evaluation.py:617
#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:46
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:164
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:170
msgid "cm_eval_summary_header_6"
msgstr ""
-#: waskaweb/lib/evaluation.py:667
+#: waskaweb/lib/evaluation.py:686
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:14
msgid "cm_eval_length_cm"
msgstr ""
-#: waskaweb/lib/evaluation.py:708
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:41
+#: waskaweb/lib/evaluation.py:734
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:44
msgid "cm_eval_avg_length_cm"
msgstr ""
-#: waskaweb/lib/evaluation.py:758
+#: waskaweb/lib/evaluation.py:784
msgid "cm_eval_header_graduation"
msgstr ""
-#: waskaweb/lib/evaluation.py:808
+#: waskaweb/lib/evaluation.py:834
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:105
msgid "cm_eval_header_work"
msgstr ""
-#: waskaweb/lib/evaluation.py:817 waskaweb/lib/evaluation.py:964
+#: waskaweb/lib/evaluation.py:843 waskaweb/lib/evaluation.py:989
msgid "cm_eval_header_effort"
msgstr ""
-#: waskaweb/lib/evaluation.py:924
+#: waskaweb/lib/evaluation.py:949
msgid "cm_eval_header_effort2"
msgstr ""
-#: waskaweb/lib/evaluation.py:941
+#: waskaweb/lib/evaluation.py:966
msgid "cm_eval_header_avg_effort"
msgstr ""
-#: waskaweb/lib/evaluation.py:957
+#: waskaweb/lib/evaluation.py:982
msgid "cm_eval_header_avg_effort2"
msgstr ""
-#: waskaweb/lib/renderer.py:244
+#: waskaweb/lib/evaluation.py:1057 waskaweb/lib/evaluation.py:1100
+msgid "cm_eval_header_enemployed"
+msgstr ""
+
+#: waskaweb/lib/renderer.py:251
msgid "cm_rg_aid_overview_table_institution"
msgstr ""
-#: waskaweb/lib/renderer.py:245
+#: waskaweb/lib/renderer.py:252
msgid "cm_rg_aid_overview_table_offer_type"
msgstr ""
-#: waskaweb/lib/renderer.py:246
+#: waskaweb/lib/renderer.py:253
msgid "cm_rg_aid_overview_table_actions"
msgstr ""
-#: waskaweb/lib/renderer.py:248
+#: waskaweb/lib/renderer.py:255
msgid "cm_rg_aid_overview_table_edit"
msgstr ""
-#: waskaweb/lib/renderer.py:249
+#: waskaweb/lib/renderer.py:256
msgid "cm_rg_aid_overview_table_goal"
msgstr ""
-#: waskaweb/lib/renderer.py:250 waskaweb/lib/renderer.py:251
+#: waskaweb/lib/renderer.py:257 waskaweb/lib/renderer.py:258
#: waskaweb/templates/administration/overview_user.mako:43
#: waskaweb/templates/administration/overview_user.mako:60
#: waskaweb/templates/administration/overview_usergroups.mako:34
@@ -287,7 +291,7 @@
msgid "cm_overview_a_show"
msgstr ""
-#: waskaweb/lib/renderer.py:252 waskaweb/lib/renderer.py:253
+#: waskaweb/lib/renderer.py:259 waskaweb/lib/renderer.py:260
#: waskaweb/templates/administration/overview_user.mako:45
#: waskaweb/templates/administration/overview_user.mako:62
#: waskaweb/templates/administration/overview_usergroups.mako:35
@@ -308,65 +312,65 @@
msgid "cm_overview_a_delete"
msgstr ""
-#: waskaweb/lib/renderer.py:254
+#: waskaweb/lib/renderer.py:261
msgid "cm_rg_aid_overview_table_no_offer_found"
msgstr ""
-#: waskaweb/lib/renderer.py:255
+#: waskaweb/lib/renderer.py:262
msgid "cm_rg_aid_overview_legend_legend"
msgstr ""
-#: waskaweb/lib/renderer.py:256
+#: waskaweb/lib/renderer.py:263
msgid "cm_rg_aid_overview_legend_bb"
msgstr ""
-#: waskaweb/lib/renderer.py:257
+#: waskaweb/lib/renderer.py:264
msgid "cm_rg_aid_overview_legend_common_educational_area"
msgstr ""
-#: waskaweb/lib/renderer.py:258
+#: waskaweb/lib/renderer.py:265
msgid "cm_rg_aid_overview_legend_bv"
msgstr ""
-#: waskaweb/lib/renderer.py:259
+#: waskaweb/lib/renderer.py:266
msgid "cm_rg_aid_overview_legend_vocational_preparation"
msgstr ""
-#: waskaweb/lib/renderer.py:260
+#: waskaweb/lib/renderer.py:267
msgid "cm_rg_aid_overview_legend_bq"
msgstr ""
-#: waskaweb/lib/renderer.py:261
+#: waskaweb/lib/renderer.py:268
msgid "cm_rg_aid_overview_legend_qualifications"
msgstr ""
-#: waskaweb/lib/renderer.py:262
+#: waskaweb/lib/renderer.py:269
msgid "cm_rg_aid_overview_legend_lb"
msgstr ""
-#: waskaweb/lib/renderer.py:263
+#: waskaweb/lib/renderer.py:270
msgid "cm_rg_aid_overview_legend_life_skills"
msgstr ""
-#: waskaweb/lib/renderer.py:264
+#: waskaweb/lib/renderer.py:271
msgid "cm_rg_aid_overview_legend_new_offer"
msgstr ""
-#: waskaweb/model/case.py:1081 waskaweb/model/case.py:1082
+#: waskaweb/model/case.py:1117 waskaweb/model/case.py:1118
#: waskaweb/templates/casemanagement/caselist.mako:64
#: waskaweb/templates/casemanagement/caselist.mako:123
msgid "case_state_label_open"
msgstr ""
-#: waskaweb/model/case.py:1083
+#: waskaweb/model/case.py:1119
msgid "case_state_label_outstanding_delete"
msgstr ""
-#: waskaweb/model/case.py:1084
+#: waskaweb/model/case.py:1120
msgid "case_state_label_outstanding_anon"
msgstr ""
-#: waskaweb/model/case.py:1085
+#: waskaweb/model/case.py:1121
msgid "case_state_label_anon"
msgstr ""
@@ -504,7 +508,6 @@
msgstr ""
#: waskaweb/templates/main_login.mako:38
-#: waskaweb/templates/start/responsible.mako:149
msgid "main_login_bmf_phrase"
msgstr ""
@@ -1433,7 +1436,7 @@
msgid "cm_header_overview"
msgstr ""
-#: waskaweb/templates/casemanagement/agency_search.mako:55
+#: waskaweb/templates/casemanagement/agency_search.mako:57
#: waskaweb/templates/casemanagement/search.mako:6
msgid "cm_form_overview_search_submit"
msgstr ""
@@ -1475,6 +1478,8 @@
#: waskaweb/templates/casemanagement/dialogs/confirm_open.mako:5
#: waskaweb/templates/casemanagement/dialogs/delete_attachment_success.mako:6
#: waskaweb/templates/casemanagement/dialogs/failed_delete_appointment.mako:5
+#: waskaweb/templates/casemanagement/dialogs/failed_markanonymize_phase_incomplete.mako:5
+#: waskaweb/templates/casemanagement/dialogs/failed_markanonymize_phase_incomplete_from_overview.mako:5
#: waskaweb/templates/casemanagement/dialogs/success_anonymize.mako:5
#: waskaweb/templates/casemanagement/dialogs/success_case_close.mako:5
#: waskaweb/templates/casemanagement/dialogs/success_create_appointment.mako:5
@@ -1482,6 +1487,7 @@
#: waskaweb/templates/casemanagement/dialogs/success_delete_appointment.mako:5
#: waskaweb/templates/casemanagement/dialogs/success_edit_appointment.mako:5
#: waskaweb/templates/casemanagement/dialogs/success_markanonymize.mako:5
+#: waskaweb/templates/casemanagement/dialogs/success_set_phase.mako:6
#: waskaweb/templates/documents/case_new.mako:5
#: waskaweb/templates/documents/case_overview.mako:5
#: waskaweb/templates/documents/dialogs/delete_attachment_success.mako:4
@@ -1751,90 +1757,91 @@
msgid "cm_help_header_help_for_dossier"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:18
+#: waskaweb/templates/casemanagement/main.mako:19
msgid "cm_info_name"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:21
-#: waskaweb/templates/casemanagement/phase.mako:14
+#: waskaweb/templates/casemanagement/main.mako:22
+#: waskaweb/templates/casemanagement/phase.mako:16
msgid "cm_info_phase"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:22
+#: waskaweb/templates/casemanagement/main.mako:23
msgid "cm_info_status"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:24
+#: waskaweb/templates/casemanagement/main.mako:25
msgid "cm_info_nr"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:30
+#: waskaweb/templates/casemanagement/main.mako:31
msgid "cm_main_header_data_protection"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:35
+#: waskaweb/templates/casemanagement/main.mako:36
msgid "cm_main_set_statement"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:37
+#: waskaweb/templates/casemanagement/main.mako:38
msgid "cm_main_revoke_statement"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:40
+#: waskaweb/templates/casemanagement/main.mako:41
msgid "cm_main_anonymize_case"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:41
+#: waskaweb/templates/casemanagement/main.mako:42
msgid "statement_list_statement"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:51
+#: waskaweb/templates/casemanagement/main.mako:52
msgid "cm_menu_header_cases"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:56
+#: waskaweb/templates/casemanagement/main.mako:57
msgid "cm_menu_link_backtooverview"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:57
+#: waskaweb/templates/casemanagement/main.mako:58
msgid "cm_menu_link_print"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:58
+#: waskaweb/templates/casemanagement/main.mako:59
msgid "cm_menu_link_printempty"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:60
+#: waskaweb/templates/casemanagement/main.mako:61
msgid "cm_menu_link_create_reminder"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:67
+#: waskaweb/templates/casemanagement/main.mako:68
msgid "cm_menu_header_seperator"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:70
+#: waskaweb/templates/casemanagement/main.mako:71
msgid "cm_menu_link_digest"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:72
+#: waskaweb/templates/casemanagement/main.mako:73
#: waskaweb/templates/casemanagement/phase.mako:7
#: waskaweb/templates/casemanagement/phase.mako:10
+#: waskaweb/templates/casemanagement/dialogs/success_set_phase.mako:7
msgid "case_cm_phase"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:73
+#: waskaweb/templates/casemanagement/main.mako:74
msgid "cm_menu_link_organisation"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:74
+#: waskaweb/templates/casemanagement/main.mako:75
msgid "cm_menu_link_appointment"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:76
+#: waskaweb/templates/casemanagement/main.mako:77
msgid "cm_menu_link_documents"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:82
+#: waskaweb/templates/casemanagement/main.mako:83
msgid "cm_menu_header_structure"
msgstr ""
@@ -1893,15 +1900,15 @@
msgid "cm_overview_con_list_dossiers_cm"
msgstr ""
-#: waskaweb/templates/casemanagement/phase.mako:16
+#: waskaweb/templates/casemanagement/phase.mako:18
msgid "case_cm_phase_required_fields"
msgstr ""
-#: waskaweb/templates/casemanagement/phase.mako:17
+#: waskaweb/templates/casemanagement/phase.mako:19
msgid "case_cm_phase_time"
msgstr ""
-#: waskaweb/templates/casemanagement/phase.mako:18
+#: waskaweb/templates/casemanagement/phase.mako:22
msgid "case_cm_phase_change"
msgstr ""
@@ -1936,6 +1943,8 @@
#: waskaweb/templates/casemanagement/dialogs/confirm_markanonymizeFromOverview.mako:6
#: waskaweb/templates/casemanagement/dialogs/failed_anonymize.mako:5
#: waskaweb/templates/casemanagement/dialogs/failed_markanonymize.mako:5
+#: waskaweb/templates/casemanagement/dialogs/failed_markanonymize_phase_incomplete.mako:6
+#: waskaweb/templates/casemanagement/dialogs/failed_markanonymize_phase_incomplete_from_overview.mako:6
#: waskaweb/templates/casemanagement/dialogs/failed_xml_import.mako:5
#: waskaweb/templates/casemanagement/dialogs/success_anonymize.mako:6
#: waskaweb/templates/casemanagement/dialogs/success_bundle_anonymize.mako:6
@@ -2071,27 +2080,37 @@
msgid "cm_eval_summary_header_3"
msgstr ""
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:47
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:202
+msgid "cm_eval_summary_header_19"
+msgstr ""
+
#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:48
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:238
+msgid "cm_eval_summary_header_20"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:50
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:10
msgid "eval_group_header_finished"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:50
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:52
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:15
msgid "cm_eval_summary_header_7"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:52
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:54
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:78
msgid "cm_eval_summary_header_15"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:56
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:58
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_0.mako:10
msgid "eval_group_header_finished2"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:58
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:60
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_0.mako:15
msgid "cm_eval_summary_header_14"
msgstr ""
@@ -2114,12 +2133,14 @@
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:104
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:134
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:166
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:40
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:64
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:101
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:131
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:161
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:193
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:43
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:70
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:107
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:137
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:167
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:199
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:235
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:259
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:45
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:75
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:81
@@ -2134,12 +2155,14 @@
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:104
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:134
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:166
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:40
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:64
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:101
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:131
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:161
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:193
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:43
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:70
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:107
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:137
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:167
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:199
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:235
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:259
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:45
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:75
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:81
@@ -2160,10 +2183,12 @@
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:79
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:109
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:141
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:72
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:106
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:138
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:168
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:78
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:112
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:144
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:174
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:206
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:242
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:20
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:50
msgid "cm_eval_table_number"
@@ -2174,10 +2199,12 @@
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:80
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:110
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:142
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:73
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:107
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:139
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:169
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:79
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:113
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:145
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:175
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:207
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:243
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:21
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:51
msgid "cm_eval_table_percent"
@@ -2220,60 +2247,67 @@
msgstr ""
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:18
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:44
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:47
msgid "cm_eval_table_completed"
msgstr ""
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:19
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:45
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:48
+msgid "cm_eval_table_early_completed"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:20
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:49
msgid "cm_eval_table_aborted"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:68
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:74
msgid "cm_eval_header_on_gender"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:71
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:77
msgid "cm_eval_table_gender"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:77
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:83
msgid "cm_eval_label_male"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:83
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:89
msgid "cm_eval_label_female"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:89
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:95
msgid "cm_eval_label_intersexual"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:95
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:101
msgid "cm_eval_label_unknown"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:105
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:111
msgid "cm_eval_table_age"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:137
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:143
msgid "cm_eval_table_category"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:143
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:149
msgid "cm_eval_label_migration_background"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:149
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:155
msgid "cm_eval_label_no_migration_background"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:155
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:161
msgid "cm_eval_label_ka_migration_background"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:167
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:173
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:205
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:241
msgid "cm_eval_table_offer"
msgstr ""
@@ -2429,10 +2463,6 @@
msgid "cm_overview_a_keepactive"
msgstr ""
-#: waskaweb/templates/start/responsible.mako:126
-msgid "responsible_realisation"
-msgstr ""
-
#: waskaweb/templates/start/start.mako:6
msgid "start_header_blackboard"
msgstr ""
@@ -2553,7 +2583,7 @@
msgid "adm_form_newuser_passwd_confirm"
msgstr ""
-#: waskaweb/templates/usersettings/change_password.mako:50
+#: waskaweb/templates/usersettings/change_password.mako:51
#: waskaweb/templates/usersettings/change_password_login.mako:38
msgid "adm_form_changepassword_submit"
msgstr ""
Modified: waska/trunk/waskaweb/lib/evaluation.py
===================================================================
--- waska/trunk/waskaweb/lib/evaluation.py 2008-09-22 13:14:33 UTC (rev 186)
+++ waska/trunk/waskaweb/lib/evaluation.py 2008-09-23 09:24:10 UTC (rev 187)
@@ -630,11 +630,13 @@
zeitraum_fallmanagement,
count(a.id) as abbruch,
count(r.id) as regulaer,
+ count(v.id) as vorzeitig,
count(k.id) as keine
FROM master_tbl_eval_incm_view m
LEFT JOIN art_beendigung_tbl a on a.id = m.art_beendigung AND a.id = 1
- LEFT JOIN art_beendigung_tbl r on r.id = m.art_beendigung AND r.id IN (0,2)
- LEFT JOIN art_beendigung_tbl k on k.id = m.art_beendigung AND k.id = -1
+ LEFT JOIN art_beendigung_tbl r on r.id = m.art_beendigung AND r.id = 0
+ LEFT JOIN art_beendigung_tbl v on v.id = m.art_beendigung AND v.id = 2
+ LEFT JOIN art_beendigung_tbl k on k.id = m.art_beendigung AND k.id = -1
WHERE m.phase IN (3,4,5) AND %s
GROUP BY zeitraum_fallmanagement
ORDER BY zeitraum_fallmanagement
@@ -653,11 +655,11 @@
except:
traceback.print_exc(file=sys.stderr)
- # query_result: [monat, anz_abr, anz_reg, anz_ka]
+ # query_result: [monat, anz_abr, anz_reg, anz_vor, anz_ka]
result = []
- # row: [monat, abgeschl_num, abschloss_proz, abbruch_num, abbruch_proz, ka_num, ka_proz]
+ # row: [monat, abgeschl_num, abschloss_proz, abbruch_num, abbruch_proz, vorz_num, vorz_proz, ka_num, ka_proz]
for r in query_result:
- row = ['Keine Angabe',0,0,0,0,0,0]
+ row = ['Keine Angabe',0,0,0,0,0,0,0,0]
# Monat
if r[0]:
row[0] = r[0]
@@ -667,10 +669,13 @@
# Abbruch
row[3] = r[1]
row[4] = "%s" % h.formatNumber(float(r[1])/float(divisor)*100)
+ #Vorzeitig
+ row[5] = r[3]
+ row[6] = "%s" % h.formatNumber(float(r[3])/float(divisor)*100)
# KA
- #row[5] = r[3]
- #row[6] = "%s" % h.formatNumber(float(r[3])/float(divisor)*100)
- if r[2] > 0 or r[1] > 0:
+ row[7] = r[4]
+ row[8] = "%s" % h.formatNumber(float(r[4])/float(divisor)*100)
+ if r[2] > 0 or r[1] > 0 or r[3] > 0:
result.append(row)
return result
@@ -691,36 +696,43 @@
def perform(self):
eval_10 = Evaluation_10(self.compressed_ids).perform()
- #r: [monat, abgeschl_num, abschloss_proz, abbruch_num, abbruch_proz, ka_num, ka_proz]
+ # row: [monat, abgeschl_num, abschloss_proz, abbruch_num, abbruch_proz, vorz_num, vorz_proz, ka_num, ka_proz]
months_abr = 0
anz_abr = 0
months_abg = 0
anz_abg = 0
+ months_vz = 0
+ anz_vz = 0
avg_month_abr = "-/-"
avg_month_abg = "-/-"
+ avg_month_vz = "-/-"
for r in eval_10:
try:
months_abr += int(r[0]) * int(r[3])
anz_abr += int(r[3])
months_abg += int(r[0]) * int(r[1])
- anz_abg += int(r[1])
+ anz_vz += int(r[1])
+ months_vz += int(r[0]) * int(r[5])
+ anz_vz += int(r[5])
except:
pass
if anz_abr > 0:
avg_month_abr = "%s" % h.formatNumber(float(months_abr) / float(anz_abr))
if anz_abg > 0:
avg_month_abg = "%s" % h.formatNumber(float(months_abg) / float(anz_abg))
+ if anz_vz > 0:
+ avg_month_vz = "%s" % h.formatNumber(float(months_vz) / float(anz_vz))
- result = [avg_month_abg, avg_month_abr]
+ result = [avg_month_abg, avg_month_vz, avg_month_abr]
return result
def doExport(self, f):
p = self.perform()
f.write(u"#%s (Auswertung: Jugendliche im CM)\r\n" % _('cm_eval_avg_length_cm'))
- f.write("Durchschnitt Monat Abgeschlossen;Durchschnitt Monat Abgebrochen\r\n")
+ f.write("Durchschnitt Monat Abgeschlossen;Durchschnitt Monat vorzeitig Abgeschlossen;Durchschnitt Monat Abgebrochen\r\n")
for v in [p]:
f.write(u"%s;%s;\r\n" % (v[0], v[1]))
@@ -986,38 +998,117 @@
ORDER BY l.art
""" % self.where_clause(self.compressed_ids, "l.master_id")
-#class Evaluation_19(Evaluation):
-# """Anzahl gemeldeter Arbeitsloser"""
-# def __init__(self, compressed_ids):
-# Evaluation.__init__(self, compressed_ids)
-#
-# # Anzahl aller gemeldeten Arbeitlosen
-# select count(arbeitslosigkeit_1) from master_tbl_view where arbeitslosigkeit_1
-#= 1;
-# # Anzahl davon ALG1 Empfänger
-# select count(bezug_alg1) from (select bezug_alg1 from master_tbl_view where arbeitslosigkeit_1 = 1) arbeitslos where bezug_alg1 = 1
-# # Anzahl davon ALG2 Empfänger
-# select count(bezug_alg2) from (select bezug_alg2 from master_tbl_view where arbeitslosigkeit_1 = 1) arbeitslos where bezug_alg2 = 1
-# # Anzahl davon Langezeitarbeitslose
-# select count(dauer_nach_letzter_beschaeftigung) from (select dauer_nach_letzter_beschaeftigung from master_tbl_view where arbeitslosigkeit_1 = 1) arbeitslos where dauer_nach_letzter_beschaeftigung>= 12
-#
-# #self.sql = """SELECT sum(l.dauer) AS dauer, count(l.dauer) AS anzahl, l.art
-# # FROM ka_logbuch_tbl_view l
-# # JOIN master_tbl_eval_total_view m
-# # ON m.id = l.master_id
-# # WHERE %s
-# # AND l.dauer IS NOT NULL
-# # GROUP BY l.art
-# # ORDER BY l.art
-# #""" % self.where_clause(self.compressed_ids, "l.master_id")
-#
-# def doExport(self, f):
-# p = self.perform()
-#
-# f.write(u"#%s (Auswertung: Jugendliche im CM)\r\n" % _('cm_eval_header_enemployed'))
-# f.write("Durchschnitt Monat Abgeschlossen;Durchschnitt Monat Abgebrochen\r\n")
-# for v in [p]:
-# f.write(u"%s;%s;\r\n" % (v[0], v[1]))
-#
+class Evaluation_19(Evaluation):
+ """Anzahl gemeldeter Arbeitsloser"""
+ def __init__(self, compressed_ids):
+ Evaluation.__init__(self, compressed_ids)
+ # Anzahl aller gemeldeten Arbeitlosen
+ self.sql_gesamt = """select count(arbeitslosigkeit_1) from master_tbl_eval_incm_view where arbeitslosigkeit_1= 1 AND (%s)""" % self.where_clause(self.compressed_ids, "id")
+ # Anzahl davon ALG1 Empfänger
+ self.sql_alg1 = """select count(bezug_alg1) from (select bezug_alg1, id from master_tbl_eval_incm_view where arbeitslosigkeit_1 = 1) arbeitslos where bezug_alg1 = 1 AND (%s)""" % self.where_clause(self.compressed_ids, "id")
+ # Anzahl davon ALG2 Empfänger
+ self.sql_alg2 = """select count(bezug_alg2) from (select bezug_alg2, id from master_tbl_eval_incm_view where arbeitslosigkeit_1 = 1) arbeitslos where bezug_alg2 = 1 AND (%s)""" % self.where_clause(self.compressed_ids, "id")
+ # Anzahl davon Langezeitarbeitslose
+ self.sql_lza = """select count(dauer_nach_letzter_beschaeftigung) from (select dauer_nach_letzter_beschaeftigung, id from master_tbl_eval_incm_view where arbeitslosigkeit_1 = 1) arbeitslos where dauer_nach_letzter_beschaeftigung >= 12 AND (%s)""" % self.where_clause(self.compressed_ids, "id")
+
+
+ def perform(self):
+ result = {'gesamt': [0,0], 'alg1': [0,0], 'alg2': [0,0], 'lza': [0,0]}
+ try:
+ try:
+ conn = db.getConnection()
+ cur = conn.cursor()
+
+ if self.total_valid_cm == 0: divisor = 1
+ else: divisor = self.total_valid_cm
+
+ # gesamt
+ cur.execute(self.sql_gesamt)
+ row = cur.fetchone()
+ result['gesamt'][0] = row[0]
+ result['gesamt'][1] = h.formatNumber(float(row[0] / divisor*100))
+
+ # alg1
+ cur.execute(self.sql_alg1)
+ row = cur.fetchone()
+ result['alg1'][0] = row[0]
+ result['alg1'][1] = h.formatNumber(float(row[0] / divisor*100))
+
+ # alg2
+ cur.execute(self.sql_alg2)
+ row = cur.fetchone()
+ result['alg2'][0] = row[0]
+ result['alg2'][1] = h.formatNumber(float(row[0] / divisor*100))
+
+ # lza
+ cur.execute(self.sql_lza)
+ row = cur.fetchone()
+ result['lza'][0] = row[0]
+ result['lza'][1] = h.formatNumber(float(row[0] / divisor*100))
+
+ return result
+ except StandardError, e:
+ traceback.print_exc(file=sys.stderr)
+ print >> sys.stderr, "No results for eval 19"
+ finally:
+ db.recycleConnection(conn, cur)
+
+
+ def doExport(self, f):
+ p = self.perform()
+
+ f.write(u"#%s (Auswertung: Jugendliche im CM)\r\n" % _('cm_eval_summary_header_19'))
+ f.write("Kategorie;Anzahl;Prozent\r\n")
+ for l in [p]:
+ for k, v in l.iteritems():
+ f.write(u"%s;%s;%s;\r\n" % (k, v[0], v[1]))
+
+
+class Evaluation_20(Evaluation):
+ """Anzahl Nicht-Erwerbspersonen"""
+ def __init__(self, compressed_ids):
+ Evaluation.__init__(self, compressed_ids)
+ # Anzahl aller Nicht-Erwerbspersonen
+ self.sql_gesamt = """select count(id) from master_tbl_eval_incm_view where arbeitslosigkeit_1 = 0 and erwerbstaetigkeit_job = 0 AND (%s)""" % self.where_clause(self.compressed_ids, "id")
+ # Davon befinden sich in einer schulischen Ausbildung
+ self.sql_inschule = """select count(bei_eintritt_ist_der_jugendliche) from (select bei_eintritt_ist_der_jugendliche, id from master_tbl_eval_incm_view where arbeitslosigkeit_1 = 0 and erwerbstaetigkeit_job = 0) erwerbslos where bei_eintritt_ist_der_jugendliche = 0 AND (%s)""" % self.where_clause(self.compressed_ids, "id")
+
+ def perform(self):
+ # result [gesamt_anz, gesamt_proz, schule_anz, schule_proz]
+ result = {'gesamt':[0,0],'schule':[0,0]}
+ try:
+ try:
+ conn = db.getConnection()
+ cur = conn.cursor()
+
+ if self.total_valid_cm == 0: divisor = 1
+ else: divisor = self.total_valid_cm
+
+ cur.execute(self.sql_gesamt)
+ row = cur.fetchone()
+ result['gesamt'][0] = row[0]
+ result['gesamt'][1] = h.formatNumber(float(row[0] / divisor*100))
+
+ cur.execute(self.sql_inschule)
+ row = cur.fetchone()
+ result['schule'][0] = row[0]
+ result['schule'][1] = h.formatNumber(float(row[0] / divisor*100))
+ return result
+ except StandardError, e:
+ traceback.print_exc(file=sys.stderr)
+ print >> sys.stderr, "No results for eval 20"
+ finally:
+ db.recycleConnection(conn, cur)
+
+ def doExport(self, f):
+ p = self.perform()
+
+ f.write(u"#%s (Auswertung: Jugendliche im CM)\r\n" % _('cm_eval_summary_header_20'))
+ f.write("Kategorie;Anzahl;Prozent\r\n")
+ for l in [p]:
+ for k, v in l.iteritems():
+ f.write(u"%s;%s;%s;\r\n" % (k, v[0], v[1]))
+
+
# vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8:
Modified: waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako
===================================================================
--- waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako 2008-09-22 13:14:33 UTC (rev 186)
+++ waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako 2008-09-23 09:24:10 UTC (rev 187)
@@ -44,6 +44,8 @@
<li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=2)}#eval_4">${_('cm_eval_summary_header_4')}</a></li>
<li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=2)}#eval_5">${_('cm_eval_summary_header_5')}</a></li>
<li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=2)}#eval_6">${_('cm_eval_summary_header_6')}</a></li>
+ <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=2)}#eval_19">${_('cm_eval_summary_header_19')}</a></li>
+ <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=2)}#eval_20">${_('cm_eval_summary_header_20')}</a></li>
</ul>
<h2>${_('eval_group_header_finished')}</h2>
<ul>
Modified: waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako
===================================================================
--- waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako 2008-09-22 13:14:33 UTC (rev 186)
+++ waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako 2008-09-23 09:24:10 UTC (rev 187)
@@ -16,6 +16,7 @@
<tr>
<th class="table_header_h table_width_mid_s">${_('cm_eval_table_month')}</th>
<th class="table_header_h table_width_mid_l">${_('cm_eval_table_completed')}</th>
+ <th class="table_header_h table_width_mid_l">${_('cm_eval_table_early_completed')}</th>
<th class="table_header_h table_width_mid_l">${_('cm_eval_table_aborted')}</th>
</tr>
<% idset = 0 %>
@@ -24,6 +25,7 @@
<tr>
<td>${r[0]}</td>
<td>${r[1]| F.NA, h} (${r[2]| F.NA, h}%)</td>
+ <td>${r[5]| F.NA, h} (${r[6]| F.NA, h}%)</td>
<td>${r[3]| F.NA, h} (${r[4]| F.NA, h}%)</td>
</tr>
<% idset = 1 %>
@@ -31,6 +33,7 @@
<tr>
<td class="table_row_v_12">${r[0]}</td>
<td class="table_row_v_12">${r[1]| F.NA, h} (${r[2]| F.NA, h}%)</td>
+ <td class="table_row_v_12">${r[5]| F.NA, h} (${r[6]| F.NA, h}%)</td>
<td class="table_row_v_12">${r[3]| F.NA, h} (${r[4]| F.NA, h}%)</td>
</tr>
<% idset = 0 %>
@@ -42,6 +45,7 @@
<table class="evaluation">
<tr>
<th class="table_header_h table_width_mid_l">${_('cm_eval_table_completed')}</th>
+ <th class="table_header_h table_width_mid_l">${_('cm_eval_table_early_completed')}</th>
<th class="table_header_h table_width_mid_l">${_('cm_eval_table_aborted')}</th>
</tr>
<% idset = 0 %>
@@ -50,12 +54,14 @@
<tr>
<td>${r[0]| F.NA, h}</td>
<td>${r[1]| F.NA, h}</td>
+ <td>${r[2]| F.NA, h}</td>
</tr>
<% idset = 1 %>
% else:
<tr>
<td class="table_row_v_12">${r[0]| F.NA, h}</td>
<td class="table_row_v_12">${r[1]| F.NA, h}</td>
+ <td class="table_row_v_12">${r[2]| F.NA, h}</td>
</tr>
<% idset = 0 %>
% endif
@@ -130,7 +136,7 @@
</table>
<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_8/auswertung_2_2_2.csv">${_('cm_eval_table_export_analysis')}</a>
</div>
-<div class="evaluation even-row">
+<div class="evaluation odd-row">
<h3><a name="eval_5">${_('cm_eval_summary_header_5')| F.NA, h}</a>${h.getHelp('cm_eval_note_ka_migration_background')}</h3>
<table class="evaluation">
<tr>
@@ -192,3 +198,63 @@
</table>
<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_9/auswertung_2_4.csv">${_('cm_eval_table_export_analysis')}</a>
</div>
+<div class="evaluation odd-row">
+<h3><a name="eval_19">${_('cm_eval_summary_header_19')}</a></h3>
+<table class="evaluation">
+ <tr>
+ <th class="table_header_h table_width_long">${_('cm_eval_table_category')}</th>
+ <th class="table_header_h table_width_mid_s num">${_('cm_eval_table_number')}</th>
+ <th class="table_header_h table_width_mid_s num">${_('cm_eval_table_percent')}</th>
+ <th class="table_header_h table_width_mid_s"> </th>
+ </tr>
+ <tr>
+ <td>Gesamt gemeldet</td>
+ <td class="num">${c.eval_19['gesamt'][0]}</td>
+ <td class="num">(${c.eval_19['gesamt'][1]}%)</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td class="table_row_v_12"> davon langzeitarbeitslos</td>
+ <td class="table_row_v_12 num">${c.eval_19['lza'][0]| F.NA, h}</td>
+ <td class="table_row_v_12 num">(${c.eval_19['lza'][1]| F.NA, h}%)</td>
+ <td class="table_row_v_12"></td>
+ </tr>
+ <tr>
+ <td> davon aus Regelkreis SGBII</td>
+ <td class="num">${c.eval_19['alg1'][0]| F.NA, h}</td>
+ <td class="num">(${c.eval_19['alg1'][1]| F.NA, h}%)</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td class="table_row_v_12"> davon aus Regelkreis SGBIII</td>
+ <td class="table_row_v_12 num">${c.eval_19['alg2'][0]| F.NA, h}</td>
+ <td class="table_row_v_12 num">(${c.eval_19['alg2'][1]| F.NA, h}%)</td>
+ <td class="table_row_v_12"></td>
+ </tr>
+</table>
+<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_19/auswertung_2_5.csv">${_('cm_eval_table_export_analysis')}</a>
+</div>
+<div class="evaluation even-row">
+<h3><a name="eval_20">${_('cm_eval_summary_header_20')}</a></h3>
+<table class="evaluation">
+ <tr>
+ <th class="table_header_h table_width_long">${_('cm_eval_table_category')}</th>
+ <th class="table_header_h table_width_mid_s num">${_('cm_eval_table_number')}</th>
+ <th class="table_header_h table_width_mid_s num">${_('cm_eval_table_percent')}</th>
+ <th class="table_header_h table_width_mid_s"> </th>
+ </tr>
+ <tr>
+ <td>Gesamt Nicht-Erwerb</td>
+ <td class="num">${c.eval_20['gesamt'][0]| F.NA, h}</td>
+ <td class="num">(${c.eval_20['gesamt'][1]| F.NA, h}%)</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td class="table_row_v_12"> davon in Ausbildung</td>
+ <td class="table_row_v_12 num">${c.eval_20['schule'][0]| F.NA, h}</td>
+ <td class="table_row_v_12 num">(${c.eval_20['schule'][1]| F.NA, h}%)</td>
+ <td class="table_row_v_12"></td>
+ </tr>
+</table>
+<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_20/auswertung_2_6.csv">${_('cm_eval_table_export_analysis')}</a>
+</div>
More information about the Mpuls-commits
mailing list