[Mpuls-commits] r713 - in waska/trunk: . waskaweb/i18n waskaweb/i18n/de/LC_MESSAGES waskaweb/lib

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Mon Nov 30 09:54:24 CET 2009


Author: torsten
Date: 2009-11-30 09:54:23 +0100 (Mon, 30 Nov 2009)
New Revision: 713

Added:
   waska/trunk/waskaweb/lib/config.py
Modified:
   waska/trunk/ChangeLog.txt
   waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.mo
   waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
   waska/trunk/waskaweb/i18n/waskaweb.pot
Log:
Updated translations


Modified: waska/trunk/ChangeLog.txt
===================================================================
--- waska/trunk/ChangeLog.txt	2009-11-27 13:11:23 UTC (rev 712)
+++ waska/trunk/ChangeLog.txt	2009-11-30 08:54:23 UTC (rev 713)
@@ -1,3 +1,12 @@
+2009-11-30 	Torsten Irlaender  <torsten.irlaender at intevation.de>
+	
+	Updated translations
+
+	* waskaweb/i18n/waskaweb.pot,
+	  waskaweb/i18n/de/LC_MESSAGES/waskaweb.po,
+	  waskaweb/i18n/de/LC_MESSAGES/waskaweb.mo,
+	  waskaweb/lib/config.py: Updated translations. 
+
 2009-11-27 	Torsten Irlaender  <torsten.irlaender at intevation.de>
 
 	Implemented new evaluations based on libmpuls

Modified: waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.mo
===================================================================
(Binary files differ)

Modified: waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
===================================================================
--- waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po	2009-11-27 13:11:23 UTC (rev 712)
+++ waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po	2009-11-30 08:54:23 UTC (rev 713)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: waskaweb 0.0.0\n"
 "Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2008-09-24 14:51+0200\n"
-"PO-Revision-Date: 2007-10-14 20:33+0200\n"
+"POT-Creation-Date: 2009-11-30 09:38+0100\n"
+"PO-Revision-Date: 2009-11-30 09:51+0100\n"
 "Last-Translator: Torsten Irländer<torsten.irlaender at intevation.de>\n"
 "Language-Team: de <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -178,6 +178,11 @@
 msgid "adm_edit_agency_text"
 msgstr "Bitte klicken Sie auf OK, um fortzufahren."
 
+#: waskaweb/controllers/evaluate.py:92 waskaweb/controllers/evaluate.py:225
+#: waskaweb/controllers/evaluate.py:252 waskaweb/controllers/evaluate.py:280
+msgid "Error: Evaluation failed"
+msgstr "Fehler: Auswertung fehlgeschlagen"
+
 #: waskaweb/controllers/usersettings.py:45
 msgid "adm_edit_standin_success_header"
 msgstr "Vertretung gespeichert!"
@@ -188,141 +193,149 @@
 "Ihre Standard-Vertretung wurde gespeichert. Bitte klicken Sie auf OK, um "
 "fortzufahren."
 
-#: waskaweb/lib/evaluation.py:178
+#: waskaweb/lib/evaluation.py:183
 #: 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:234
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:44
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:73
+#: waskaweb/lib/evaluation.py:239
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:43
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:13
 msgid "cm_eval_summary_header_4"
 msgstr "2.1. Alters- und Geschlechterstruktur in %"
 
-#: waskaweb/lib/evaluation.py:285
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:45
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:140
+#: waskaweb/lib/evaluation.py:290
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:44
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:80
 msgid "cm_eval_summary_header_5"
 msgstr "2.2. Migrationshintergrund"
 
-#: waskaweb/lib/evaluation.py:335
+#: waskaweb/lib/evaluation.py:340
 #: 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:380
+#: waskaweb/lib/evaluation.py:385
 #: 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:431
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:16
+#: waskaweb/lib/evaluation.py:436
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:82
 msgid "cm_eval_head_where_to_place_youngster"
 msgstr "3.2.1. Wohin wurden die Jugendlichen vermittlelt?"
 
-#: waskaweb/lib/evaluation.py:477
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:46
+#: waskaweb/lib/evaluation.py:482
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:112
 msgid "cm_eval_header_law_changed_after_place"
 msgstr "3.2.2. Angaben zum Rechtskreis nach der Vermittlung"
 
-#: waskaweb/lib/evaluation.py:552
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:108
+#: waskaweb/lib/evaluation.py:557
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:48
 msgid "cm_eval_header_on_age"
 msgstr "2.1.2. Angaben zur Altersverteilung"
 
-#: waskaweb/lib/evaluation.py:617
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:46
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:170
+#: waskaweb/lib/evaluation.py:622
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:45
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:110
 msgid "cm_eval_summary_header_6"
 msgstr "2.3. Förderbedarf"
 
-#: waskaweb/lib/evaluation.py:686
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:14
+#: waskaweb/lib/evaluation.py:691
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:16
 msgid "cm_eval_length_cm"
 msgstr "3.1.1. Verweildauer im CM"
 
-#: waskaweb/lib/evaluation.py:734
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:44
+#: waskaweb/lib/evaluation.py:746
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:49
 msgid "cm_eval_avg_length_cm"
 msgstr "3.1.2. Durchschnittliche Verweildauer in Wochen"
 
-#: waskaweb/lib/evaluation.py:784
+#: waskaweb/lib/evaluation.py:796
 msgid "cm_eval_header_graduation"
 msgstr "1.3. Höchster erreichte Schulanbschluss"
 
-#: waskaweb/lib/evaluation.py:834
+#: waskaweb/lib/evaluation.py:846
 #: 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:843 waskaweb/lib/evaluation.py:989
+#: waskaweb/lib/evaluation.py:855 waskaweb/lib/evaluation.py:1012
+#: waskaweb/lib/evaluation.py:1028
 msgid "cm_eval_header_effort"
 msgstr "Aufschlüsselung der einzelnen Tätigkeiten"
 
-#: waskaweb/lib/evaluation.py:949
+#: waskaweb/lib/evaluation.py:972
 msgid "cm_eval_header_effort2"
 msgstr "Aufschlüsselung der einzelnen Tätigkeiten"
 
-#: waskaweb/lib/evaluation.py:966
+#: waskaweb/lib/evaluation.py:989
 msgid "cm_eval_header_avg_effort"
 msgstr "Durchschnittliche Dauer der Tätigkeiten"
 
-#: waskaweb/lib/evaluation.py:982
+#: waskaweb/lib/evaluation.py:1005
 msgid "cm_eval_header_avg_effort2"
 msgstr "Durchschnittliche Dauer der Tätigkeiten"
 
-#: waskaweb/lib/evaluation.py:1061
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:47
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:202
+#: waskaweb/lib/evaluation.py:1100
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:46
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:142
 msgid "cm_eval_summary_header_19"
 msgstr "2.4. Gemeldete Arbeitslose"
 
-#: waskaweb/lib/evaluation.py:1107
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:48
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:238
+#: waskaweb/lib/evaluation.py:1146
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:47
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:178
 msgid "cm_eval_summary_header_20"
 msgstr "2.5. Angaben zu Nicht-Erwerbspersonen"
 
-#: waskaweb/lib/evaluation.py:1181
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:49
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:262
+#: waskaweb/lib/evaluation.py:1228
 msgid "cm_eval_summary_header_21"
 msgstr "2.6. ESF-Stammblatt"
 
-#: waskaweb/lib/evaluation.py:1239
+#: waskaweb/lib/evaluation.py:1286
 msgid "cm_eval_summary_header_23"
 msgstr ""
 
-#: waskaweb/lib/renderer.py:251
+#: waskaweb/lib/evaluation_new.py:276
+#, python-format
+msgid "Eval No: %s"
+msgstr ""
+
+#: waskaweb/lib/evaluation_new.py:279
+msgid "No description available"
+msgstr "Keine Beschreibung vorhanden"
+
+#: waskaweb/lib/renderer.py:285
 msgid "cm_rg_aid_overview_table_institution"
 msgstr "Institution"
 
-#: waskaweb/lib/renderer.py:252
+#: waskaweb/lib/renderer.py:286
 msgid "cm_rg_aid_overview_table_offer_type"
 msgstr "Form"
 
-#: waskaweb/lib/renderer.py:253
+#: waskaweb/lib/renderer.py:287
 msgid "cm_rg_aid_overview_table_actions"
 msgstr "Aktionen"
 
-#: waskaweb/lib/renderer.py:255
+#: waskaweb/lib/renderer.py:289
 msgid "cm_rg_aid_overview_table_edit"
 msgstr "Bearbeiten"
 
-#: waskaweb/lib/renderer.py:256
+#: waskaweb/lib/renderer.py:290
 msgid "cm_rg_aid_overview_table_goal"
 msgstr "Zielsetzung"
 
-#: waskaweb/lib/renderer.py:257 waskaweb/lib/renderer.py:258
+#: waskaweb/lib/renderer.py:291 waskaweb/lib/renderer.py:292
 #: waskaweb/templates/administration/overview_user.mako:43
 #: waskaweb/templates/administration/overview_user.mako:60
 #: waskaweb/templates/administration/overview_usergroups.mako:34
 #: waskaweb/templates/administration/overview_usergroups.mako:43
 #: waskaweb/templates/appointments/appointmentlist.mako:3
 #: waskaweb/templates/casemanagement/appointmentlist.mako:3
-#: waskaweb/templates/casemanagement/caselist.mako:75
-#: waskaweb/templates/casemanagement/caselist.mako:134
+#: waskaweb/templates/casemanagement/caselist.mako:93
+#: waskaweb/templates/casemanagement/caselist.mako:170
 #: waskaweb/templates/casemanagement/reminderlist.mako:4
 #: waskaweb/templates/documents/case_overview.mako:42
 #: waskaweb/templates/documents/case_overview.mako:53
@@ -338,7 +351,7 @@
 msgid "cm_overview_a_show"
 msgstr "Anzeigen"
 
-#: waskaweb/lib/renderer.py:259 waskaweb/lib/renderer.py:260
+#: waskaweb/lib/renderer.py:293 waskaweb/lib/renderer.py:294
 #: waskaweb/templates/administration/overview_user.mako:45
 #: waskaweb/templates/administration/overview_user.mako:62
 #: waskaweb/templates/administration/overview_usergroups.mako:35
@@ -347,10 +360,10 @@
 #: waskaweb/templates/casemanagement/agencylist.mako:32
 #: waskaweb/templates/casemanagement/agencylist.mako:42
 #: waskaweb/templates/casemanagement/appointmentlist.mako:5
-#: waskaweb/templates/casemanagement/caselist.mako:79
-#: waskaweb/templates/casemanagement/caselist.mako:89
-#: waskaweb/templates/casemanagement/caselist.mako:138
-#: waskaweb/templates/casemanagement/caselist.mako:148
+#: waskaweb/templates/casemanagement/caselist.mako:97
+#: waskaweb/templates/casemanagement/caselist.mako:107
+#: waskaweb/templates/casemanagement/caselist.mako:174
+#: waskaweb/templates/casemanagement/caselist.mako:184
 #: waskaweb/templates/casemanagement/reminderlist.mako:7
 #: waskaweb/templates/documents/case_overview.mako:44
 #: waskaweb/templates/documents/case_overview.mako:55
@@ -359,65 +372,69 @@
 msgid "cm_overview_a_delete"
 msgstr "Löschen"
 
-#: waskaweb/lib/renderer.py:261
+#: waskaweb/lib/renderer.py:295
 msgid "cm_rg_aid_overview_table_no_offer_found"
 msgstr "Keine Angebote gefunden"
 
-#: waskaweb/lib/renderer.py:262
+#: waskaweb/lib/renderer.py:296
 msgid "cm_rg_aid_overview_legend_legend"
 msgstr "Legende:"
 
-#: waskaweb/lib/renderer.py:263
+#: waskaweb/lib/renderer.py:297
 msgid "cm_rg_aid_overview_legend_bb"
 msgstr "(BB)"
 
-#: waskaweb/lib/renderer.py:264
+#: waskaweb/lib/renderer.py:298
 msgid "cm_rg_aid_overview_legend_common_educational_area"
 msgstr "Allgemein bildenden Bereich"
 
-#: waskaweb/lib/renderer.py:265
+#: waskaweb/lib/renderer.py:299
 msgid "cm_rg_aid_overview_legend_bv"
 msgstr "(BV)"
 
-#: waskaweb/lib/renderer.py:266
+#: waskaweb/lib/renderer.py:300
 msgid "cm_rg_aid_overview_legend_vocational_preparation"
 msgstr "Bereich der Berufsvorbereitung"
 
-#: waskaweb/lib/renderer.py:267
+#: waskaweb/lib/renderer.py:301
 msgid "cm_rg_aid_overview_legend_bq"
 msgstr "(BQ)"
 
-#: waskaweb/lib/renderer.py:268
+#: waskaweb/lib/renderer.py:302
 msgid "cm_rg_aid_overview_legend_qualifications"
 msgstr "Berufliche Qualifizierung"
 
-#: waskaweb/lib/renderer.py:269
+#: waskaweb/lib/renderer.py:303
 msgid "cm_rg_aid_overview_legend_lb"
 msgstr "(LB)"
 
-#: waskaweb/lib/renderer.py:270
+#: waskaweb/lib/renderer.py:304
 msgid "cm_rg_aid_overview_legend_life_skills"
 msgstr "Lebensbewältigung"
 
-#: waskaweb/lib/renderer.py:271
+#: waskaweb/lib/renderer.py:305
 msgid "cm_rg_aid_overview_legend_new_offer"
 msgstr "Neues Angebot hinzufügen"
 
-#: waskaweb/model/case.py:1117 waskaweb/model/case.py:1118
-#: waskaweb/templates/casemanagement/caselist.mako:64
-#: waskaweb/templates/casemanagement/caselist.mako:123
+#: waskaweb/lib/validators.py:52
+msgid "Date is invalid"
+msgstr "Datum ist ungültig"
+
+#: waskaweb/model/case.py:1152 waskaweb/model/case.py:1153
+#: waskaweb/templates/casemanagement/caselist.mako:82
+#: waskaweb/templates/casemanagement/caselist.mako:159
 msgid "case_state_label_open"
 msgstr "Bearbeitbar"
 
-#: waskaweb/model/case.py:1119
+#: waskaweb/model/case.py:1154
 msgid "case_state_label_outstanding_delete"
 msgstr "Schwebend gelöscht"
 
-#: waskaweb/model/case.py:1120
+#: waskaweb/model/case.py:1155
 msgid "case_state_label_outstanding_anon"
 msgstr "Schwebend anonymisiert"
 
-#: waskaweb/model/case.py:1121
+#: waskaweb/model/case.py:1156
 msgid "case_state_label_anon"
 msgstr "Anonymisiert"
 
@@ -461,37 +478,37 @@
 msgid "logout_p_login_again"
 msgstr ", um sich erneut in WASKA anzumelden."
 
-#: waskaweb/templates/main.mako:78
+#: waskaweb/templates/main.mako:4
 msgid "statusbar_logininfo"
 msgstr "Angemeldet als"
 
-#: waskaweb/templates/main.mako:90 waskaweb/templates/main.mako:120
+#: waskaweb/templates/main.mako:16 waskaweb/templates/main.mako:46
 msgid "sm_menu_link_home"
 msgstr "Schwarzes Brett"
 
-#: waskaweb/templates/main.mako:91 waskaweb/templates/start/help.mako:4
+#: waskaweb/templates/main.mako:17 waskaweb/templates/start/help.mako:4
 msgid "sm_menu_link_help"
 msgstr "Hilfe"
 
-#: waskaweb/templates/main.mako:92
+#: waskaweb/templates/main.mako:18
 #: waskaweb/templates/usersettings/change_password.mako:4
 #: waskaweb/templates/usersettings/show_settings.mako:4
 msgid "sm_menu_link_settings"
 msgstr "Mein Konto"
 
-#: waskaweb/templates/main.mako:93 waskaweb/templates/start/responsible.mako:4
+#: waskaweb/templates/main.mako:19 waskaweb/templates/start/responsible.mako:4
 msgid "sm_menu_link_responsible"
 msgstr "Info"
 
-#: waskaweb/templates/main.mako:94
+#: waskaweb/templates/main.mako:20
 msgid "sm_menu_link_logout"
 msgstr "Abmelden"
 
-#: waskaweb/templates/main.mako:100 waskaweb/templates/main.mako:118
+#: waskaweb/templates/main.mako:26 waskaweb/templates/main.mako:44
 msgid "np_root"
 msgstr "Waska Start"
 
-#: waskaweb/templates/main.mako:121
+#: waskaweb/templates/main.mako:47
 #: waskaweb/templates/appointments/dialogs/confirm.mako:4
 #: waskaweb/templates/appointments/dialogs/notificate_delete_appointment.mako:5
 #: waskaweb/templates/appointments/dialogs/success_delete_appointment.mako:5
@@ -501,58 +518,62 @@
 msgid "menu_app_link_overview"
 msgstr "Termine"
 
-#: waskaweb/templates/main.mako:122
+#: waskaweb/templates/main.mako:48
 msgid "menu_doc_link_overview"
 msgstr "Dokumente"
 
-#: waskaweb/templates/main.mako:130 waskaweb/templates/main.mako:140
+#: waskaweb/templates/main.mako:56 waskaweb/templates/main.mako:66
 msgid "menu_header_cm"
 msgstr "Case-Management"
 
-#: waskaweb/templates/main.mako:132 waskaweb/templates/main.mako:142
+#: waskaweb/templates/main.mako:58 waskaweb/templates/main.mako:68
 msgid "menu_cm_link_overview"
 msgstr "Fallakten\t"
 
-#: waskaweb/templates/main.mako:133 waskaweb/templates/main.mako:147
+#: waskaweb/templates/main.mako:59
 #: waskaweb/templates/casemanagement/evaluation.mako:8
 msgid "cm_actions_link_evaluate"
 msgstr "Auswertung"
 
-#: waskaweb/templates/main.mako:144
+#: waskaweb/templates/main.mako:70
 msgid "menu_cm_link_new"
 msgstr "Fallakte anlegen"
 
-#: waskaweb/templates/main.mako:145
+#: waskaweb/templates/main.mako:71
 msgid "menu_cm_link_import"
 msgstr "Fallakte importieren"
 
-#: waskaweb/templates/main.mako:163
+#: waskaweb/templates/main.mako:74
+msgid "Auswertungen"
+msgstr ""
+
+#: waskaweb/templates/main.mako:94
 msgid "menu_header_adm"
 msgstr "Administration"
 
-#: waskaweb/templates/main.mako:165
+#: waskaweb/templates/main.mako:96
 msgid "menu_adm_link_useroverview"
 msgstr "Benutzer"
 
-#: waskaweb/templates/main.mako:168
+#: waskaweb/templates/main.mako:99
 msgid "menu_adm_link_usergroupoverview"
 msgstr "Benutzergruppen"
 
-#: waskaweb/templates/main.mako:171
+#: waskaweb/templates/main.mako:102
 msgid "menu_adm_link_showsettings"
 msgstr "Agentur"
 
-#: waskaweb/templates/main.mako:184
+#: waskaweb/templates/main.mako:115
 msgid "main_formular_input_error"
 msgstr "Fehlerhafte Formulareingabe"
 
-#: waskaweb/templates/main.mako:197
+#: waskaweb/templates/main.mako:128
 msgid "footer_title"
 msgstr "WASKA"
 
-#: waskaweb/templates/main.mako:197
+#: waskaweb/templates/main.mako:128
 msgid "footer_version"
-msgstr "26.11.2009 | Version 1.5.6-beta8"
+msgstr "30.11.2009 | Version 1.6.0-beta1"
 
 #: waskaweb/templates/main_login.mako:38
 msgid "main_login_bmf_phrase"
@@ -991,7 +1012,7 @@
 
 #: waskaweb/templates/administration/overview_usergroups.mako:53
 #: waskaweb/templates/casemanagement/agencylist.mako:51
-#: waskaweb/templates/casemanagement/caselist.mako:158
+#: waskaweb/templates/casemanagement/caselist.mako:194
 msgid "cm_overview_tbl_no_data_found"
 msgstr "Es wurden keine Datensätze gefunden."
 
@@ -1471,6 +1492,8 @@
 #: waskaweb/templates/casemanagement/dialogs/success_delete_cm.mako:5
 #: waskaweb/templates/casemanagement/dialogs/success_markdelete.mako:5
 #: waskaweb/templates/casemanagement/dialogs/success_restore.mako:5
+#: waskaweb/templates/casemanagement/evaluation/evaluation_adele.mako:6
+#: waskaweb/templates/casemanagement/evaluation/evaluation_basic.mako:6
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_0.mako:6
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:6
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:6
@@ -1639,40 +1662,40 @@
 msgid "cm_overview_tbl_header_status"
 msgstr "Status"
 
-#: waskaweb/templates/casemanagement/caselist.mako:58
-#: waskaweb/templates/casemanagement/caselist.mako:117
+#: waskaweb/templates/casemanagement/caselist.mako:76
+#: waskaweb/templates/casemanagement/caselist.mako:153
 msgid "cm_overview_img_editor"
 msgstr "Bearbeiter"
 
-#: waskaweb/templates/casemanagement/caselist.mako:60
-#: waskaweb/templates/casemanagement/caselist.mako:119
+#: waskaweb/templates/casemanagement/caselist.mako:78
+#: waskaweb/templates/casemanagement/caselist.mako:155
 msgid "cm_overview_img_standin"
 msgstr "Vertreter"
 
-#: waskaweb/templates/casemanagement/caselist.mako:66
-#: waskaweb/templates/casemanagement/caselist.mako:125
+#: waskaweb/templates/casemanagement/caselist.mako:84
+#: waskaweb/templates/casemanagement/caselist.mako:161
 msgid "case_state_label_delete"
 msgstr "Gelöscht"
 
-#: waskaweb/templates/casemanagement/caselist.mako:68
-#: waskaweb/templates/casemanagement/caselist.mako:127
+#: waskaweb/templates/casemanagement/caselist.mako:86
+#: waskaweb/templates/casemanagement/caselist.mako:163
 msgid "case_state_label_markanonym"
 msgstr "Schwebend anonymisiert"
 
-#: waskaweb/templates/casemanagement/caselist.mako:70
-#: waskaweb/templates/casemanagement/caselist.mako:129
+#: waskaweb/templates/casemanagement/caselist.mako:88
+#: waskaweb/templates/casemanagement/caselist.mako:165
 msgid "case_state_label_anonym"
 msgstr "Anonymisiert"
 
-#: waskaweb/templates/casemanagement/caselist.mako:82
-#: waskaweb/templates/casemanagement/caselist.mako:88
-#: waskaweb/templates/casemanagement/caselist.mako:141
-#: waskaweb/templates/casemanagement/caselist.mako:147
+#: waskaweb/templates/casemanagement/caselist.mako:100
+#: waskaweb/templates/casemanagement/caselist.mako:106
+#: waskaweb/templates/casemanagement/caselist.mako:177
+#: waskaweb/templates/casemanagement/caselist.mako:183
 msgid "cm_overview_a_anonymize"
 msgstr "Fallakte anonymisieren"
 
-#: waskaweb/templates/casemanagement/caselist.mako:85
-#: waskaweb/templates/casemanagement/caselist.mako:144
+#: waskaweb/templates/casemanagement/caselist.mako:103
+#: waskaweb/templates/casemanagement/caselist.mako:180
 msgid "cm_overview_a_restore"
 msgstr "Fallakte wiederherstellen"
 
@@ -1694,60 +1717,84 @@
 msgid "cm_header_digest"
 msgstr "Zusammenfassung der Fallakte"
 
-#: waskaweb/templates/casemanagement/digest_body.mako:51
+#: waskaweb/templates/casemanagement/digest_body.mako:52
+msgid "Angaben zum Verlauf"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/digest_body.mako:55
+msgid "Fallart"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/digest_body.mako:67
+msgid "Phase"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/digest_body.mako:71
+msgid "Start- Enddaten"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/digest_body.mako:83
+msgid "Art Beendigung"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/digest_body.mako:87
+msgid "Status bei Beendigung"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/digest_body.mako:92
 msgid "cm_header_digest_youth"
 msgstr "Angaben zum Jugendlichen"
 
-#: waskaweb/templates/casemanagement/digest_body.mako:54
-#: waskaweb/templates/casemanagement/digest_body.mako:108
+#: waskaweb/templates/casemanagement/digest_body.mako:95
+#: waskaweb/templates/casemanagement/digest_body.mako:149
 msgid "cm_digest_tbl_label_lastname"
 msgstr "Name"
 
-#: waskaweb/templates/casemanagement/digest_body.mako:58
-#: waskaweb/templates/casemanagement/digest_body.mako:112
+#: waskaweb/templates/casemanagement/digest_body.mako:99
+#: waskaweb/templates/casemanagement/digest_body.mako:153
 msgid "cm_digest_tbl_label_firstname"
 msgstr "Vorname"
 
-#: waskaweb/templates/casemanagement/digest_body.mako:62
+#: waskaweb/templates/casemanagement/digest_body.mako:103
 msgid "cm_digest_tbl_label_caseid"
 msgstr "Kundennummer"
 
-#: waskaweb/templates/casemanagement/digest_body.mako:66
+#: waskaweb/templates/casemanagement/digest_body.mako:107
 msgid "cm_digest_tbl_label_age"
 msgstr "Alter"
 
-#: waskaweb/templates/casemanagement/digest_body.mako:70
-#: waskaweb/templates/casemanagement/digest_body.mako:116
+#: waskaweb/templates/casemanagement/digest_body.mako:111
+#: waskaweb/templates/casemanagement/digest_body.mako:157
 msgid "cm_digest_tbl_label_email"
 msgstr "E-Mail"
 
-#: waskaweb/templates/casemanagement/digest_body.mako:80
+#: waskaweb/templates/casemanagement/digest_body.mako:121
 msgid "cm_digest_tbl_label_street"
 msgstr "Straße"
 
-#: waskaweb/templates/casemanagement/digest_body.mako:84
+#: waskaweb/templates/casemanagement/digest_body.mako:125
 msgid "cm_digest_tbl_label_plz"
 msgstr "PLZ"
 
-#: waskaweb/templates/casemanagement/digest_body.mako:88
+#: waskaweb/templates/casemanagement/digest_body.mako:129
 msgid "cm_digest_tbl_label_city"
 msgstr "Ort"
 
-#: waskaweb/templates/casemanagement/digest_body.mako:92
-#: waskaweb/templates/casemanagement/digest_body.mako:126
+#: waskaweb/templates/casemanagement/digest_body.mako:133
+#: waskaweb/templates/casemanagement/digest_body.mako:167
 msgid "cm_digest_tbl_label_telephone"
 msgstr "Festnetz"
 
-#: waskaweb/templates/casemanagement/digest_body.mako:96
-#: waskaweb/templates/casemanagement/digest_body.mako:130
+#: waskaweb/templates/casemanagement/digest_body.mako:137
+#: waskaweb/templates/casemanagement/digest_body.mako:171
 msgid "cm_digest_tbl_label_mobiletelephone"
 msgstr "Mobil"
 
-#: waskaweb/templates/casemanagement/digest_body.mako:100
+#: waskaweb/templates/casemanagement/digest_body.mako:141
 msgid "cm_digest_tbl_label_telephone_more"
 msgstr "Weitere Telefonnummern"
 
-#: waskaweb/templates/casemanagement/digest_body.mako:105
+#: waskaweb/templates/casemanagement/digest_body.mako:146
 msgid "cm_header_digest_parent"
 msgstr "Angaben zum Erziehungsberechtigten"
 
@@ -1897,11 +1944,11 @@
 msgid "cm_menu_link_appointment"
 msgstr "Termine"
 
-#: waskaweb/templates/casemanagement/main.mako:77
+#: waskaweb/templates/casemanagement/main.mako:79
 msgid "cm_menu_link_documents"
 msgstr "Anlagen"
 
-#: waskaweb/templates/casemanagement/main.mako:83
+#: waskaweb/templates/casemanagement/main.mako:85
 msgid "cm_menu_header_structure"
 msgstr "Gliederung"
 
@@ -1919,7 +1966,7 @@
 "Auswahl 'Erklärung drucken'. Bitte nutzen Sie den 'Zurück'-Knopf Ihres "
 "Browsers, um nach dem Drucken auf diese Seite zurückzukehren."
 
-#: waskaweb/templates/casemanagement/new.mako:35
+#: waskaweb/templates/casemanagement/new.mako:52
 msgid "cm_new_con_acceptance_statement_true"
 msgstr ""
 "Die Einwilligungserklärung für die Erfassung, Verarbeitung und Nutzung "
@@ -1999,8 +2046,7 @@
 msgid "cm_header_import"
 msgstr "Fallakte importieren"
 
-#: waskaweb/templates/casemanagement/upload.mako:22
-#: waskaweb/templates/casemanagement/upload.mako:34
+#: waskaweb/templates/casemanagement/upload.mako:20
 msgid "cm_from_import_submit"
 msgstr "Importieren"
 
@@ -2147,23 +2193,23 @@
 msgid "eval_group_header_incm"
 msgstr "2. Auswertungen über Jugendliche im Case-Management"
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:43
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:13
-msgid "cm_eval_summary_header_3"
-msgstr "3.1. Verweildauer im CM"
-
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:51
+#: 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:52
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:15
+msgid "cm_eval_summary_header_3"
+msgstr "3.1. Verweildauer im CM"
+
 #: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:53
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:15
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:81
 msgid "cm_eval_summary_header_7"
 msgstr "3.2. Vermittlung"
 
 #: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:55
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:78
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:144
 msgid "cm_eval_summary_header_15"
 msgstr "3.3. Zeitaufwände"
 
@@ -2198,19 +2244,18 @@
 #: 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:43
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:70
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:47
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:77
 #: 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:139
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:175
 #: 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_2.mako:264
-#: 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
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:84
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:48
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:78
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:111
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:141
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:147
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:150
 msgid "cm_eval_table_to_overview"
 msgstr "Zur Übersicht"
 
@@ -2221,19 +2266,18 @@
 #: 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:43
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:70
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:47
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:77
 #: 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:139
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:175
 #: 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_2.mako:264
-#: 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
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:84
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:48
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:78
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:111
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:141
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:147
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:150
 msgid "cm_eval_table_export_analysis"
 msgstr "Auswertung exportieren"
 
@@ -2254,14 +2298,14 @@
 #: 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: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
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:18
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:52
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:84
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:114
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:146
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:182
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:86
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:116
 msgid "cm_eval_table_number"
 msgstr "Anzahl"
 
@@ -2270,14 +2314,14 @@
 #: 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: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
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:19
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:53
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:85
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:115
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:147
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:183
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:87
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:117
 msgid "cm_eval_table_percent"
 msgstr "Prozent"
 
@@ -2317,72 +2361,53 @@
 "aufgenommen, wenn für den Jugendlichen die Phase des Case-Management "
 "begonnen wurde.</strong>"
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:17
-msgid "cm_eval_table_month"
-msgstr "Woche"
-
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:18
-#: 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: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:74
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:14
 msgid "cm_eval_header_on_gender"
 msgstr "2.1.1. Angaben zur Geschlechtsstruktur"
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:77
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:17
 msgid "cm_eval_table_gender"
 msgstr "Geschlecht"
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:83
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:23
 msgid "cm_eval_label_male"
 msgstr "männlich"
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:89
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:29
 msgid "cm_eval_label_female"
 msgstr "weiblich"
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:95
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:35
 msgid "cm_eval_label_intersexual"
 msgstr "intersexuell"
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:101
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:41
 msgid "cm_eval_label_unknown"
 msgstr "Keine Angabe"
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:111
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:51
 msgid "cm_eval_table_age"
 msgstr "Alter"
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:143
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:205
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:241
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:83
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:145
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:181
 msgid "cm_eval_table_category"
 msgstr "Kategorie"
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:149
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:89
 msgid "cm_eval_label_migration_background"
 msgstr "Migrationshintergrund"
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:155
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:95
 msgid "cm_eval_label_no_migration_background"
 msgstr "Kein Migrationshintergrund"
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:161
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:101
 msgid "cm_eval_label_ka_migration_background"
 msgstr "Keine Angabe"
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:173
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:113
 msgid "cm_eval_table_offer"
 msgstr "Angebot"
 
@@ -2394,10 +2419,34 @@
 "als abgeschlossen, wenn die Phase des Case-Management abgeschlossen wurde."
 
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:19
+msgid "cm_eval_table_month"
+msgstr "Woche"
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:20
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:52
+msgid "cm_eval_table_completed"
+msgstr "Abgeschlossen"
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:21
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:53
+msgid "cm_eval_table_early_completed"
+msgstr "vorz. Abgeschlossen"
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:22
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:54
+msgid "cm_eval_table_aborted"
+msgstr "Abgebrochen"
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:23
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:55
+msgid "keine Angabe"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:85
 msgid "cm_eval_table_place"
 msgstr "Vermittlung"
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:49
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:115
 msgid "cm_eval_table_law_change"
 msgstr "Rechtskreis"
 
@@ -2538,6 +2587,59 @@
 msgid "cm_np_doc_success"
 msgstr "Dokument hinzugefügt"
 
+#: waskaweb/templates/evaluation/evaluate.mako:12
+#: waskaweb/templates/evaluation/evaluate_adele.mako:12
+msgid "Evaluation configuration"
+msgstr "Auswertungskonfiguration"
+
+#: waskaweb/templates/evaluation/evaluate.mako:20
+#: waskaweb/templates/evaluation/evaluate_adele.mako:20
+msgid "Name"
+msgstr ""
+
+#: waskaweb/templates/evaluation/evaluate.mako:24
+#: waskaweb/templates/evaluation/evaluate_adele.mako:24
+msgid "Description"
+msgstr "Beschreibung"
+
+#: waskaweb/templates/evaluation/evaluate.mako:60
+#: waskaweb/templates/evaluation/evaluate_adele.mako:62
+msgid "Filter"
+msgstr ""
+
+#: waskaweb/templates/evaluation/evaluate.mako:68
+#: waskaweb/templates/evaluation/evaluate_adele.mako:70
+msgid "Available evaluations"
+msgstr "Verfügbare Auswertungen"
+
+#: waskaweb/templates/evaluation/evaluate.mako:69
+#: waskaweb/templates/evaluation/evaluate_adele.mako:71
+msgid "Please select one or more evaluations"
+msgstr "Bitte wählen Sie eine oder mehrere Auswertungen"
+
+#: waskaweb/templates/evaluation/evaluate.mako:72
+#: waskaweb/templates/evaluation/evaluate_adele.mako:74
+msgid "Evaluations"
+msgstr "Auswertungen"
+
+#: waskaweb/templates/evaluation/evaluate.mako:88
+#: waskaweb/templates/evaluation/evaluate_adele.mako:90
+msgid "Show percent"
+msgstr "Prozentwerte anzeigen"
+
+#: waskaweb/templates/evaluation/evaluate.mako:91
+#: waskaweb/templates/evaluation/evaluate_adele.mako:93
+msgid "evaluate"
+msgstr "auswerten"
+
+#: waskaweb/templates/evaluation/result.mako:20
+msgid "Export XML"
+msgstr "XML-Export"
+
+#: waskaweb/templates/evaluation/result.mako:21
+msgid "Export CSV"
+msgstr "CSV-Export"
+
 #: waskaweb/templates/start/remindlist.mako:8
 msgid "cm_overview_a_keepactive"
 msgstr "Aufbewahrung verlängern"
@@ -2578,11 +2680,11 @@
 "Fallakten werden nach Ablauf der Frist automatisch zur Anonymisierung "
 "vorgeschlagen."
 
-#: waskaweb/templates/statement/list_statements.mako:24
+#: waskaweb/templates/statement/list_statements.mako:41
 msgid "statement_header_fp"
 msgstr "Vereinbarung Förderplan"
 
-#: waskaweb/templates/statement/list_statements.mako:26
+#: waskaweb/templates/statement/list_statements.mako:43
 msgid "statement_explaination_fp"
 msgstr ""
 "Vereinbarung zwischen dem Jugendlichen und der Kompetenzagentur über einen "
@@ -2591,13 +2693,13 @@
 "Erziehungsberechtigen einzuholen, wenn der Förderplan bzw. Daten an eine "
 "andere Hilfeinstitution weitergeleitet werden"
 
-#: waskaweb/templates/statement/list_statements.mako:33
+#: waskaweb/templates/statement/list_statements.mako:50
 msgid "statement_header_ud"
 msgstr ""
 "Einwilligungserklärung zur Übermittlung von personenbezogenen Daten an die "
 "Kompetenzagentur"
 
-#: waskaweb/templates/statement/list_statements.mako:35
+#: waskaweb/templates/statement/list_statements.mako:52
 msgid "statement_explaination_ud"
 msgstr ""
 "Erklärung zur Schweigepflichtsentbindung von Vertrauenspersonen mit "

Modified: waska/trunk/waskaweb/i18n/waskaweb.pot
===================================================================
--- waska/trunk/waskaweb/i18n/waskaweb.pot	2009-11-27 13:11:23 UTC (rev 712)
+++ waska/trunk/waskaweb/i18n/waskaweb.pot	2009-11-30 08:54:23 UTC (rev 713)
@@ -1,21 +1,21 @@
 # Translations template for waskaweb.
-# Copyright (C) 2008 ORGANIZATION
+# Copyright (C) 2009 ORGANIZATION
 # This file is distributed under the same license as the waskaweb project.
-# FIRST AUTHOR <EMAIL at ADDRESS>, 2008.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: waskaweb 0.0.0\n"
 "Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2008-09-24 14:51+0200\n"
+"POT-Creation-Date: 2009-11-30 09:38+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.1\n"
+"Generated-By: Babel 0.9.4\n"
 
 #: waskaweb/controllers/administration.py:46
 msgid "adm_reset_user_password"
@@ -151,6 +151,11 @@
 msgid "adm_edit_agency_text"
 msgstr ""
 
+#: waskaweb/controllers/evaluate.py:92 waskaweb/controllers/evaluate.py:225
+#: waskaweb/controllers/evaluate.py:252 waskaweb/controllers/evaluate.py:280
+msgid "Error: Evaluation failed"
+msgstr ""
+
 #: waskaweb/controllers/usersettings.py:45
 msgid "adm_edit_standin_success_header"
 msgstr ""
@@ -159,141 +164,149 @@
 msgid "adm_edit_standin_success_text"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:178
+#: waskaweb/lib/evaluation.py:183
 #: 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:234
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:44
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:73
+#: waskaweb/lib/evaluation.py:239
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:43
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:13
 msgid "cm_eval_summary_header_4"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:285
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:45
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:140
+#: waskaweb/lib/evaluation.py:290
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:44
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:80
 msgid "cm_eval_summary_header_5"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:335
+#: waskaweb/lib/evaluation.py:340
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:45
 msgid "cm_eval_header_access_youngster_to_agency"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:380
+#: waskaweb/lib/evaluation.py:385
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:75
 msgid "cm_eval_head_law_access_agency"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:431
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:16
+#: waskaweb/lib/evaluation.py:436
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:82
 msgid "cm_eval_head_where_to_place_youngster"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:477
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:46
+#: waskaweb/lib/evaluation.py:482
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:112
 msgid "cm_eval_header_law_changed_after_place"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:552
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:108
+#: waskaweb/lib/evaluation.py:557
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:48
 msgid "cm_eval_header_on_age"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:617
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:46
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:170
+#: waskaweb/lib/evaluation.py:622
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:45
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:110
 msgid "cm_eval_summary_header_6"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:686
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:14
+#: waskaweb/lib/evaluation.py:691
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:16
 msgid "cm_eval_length_cm"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:734
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:44
+#: waskaweb/lib/evaluation.py:746
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:49
 msgid "cm_eval_avg_length_cm"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:784
+#: waskaweb/lib/evaluation.py:796
 msgid "cm_eval_header_graduation"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:834
+#: waskaweb/lib/evaluation.py:846
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:105
 msgid "cm_eval_header_work"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:843 waskaweb/lib/evaluation.py:989
+#: waskaweb/lib/evaluation.py:855 waskaweb/lib/evaluation.py:1012
+#: waskaweb/lib/evaluation.py:1028
 msgid "cm_eval_header_effort"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:949
+#: waskaweb/lib/evaluation.py:972
 msgid "cm_eval_header_effort2"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:966
+#: waskaweb/lib/evaluation.py:989
 msgid "cm_eval_header_avg_effort"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:982
+#: waskaweb/lib/evaluation.py:1005
 msgid "cm_eval_header_avg_effort2"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:1061
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:47
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:202
+#: waskaweb/lib/evaluation.py:1100
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:46
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:142
 msgid "cm_eval_summary_header_19"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:1107
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:48
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:238
+#: waskaweb/lib/evaluation.py:1146
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:47
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:178
 msgid "cm_eval_summary_header_20"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:1181
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:49
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:262
+#: waskaweb/lib/evaluation.py:1228
 msgid "cm_eval_summary_header_21"
 msgstr ""
 
-#: waskaweb/lib/evaluation.py:1239
+#: waskaweb/lib/evaluation.py:1286
 msgid "cm_eval_summary_header_23"
 msgstr ""
 
-#: waskaweb/lib/renderer.py:251
+#: waskaweb/lib/evaluation_new.py:276
+#, python-format
+msgid "Eval No: %s"
+msgstr ""
+
+#: waskaweb/lib/evaluation_new.py:279
+msgid "No description available"
+msgstr ""
+
+#: waskaweb/lib/renderer.py:285
 msgid "cm_rg_aid_overview_table_institution"
 msgstr ""
 
-#: waskaweb/lib/renderer.py:252
+#: waskaweb/lib/renderer.py:286
 msgid "cm_rg_aid_overview_table_offer_type"
 msgstr ""
 
-#: waskaweb/lib/renderer.py:253
+#: waskaweb/lib/renderer.py:287
 msgid "cm_rg_aid_overview_table_actions"
 msgstr ""
 
-#: waskaweb/lib/renderer.py:255
+#: waskaweb/lib/renderer.py:289
 msgid "cm_rg_aid_overview_table_edit"
 msgstr ""
 
-#: waskaweb/lib/renderer.py:256
+#: waskaweb/lib/renderer.py:290
 msgid "cm_rg_aid_overview_table_goal"
 msgstr ""
 
-#: waskaweb/lib/renderer.py:257 waskaweb/lib/renderer.py:258
+#: waskaweb/lib/renderer.py:291 waskaweb/lib/renderer.py:292
 #: waskaweb/templates/administration/overview_user.mako:43
 #: waskaweb/templates/administration/overview_user.mako:60
 #: waskaweb/templates/administration/overview_usergroups.mako:34
 #: waskaweb/templates/administration/overview_usergroups.mako:43
 #: waskaweb/templates/appointments/appointmentlist.mako:3
 #: waskaweb/templates/casemanagement/appointmentlist.mako:3
-#: waskaweb/templates/casemanagement/caselist.mako:75
-#: waskaweb/templates/casemanagement/caselist.mako:134
+#: waskaweb/templates/casemanagement/caselist.mako:93
+#: waskaweb/templates/casemanagement/caselist.mako:170
 #: waskaweb/templates/casemanagement/reminderlist.mako:4
 #: waskaweb/templates/documents/case_overview.mako:42
 #: waskaweb/templates/documents/case_overview.mako:53
@@ -309,7 +322,7 @@
 msgid "cm_overview_a_show"
 msgstr ""
 
-#: waskaweb/lib/renderer.py:259 waskaweb/lib/renderer.py:260
+#: waskaweb/lib/renderer.py:293 waskaweb/lib/renderer.py:294
 #: waskaweb/templates/administration/overview_user.mako:45
 #: waskaweb/templates/administration/overview_user.mako:62
 #: waskaweb/templates/administration/overview_usergroups.mako:35
@@ -318,10 +331,10 @@
 #: waskaweb/templates/casemanagement/agencylist.mako:32
 #: waskaweb/templates/casemanagement/agencylist.mako:42
 #: waskaweb/templates/casemanagement/appointmentlist.mako:5
-#: waskaweb/templates/casemanagement/caselist.mako:79
-#: waskaweb/templates/casemanagement/caselist.mako:89
-#: waskaweb/templates/casemanagement/caselist.mako:138
-#: waskaweb/templates/casemanagement/caselist.mako:148
+#: waskaweb/templates/casemanagement/caselist.mako:97
+#: waskaweb/templates/casemanagement/caselist.mako:107
+#: waskaweb/templates/casemanagement/caselist.mako:174
+#: waskaweb/templates/casemanagement/caselist.mako:184
 #: waskaweb/templates/casemanagement/reminderlist.mako:7
 #: waskaweb/templates/documents/case_overview.mako:44
 #: waskaweb/templates/documents/case_overview.mako:55
@@ -330,65 +343,69 @@
 msgid "cm_overview_a_delete"
 msgstr ""
 
-#: waskaweb/lib/renderer.py:261
+#: waskaweb/lib/renderer.py:295
 msgid "cm_rg_aid_overview_table_no_offer_found"
 msgstr ""
 
-#: waskaweb/lib/renderer.py:262
+#: waskaweb/lib/renderer.py:296
 msgid "cm_rg_aid_overview_legend_legend"
 msgstr ""
 
-#: waskaweb/lib/renderer.py:263
+#: waskaweb/lib/renderer.py:297
 msgid "cm_rg_aid_overview_legend_bb"
 msgstr ""
 
-#: waskaweb/lib/renderer.py:264
+#: waskaweb/lib/renderer.py:298
 msgid "cm_rg_aid_overview_legend_common_educational_area"
 msgstr ""
 
-#: waskaweb/lib/renderer.py:265
+#: waskaweb/lib/renderer.py:299
 msgid "cm_rg_aid_overview_legend_bv"
 msgstr ""
 
-#: waskaweb/lib/renderer.py:266
+#: waskaweb/lib/renderer.py:300
 msgid "cm_rg_aid_overview_legend_vocational_preparation"
 msgstr ""
 
-#: waskaweb/lib/renderer.py:267
+#: waskaweb/lib/renderer.py:301
 msgid "cm_rg_aid_overview_legend_bq"
 msgstr ""
 
-#: waskaweb/lib/renderer.py:268
+#: waskaweb/lib/renderer.py:302
 msgid "cm_rg_aid_overview_legend_qualifications"
 msgstr ""
 
-#: waskaweb/lib/renderer.py:269
+#: waskaweb/lib/renderer.py:303
 msgid "cm_rg_aid_overview_legend_lb"
 msgstr ""
 
-#: waskaweb/lib/renderer.py:270
+#: waskaweb/lib/renderer.py:304
 msgid "cm_rg_aid_overview_legend_life_skills"
 msgstr ""
 
-#: waskaweb/lib/renderer.py:271
+#: waskaweb/lib/renderer.py:305
 msgid "cm_rg_aid_overview_legend_new_offer"
 msgstr ""
 
-#: waskaweb/model/case.py:1117 waskaweb/model/case.py:1118
-#: waskaweb/templates/casemanagement/caselist.mako:64
-#: waskaweb/templates/casemanagement/caselist.mako:123
+#: waskaweb/lib/validators.py:52
+msgid "Date is invalid"
+msgstr ""
+
+#: waskaweb/model/case.py:1152 waskaweb/model/case.py:1153
+#: waskaweb/templates/casemanagement/caselist.mako:82
+#: waskaweb/templates/casemanagement/caselist.mako:159
 msgid "case_state_label_open"
 msgstr ""
 
-#: waskaweb/model/case.py:1119
+#: waskaweb/model/case.py:1154
 msgid "case_state_label_outstanding_delete"
 msgstr ""
 
-#: waskaweb/model/case.py:1120
+#: waskaweb/model/case.py:1155
 msgid "case_state_label_outstanding_anon"
 msgstr ""
 
-#: waskaweb/model/case.py:1121
+#: waskaweb/model/case.py:1156
 msgid "case_state_label_anon"
 msgstr ""
 
@@ -432,37 +449,37 @@
 msgid "logout_p_login_again"
 msgstr ""
 
-#: waskaweb/templates/main.mako:78
+#: waskaweb/templates/main.mako:4
 msgid "statusbar_logininfo"
 msgstr ""
 
-#: waskaweb/templates/main.mako:90 waskaweb/templates/main.mako:120
+#: waskaweb/templates/main.mako:16 waskaweb/templates/main.mako:46
 msgid "sm_menu_link_home"
 msgstr ""
 
-#: waskaweb/templates/main.mako:91 waskaweb/templates/start/help.mako:4
+#: waskaweb/templates/main.mako:17 waskaweb/templates/start/help.mako:4
 msgid "sm_menu_link_help"
 msgstr ""
 
-#: waskaweb/templates/main.mako:92
+#: waskaweb/templates/main.mako:18
 #: waskaweb/templates/usersettings/change_password.mako:4
 #: waskaweb/templates/usersettings/show_settings.mako:4
 msgid "sm_menu_link_settings"
 msgstr ""
 
-#: waskaweb/templates/main.mako:93 waskaweb/templates/start/responsible.mako:4
+#: waskaweb/templates/main.mako:19 waskaweb/templates/start/responsible.mako:4
 msgid "sm_menu_link_responsible"
 msgstr ""
 
-#: waskaweb/templates/main.mako:94
+#: waskaweb/templates/main.mako:20
 msgid "sm_menu_link_logout"
 msgstr ""
 
-#: waskaweb/templates/main.mako:100 waskaweb/templates/main.mako:118
+#: waskaweb/templates/main.mako:26 waskaweb/templates/main.mako:44
 msgid "np_root"
 msgstr ""
 
-#: waskaweb/templates/main.mako:121
+#: waskaweb/templates/main.mako:47
 #: waskaweb/templates/appointments/dialogs/confirm.mako:4
 #: waskaweb/templates/appointments/dialogs/notificate_delete_appointment.mako:5
 #: waskaweb/templates/appointments/dialogs/success_delete_appointment.mako:5
@@ -472,56 +489,60 @@
 msgid "menu_app_link_overview"
 msgstr ""
 
-#: waskaweb/templates/main.mako:122
+#: waskaweb/templates/main.mako:48
 msgid "menu_doc_link_overview"
 msgstr ""
 
-#: waskaweb/templates/main.mako:130 waskaweb/templates/main.mako:140
+#: waskaweb/templates/main.mako:56 waskaweb/templates/main.mako:66
 msgid "menu_header_cm"
 msgstr ""
 
-#: waskaweb/templates/main.mako:132 waskaweb/templates/main.mako:142
+#: waskaweb/templates/main.mako:58 waskaweb/templates/main.mako:68
 msgid "menu_cm_link_overview"
 msgstr ""
 
-#: waskaweb/templates/main.mako:133 waskaweb/templates/main.mako:147
+#: waskaweb/templates/main.mako:59
 #: waskaweb/templates/casemanagement/evaluation.mako:8
 msgid "cm_actions_link_evaluate"
 msgstr ""
 
-#: waskaweb/templates/main.mako:144
+#: waskaweb/templates/main.mako:70
 msgid "menu_cm_link_new"
 msgstr ""
 
-#: waskaweb/templates/main.mako:145
+#: waskaweb/templates/main.mako:71
 msgid "menu_cm_link_import"
 msgstr ""
 
-#: waskaweb/templates/main.mako:163
+#: waskaweb/templates/main.mako:74
+msgid "Auswertungen"
+msgstr ""
+
+#: waskaweb/templates/main.mako:94
 msgid "menu_header_adm"
 msgstr ""
 
-#: waskaweb/templates/main.mako:165
+#: waskaweb/templates/main.mako:96
 msgid "menu_adm_link_useroverview"
 msgstr ""
 
-#: waskaweb/templates/main.mako:168
+#: waskaweb/templates/main.mako:99
 msgid "menu_adm_link_usergroupoverview"
 msgstr ""
 
-#: waskaweb/templates/main.mako:171
+#: waskaweb/templates/main.mako:102
 msgid "menu_adm_link_showsettings"
 msgstr ""
 
-#: waskaweb/templates/main.mako:184
+#: waskaweb/templates/main.mako:115
 msgid "main_formular_input_error"
 msgstr ""
 
-#: waskaweb/templates/main.mako:197
+#: waskaweb/templates/main.mako:128
 msgid "footer_title"
 msgstr ""
 
-#: waskaweb/templates/main.mako:197
+#: waskaweb/templates/main.mako:128
 msgid "footer_version"
 msgstr ""
 
@@ -952,7 +973,7 @@
 
 #: waskaweb/templates/administration/overview_usergroups.mako:53
 #: waskaweb/templates/casemanagement/agencylist.mako:51
-#: waskaweb/templates/casemanagement/caselist.mako:158
+#: waskaweb/templates/casemanagement/caselist.mako:194
 msgid "cm_overview_tbl_no_data_found"
 msgstr ""
 
@@ -1432,6 +1453,8 @@
 #: waskaweb/templates/casemanagement/dialogs/success_delete_cm.mako:5
 #: waskaweb/templates/casemanagement/dialogs/success_markdelete.mako:5
 #: waskaweb/templates/casemanagement/dialogs/success_restore.mako:5
+#: waskaweb/templates/casemanagement/evaluation/evaluation_adele.mako:6
+#: waskaweb/templates/casemanagement/evaluation/evaluation_basic.mako:6
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_0.mako:6
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:6
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:6
@@ -1599,40 +1622,40 @@
 msgid "cm_overview_tbl_header_status"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/caselist.mako:58
-#: waskaweb/templates/casemanagement/caselist.mako:117
+#: waskaweb/templates/casemanagement/caselist.mako:76
+#: waskaweb/templates/casemanagement/caselist.mako:153
 msgid "cm_overview_img_editor"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/caselist.mako:60
-#: waskaweb/templates/casemanagement/caselist.mako:119
+#: waskaweb/templates/casemanagement/caselist.mako:78
+#: waskaweb/templates/casemanagement/caselist.mako:155
 msgid "cm_overview_img_standin"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/caselist.mako:66
-#: waskaweb/templates/casemanagement/caselist.mako:125
+#: waskaweb/templates/casemanagement/caselist.mako:84
+#: waskaweb/templates/casemanagement/caselist.mako:161
 msgid "case_state_label_delete"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/caselist.mako:68
-#: waskaweb/templates/casemanagement/caselist.mako:127
+#: waskaweb/templates/casemanagement/caselist.mako:86
+#: waskaweb/templates/casemanagement/caselist.mako:163
 msgid "case_state_label_markanonym"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/caselist.mako:70
-#: waskaweb/templates/casemanagement/caselist.mako:129
+#: waskaweb/templates/casemanagement/caselist.mako:88
+#: waskaweb/templates/casemanagement/caselist.mako:165
 msgid "case_state_label_anonym"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/caselist.mako:82
-#: waskaweb/templates/casemanagement/caselist.mako:88
-#: waskaweb/templates/casemanagement/caselist.mako:141
-#: waskaweb/templates/casemanagement/caselist.mako:147
+#: waskaweb/templates/casemanagement/caselist.mako:100
+#: waskaweb/templates/casemanagement/caselist.mako:106
+#: waskaweb/templates/casemanagement/caselist.mako:177
+#: waskaweb/templates/casemanagement/caselist.mako:183
 msgid "cm_overview_a_anonymize"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/caselist.mako:85
-#: waskaweb/templates/casemanagement/caselist.mako:144
+#: waskaweb/templates/casemanagement/caselist.mako:103
+#: waskaweb/templates/casemanagement/caselist.mako:180
 msgid "cm_overview_a_restore"
 msgstr ""
 
@@ -1652,60 +1675,84 @@
 msgid "cm_header_digest"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/digest_body.mako:51
+#: waskaweb/templates/casemanagement/digest_body.mako:52
+msgid "Angaben zum Verlauf"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/digest_body.mako:55
+msgid "Fallart"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/digest_body.mako:67
+msgid "Phase"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/digest_body.mako:71
+msgid "Start- Enddaten"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/digest_body.mako:83
+msgid "Art Beendigung"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/digest_body.mako:87
+msgid "Status bei Beendigung"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/digest_body.mako:92
 msgid "cm_header_digest_youth"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/digest_body.mako:54
-#: waskaweb/templates/casemanagement/digest_body.mako:108
+#: waskaweb/templates/casemanagement/digest_body.mako:95
+#: waskaweb/templates/casemanagement/digest_body.mako:149
 msgid "cm_digest_tbl_label_lastname"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/digest_body.mako:58
-#: waskaweb/templates/casemanagement/digest_body.mako:112
+#: waskaweb/templates/casemanagement/digest_body.mako:99
+#: waskaweb/templates/casemanagement/digest_body.mako:153
 msgid "cm_digest_tbl_label_firstname"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/digest_body.mako:62
+#: waskaweb/templates/casemanagement/digest_body.mako:103
 msgid "cm_digest_tbl_label_caseid"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/digest_body.mako:66
+#: waskaweb/templates/casemanagement/digest_body.mako:107
 msgid "cm_digest_tbl_label_age"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/digest_body.mako:70
-#: waskaweb/templates/casemanagement/digest_body.mako:116
+#: waskaweb/templates/casemanagement/digest_body.mako:111
+#: waskaweb/templates/casemanagement/digest_body.mako:157
 msgid "cm_digest_tbl_label_email"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/digest_body.mako:80
+#: waskaweb/templates/casemanagement/digest_body.mako:121
 msgid "cm_digest_tbl_label_street"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/digest_body.mako:84
+#: waskaweb/templates/casemanagement/digest_body.mako:125
 msgid "cm_digest_tbl_label_plz"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/digest_body.mako:88
+#: waskaweb/templates/casemanagement/digest_body.mako:129
 msgid "cm_digest_tbl_label_city"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/digest_body.mako:92
-#: waskaweb/templates/casemanagement/digest_body.mako:126
+#: waskaweb/templates/casemanagement/digest_body.mako:133
+#: waskaweb/templates/casemanagement/digest_body.mako:167
 msgid "cm_digest_tbl_label_telephone"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/digest_body.mako:96
-#: waskaweb/templates/casemanagement/digest_body.mako:130
+#: waskaweb/templates/casemanagement/digest_body.mako:137
+#: waskaweb/templates/casemanagement/digest_body.mako:171
 msgid "cm_digest_tbl_label_mobiletelephone"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/digest_body.mako:100
+#: waskaweb/templates/casemanagement/digest_body.mako:141
 msgid "cm_digest_tbl_label_telephone_more"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/digest_body.mako:105
+#: waskaweb/templates/casemanagement/digest_body.mako:146
 msgid "cm_header_digest_parent"
 msgstr ""
 
@@ -1855,11 +1902,11 @@
 msgid "cm_menu_link_appointment"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/main.mako:77
+#: waskaweb/templates/casemanagement/main.mako:79
 msgid "cm_menu_link_documents"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/main.mako:83
+#: waskaweb/templates/casemanagement/main.mako:85
 msgid "cm_menu_header_structure"
 msgstr ""
 
@@ -1873,7 +1920,7 @@
 msgid "cm_new_p_please_consider_statement"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/new.mako:35
+#: waskaweb/templates/casemanagement/new.mako:52
 msgid "cm_new_con_acceptance_statement_true"
 msgstr ""
 
@@ -1945,8 +1992,7 @@
 msgid "cm_header_import"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/upload.mako:22
-#: waskaweb/templates/casemanagement/upload.mako:34
+#: waskaweb/templates/casemanagement/upload.mako:20
 msgid "cm_from_import_submit"
 msgstr ""
 
@@ -2093,23 +2139,23 @@
 msgid "eval_group_header_incm"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:43
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:13
-msgid "cm_eval_summary_header_3"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:51
+#: 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:52
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:15
+msgid "cm_eval_summary_header_3"
+msgstr ""
+
 #: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:53
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:15
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:81
 msgid "cm_eval_summary_header_7"
 msgstr ""
 
 #: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:55
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:78
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:144
 msgid "cm_eval_summary_header_15"
 msgstr ""
 
@@ -2141,19 +2187,18 @@
 #: 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:43
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:70
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:47
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:77
 #: 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:139
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:175
 #: 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_2.mako:264
-#: 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
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:84
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:48
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:78
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:111
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:141
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:147
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:150
 msgid "cm_eval_table_to_overview"
 msgstr ""
 
@@ -2164,19 +2209,18 @@
 #: 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:43
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:70
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:47
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:77
 #: 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:139
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:175
 #: 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_2.mako:264
-#: 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
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:84
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:48
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:78
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:111
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:141
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:147
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:150
 msgid "cm_eval_table_export_analysis"
 msgstr ""
 
@@ -2193,14 +2237,14 @@
 #: 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: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
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:18
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:52
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:84
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:114
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:146
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:182
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:86
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:116
 msgid "cm_eval_table_number"
 msgstr ""
 
@@ -2209,14 +2253,14 @@
 #: 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: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
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:19
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:53
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:85
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:115
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:147
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:183
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:87
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:117
 msgid "cm_eval_table_percent"
 msgstr ""
 
@@ -2252,72 +2296,53 @@
 msgid "eval_group_note_incm"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:17
-msgid "cm_eval_table_month"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:18
-#: 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: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:74
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:14
 msgid "cm_eval_header_on_gender"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:77
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:17
 msgid "cm_eval_table_gender"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:83
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:23
 msgid "cm_eval_label_male"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:89
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:29
 msgid "cm_eval_label_female"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:95
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:35
 msgid "cm_eval_label_intersexual"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:101
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:41
 msgid "cm_eval_label_unknown"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:111
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:51
 msgid "cm_eval_table_age"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:143
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:205
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:241
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:83
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:145
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:181
 msgid "cm_eval_table_category"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:149
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:89
 msgid "cm_eval_label_migration_background"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:155
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:95
 msgid "cm_eval_label_no_migration_background"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:161
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:101
 msgid "cm_eval_label_ka_migration_background"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:173
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:113
 msgid "cm_eval_table_offer"
 msgstr ""
 
@@ -2326,10 +2351,34 @@
 msgstr ""
 
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:19
+msgid "cm_eval_table_month"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:20
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:52
+msgid "cm_eval_table_completed"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:21
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:53
+msgid "cm_eval_table_early_completed"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:22
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:54
+msgid "cm_eval_table_aborted"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:23
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:55
+msgid "keine Angabe"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:85
 msgid "cm_eval_table_place"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:49
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:115
 msgid "cm_eval_table_law_change"
 msgstr ""
 
@@ -2469,6 +2518,59 @@
 msgid "cm_np_doc_success"
 msgstr ""
 
+#: waskaweb/templates/evaluation/evaluate.mako:12
+#: waskaweb/templates/evaluation/evaluate_adele.mako:12
+msgid "Evaluation configuration"
+msgstr ""
+
+#: waskaweb/templates/evaluation/evaluate.mako:20
+#: waskaweb/templates/evaluation/evaluate_adele.mako:20
+msgid "Name"
+msgstr ""
+
+#: waskaweb/templates/evaluation/evaluate.mako:24
+#: waskaweb/templates/evaluation/evaluate_adele.mako:24
+msgid "Description"
+msgstr ""
+
+#: waskaweb/templates/evaluation/evaluate.mako:60
+#: waskaweb/templates/evaluation/evaluate_adele.mako:62
+msgid "Filter"
+msgstr ""
+
+#: waskaweb/templates/evaluation/evaluate.mako:68
+#: waskaweb/templates/evaluation/evaluate_adele.mako:70
+msgid "Available evaluations"
+msgstr ""
+
+#: waskaweb/templates/evaluation/evaluate.mako:69
+#: waskaweb/templates/evaluation/evaluate_adele.mako:71
+msgid "Please select one or more evaluations"
+msgstr ""
+
+#: waskaweb/templates/evaluation/evaluate.mako:72
+#: waskaweb/templates/evaluation/evaluate_adele.mako:74
+msgid "Evaluations"
+msgstr ""
+
+#: waskaweb/templates/evaluation/evaluate.mako:88
+#: waskaweb/templates/evaluation/evaluate_adele.mako:90
+msgid "Show percent"
+msgstr ""
+
+#: waskaweb/templates/evaluation/evaluate.mako:91
+#: waskaweb/templates/evaluation/evaluate_adele.mako:93
+msgid "evaluate"
+msgstr ""
+
+#: waskaweb/templates/evaluation/result.mako:20
+msgid "Export XML"
+msgstr ""
+
+#: waskaweb/templates/evaluation/result.mako:21
+msgid "Export CSV"
+msgstr ""
+
 #: waskaweb/templates/start/remindlist.mako:8
 msgid "cm_overview_a_keepactive"
 msgstr ""
@@ -2502,19 +2604,19 @@
 msgid "statement_explaination_ee"
 msgstr ""
 
-#: waskaweb/templates/statement/list_statements.mako:24
+#: waskaweb/templates/statement/list_statements.mako:41
 msgid "statement_header_fp"
 msgstr ""
 
-#: waskaweb/templates/statement/list_statements.mako:26
+#: waskaweb/templates/statement/list_statements.mako:43
 msgid "statement_explaination_fp"
 msgstr ""
 
-#: waskaweb/templates/statement/list_statements.mako:33
+#: waskaweb/templates/statement/list_statements.mako:50
 msgid "statement_header_ud"
 msgstr ""
 
-#: waskaweb/templates/statement/list_statements.mako:35
+#: waskaweb/templates/statement/list_statements.mako:52
 msgid "statement_explaination_ud"
 msgstr ""
 

Added: waska/trunk/waskaweb/lib/config.py
===================================================================
--- waska/trunk/waskaweb/lib/config.py	2009-11-27 13:11:23 UTC (rev 712)
+++ waska/trunk/waskaweb/lib/config.py	2009-11-30 08:54:23 UTC (rev 713)
@@ -0,0 +1,320 @@
+# -*- coding: utf-8 -*-
+#
+# (c) 2008 by Intevation GmbH
+# This is Free software under the GPLv3. 
+# See LICENSE comming with the source of 'mpuls'
+# for details.
+#
+# author: Torsten Irländer <torsten.irlaender at intevation.de>
+#
+
+
+import os.path, datetime
+import pylons
+import logging
+
+import sys
+
+import simplejson as json
+
+log = logging.getLogger(__name__)
+
+def get_revision():
+    return "0.8"
+
+def get_path(dir, file):
+    try:
+        if os.path.isabs(file): return file
+        return os.path.join(pylons.config.get('pylons.paths').get('static_files'), dir, file)
+    except:
+        return None # path building will fail on initial server start/restart
+                    # as pylonspath is empty
+
+def merge(a, b):
+    '''recursive merge b into a. a is default, b is userdefined'''
+    changes = []
+    for ka, va in a.iteritems():
+        try:
+            vb = b[ka]
+        except KeyError, err:
+            continue
+        if type(vb) == dict and type(va) == dict:
+            merge(va, vb)
+        elif vb != va:
+            changes.append((ka, vb))
+    a.update(changes)
+
+class MpulsConfig(object):
+
+    def __init__(self, filename = None):
+
+        self.config = self.build_defaults()
+
+        if filename and os.path.isfile(filename):
+            try:
+                f = None
+                try:
+                    f = open(filename, "rb")
+                    cfg = json.load(f)
+                finally:
+                    if f: f.close()
+                merge(self.config, cfg)
+            except:
+                log.error("I/O error processing config file '%s'." % filename)
+
+    def build_defaults(self):
+        '''Set default configuration. This is function should be calles if
+        there is no config file'''
+
+        sections = {}
+
+        def set(section_key, item_key, item):
+            try:
+                section = sections[section_key]
+            except KeyError:
+                section = {}
+                sections[section_key] = section
+            section[item_key] = item
+
+        set('common', 'name', 'mpuls - Evaluationserver')
+        set('common', 'shortname', 'evalmpuls')
+        set('common', 'version', 'rev. %s' % get_revision())
+        set('common', 'releasedate', '21.09.2009')
+        set('common', 'lang', 'en')
+        set('common', 'agencyname', 'Evaluationserver')
+
+        # Formed
+        set('formed', 'treefile', 'formedtree.xml')
+        set('formed', 'annotation', 'annotations.xhtml')
+
+        # Leave empty for default values
+        set('paths', 'public', '')
+        set('paths', 'i18n', '')
+        set('paths', 'addons', '')
+        set('paths', 'templates', '')
+
+        set('database', 'url', 'gruenkern.pult.intevation.de')
+        set('database', 'port', '5432')
+        set('database', 'name', 'waskoauswertung')
+        set('database', 'login', 'auswertung')
+        set('database', 'pass', 'wae1Foo1')
+
+        #set('database', 'url', 'localhost')
+        #set('database', 'port', '9999')
+        #set('database', 'name', 'auswertung')
+        #set('database', 'login', 'intevation')
+
+        set('database', 'nameschema', 'ka_%s_db')
+        set('database', 'userschema', 'ka_%s_%s')
+        set('database', 'namefromssl', '0')
+        set('database', 'mappingfile', get_path('mappings', 'waska-fkz-mapping.csv'))
+
+        # AEGENCYDATA
+        # --------
+        # 1. Elementary fields.
+        # Every case consists of various fields. Some of the fields are
+        # elementary fields, which are essential for the workflow and should
+        # not be changed! Changing them would result in further changes in
+        # application logic. In other words the application rely on the fact
+        # that the following fields are present.
+        elementary_list = ['id' 'name', 'count', 'federalstate']
+        set('agency-fields', 'elementary', elementary_list)
+
+        # 2. Individual fields.
+        # Beside the elemtary fields there are some indiviual fields which can
+        # be defined here, and depends on the concrete usecase of mpuls. In
+        # most cases these fields will hold the name, the address and some other
+        # general information on the case.
+        individual_list = []
+        set('agency-fields', 'individual', individual_list)
+        tostr_list = ['fkz', 'count']
+        set('agency-fields', 'tostr', tostr_list)
+
+        # 3. Overview 
+
+        # Search options
+        # Phase
+        p1 = {'Unbekannt': -1}
+        phases = [p1] 
+        set('search', 'phases', phases)
+
+        te1 = {'Keine Angabe': -1}
+        types_ending = [te1] 
+        set('search', 'types_ending', types_ending)
+        set('search', 'default-start-date', datetime.date(2008,9,1))
+        #set('search', 'default-end-date', datetime.date.today())
+        set('search', 'default-end-date', datetime.date(2009,8,31))
+
+        # Define which fields of the case will be available in the overviewpage
+        overview_list = ['id', 'count',  'federalstate', 'name']
+        set('case-fields', 'overview', overview_list)
+
+        agency_bw = ['abc']
+        agency_by = []
+        agency_be = []
+        agency_bb = []
+        agency_hb = []
+        agency_hh = []
+        agency_he = []
+        agency_mv = []
+        agency_ni = []
+        agency_nw = []
+        agency_rp = []
+        agency_sl = []
+        agency_sn = []
+        agency_st = []
+        agency_sh = []
+        agency_th = []
+
+        agency_mapping = {
+            'BW':agency_bw,
+            'BY':agency_by,
+            'BE':agency_be,
+            'BB':agency_bb,
+            'HB':agency_hb,
+            'HH':agency_hh,
+            'HE':agency_he,
+            'MV':agency_mv,
+            'NI':agency_ni,
+            'NW':agency_nw,
+            'RP':agency_rp,
+            'SL':agency_sl,
+            'SN':agency_sn,
+            'ST':agency_st,
+            'SH':agency_sh,
+            'TH':agency_th 
+        }
+        country_mapping = {
+            'BW': 'Baden-Württemberg',
+            'BY': 'Bayern',
+            'BE': 'Berlin',
+            'BB': 'Brandenburg',
+            'HB': 'Bremen',
+            'HH': 'Hamburg',
+            'HE': 'Hessen',
+            'MV': 'Mecklenburg-Vorpommern',
+            'NI': 'Niedersachsen',
+            'NW': 'Nordrhein-Westfalen',
+            'RP': 'Rheinland-Pfalz',
+            'SL': 'Saarland',
+            'SN': 'Sachsen',
+            'ST': 'Sachsen-Anhalt',
+            'SH': 'Schleswig-Holstein',
+            'TH': 'Thüringen'
+            }
+
+        set('agency', 'agency-mapping', agency_mapping)
+        set('agency', 'country-mapping', country_mapping)
+        set('agency', 'name-mappingfile', get_path('mappings', 'waska-fkz-name-mapping.csv'))
+        set('agency', 'fkz-mappingfile', get_path('mappings',  'waska-fkz-mapping.csv'))
+
+
+        # 4. Field Mapping 
+        # Mpuls uses fixed names for common used fields in the application
+        # which may vary from the actual names in the database. This is the
+        # right place to define the mapping between the mpuls-intern names and
+        # the db-names. Please note, that these mapping will also be used for
+        # saving data! This may cause problems.
+
+        # Elementary fields.
+        set('agency-fields-mapping', 'id', 'a.fkz')
+        set('agency-fields-mapping', 'count', 'count(m.id)')
+        set('agency-fields-mapping', 'federalstate', 'b.kurz')
+        set('agency-fields-mapping', 'name', 'a.name')
+        set('agency-fields-mapping', 'typeending', 'm.cm_end_art')
+        set('agency-fields-mapping', 'date_phase0_start', 'm.erstgespraech')
+        set('agency-fields-mapping', 'date_phase0_end', 'coalesce(m.datum_cm_start, now())')
+        set('agency-fields-mapping', 'date_phase1_start', 'm.erstgespraech')
+        set('agency-fields-mapping', 'date_phase1_end', 'coalesce(m.datum_cm_start, now())')
+        set('agency-fields-mapping', 'date_phase2_start', 'm.datum_cm_start')
+        set('agency-fields-mapping', 'date_phase2_end', 'coalesce(m.datum_cm_ende, now())')
+        set('agency-fields-mapping', 'date_phase3_start', 'm.datum_cm_start')
+        set('agency-fields-mapping', 'date_phase3_end', 'coalesce(m.datum_cm_ende, now())')
+        set('agency-fields-mapping', 'date_phase4_start', 'm.nbetr_start')
+        set('agency-fields-mapping', 'date_phase4_end', 'coalesce(m.nbetr_ende, now())')
+        set('agency-fields-mapping', 'date_phase5_start', 'm.nbetr_start')
+        set('agency-fields-mapping', 'date_phase5_end', 'coalesce(m.nbetr_ende, now())')
+        set('agency-fields-mapping', 'date_phase6_start', 'm.nbetr_start')
+        set('agency-fields-mapping', 'date_phase6_end', 'coalesce(m.nbetr_ende, now())')
+        set('agency-fields-mapping', 'date_phase7_start', 'm.nbetr_start')
+        set('agency-fields-mapping', 'date_phase7_end', 'coalesce(m.nbetr_ende, now())')
+
+        # Individual fields 
+
+        # PHASES
+        # --------
+        # Available Phases:
+        phases = []
+        set('phases', 'phases', phases)
+
+        # Description of phases
+        description = {}
+        set('phases', 'description', description)
+
+        # Phasepairs
+        pairs =[] 
+        set('phases', 'pairs', pairs)
+        set('phases', 'pairss', [])
+        symbols = [] 
+        set('phases', 'symbols', symbols)
+
+        # Succenssors and Predesessors
+        successors = [] 
+        set('phases', 'successors', successors)
+
+        #  EVALUATIONS 
+        # ------------
+        #
+        dummy = {'name': 'Analyse', 'id': '4', 'config': 'eval_analyse.xml'}
+        enabled_evaluations = [dummy]
+        set('evaluations', 'enabled', enabled_evaluations)
+        set('evaluations', 'default-start-date-field', 'erstgespraech')
+        set('evaluations', 'default-end-date-field', 'coalesce(datum_cm_ende, now())')
+
+        return sections
+
+    def is_enabled(self, section, name):
+        try:
+            return self.get(section, name) == '1'
+        except:
+            log.error('Error on checking config (%s, %s)' % (section, name))
+            return False
+
+    def get(self, section, name):
+        try:
+            return self.config[section][name]
+        except KeyError:
+            log.error('Error on checking config (%s, %s)' % (section, name))
+            return ''
+
+    def get_app_name(self):
+        return self.get('common', 'name')
+
+    def get_app_shortname(self):
+        return self.get('common', 'shortname')
+
+    def get_app_version(self):
+        return self.get('common', 'version')
+
+    def get_releasedate(self):
+        return self.get('common', 'releasedate')
+
+    def get_overview_fields(self):
+        return list(self.get('case-fields', 'overview'))
+
+    def get_elementary_fields(self):
+        return list(self.get('case-fields', 'elementary'))
+
+    def get_individual_fields(self):
+        return list(self.get('case-fields', 'individual'))
+
+    def get_fieldname(self, key, mapping='case-fields-mapping'):
+        '''Returns the mapped name of database field for a given mpuls internal
+        datafield. If the field is not mapable return the key'''
+        if not mapping: mapping = 'case-fields-mapping'
+        try:
+            return self.config[mapping][key]
+        except KeyError:
+            return key
+
+# vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8:



More information about the Mpuls-commits mailing list