[Mpuls-commits] r40 - in trunk: . waskaweb/controllers waskaweb/i18n waskaweb/i18n/de/LC_MESSAGES waskaweb/lib waskaweb/model waskaweb/public/images waskaweb/public/images/icons waskaweb/public/styles waskaweb/templates/administration waskaweb/templates/casemanagement

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Wed Aug 13 15:10:53 CEST 2008


Author: thomas
Date: 2008-08-13 15:10:52 +0200 (Wed, 13 Aug 2008)
New Revision: 40

Added:
   trunk/waskaweb/public/images/eval_all_bg.png
   trunk/waskaweb/public/images/eval_finished_bg.png
   trunk/waskaweb/public/images/eval_incm_bg.png
   trunk/waskaweb/public/images/icons/anonym.gif
Modified:
   trunk/ChangeLog.txt
   trunk/waskaweb/controllers/case_overview.py
   trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
   trunk/waskaweb/i18n/waskaweb.pot
   trunk/waskaweb/lib/evaluation.py
   trunk/waskaweb/model/case.py
   trunk/waskaweb/model/user.py
   trunk/waskaweb/public/styles/all.css
   trunk/waskaweb/templates/administration/overview_user.mako
   trunk/waskaweb/templates/casemanagement/caselist.mako
   trunk/waskaweb/templates/casemanagement/evaluation_result.mako
Log:
Load 3918230b98f0 into trunk.


Modified: trunk/ChangeLog.txt
===================================================================
--- trunk/ChangeLog.txt	2008-08-13 13:10:26 UTC (rev 39)
+++ trunk/ChangeLog.txt	2008-08-13 13:10:52 UTC (rev 40)
@@ -1,3 +1,57 @@
+2008-03-09 Torsten Irlaender  <torsten.irlaender at intevation.de>
+
+	* M waskaweb/i18n/de/LC_MESSAGES/waskaweb.po,
+	  M waskaweb/model/case.py,
+	  M waskaweb/templates/casemanagement/caselist.mako: Changed footer to
+	  BETA 25. Commented out last access time and fixed display of the
+	  anonymized icon 
+
+	* M waskaweb/i18n/de/LC_MESSAGES/waskaweb.po,
+	  M waskaweb/i18n/waskaweb.pot,
+	  M waskaweb/templates/casemanagement/evaluation_result.mako: Moved
+	  some static text from the evaluation_result page into po file.
+
+2008-03-07 Torsten Irlaender  <torsten.irlaender at intevation.de>
+
+	* M waskaweb/public/styles/all.css, 
+	  M waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
+	  M waskaweb/templates/casemanagement/evaluation_result.mako,
+	  M waskaweb/lib/evaluation.py: Changed Layout of the evaluation. The
+	  evalauations are now grouped into different evaluation categories.
+	  (incm, all, finished). Simplify of the esq statement and renaming of
+	  some descriptions in result.
+
+	* M waskaweb/model/case.py,
+	  M waskaweb/templates/casemanagement/caselist.mako: Cases which have
+	  no privacy statement are now signed with an on own icon in the admin
+	  view. Further the admin can not restore these cases (they are
+	  markded to be deleted) anymore.
+
+	* M waskaweb/lib/evaluation.py,
+	  M waskaweb/i18n/de/LC_MESSAGES/waskaweb.po,
+	  M waskaweb/templates/casemanagement/evaluation_result.mako: Changed
+	  naming in the first evaluation. Feedback (DLR)
+
+	* M waskaweb/model/case.py,
+	  M waskaweb/templates/casemanagement/caselist.mako: Added last access
+	  time to the caselisting of cm-users. admins do not see the last
+	  access time yet as the time does not fit into the caselisting. 
+	  TODO: Change Layout here.
+
+2008-03-04 Torsten Irlaender  <torsten.irlaender at intevation.de>
+
+	Hotfix for evaluationserver
+
+	* M waskaweb/model/user.py,
+	  M waskaweb/templates/administration/overview_user.mako: The "adm"
+	  user is not listed anymore in the user overview. Normally this did
+	  not happen anyway but on the evaluation Server the adm user also
+	  gets an entry in the user table and would therefor be listed.
+
+2008-03-04 Torsten Irlaender  <torsten.irlaender at intevation.de>
+
+	* Tagged Beta 24
+
 2008-03-03 Torsten Irlaender  <torsten.irlaender at intevation.de>
 
 	* waskaweb/controllers/case_overview.py: Fixed wrong import and use of

Modified: trunk/waskaweb/controllers/case_overview.py
===================================================================
--- trunk/waskaweb/controllers/case_overview.py	2008-08-13 13:10:26 UTC (rev 39)
+++ trunk/waskaweb/controllers/case_overview.py	2008-08-13 13:10:52 UTC (rev 40)
@@ -77,6 +77,8 @@
         try:
             c.form_result = validator.to_python(request.params)
             c.cases = CaseOverview()
+            # Userlisting to select cases of an praticular user. only available
+            # for admins
             ulo = UserListObject()
             filter = [u.id for u in ulo.getAdminList()]
             c.userlist = ulo.getUserList(filter) 

Modified: trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
===================================================================
--- trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po	2008-08-13 13:10:26 UTC (rev 39)
+++ trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po	2008-08-13 13:10:52 UTC (rev 40)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: waskaweb 0.0.0\n"
 "Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2008-03-03 15:27+0100\n"
+"POT-Creation-Date: 2008-03-09 14:27+0100\n"
 "PO-Revision-Date: 2007-10-14 20:33+0200\n"
 "Last-Translator: Torsten Irländer<torsten.irlaender at intevation.de>\n"
 "Language-Team: de <LL at li.org>\n"
@@ -187,27 +187,27 @@
 msgid "cm_rg_aid_overview_legend_new_offer"
 msgstr "Neues Angebot hinzufügen"
 
-#: waskaweb/model/case.py:898
-#: waskaweb/templates/casemanagement/caselist.mako:37
-#: waskaweb/templates/casemanagement/caselist.mako:74
+#: waskaweb/model/case.py:908
+#: waskaweb/templates/casemanagement/caselist.mako:41
+#: waskaweb/templates/casemanagement/caselist.mako:86
 msgid "case_state_label_open"
 msgstr "Offen"
 
-#: waskaweb/model/case.py:899
-#: waskaweb/templates/casemanagement/caselist.mako:39
-#: waskaweb/templates/casemanagement/caselist.mako:76
+#: waskaweb/model/case.py:909
+#: waskaweb/templates/casemanagement/caselist.mako:43
+#: waskaweb/templates/casemanagement/caselist.mako:88
 msgid "case_state_label_closed"
 msgstr "Geschlossen"
 
-#: waskaweb/model/case.py:900
+#: waskaweb/model/case.py:910
 msgid "case_state_label_outstanding_delete"
 msgstr "Schwebend gelöscht"
 
-#: waskaweb/model/case.py:901
+#: waskaweb/model/case.py:911
 msgid "case_state_label_outstanding_anon"
 msgstr "Schwebend anonymisiert"
 
-#: waskaweb/model/case.py:902
+#: waskaweb/model/case.py:912
 msgid "case_state_label_anon"
 msgstr "Anonymisiert"
 
@@ -328,7 +328,7 @@
 
 #: waskaweb/templates/main.mako:175
 msgid "footer_version"
-msgstr "03.03.2008 | Beta 24"
+msgstr "09.03.2008 | Beta 25"
 
 #: waskaweb/templates/main_login.mako:38
 #: waskaweb/templates/start/responsible.mako:71
@@ -686,10 +686,10 @@
 msgid "adm_overview_tbl_header_actions"
 msgstr "Aktionen"
 
-#: waskaweb/templates/administration/overview_user.mako:42
-#: waskaweb/templates/administration/overview_user.mako:59
-#: waskaweb/templates/casemanagement/caselist.mako:45
-#: waskaweb/templates/casemanagement/caselist.mako:82
+#: waskaweb/templates/administration/overview_user.mako:43
+#: waskaweb/templates/administration/overview_user.mako:60
+#: waskaweb/templates/casemanagement/caselist.mako:52
+#: waskaweb/templates/casemanagement/caselist.mako:94
 #: waskaweb/templates/documents/case_overview.mako:42
 #: waskaweb/templates/documents/case_overview.mako:53
 #: waskaweb/templates/documents/global_overview.mako:39
@@ -699,14 +699,14 @@
 msgid "cm_overview_a_show"
 msgstr "Anzeigen"
 
-#: waskaweb/templates/administration/overview_user.mako:44
-#: waskaweb/templates/administration/overview_user.mako:61
+#: waskaweb/templates/administration/overview_user.mako:45
+#: waskaweb/templates/administration/overview_user.mako:62
 #: waskaweb/templates/casemanagement/agencylist.mako:20
 #: waskaweb/templates/casemanagement/agencylist.mako:30
-#: waskaweb/templates/casemanagement/caselist.mako:47
-#: waskaweb/templates/casemanagement/caselist.mako:50
-#: waskaweb/templates/casemanagement/caselist.mako:84
-#: waskaweb/templates/casemanagement/caselist.mako:87
+#: waskaweb/templates/casemanagement/caselist.mako:54
+#: waskaweb/templates/casemanagement/caselist.mako:60
+#: waskaweb/templates/casemanagement/caselist.mako:96
+#: waskaweb/templates/casemanagement/caselist.mako:99
 #: waskaweb/templates/documents/case_overview.mako:44
 #: waskaweb/templates/documents/case_overview.mako:55
 #: waskaweb/templates/documents/global_overview.mako:42
@@ -1123,12 +1123,12 @@
 msgstr "Aktualisiert"
 
 #: waskaweb/templates/casemanagement/agencylist.mako:9
-#: waskaweb/templates/casemanagement/caselist.mako:13
+#: waskaweb/templates/casemanagement/caselist.mako:15
 msgid "cm_overview_tbl_header_actions"
 msgstr "Aktionen"
 
 #: waskaweb/templates/casemanagement/agencylist.mako:39
-#: waskaweb/templates/casemanagement/caselist.mako:97
+#: waskaweb/templates/casemanagement/caselist.mako:109
 msgid "cm_overview_tbl_no_data_found"
 msgstr "Es wurden keine Datensätze gefunden."
 
@@ -1211,26 +1211,31 @@
 msgstr "Bearbeiter"
 
 #: waskaweb/templates/casemanagement/caselist.mako:12
+msgid "cm_overview_tbl_header_accesstime"
+msgstr "Aktualisiert"
+
+#: waskaweb/templates/casemanagement/caselist.mako:14
 msgid "cm_overview_tbl_header_status"
 msgstr "Status"
 
-#: waskaweb/templates/casemanagement/caselist.mako:31
-#: waskaweb/templates/casemanagement/caselist.mako:68
+#: waskaweb/templates/casemanagement/caselist.mako:35
+#: waskaweb/templates/casemanagement/caselist.mako:80
 msgid "cm_overview_img_editor"
 msgstr "Bearbeiter"
 
-#: waskaweb/templates/casemanagement/caselist.mako:33
-#: waskaweb/templates/casemanagement/caselist.mako:70
+#: waskaweb/templates/casemanagement/caselist.mako:37
+#: waskaweb/templates/casemanagement/caselist.mako:82
 msgid "cm_overview_img_standin"
 msgstr "Vertreter"
 
-#: waskaweb/templates/casemanagement/caselist.mako:41
-#: waskaweb/templates/casemanagement/caselist.mako:78
+#: waskaweb/templates/casemanagement/caselist.mako:45
+#: waskaweb/templates/casemanagement/caselist.mako:48
+#: waskaweb/templates/casemanagement/caselist.mako:90
 msgid "case_state_label_delete"
 msgstr "Gelöscht"
 
-#: waskaweb/templates/casemanagement/caselist.mako:48
-#: waskaweb/templates/casemanagement/caselist.mako:85
+#: waskaweb/templates/casemanagement/caselist.mako:57
+#: waskaweb/templates/casemanagement/caselist.mako:97
 msgid "cm_overview_a_restore"
 msgstr "Fallakte wiederherstellen"
 
@@ -1335,23 +1340,23 @@
 
 #: waskaweb/templates/casemanagement/evaluation_result.mako:12
 msgid "cm_eval_summary_header_1"
-msgstr "1. Verhältnis Beratungskunden/Aufnahmen in das CM"
+msgstr "1. Verhältnis Beratungskunden/Aufnahmen in das Case-Management (CM)"
 
 #: waskaweb/templates/casemanagement/evaluation_result.mako:13
 msgid "cm_eval_summary_header_2"
-msgstr "2. Verweildauer im CM"
+msgstr "2. Zugang zur Kompetenzagentur"
 
 #: waskaweb/templates/casemanagement/evaluation_result.mako:14
 msgid "cm_eval_summary_header_3"
-msgstr "3. Alters- und Geschlechterstruktur in %"
+msgstr "3. Verweildauer im CM"
 
 #: waskaweb/templates/casemanagement/evaluation_result.mako:15
 msgid "cm_eval_summary_header_4"
-msgstr "4. Migrationshintergrund"
+msgstr "4. Alters- und Geschlechterstruktur in %"
 
 #: waskaweb/templates/casemanagement/evaluation_result.mako:16
 msgid "cm_eval_summary_header_5"
-msgstr "5. Zugang zur Kompetenzagentur"
+msgstr "5. Migrationshintergrund"
 
 #: waskaweb/templates/casemanagement/evaluation_result.mako:17
 msgid "cm_eval_summary_header_6"
@@ -1373,193 +1378,228 @@
 msgid "cm_actions_link_export_evaluate"
 msgstr "Ergebnis der Auswertung exportieren"
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:36
+#: waskaweb/templates/casemanagement/evaluation_result.mako:35
+msgid "eval_group_note_header"
+msgstr "Erklärung"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:40
+msgid "eval_group_note_all"
+msgstr ""
+"Diese Auswertung wird über alle gespeicherten Jugendlichen geführt.  Dies "
+"umfasst sowohl Jugendliche die sich im Case-Management befinden, dieses "
+"bereits abgeschlossen haben, oder noch nicht in das CM aufgenommen wurden."
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:46
+msgid "eval_group_note_incm"
+msgstr ""
+"Diese Auswertung wird nur über Jugendliche geführt, die in das Case-"
+"Management aufgenommen wurden. <strong>Ein Jugendlicher gilt als in das CM "
+"aufgenommen, wenn für den Jugendlichen ein Förderplan im Bereich der "
+"Förderplanung erstellt wurde und ein Bedarf zur Förderung eingetragen wurde</"
+"strong>."
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:52
+msgid "eval_group_note_finished"
+msgstr ""
+"Diese Auswertung wird nur über die Jugendlichen geführt, die das Case-"
+"Management abgeschlossen haben. Das Case-Management gilt in der Auswertung "
+"als abgeschlossen, wenn im Bereich der Abschlußbewertung eine Angabe zum "
+"Punkt 'Art der Beendigung' gemacht wurde. Das CM wird sowohl bei regulären "
+"als auch bei Abbruch als abgeschlossen gewertet."
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:61
 msgid "cm_eval_header_1"
-msgstr "1. Anzahl der Beratungskunden, davon % ins CM aufgenommen"
+msgstr ""
+"1. Anzahl der Beratungskunden, davon % in das Case-Management (CM) "
+"aufgenommen"
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:39
+#: waskaweb/templates/casemanagement/evaluation_result.mako:64
 msgid "cm_eval_table_adolescent"
 msgstr "Jugendliche"
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:40
-#: waskaweb/templates/casemanagement/evaluation_result.mako:97
-#: waskaweb/templates/casemanagement/evaluation_result.mako:131
-#: waskaweb/templates/casemanagement/evaluation_result.mako:163
-#: waskaweb/templates/casemanagement/evaluation_result.mako:194
-#: waskaweb/templates/casemanagement/evaluation_result.mako:224
-#: waskaweb/templates/casemanagement/evaluation_result.mako:256
-#: waskaweb/templates/casemanagement/evaluation_result.mako:289
-#: waskaweb/templates/casemanagement/evaluation_result.mako:319
+#: waskaweb/templates/casemanagement/evaluation_result.mako:65
+#: waskaweb/templates/casemanagement/evaluation_result.mako:94
+#: waskaweb/templates/casemanagement/evaluation_result.mako:124
+#: waskaweb/templates/casemanagement/evaluation_result.mako:198
+#: waskaweb/templates/casemanagement/evaluation_result.mako:232
+#: waskaweb/templates/casemanagement/evaluation_result.mako:268
+#: waskaweb/templates/casemanagement/evaluation_result.mako:302
+#: waskaweb/templates/casemanagement/evaluation_result.mako:341
+#: waskaweb/templates/casemanagement/evaluation_result.mako:371
 msgid "cm_eval_table_number"
 msgstr "Anzahl"
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:41
-#: waskaweb/templates/casemanagement/evaluation_result.mako:98
-#: waskaweb/templates/casemanagement/evaluation_result.mako:132
-#: waskaweb/templates/casemanagement/evaluation_result.mako:164
-#: waskaweb/templates/casemanagement/evaluation_result.mako:195
-#: waskaweb/templates/casemanagement/evaluation_result.mako:225
-#: waskaweb/templates/casemanagement/evaluation_result.mako:257
-#: waskaweb/templates/casemanagement/evaluation_result.mako:290
-#: waskaweb/templates/casemanagement/evaluation_result.mako:320
+#: waskaweb/templates/casemanagement/evaluation_result.mako:66
+#: waskaweb/templates/casemanagement/evaluation_result.mako:95
+#: waskaweb/templates/casemanagement/evaluation_result.mako:125
+#: waskaweb/templates/casemanagement/evaluation_result.mako:199
+#: waskaweb/templates/casemanagement/evaluation_result.mako:233
+#: waskaweb/templates/casemanagement/evaluation_result.mako:269
+#: waskaweb/templates/casemanagement/evaluation_result.mako:303
+#: waskaweb/templates/casemanagement/evaluation_result.mako:342
+#: waskaweb/templates/casemanagement/evaluation_result.mako:372
 msgid "cm_eval_table_percent"
 msgstr "Prozent"
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:45
+#: waskaweb/templates/casemanagement/evaluation_result.mako:70
 msgid "cm_eval_table_consult_customer"
 msgstr "Beratungskunden"
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:51
+#: waskaweb/templates/casemanagement/evaluation_result.mako:76
 msgid "cm_eval_table_taken_over_to_cm"
-msgstr "Ins CM übernommen"
+msgstr "Davon in das CM übernommen"
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:57
-#: waskaweb/templates/casemanagement/evaluation_result.mako:89
-#: waskaweb/templates/casemanagement/evaluation_result.mako:126
-#: waskaweb/templates/casemanagement/evaluation_result.mako:156
+#: waskaweb/templates/casemanagement/evaluation_result.mako:82
+#: waskaweb/templates/casemanagement/evaluation_result.mako:119
+#: waskaweb/templates/casemanagement/evaluation_result.mako:149
 #: waskaweb/templates/casemanagement/evaluation_result.mako:186
-#: waskaweb/templates/casemanagement/evaluation_result.mako:219
-#: waskaweb/templates/casemanagement/evaluation_result.mako:249
-#: waskaweb/templates/casemanagement/evaluation_result.mako:281
-#: waskaweb/templates/casemanagement/evaluation_result.mako:314
-#: waskaweb/templates/casemanagement/evaluation_result.mako:344
+#: waskaweb/templates/casemanagement/evaluation_result.mako:227
+#: waskaweb/templates/casemanagement/evaluation_result.mako:257
+#: waskaweb/templates/casemanagement/evaluation_result.mako:291
+#: waskaweb/templates/casemanagement/evaluation_result.mako:328
+#: waskaweb/templates/casemanagement/evaluation_result.mako:366
+#: waskaweb/templates/casemanagement/evaluation_result.mako:396
 msgid "cm_eval_table_to_overview"
 msgstr "Zur Übersicht"
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:57
-#: waskaweb/templates/casemanagement/evaluation_result.mako:89
-#: waskaweb/templates/casemanagement/evaluation_result.mako:126
-#: waskaweb/templates/casemanagement/evaluation_result.mako:156
+#: waskaweb/templates/casemanagement/evaluation_result.mako:82
+#: waskaweb/templates/casemanagement/evaluation_result.mako:119
+#: waskaweb/templates/casemanagement/evaluation_result.mako:149
 #: waskaweb/templates/casemanagement/evaluation_result.mako:186
-#: waskaweb/templates/casemanagement/evaluation_result.mako:219
-#: waskaweb/templates/casemanagement/evaluation_result.mako:249
-#: waskaweb/templates/casemanagement/evaluation_result.mako:281
-#: waskaweb/templates/casemanagement/evaluation_result.mako:314
-#: waskaweb/templates/casemanagement/evaluation_result.mako:344
+#: waskaweb/templates/casemanagement/evaluation_result.mako:227
+#: waskaweb/templates/casemanagement/evaluation_result.mako:257
+#: waskaweb/templates/casemanagement/evaluation_result.mako:291
+#: waskaweb/templates/casemanagement/evaluation_result.mako:328
+#: waskaweb/templates/casemanagement/evaluation_result.mako:366
+#: waskaweb/templates/casemanagement/evaluation_result.mako:396
 msgid "cm_eval_table_export_analysis"
 msgstr "Auswertung exportieren"
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:60
+#: waskaweb/templates/casemanagement/evaluation_result.mako:89
 msgid "cm_eval_header_2"
+msgstr "2. Angaben zum Zugang des Jugendlichen zur Kompetenzagentur in %"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:90
+msgid "cm_eval_header_access_youngster_to_agency"
+msgstr "Zugang des Jugendlichen zur Kompetenzagentur in %"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:93
+msgid "cm_eval_table_access"
+msgstr "Zugang"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:120
+msgid "cm_eval_head_law_access_agency"
+msgstr "Rechtskreis der Jugendlichen beim Zugang zur Kompetenzagentur in %"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:123
+msgid "cm_eval_table_law"
+msgstr "Rechtkreis"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:157
+msgid "cm_eval_header_3"
 msgstr ""
-"2. Anzahl der Jugendlichen im CM, davon % abgeschlossen nach "
+"3. Anzahl der Jugendlichen im CM, davon % abgeschlossen nach "
 "durchschnittlich x Monaten"
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:63
+#: waskaweb/templates/casemanagement/evaluation_result.mako:160
 msgid "cm_eval_table_month"
 msgstr "Monat"
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:64
+#: waskaweb/templates/casemanagement/evaluation_result.mako:161
 msgid "cm_eval_table_completed"
 msgstr "Abgeschlossen"
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:65
+#: waskaweb/templates/casemanagement/evaluation_result.mako:162
 msgid "cm_eval_table_aborted"
 msgstr "Abgebrochen"
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:92
-msgid "cm_eval_header_3"
-msgstr "3. Alters- und Geschlechterstruktur in %"
+#: waskaweb/templates/casemanagement/evaluation_result.mako:193
+msgid "cm_eval_header_4"
+msgstr "4. Alters- und Geschlechterstruktur in %"
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:93
+#: waskaweb/templates/casemanagement/evaluation_result.mako:194
 msgid "cm_eval_header_on_gender"
 msgstr "Angaben zur Geschlechtsstruktur"
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:96
+#: waskaweb/templates/casemanagement/evaluation_result.mako:197
 msgid "cm_eval_table_gender"
 msgstr "Geschlecht"
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:102
+#: waskaweb/templates/casemanagement/evaluation_result.mako:203
 msgid "cm_eval_label_male"
 msgstr "männlich"
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:108
+#: waskaweb/templates/casemanagement/evaluation_result.mako:209
 msgid "cm_eval_label_female"
 msgstr "weiblich"
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:114
+#: waskaweb/templates/casemanagement/evaluation_result.mako:215
 msgid "cm_eval_label_intersexual"
 msgstr "intersexuell"
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:120
+#: waskaweb/templates/casemanagement/evaluation_result.mako:221
 msgid "cm_eval_label_unknown"
 msgstr "Keine Angabe"
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:127
+#: waskaweb/templates/casemanagement/evaluation_result.mako:228
 msgid "cm_eval_header_on_age"
 msgstr "Angaben zur Altersverteilung"
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:130
+#: waskaweb/templates/casemanagement/evaluation_result.mako:231
 msgid "cm_eval_table_age"
 msgstr "Alter"
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:159
-msgid "cm_eval_header_4"
+#: waskaweb/templates/casemanagement/evaluation_result.mako:264
+msgid "cm_eval_header_5"
 msgstr ""
-"4. Migrationshintergrund in % (Staatsangehörigkeit nicht Deutsch oder Mutter/"
+"5. Migrationshintergrund in % (Staatsangehörigkeit nicht Deutsch oder Mutter/"
 "Vater nicht in Deutschland geboren)"
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:162
+#: waskaweb/templates/casemanagement/evaluation_result.mako:267
 msgid "cm_eval_table_category"
 msgstr "Kategorie"
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:168
+#: waskaweb/templates/casemanagement/evaluation_result.mako:273
 msgid "cm_eval_label_migration_background"
 msgstr "Migrationshintergrund"
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:174
+#: waskaweb/templates/casemanagement/evaluation_result.mako:279
 msgid "cm_eval_label_no_migration_background"
 msgstr "Kein Migrationshintergrund"
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:180
+#: waskaweb/templates/casemanagement/evaluation_result.mako:285
 msgid "cm_eval_label_ka_migration_background"
 msgstr "Keine Angabe"
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:189
-msgid "cm_eval_header_5"
-msgstr "5. Angaben zum Zugang des Jugendlichen zur Kompetenzagentur in %"
-
-#: waskaweb/templates/casemanagement/evaluation_result.mako:190
-msgid "cm_eval_header_access_youngster_to_agency"
-msgstr "Zugang des Jugendlichen zur Kompetenzagentur in %"
-
-#: waskaweb/templates/casemanagement/evaluation_result.mako:193
-msgid "cm_eval_table_access"
-msgstr "Zugang"
-
-#: waskaweb/templates/casemanagement/evaluation_result.mako:220
-msgid "cm_eval_head_law_access_agency"
-msgstr "Rechtskreis der Jugendlichen beim Zugang zur Kompetenzagentur in %"
-
-#: waskaweb/templates/casemanagement/evaluation_result.mako:223
-msgid "cm_eval_table_law"
-msgstr "Rechtkreis"
-
-#: waskaweb/templates/casemanagement/evaluation_result.mako:252
+#: waskaweb/templates/casemanagement/evaluation_result.mako:298
 msgid "cm_eval_header_6"
 msgstr "6. Verteilung Förderbedarf in %"
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:255
+#: waskaweb/templates/casemanagement/evaluation_result.mako:301
 msgid "cm_eval_table_offer"
 msgstr "Angebot"
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:284
+#: waskaweb/templates/casemanagement/evaluation_result.mako:327
+msgid "eval6_note"
+msgstr "(Hinweis: Diese Auswertung wird nur über die Angaben des Förderbedarfs in der Förderplanung geführt. Die tatsächliche Anzahl der eingetragenen Unterstützungsangebote wird nicht berücksichtigt.)"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:336
 msgid "cm_eval_header_7"
 msgstr "7. Angaben zur Vermittlung der Jugendlichen"
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:285
+#: waskaweb/templates/casemanagement/evaluation_result.mako:337
 msgid "cm_eval_head_where_to_place_youngster"
 msgstr "Wohin wurden die Jugendlichen vermittlelt?"
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:288
+#: waskaweb/templates/casemanagement/evaluation_result.mako:340
 msgid "cm_eval_table_place"
 msgstr "Vermittlung"
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:315
+#: waskaweb/templates/casemanagement/evaluation_result.mako:367
 msgid "cm_eval_header_law_changed_after_place"
 msgstr "Angaben zur Veränderung des Rechtskreises nach der Vermittlung"
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:318
+#: waskaweb/templates/casemanagement/evaluation_result.mako:370
 msgid "cm_eval_table_law_change"
 msgstr "Rechtskreis"
 

Modified: trunk/waskaweb/i18n/waskaweb.pot
===================================================================
--- trunk/waskaweb/i18n/waskaweb.pot	2008-08-13 13:10:26 UTC (rev 39)
+++ trunk/waskaweb/i18n/waskaweb.pot	2008-08-13 13:10:52 UTC (rev 40)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: waskaweb 0.0.0\n"
 "Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2008-03-03 15:27+0100\n"
+"POT-Creation-Date: 2008-03-09 14:27+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"
@@ -171,25 +171,25 @@
 msgid "cm_rg_aid_overview_legend_new_offer"
 msgstr ""
 
-#: waskaweb/model/case.py:898 waskaweb/templates/casemanagement/caselist.mako:37
-#: waskaweb/templates/casemanagement/caselist.mako:74
+#: waskaweb/model/case.py:908 waskaweb/templates/casemanagement/caselist.mako:41
+#: waskaweb/templates/casemanagement/caselist.mako:86
 msgid "case_state_label_open"
 msgstr ""
 
-#: waskaweb/model/case.py:899 waskaweb/templates/casemanagement/caselist.mako:39
-#: waskaweb/templates/casemanagement/caselist.mako:76
+#: waskaweb/model/case.py:909 waskaweb/templates/casemanagement/caselist.mako:43
+#: waskaweb/templates/casemanagement/caselist.mako:88
 msgid "case_state_label_closed"
 msgstr ""
 
-#: waskaweb/model/case.py:900
+#: waskaweb/model/case.py:910
 msgid "case_state_label_outstanding_delete"
 msgstr ""
 
-#: waskaweb/model/case.py:901
+#: waskaweb/model/case.py:911
 msgid "case_state_label_outstanding_anon"
 msgstr ""
 
-#: waskaweb/model/case.py:902
+#: waskaweb/model/case.py:912
 msgid "case_state_label_anon"
 msgstr ""
 
@@ -658,10 +658,10 @@
 msgid "adm_overview_tbl_header_actions"
 msgstr ""
 
-#: waskaweb/templates/administration/overview_user.mako:42
-#: waskaweb/templates/administration/overview_user.mako:59
-#: waskaweb/templates/casemanagement/caselist.mako:45
-#: waskaweb/templates/casemanagement/caselist.mako:82
+#: waskaweb/templates/administration/overview_user.mako:43
+#: waskaweb/templates/administration/overview_user.mako:60
+#: waskaweb/templates/casemanagement/caselist.mako:52
+#: waskaweb/templates/casemanagement/caselist.mako:94
 #: waskaweb/templates/documents/case_overview.mako:42
 #: waskaweb/templates/documents/case_overview.mako:53
 #: waskaweb/templates/documents/global_overview.mako:39
@@ -671,14 +671,14 @@
 msgid "cm_overview_a_show"
 msgstr ""
 
-#: waskaweb/templates/administration/overview_user.mako:44
-#: waskaweb/templates/administration/overview_user.mako:61
+#: waskaweb/templates/administration/overview_user.mako:45
+#: waskaweb/templates/administration/overview_user.mako:62
 #: waskaweb/templates/casemanagement/agencylist.mako:20
 #: waskaweb/templates/casemanagement/agencylist.mako:30
-#: waskaweb/templates/casemanagement/caselist.mako:47
-#: waskaweb/templates/casemanagement/caselist.mako:50
-#: waskaweb/templates/casemanagement/caselist.mako:84
-#: waskaweb/templates/casemanagement/caselist.mako:87
+#: waskaweb/templates/casemanagement/caselist.mako:54
+#: waskaweb/templates/casemanagement/caselist.mako:60
+#: waskaweb/templates/casemanagement/caselist.mako:96
+#: waskaweb/templates/casemanagement/caselist.mako:99
 #: waskaweb/templates/documents/case_overview.mako:44
 #: waskaweb/templates/documents/case_overview.mako:55
 #: waskaweb/templates/documents/global_overview.mako:42
@@ -1095,12 +1095,12 @@
 msgstr ""
 
 #: waskaweb/templates/casemanagement/agencylist.mako:9
-#: waskaweb/templates/casemanagement/caselist.mako:13
+#: waskaweb/templates/casemanagement/caselist.mako:15
 msgid "cm_overview_tbl_header_actions"
 msgstr ""
 
 #: waskaweb/templates/casemanagement/agencylist.mako:39
-#: waskaweb/templates/casemanagement/caselist.mako:97
+#: waskaweb/templates/casemanagement/caselist.mako:109
 msgid "cm_overview_tbl_no_data_found"
 msgstr ""
 
@@ -1183,26 +1183,31 @@
 msgstr ""
 
 #: waskaweb/templates/casemanagement/caselist.mako:12
+msgid "cm_overview_tbl_header_accesstime"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/caselist.mako:14
 msgid "cm_overview_tbl_header_status"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/caselist.mako:31
-#: waskaweb/templates/casemanagement/caselist.mako:68
+#: waskaweb/templates/casemanagement/caselist.mako:35
+#: waskaweb/templates/casemanagement/caselist.mako:80
 msgid "cm_overview_img_editor"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/caselist.mako:33
-#: waskaweb/templates/casemanagement/caselist.mako:70
+#: waskaweb/templates/casemanagement/caselist.mako:37
+#: waskaweb/templates/casemanagement/caselist.mako:82
 msgid "cm_overview_img_standin"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/caselist.mako:41
-#: waskaweb/templates/casemanagement/caselist.mako:78
+#: waskaweb/templates/casemanagement/caselist.mako:45
+#: waskaweb/templates/casemanagement/caselist.mako:48
+#: waskaweb/templates/casemanagement/caselist.mako:90
 msgid "case_state_label_delete"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/caselist.mako:48
-#: waskaweb/templates/casemanagement/caselist.mako:85
+#: waskaweb/templates/casemanagement/caselist.mako:57
+#: waskaweb/templates/casemanagement/caselist.mako:97
 msgid "cm_overview_a_restore"
 msgstr ""
 
@@ -1340,189 +1345,209 @@
 msgid "cm_actions_link_export_evaluate"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:36
+#: waskaweb/templates/casemanagement/evaluation_result.mako:35
+msgid "eval_group_note_header"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:40
+msgid "eval_group_note_all"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:46
+msgid "eval_group_note_incm"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:52
+msgid "eval_group_note_finished"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:61
 msgid "cm_eval_header_1"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:39
+#: waskaweb/templates/casemanagement/evaluation_result.mako:64
 msgid "cm_eval_table_adolescent"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:40
-#: waskaweb/templates/casemanagement/evaluation_result.mako:97
-#: waskaweb/templates/casemanagement/evaluation_result.mako:131
-#: waskaweb/templates/casemanagement/evaluation_result.mako:163
-#: waskaweb/templates/casemanagement/evaluation_result.mako:194
-#: waskaweb/templates/casemanagement/evaluation_result.mako:224
-#: waskaweb/templates/casemanagement/evaluation_result.mako:256
-#: waskaweb/templates/casemanagement/evaluation_result.mako:289
-#: waskaweb/templates/casemanagement/evaluation_result.mako:319
+#: waskaweb/templates/casemanagement/evaluation_result.mako:65
+#: waskaweb/templates/casemanagement/evaluation_result.mako:94
+#: waskaweb/templates/casemanagement/evaluation_result.mako:124
+#: waskaweb/templates/casemanagement/evaluation_result.mako:198
+#: waskaweb/templates/casemanagement/evaluation_result.mako:232
+#: waskaweb/templates/casemanagement/evaluation_result.mako:268
+#: waskaweb/templates/casemanagement/evaluation_result.mako:302
+#: waskaweb/templates/casemanagement/evaluation_result.mako:341
+#: waskaweb/templates/casemanagement/evaluation_result.mako:371
 msgid "cm_eval_table_number"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:41
-#: waskaweb/templates/casemanagement/evaluation_result.mako:98
-#: waskaweb/templates/casemanagement/evaluation_result.mako:132
-#: waskaweb/templates/casemanagement/evaluation_result.mako:164
-#: waskaweb/templates/casemanagement/evaluation_result.mako:195
-#: waskaweb/templates/casemanagement/evaluation_result.mako:225
-#: waskaweb/templates/casemanagement/evaluation_result.mako:257
-#: waskaweb/templates/casemanagement/evaluation_result.mako:290
-#: waskaweb/templates/casemanagement/evaluation_result.mako:320
+#: waskaweb/templates/casemanagement/evaluation_result.mako:66
+#: waskaweb/templates/casemanagement/evaluation_result.mako:95
+#: waskaweb/templates/casemanagement/evaluation_result.mako:125
+#: waskaweb/templates/casemanagement/evaluation_result.mako:199
+#: waskaweb/templates/casemanagement/evaluation_result.mako:233
+#: waskaweb/templates/casemanagement/evaluation_result.mako:269
+#: waskaweb/templates/casemanagement/evaluation_result.mako:303
+#: waskaweb/templates/casemanagement/evaluation_result.mako:342
+#: waskaweb/templates/casemanagement/evaluation_result.mako:372
 msgid "cm_eval_table_percent"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:45
+#: waskaweb/templates/casemanagement/evaluation_result.mako:70
 msgid "cm_eval_table_consult_customer"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:51
+#: waskaweb/templates/casemanagement/evaluation_result.mako:76
 msgid "cm_eval_table_taken_over_to_cm"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:57
-#: waskaweb/templates/casemanagement/evaluation_result.mako:89
-#: waskaweb/templates/casemanagement/evaluation_result.mako:126
-#: waskaweb/templates/casemanagement/evaluation_result.mako:156
+#: waskaweb/templates/casemanagement/evaluation_result.mako:82
+#: waskaweb/templates/casemanagement/evaluation_result.mako:119
+#: waskaweb/templates/casemanagement/evaluation_result.mako:149
 #: waskaweb/templates/casemanagement/evaluation_result.mako:186
-#: waskaweb/templates/casemanagement/evaluation_result.mako:219
-#: waskaweb/templates/casemanagement/evaluation_result.mako:249
-#: waskaweb/templates/casemanagement/evaluation_result.mako:281
-#: waskaweb/templates/casemanagement/evaluation_result.mako:314
-#: waskaweb/templates/casemanagement/evaluation_result.mako:344
+#: waskaweb/templates/casemanagement/evaluation_result.mako:227
+#: waskaweb/templates/casemanagement/evaluation_result.mako:257
+#: waskaweb/templates/casemanagement/evaluation_result.mako:291
+#: waskaweb/templates/casemanagement/evaluation_result.mako:328
+#: waskaweb/templates/casemanagement/evaluation_result.mako:366
+#: waskaweb/templates/casemanagement/evaluation_result.mako:396
 msgid "cm_eval_table_to_overview"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:57
-#: waskaweb/templates/casemanagement/evaluation_result.mako:89
-#: waskaweb/templates/casemanagement/evaluation_result.mako:126
-#: waskaweb/templates/casemanagement/evaluation_result.mako:156
+#: waskaweb/templates/casemanagement/evaluation_result.mako:82
+#: waskaweb/templates/casemanagement/evaluation_result.mako:119
+#: waskaweb/templates/casemanagement/evaluation_result.mako:149
 #: waskaweb/templates/casemanagement/evaluation_result.mako:186
-#: waskaweb/templates/casemanagement/evaluation_result.mako:219
-#: waskaweb/templates/casemanagement/evaluation_result.mako:249
-#: waskaweb/templates/casemanagement/evaluation_result.mako:281
-#: waskaweb/templates/casemanagement/evaluation_result.mako:314
-#: waskaweb/templates/casemanagement/evaluation_result.mako:344
+#: waskaweb/templates/casemanagement/evaluation_result.mako:227
+#: waskaweb/templates/casemanagement/evaluation_result.mako:257
+#: waskaweb/templates/casemanagement/evaluation_result.mako:291
+#: waskaweb/templates/casemanagement/evaluation_result.mako:328
+#: waskaweb/templates/casemanagement/evaluation_result.mako:366
+#: waskaweb/templates/casemanagement/evaluation_result.mako:396
 msgid "cm_eval_table_export_analysis"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:60
+#: waskaweb/templates/casemanagement/evaluation_result.mako:89
 msgid "cm_eval_header_2"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:63
+#: waskaweb/templates/casemanagement/evaluation_result.mako:90
+msgid "cm_eval_header_access_youngster_to_agency"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:93
+msgid "cm_eval_table_access"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:120
+msgid "cm_eval_head_law_access_agency"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:123
+msgid "cm_eval_table_law"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:157
+msgid "cm_eval_header_3"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:160
 msgid "cm_eval_table_month"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:64
+#: waskaweb/templates/casemanagement/evaluation_result.mako:161
 msgid "cm_eval_table_completed"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:65
+#: waskaweb/templates/casemanagement/evaluation_result.mako:162
 msgid "cm_eval_table_aborted"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:92
-msgid "cm_eval_header_3"
+#: waskaweb/templates/casemanagement/evaluation_result.mako:193
+msgid "cm_eval_header_4"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:93
+#: waskaweb/templates/casemanagement/evaluation_result.mako:194
 msgid "cm_eval_header_on_gender"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:96
+#: waskaweb/templates/casemanagement/evaluation_result.mako:197
 msgid "cm_eval_table_gender"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:102
+#: waskaweb/templates/casemanagement/evaluation_result.mako:203
 msgid "cm_eval_label_male"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:108
+#: waskaweb/templates/casemanagement/evaluation_result.mako:209
 msgid "cm_eval_label_female"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:114
+#: waskaweb/templates/casemanagement/evaluation_result.mako:215
 msgid "cm_eval_label_intersexual"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:120
+#: waskaweb/templates/casemanagement/evaluation_result.mako:221
 msgid "cm_eval_label_unknown"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:127
+#: waskaweb/templates/casemanagement/evaluation_result.mako:228
 msgid "cm_eval_header_on_age"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:130
+#: waskaweb/templates/casemanagement/evaluation_result.mako:231
 msgid "cm_eval_table_age"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:159
-msgid "cm_eval_header_4"
+#: waskaweb/templates/casemanagement/evaluation_result.mako:264
+msgid "cm_eval_header_5"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:162
+#: waskaweb/templates/casemanagement/evaluation_result.mako:267
 msgid "cm_eval_table_category"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:168
+#: waskaweb/templates/casemanagement/evaluation_result.mako:273
 msgid "cm_eval_label_migration_background"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:174
+#: waskaweb/templates/casemanagement/evaluation_result.mako:279
 msgid "cm_eval_label_no_migration_background"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:180
+#: waskaweb/templates/casemanagement/evaluation_result.mako:285
 msgid "cm_eval_label_ka_migration_background"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:189
-msgid "cm_eval_header_5"
+#: waskaweb/templates/casemanagement/evaluation_result.mako:298
+msgid "cm_eval_header_6"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:190
-msgid "cm_eval_header_access_youngster_to_agency"
+#: waskaweb/templates/casemanagement/evaluation_result.mako:301
+msgid "cm_eval_table_offer"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:193
-msgid "cm_eval_table_access"
+#: waskaweb/templates/casemanagement/evaluation_result.mako:327
+msgid "eval6_note"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:220
-msgid "cm_eval_head_law_access_agency"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/evaluation_result.mako:223
-msgid "cm_eval_table_law"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/evaluation_result.mako:252
-msgid "cm_eval_header_6"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/evaluation_result.mako:255
-msgid "cm_eval_table_offer"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/evaluation_result.mako:284
+#: waskaweb/templates/casemanagement/evaluation_result.mako:336
 msgid "cm_eval_header_7"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:285
+#: waskaweb/templates/casemanagement/evaluation_result.mako:337
 msgid "cm_eval_head_where_to_place_youngster"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:288
+#: waskaweb/templates/casemanagement/evaluation_result.mako:340
 msgid "cm_eval_table_place"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:315
+#: waskaweb/templates/casemanagement/evaluation_result.mako:367
 msgid "cm_eval_header_law_changed_after_place"
 msgstr ""
 
-#: waskaweb/templates/casemanagement/evaluation_result.mako:318
+#: waskaweb/templates/casemanagement/evaluation_result.mako:370
 msgid "cm_eval_table_law_change"
 msgstr ""
 

Modified: trunk/waskaweb/lib/evaluation.py
===================================================================
--- trunk/waskaweb/lib/evaluation.py	2008-08-13 13:10:26 UTC (rev 39)
+++ trunk/waskaweb/lib/evaluation.py	2008-08-13 13:10:52 UTC (rev 40)
@@ -72,7 +72,7 @@
         self.perform()
         f.write(u"Jugendliche;Anzahl;Prozent\r\n")
         f.write(u"Erstgespräche;%s;100%%\r\n" % (self.total))
-        f.write(u"In das CM übernommen;%s;%s%%\r\n" %(self.total_cm, self.percent))
+        f.write(u"Davon in das CM übernommen;%s;%s%%\r\n" %(self.total_cm, self.percent))
 
 class Evaluation_2(Evaluation):
     def __init__(self):
@@ -89,20 +89,20 @@
             try:
                 conn = db.getConnection()
                 cur = conn.cursor()
-                sql = """SELECT count(geschlecht), geschlecht, g.value 
-                    FROM master_tbl_eval_incm_view v 
-                    JOIN geschlecht_tbl g ON v.geschlecht = g.id 
-                    GROUP BY geschlecht, g.value"""
+                sql = """SELECT count(geschlecht), coalesce(geschlecht, -1)
+                    FROM master_tbl_eval_incm_view
+                    GROUP BY geschlecht"""
                 cur.execute(sql)
-                for g in cur.fetchall():
+                result = cur.fetchall()
+                for g in result:
                     if g[1] == 1:
-                        self.m[0] = g[0]
-                    elif g[1]== 0:
-                        self.w[0] = g[0]
+                        self.m[0] += g[0]
+                    elif g[1] == 0:
+                        self.w[0] += g[0]
                     elif g[1] == 2:
-                        self.i[0] = g[0]
+                        self.i[0] += g[0]
                     else:
-                        self.u[0] = g[0]
+                        self.u[0] += g[0]
                 self.total = self.m[0]+self.w[0]+self.i[0]+self.u[0]
                 if self.total > 0:
                     if self.total == 0: divisor = 1
@@ -127,6 +127,7 @@
         f.write(u"Männlich;%s;%s%%\r\n" % (self.m[0], self.m[1]))
         f.write(u"Weiblich;%s;%s%%\r\n" %(self.w[0], self.w[1]))
         f.write(u"Intersexuell;%s;%s%%\r\n" %(self.i[0], self.i[1]))
+        f.write(u"Keine Angabe;%s;%s%%\r\n" %(self.u[0], self.u[1]))
 
 class Evaluation_3(Evaluation):
     """Migrationshintergrund"""
@@ -435,8 +436,8 @@
 
     def perform(self):
         result = [[u"berufliche Qualifizierung",0,0],
-            [u"berufliche Vorbereitung", 0,0],
-            [u"bildenden Bereich", 0,0],
+            [u"Berufsvorbereitung", 0,0],
+            [u"allgemein bildenden Bereich", 0,0],
             [u"%s" % unicode("Lebensbewältigung", "utf-8"), 0,0],
             [u"%s" % unicode("Sonstige", "utf-8"), 0,0]
         ]

Modified: trunk/waskaweb/model/case.py
===================================================================
--- trunk/waskaweb/model/case.py	2008-08-13 13:10:26 UTC (rev 39)
+++ trunk/waskaweb/model/case.py	2008-08-13 13:10:52 UTC (rev 40)
@@ -7,6 +7,7 @@
 
 import sys
 import re
+from datetime import datetime
 import traceback
 import psycopg2.extras
 import codecs
@@ -36,7 +37,8 @@
       m.vorname_1,
       m.kundennummer,
       m.bearbeiter_id,
-      st.status
+      st.status,
+      m.einverstaendniserklaerung
     FROM master_tbl_view m
     JOIN ka_status_tbl_view st ON
     m.id = st.master_id
@@ -248,7 +250,13 @@
             rows = cur.fetchall()
             factory = CaseFactory()
             for row in rows:
-                case = factory.loadByName(row['id'], row['vorname_1'], row['name_1'], row['kundennummer'], row['bearbeiter_id'])
+                case = factory.loadByName( \
+                    row['id'], \
+                    row['vorname_1'], \
+                    row['name_1'], \
+                    row['kundennummer'], \
+                    row['bearbeiter_id'], \
+                    row['einverstaendniserklaerung'])
                 self.ds_list.append(case)
         finally:
             db.recycleConnection(con, cur)
@@ -287,7 +295,7 @@
         case.state      = State(id)
         return case
 
-    def loadByName(self, id, first_name, last_name, knr, bearbeiter_id):
+    def loadByName(self, id, first_name, last_name, knr, bearbeiter_id, einverst):
         '''This method does not actually loads a case from the database. It
         just returns a case object initiated with the provided parameters'''
         case = Case()
@@ -297,6 +305,7 @@
         case.knr        = unicode(str(knr),        'utf-8')
         case.editor     = bearbeiter_id
         case.state      = State(id)
+        case.privacy_statement_signed = einverst in (1, -1) and True or False
         return case
 
     def importPdf(self, pdf):
@@ -692,6 +701,7 @@
         self.page = None
         self.documents = []
         self.appointments = []
+        self.privacy_statement_signed = False
         self.privacy_statement = None
         self.aidplan_statement = None
 
@@ -865,7 +875,7 @@
     '''This class store the state and the last accesstime of the case.
     Possible states are:
         * Open (1)
-        * Closes (2)j
+        * Closes (2)
         * outstanding deletion (3)
         * outstanding anonymision (4)
         * anonymised (5)'''
@@ -923,9 +933,9 @@
         return False 
 
     def getAccessTime(self):
-        return self.access
+        return self.access.strftime('%d.%m.%y %H:%M')
 
     def setAccessTime(self):
         pass
-        
+
 # vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8:

Modified: trunk/waskaweb/model/user.py
===================================================================
--- trunk/waskaweb/model/user.py	2008-08-13 13:10:26 UTC (rev 39)
+++ trunk/waskaweb/model/user.py	2008-08-13 13:10:52 UTC (rev 40)
@@ -4,7 +4,7 @@
 
 from pylons import config, session
 import sys
-FETCH_USER_LIST_SQL = """SELECT id, vorname, nachname, rolle from ka_benutzer_tbl_view order by nachname""" 
+FETCH_USER_LIST_SQL = """SELECT id, vorname, nachname, rolle, login from ka_benutzer_tbl_view order by nachname""" 
 FETCH_USER_DATA_SQL = """SELECT id, vorname, nachname, telefon, aktiviert, passwort_aendern, login, raumnummer, filiale, usesysid, vertreter, rolle from ka_benutzer_tbl_view WHERE id = %s"""
 FETCH_USER_SYS_ID_SQL = """SELECT usesysid FROM pg_user WHERE usename = '%s'"""
 CREATE_USER_SQL_M = """SELECT ka_create_role(%(agency)s, %(grouprole)s, %(loginname)s, %(firstname)s, %(surname)s, %(phone)s, %(room)s, %(branchoffice)s, %(activated)s , %(setpassword)s)"""
@@ -27,7 +27,8 @@
                 for r in cur.fetchall():
                     firstname = unicode(str(r[1]), 'utf-8')
                     lastname = unicode(str(r[2]), 'utf-8')
-                    data = {'id': r[0], 'firstname': firstname, 'lastname': lastname, 'role': r[3]}
+                    login = unicode(str(r[4]), 'utf-8')
+                    data = {'id': r[0], 'firstname': firstname, 'lastname': lastname, 'role': r[3], 'login': login}
                     uo = UserObject()
                     uo.setData(data)
                     self.user.append(uo)
@@ -243,6 +244,9 @@
         self.telephone = data.get('telephone', self.telephone) 
         self.room = data.get('room', self.room) 
         self.branchoffice = data.get('branchoffice', self.branchoffice) 
+        self.full_login = data.get('login', self.full_login)
+        tok = self.full_login.split('_')
+        self.login = "_".join(tok[2:])
         self.activated = data.get('activated', self.activated) 
         self.needs_passrefresh = data.get('newpass', self.needs_passrefresh) 
 

Added: trunk/waskaweb/public/images/eval_all_bg.png
===================================================================
(Binary files differ)


Property changes on: trunk/waskaweb/public/images/eval_all_bg.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/waskaweb/public/images/eval_finished_bg.png
===================================================================
(Binary files differ)


Property changes on: trunk/waskaweb/public/images/eval_finished_bg.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/waskaweb/public/images/eval_incm_bg.png
===================================================================
(Binary files differ)


Property changes on: trunk/waskaweb/public/images/eval_incm_bg.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/waskaweb/public/images/icons/anonym.gif
===================================================================
(Binary files differ)


Property changes on: trunk/waskaweb/public/images/icons/anonym.gif
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/waskaweb/public/styles/all.css
===================================================================
--- trunk/waskaweb/public/styles/all.css	2008-08-13 13:10:26 UTC (rev 39)
+++ trunk/waskaweb/public/styles/all.css	2008-08-13 13:10:52 UTC (rev 40)
@@ -111,10 +111,30 @@
 	text-align: left;
 }
 
+td.eval_group_finished {
+	width: 1em;
+	background-image: url('/images/eval_finished_bg.png');
+	background-repeat: repeat
+}
+td.eval_group_incm {
+	width: 1em;
+	background-image: url('/images/eval_incm_bg.png');
+	background-repeat: repeat
+}
+td.eval_group_all {
+	width: 1em;
+	background-image: url('/images/eval_all_bg.png');
+	background-repeat: repeat
+}
+
 div.evaluation {
 	padding: 0.5em 0.5em 1.5em 0.5em;
 }
 
+div.eval_note {
+	margin: 0.3em 0.5em 0.3em 0.5em;
+}
+
 div.evaluation h1, div.evaluation h2, div.evaluationa h3 {
         margin: 0.1em 0;
 	padding: 0;

Modified: trunk/waskaweb/templates/administration/overview_user.mako
===================================================================
--- trunk/waskaweb/templates/administration/overview_user.mako	2008-08-13 13:10:26 UTC (rev 39)
+++ trunk/waskaweb/templates/administration/overview_user.mako	2008-08-13 13:10:52 UTC (rev 40)
@@ -29,40 +29,42 @@
   </tr>
   <% idset = 0 %>
   % for user in c.user_overview:
-  % if idset==0:
-   <tr>
-     <td>${user.last_name| F.NA, h}</td>
-     <td>${user.first_name| F.NA, h}</td>
-     % if user.getRole() == 'Admin-KA':
-       <td><img src="/images/icons/admin_grey_tag.gif"></td>
-     % else:
-       <td><img src="/images/icons/cm_grey_tag_width.gif"></td>
-     % endif
-     <td>
-       <a href="/administration/showUser/${user.id}"><img src="/images/icons/view_red.gif" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
-       % if str(user.id) != str(session.get('USER_AUTHORIZED').id):
-        <a href="/administration/deleteUser/${user.id}"><img src="/images/icons/delete_red.gif" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
+    % if user.login != 'adm':
+      % if idset==0:
+       <tr>
+         <td>${user.last_name| F.NA, h}</td>
+         <td>${user.first_name| F.NA, h}</td>
+         % if user.getRole() == 'Admin-KA':
+           <td><img src="/images/icons/admin_grey_tag.gif"></td>
+         % else:
+           <td><img src="/images/icons/cm_grey_tag_width.gif"></td>
+         % endif
+         <td>
+           <a href="/administration/showUser/${user.id}"><img src="/images/icons/view_red.gif" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
+           % if str(user.id) != str(session.get('USER_AUTHORIZED').id):
+            <a href="/administration/deleteUser/${user.id}"><img src="/images/icons/delete_red.gif" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
+           % endif
+         </td>
+       </tr>
+       <% idset = 1 %>
+       % else:
+       <tr>
+         <td class="table_row_h">${user.last_name| F.NA, h}</td>
+         <td class="table_row_h">${user.first_name| F.NA, h}</td>
+         % if user.getRole() == 'Admin-KA':
+           <td class="table_row_h"><img src="/images/icons/admin_grey_tag.gif" alt="Administratorin, Administrator" title="Administrator/in"></td>
+         % else:
+           <td class="table_row_h"><img src="/images/icons/cm_grey_tag_width.gif" alt="Case-Managerin, Case-Manager" titel="Case-Manager/in"></td>
+         % endif
+         <td class="table_row_h">
+           <a href="/administration/showUser/${user.id}"><img src="/images/icons/view_red.gif" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
+           % if str(user.id) != str(session.get('USER_AUTHORIZED').id):
+            <a href="/administration/deleteUser/${user.id}"><img src="/images/icons/delete_red.gif" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
+           % endif
+         </td>
+       </tr>
+       <% idset = 0 %>
        % endif
-     </td>
-   </tr>
-   <% idset = 1 %>
-   % else:
-   <tr>
-     <td class="table_row_h">${user.last_name| F.NA, h}</td>
-     <td class="table_row_h">${user.first_name| F.NA, h}</td>
-     % if user.getRole() == 'Admin-KA':
-       <td class="table_row_h"><img src="/images/icons/admin_grey_tag.gif" alt="Administratorin, Administrator" title="Administrator/in"></td>
-     % else:
-       <td class="table_row_h"><img src="/images/icons/cm_grey_tag_width.gif" alt="Case-Managerin, Case-Manager" titel="Case-Manager/in"></td>
-     % endif
-     <td class="table_row_h">
-       <a href="/administration/showUser/${user.id}"><img src="/images/icons/view_red.gif" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
-       % if str(user.id) != str(session.get('USER_AUTHORIZED').id):
-        <a href="/administration/deleteUser/${user.id}"><img src="/images/icons/delete_red.gif" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
-       % endif
-     </td>
-   </tr>
-   <% idset = 0 %>
-   % endif
+    % endif
   % endfor
 </table>

Modified: trunk/waskaweb/templates/casemanagement/caselist.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/caselist.mako	2008-08-13 13:10:26 UTC (rev 39)
+++ trunk/waskaweb/templates/casemanagement/caselist.mako	2008-08-13 13:10:52 UTC (rev 40)
@@ -9,6 +9,9 @@
     % if h.hasRole(['admin_ka']):
       <th class="table_name table_header_h">${_('cm_overview_tbl_header_editor')}</th>
     % endif
+    ##% else:
+    ##  <th class="table_name table_header_h">${_('cm_overview_tbl_header_accesstime')}</th>
+    ##% endif
     <th class="table_status table_header_h">${_('cm_overview_tbl_header_status')}</th>
     <th class="table_action table_header_h">${_('cm_overview_tbl_header_actions')}</th>
   </tr>
@@ -25,6 +28,9 @@
             ${case.getEditor().last_name | F.NA, h}, ${case.getEditor().first_name[0] | F.NA, h}.
           </td>
         % endif
+        ##% else:
+        ##  <td>${case.state.getAccessTime() | F.NA, h}</td>
+        ##% endif
         <td>
           % if h.hasRole(['cm_ka']):
             % if str(case.getEditor().id) == str(session.get('USER_AUTHORIZED').id):
@@ -40,12 +46,18 @@
           % elif case.getState().getState() == 3:
             <img src="/images/icons/delete_grey.gif" border="0" alt="${_('case_state_label_delete')}" title="${_('case_state_label_delete')}">
           % endif
+          % if not case.privacy_statement_signed:
+            <img src="/images/icons/anonym.gif" border="0" alt="${_('case_state_label_anonym')}" title="${_('case_state_label_anonym')}">
+          % endif
         </td>
         <td>
           <a href="/case/select/${case.id}/0/"><img src="/images/icons/view_red.gif" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a> 
           % if h.hasRole(['admin_ka']) and case.getState().getState() == 3:
             <a href="/case/delete/${case.id}/0/"><img src="/images/icons/delete_red.gif" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a> 
-            <a href="/case/restore/${case.id}/0/"><img src="/images/icons/recover_red.gif" border="0" alt="${_('cm_overview_a_restore')}" title="${_('cm_overview_a_restore')}"></a> 
+
+            % if case.privacy_statement_signed:
+              <a href="/case/restore/${case.id}/0/"><img src="/images/icons/recover_red.gif" border="0" alt="${_('cm_overview_a_restore')}" title="${_('cm_overview_a_restore')}"></a> 
+            % endif
           % elif h.hasRole(['cm_ka']) and case.getState().getState() <= 2: 
             <a href="/case/markForDelete/${case.id}/0/"><img src="/images/icons/delete_red.gif" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a> 
           % endif
@@ -62,6 +74,9 @@
             ${case.getEditor().last_name | F.NA, h}, ${case.getEditor().first_name[0] | F.NA, h}.
           </td>
         % endif
+        ##% else:
+        ##  <td class="table_row_h">${case.state.getAccessTime() | F.NA, h}</td>
+        ##% endif
         <td class="table_row_h">
           % if h.hasRole(['cm_ka']):
             % if str(case.getEditor().id) == str(session.get('USER_AUTHORIZED').id):
@@ -69,6 +84,9 @@
             % else:
               <img src="/images/icons/stand-in_grey.gif" border="0" alt="${_('cm_overview_img_standin')}" title="${_('cm_overview_img_standin')}">
             % endif
+            % if not case.privacy_statement_signed:
+              <img src="/images/icons/anonym.gif" border="0" alt="${_('case_state_label_anonym')}" title="${_('case_state_label_anonym')}">
+            % endif
           % endif
           % if case.getState().getState() == 1:
             <img src="/images/icons/work_in_progress_grey.gif" border="0" alt="${_('case_state_label_open')}" title="${_('case_state_label_open')}">
@@ -82,7 +100,9 @@
           <a href="/case/select/${case.id}/0/"><img src="/images/icons/view_red.gif" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a> 
           % if h.hasRole(['admin_ka']) and case.getState().getState() == 3:
             <a href="/case/delete/${case.id}/0/"><img src="/images/icons/delete_red.gif" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a> 
-            <a href="/case/restore/${case.id}/0/"><img src="/images/icons/recover_red.gif" border="0" alt="${_('cm_overview_a_restore')}" title="${_('cm_overview_a_restore')}"></a> 
+            % if case.privacy_statement_signed:
+              <a href="/case/restore/${case.id}/0/"><img src="/images/icons/recover_red.gif" border="0" alt="${_('cm_overview_a_restore')}" title="${_('cm_overview_a_restore')}"></a> 
+            % endif
           % elif h.hasRole(['cm_ka']) and case.getState().getState() <= 2: 
             <a href="/case/markForDelete/${case.id}/0/"><img src="/images/icons/delete_red.gif" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a> 
           % endif

Modified: trunk/waskaweb/templates/casemanagement/evaluation_result.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/evaluation_result.mako	2008-08-13 13:10:26 UTC (rev 39)
+++ trunk/waskaweb/templates/casemanagement/evaluation_result.mako	2008-08-13 13:10:52 UTC (rev 40)
@@ -32,314 +32,369 @@
 </ul>
 </div>
 -->
-<div class="evaluation odd-row first-row">
-<h3><a name="eval_1">${_('cm_eval_header_1')}</a></h3>
-<table class="evaluation">
-  <tr>
-    <th class="table_header_h table_width_long">${_('cm_eval_table_adolescent')}</th>
-    <th class="table_header_h table_width_mid_s">${_('cm_eval_table_number')}</th>
-    <th class="table_header_h table_width_mid_s">${_('cm_eval_table_percent')}</th>
-    <th class="table_header_h table_width_mid_s">&nbsp;</th>
-  </tr>
-  <tr>
-    <td>${_('cm_eval_table_consult_customer')}</td>
-    <td>${c.eval_1_total| F.NA, h}</td>
-    <td>(100%)</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td class="label table_row_v_12">${_('cm_eval_table_taken_over_to_cm')}</td>
-    <td class="table_row_v_12" >${c.eval_1_cm| F.NA, h}</td>
-    <td class="table_row_v_12">(${c.eval_1_percent| F.NA, h}%)</td>
-    <td class="table_row_v_12 table_width_mid_s">&nbsp;</td>
-  </tr>
+<h2>${_('eval_group_note_header')}</h2>
+<table>
+<tr>
+  <td class="eval_group_all"></td>
+  <td>
+    ${_('eval_group_note_all')}
+  </td>
+<tr>
+<tr>
+  <td class="eval_group_incm"></td>
+  <td>
+    ${_('eval_group_note_incm')}
+  </td>
+<tr>
+<tr>
+  <td class="eval_group_finished"></td>
+  <td>
+    ${_('eval_group_note_finished')}
+  </td>
+<tr>
 </table>
-<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_1/auswertung_1_beratung.csv">${_('cm_eval_table_export_analysis')}</a>
-</div>
-<div class="evaluation even-row"> 
-<h3><a name="eval_2">${_('cm_eval_header_2')}</a></h3>
-<table class="evaluation">
-  <tr>
-    <th class="table_header_h table_width_mid_s">${_('cm_eval_table_month')}</th>
-    <th class="table_header_h table_width_mid_l">${_('cm_eval_table_completed')}</th>
-    <th class="table_header_h table_width_mid_l">${_('cm_eval_table_aborted')}</th>
-    <th class="table_header_h table_width_mid_s" >&nbsp;</th>
+<table>
+<tr>
+  <td class="eval_group_all" rowspan="2"></td>
+  <td>
+      <div class="evaluation odd-row first-row">
+      <h3><a name="eval_1">${_('cm_eval_header_1')}</a></h3>
+      <table class="evaluation">
+        <tr>
+          <th class="table_header_h table_width_long">${_('cm_eval_table_adolescent')}</th>
+          <th class="table_header_h table_width_mid_s">${_('cm_eval_table_number')}</th>
+          <th class="table_header_h table_width_mid_s">${_('cm_eval_table_percent')}</th>
+          <th class="table_header_h table_width_mid_s">&nbsp;</th>
+        </tr>
+        <tr>
+          <td>${_('cm_eval_table_consult_customer')}</td>
+          <td>${c.eval_1_total| F.NA, h}</td>
+          <td>(100%)</td>
+          <td></td>
+        </tr>
+        <tr>
+          <td class="label table_row_v_12">${_('cm_eval_table_taken_over_to_cm')}</td>
+          <td class="table_row_v_12" >${c.eval_1_cm| F.NA, h}</td>
+          <td class="table_row_v_12">(${c.eval_1_percent| F.NA, h}%)</td>
+          <td class="table_row_v_12 table_width_mid_s">&nbsp;</td>
+        </tr>
+      </table>
+      <a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_1/auswertung_1_beratung.csv">${_('cm_eval_table_export_analysis')}</a>
+      </div>
+    </td>
   </tr>
-  <% idset = 0 %>
-  % for r in c.eval_10:
-   % if idset==0:
-   <tr>
-    <td>${r[0]}</td>
-    <td>${r[1]| F.NA, h} (${r[2]| F.NA, h}%)</td>
-    <td>${r[3]| F.NA, h} (${r[4]| F.NA, h}%)</td>
-    <td></td>
-  </tr>
-  <% idset = 1 %>
-  % else:
-   <tr>
-     <td class="table_row_v_12">${r[0]}</td>
-     <td class="table_row_v_12">${r[1]| F.NA, h} (${r[2]| F.NA, h}%)</td>
-     <td class="table_row_v_12">${r[3]| F.NA, h} (${r[4]| F.NA, h}%)</td>
-     <td class="table_row_v_12 table_width_mid_s">&nbsp;</td>
-   </tr>
-  <% idset = 0 %>
-  % endif
-  % endfor
-</table>
-<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_10/auswertung_2_abgeschlossen.csv">${_('cm_eval_table_export_analysis')}</a>
-</div>
-<div class="evaluation odd-row">
-<h3><a name="eval_3">${_('cm_eval_header_3')}</a></h3>
-<h4>${_('cm_eval_header_on_gender')} </h4>
-<table class="evaluation">
   <tr>
-    <th class="table_header_h table_width_mid_s">${_('cm_eval_table_gender')}</th>
-    <th class="table_header_h table_width_mid_s">${_('cm_eval_table_number')}</th>
-    <th class="table_header_h table_width_mid_s">${_('cm_eval_table_percent')}</th>
-    <th class="table_header_h table_width_long">&nbsp;</th>
+    <td>
+      <div class="evaluation odd-row">
+      <h3><a name="eval_2">${_('cm_eval_header_2')}</a></h3>
+      <h4>${_('cm_eval_header_access_youngster_to_agency')}</h4>
+      <table class="evaluation">
+         <tr>
+          <th class="table_header_h table_width_long">${_('cm_eval_table_access')}</th>
+          <th class="table_header_h table_width_mid_s">${_('cm_eval_table_number')}</th>
+          <th class="table_header_h table_width_mid_s">${_('cm_eval_table_percent')}</th>
+          <th class="table_header_h table_width_mid_s">&nbsp;</th>
+        </tr> 
+      <% idset = 0 %>
+      % for r in c.eval_4.itervalues():
+        % if idset==0:
+         <tr>
+           <td>${r[0]}</td>
+           <td>${r[1]| F.NA, h}</td>
+           <td>(${r[2]| F.NA, h}%)</td>
+           <td></td>
+         </tr>
+         <% idset = 1 %>
+          % else:
+          <tr>
+            <td class="table_row_v_12 table_width_long">${r[0]}</td>
+            <td class="table_row_v_12">${r[1]| F.NA, h}</td>
+            <td class="table_row_v_12">(${r[2]| F.NA, h}%)</td>
+            <td class="table_row_v_12 table_width_mid_s ">&nbsp;</td>
+          </tr>
+          <% idset = 0 %>
+        % endif
+      % endfor 
+      </table>
+      <a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_4/auswertung_5_zugang.csv">${_('cm_eval_table_export_analysis')}</a>
+      <h4>${_('cm_eval_head_law_access_agency')}</h4>
+      <table class="evaluation">
+         <tr>
+          <th class="table_header_h table_width_mid_l">${_('cm_eval_table_law')}</th>
+          <th class="table_header_h table_width_mid_s">${_('cm_eval_table_number')}</th>
+          <th class="table_header_h table_width_mid_s">${_('cm_eval_table_percent')}</th>
+          <th class="table_header_h table_width_mid_l">&nbsp;</th>
+        </tr> 
+      <% idset = 0 %>
+      % for r in c.eval_5.itervalues():
+        % if idset==0:
+         <tr>
+           <td>${r[0]| F.NA, h}</td>
+           <td>${r[1]| F.NA, h}</td>
+           <td>(${r[2]| F.NA, h}%)</td>
+           <td></td>
+         </tr>
+         <% idset = 1 %>
+        % else:
+         <tr>
+           <td class="table_row_v_12">${r[0]| F.NA, h}</td>
+           <td class="table_row_v_12">${r[1]| F.NA, h}</td>
+           <td class="table_row_v_12">(${r[2]| F.NA, h}%)</td>
+           <td class="table_row_v_12 table_width_mid_l">&nbsp;</td>
+         </tr>
+         <% idset = 0 %>
+        % endif
+      % endfor 
+      </table>
+      <a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_5/auswertung_5_rechtskreis.csv">${_('cm_eval_table_export_analysis')}</a>
+      </div>
+    </td>
   </tr>
   <tr>
-    <td>${_('cm_eval_label_male')}</td>
-    <td>${c.eval_2_m[0]| F.NA, h}</td>
-    <td>(${c.eval_2_m[1]| F.NA, h}%)</td>
-    <td></td>
+    <td class="eval_group_incm" rowspan="4"></td>
+    <td>
+      <div class="evaluation even-row"> 
+      <h3><a name="eval_3">${_('cm_eval_header_3')}</a></h3>
+      <table class="evaluation">
+        <tr>
+          <th class="table_header_h table_width_mid_s">${_('cm_eval_table_month')}</th>
+          <th class="table_header_h table_width_mid_l">${_('cm_eval_table_completed')}</th>
+          <th class="table_header_h table_width_mid_l">${_('cm_eval_table_aborted')}</th>
+          <th class="table_header_h table_width_mid_s" >&nbsp;</th>
+        </tr>
+        <% idset = 0 %>
+        % for r in c.eval_10:
+         % if idset==0:
+         <tr>
+          <td>${r[0]}</td>
+          <td>${r[1]| F.NA, h} (${r[2]| F.NA, h}%)</td>
+          <td>${r[3]| F.NA, h} (${r[4]| F.NA, h}%)</td>
+          <td></td>
+        </tr>
+        <% idset = 1 %>
+        % else:
+         <tr>
+           <td class="table_row_v_12">${r[0]}</td>
+           <td class="table_row_v_12">${r[1]| F.NA, h} (${r[2]| F.NA, h}%)</td>
+           <td class="table_row_v_12">${r[3]| F.NA, h} (${r[4]| F.NA, h}%)</td>
+           <td class="table_row_v_12 table_width_mid_s">&nbsp;</td>
+         </tr>
+        <% idset = 0 %>
+        % endif
+        % endfor
+      </table>
+      <a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_10/auswertung_2_abgeschlossen.csv">${_('cm_eval_table_export_analysis')}</a>
+      </div>
+    </td>
   </tr>
   <tr>
-    <td class="table_row_v_12">${_('cm_eval_label_female')}</td>
-    <td class="table_row_v_12">${c.eval_2_w[0]| F.NA, h}</td>
-    <td class="table_row_v_12">(${c.eval_2_w[1]| F.NA, h}%)</td>
-    <td class="table_row_v_12 table_width_long">&nbsp;</td>
+    <td>
+      <div class="evaluation odd-row">
+      <h3><a name="eval_4">${_('cm_eval_header_4')}</a></h3>
+      <h4>${_('cm_eval_header_on_gender')} </h4>
+      <table class="evaluation">
+        <tr>
+          <th class="table_header_h table_width_mid_s">${_('cm_eval_table_gender')}</th>
+          <th class="table_header_h table_width_mid_s">${_('cm_eval_table_number')}</th>
+          <th class="table_header_h table_width_mid_s">${_('cm_eval_table_percent')}</th>
+          <th class="table_header_h table_width_long">&nbsp;</th>
+        </tr>
+        <tr>
+          <td>${_('cm_eval_label_male')}</td>
+          <td>${c.eval_2_m[0]| F.NA, h}</td>
+          <td>(${c.eval_2_m[1]| F.NA, h}%)</td>
+          <td></td>
+        </tr>
+        <tr>
+          <td class="table_row_v_12">${_('cm_eval_label_female')}</td>
+          <td class="table_row_v_12">${c.eval_2_w[0]| F.NA, h}</td>
+          <td class="table_row_v_12">(${c.eval_2_w[1]| F.NA, h}%)</td>
+          <td class="table_row_v_12 table_width_long">&nbsp;</td>
+        </tr>
+        <tr>
+          <td>${_('cm_eval_label_intersexual')}</td>
+          <td>${c.eval_2_i[0]| F.NA, h}</td>
+          <td>(${c.eval_2_i[1]| F.NA, h}%)</td>
+          <td></td>
+        </tr>
+        <tr>
+          <td class="table_row_v_12">${_('cm_eval_label_unknown')}</td>
+          <td class="table_row_v_12">${c.eval_2_u[0]| F.NA, h}</td>
+          <td class="table_row_v_12">(${c.eval_2_u[1]| F.NA, h}%)</td>
+          <td class="table_row_v_12 table_width_long">&nbsp;</td>
+        </tr>
+      </table>
+      <a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_2/auswertung_3_geschlecht.csv">${_('cm_eval_table_export_analysis')}</a>
+      <h4>${_('cm_eval_header_on_age')}</h4>
+      <table class="evaluation">
+        <tr>
+          <th class="table_header_h table_width_mid_s">${_('cm_eval_table_age')}</th>
+          <th class="table_header_h table_width_mid_s">${_('cm_eval_table_number')}</th>
+          <th class="table_header_h table_width_mid_s">${_('cm_eval_table_percent')}</th>
+          <th class="table_header_h table_width_long">&nbsp;</th>
+        </tr>
+      <% idset = 0 %>
+      % for v in c.eval_8:
+        % if idset==0:
+        <tr>
+          <td>${v[0]| F.NA, h}</td>
+          <td>${v[1]| F.NA, h}</td>
+          <td>${v[2]| F.NA, h}%</td>
+        <td></td>
+        </tr>
+        <% idset = 1 %>
+        % else:
+        <tr>
+          <td class="table_row_v_12">${v[0]| F.NA, h}</td>
+          <td class="table_row_v_12">${v[1]| F.NA, h}</td>
+          <td class="table_row_v_12">${v[2]| F.NA, h}%</td>
+          <td class="table_row_v_12 table_width_long">&nbsp;</td>
+        </tr>
+        <% idset = 0 %>
+        % endif
+      % endfor
+      </table>
+      <a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_8/auswertung_3_alter.csv">${_('cm_eval_table_export_analysis')}</a>
+      </div>
+    </td>
   </tr>
   <tr>
-    <td>${_('cm_eval_label_intersexual')}</td>
-    <td>${c.eval_2_i[0]| F.NA, h}</td>
-    <td>(${c.eval_2_i[1]| F.NA, h}%)</td>
-    <td></td>
+    <td>
+      <div class="evaluation even-row">
+      <h3><a name="eval_5">${_('cm_eval_header_5')| F.NA, h}</a></h3>
+      <table class="evaluation">
+        <tr>
+          <th class="table_header_h table_width_long">${_('cm_eval_table_category')}</th>
+          <th class="table_header_h table_width_mid_s">${_('cm_eval_table_number')}</th>
+          <th class="table_header_h table_width_mid_s">${_('cm_eval_table_percent')}</th>
+          <th class="table_header_h table_width_mid_s">&nbsp;</th>
+        </tr>
+        <tr>
+          <td>${_('cm_eval_label_migration_background')}</td>
+          <td>${c.eval_3[0][0]| F.NA, h}</td>
+          <td>(${c.eval_3[0][1]| F.NA, h}%)</td>
+          <td class="table_width_mid_s"></td>
+        </tr>
+        <tr>
+          <td>${_('cm_eval_label_no_migration_background')}</td>
+          <td>${c.eval_3[1][0]| F.NA, h}</td>
+          <td>(${c.eval_3[1][1]| F.NA, h}%)</td>
+          <td class="table_width_mid_s"></td>
+        </tr>
+        <tr>
+          <td>${_('cm_eval_label_ka_migration_background')}</td>
+          <td>${c.eval_3[2][0]| F.NA, h}</td>
+          <td>(${c.eval_3[2][1]| F.NA, h}%)</td>
+          <td class="table_width_mid_s"></td>
+        </tr>
+      </table>
+      <a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_3/auswertung_4_migration.csv">${_('cm_eval_table_export_analysis')}</a>
+      </div>
+    </td>
   </tr>
   <tr>
-    <td class="table_row_v_12">${_('cm_eval_label_unknown')}</td>
-    <td class="table_row_v_12">${c.eval_2_u[0]| F.NA, h}</td>
-    <td class="table_row_v_12">(${c.eval_2_u[1]| F.NA, h}%)</td>
-    <td class="table_row_v_12 table_width_long">&nbsp;</td>
+    <td>
+      <div class="evaluation even-row">
+      <h3><a name="eval_6">${_('cm_eval_header_6')}</a></h3>
+      <table class="evaluation">
+        <tr>
+          <th class="table_header_h table_width_long">${_('cm_eval_table_offer')}</th>
+          <th class="table_header_h table_width_mid_s">${_('cm_eval_table_number')}</th>
+          <th class="table_header_h table_width_mid_s">${_('cm_eval_table_percent')}</th>
+          <th class="table_header_h table_width_mid_s">&nbsp;</th>
+        </tr>
+      <% idset = 0 %>
+      % for r in c.eval_9:
+        % if idset==0:
+        <tr>
+          <td>${r[0]| F.NA, h}</td>
+          <td>${r[1]| F.NA, h}</td>
+          <td>(${r[2]| F.NA, h}%)</td>
+          <td></td>
+        </tr>
+        <% idset = 1 %>
+        % else:
+         <tr>
+           <td class="table_row_v_12">${r[0]| F.NA, h}</td>
+           <td class="table_row_v_12">${r[1]| F.NA, h}</td>
+           <td class="table_row_v_12">(${r[2]| F.NA, h}%)</td>
+           <td class="table_row_v_12 table_width_mid_s">&nbsp;</td>
+         </tr>
+         <% idset = 0 %>
+        % endif
+      % endfor 
+      </table>
+      <div class="eval_note">${_('eval6_note')}</div>
+      <a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_9/auswertung_6_bedarf.csv">${_('cm_eval_table_export_analysis')}</a>
+      </div>
+    </td>
   </tr>
-</table>
-<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_2/auswertung_3_geschlecht.csv">${_('cm_eval_table_export_analysis')}</a>
-<h4>${_('cm_eval_header_on_age')}</h4>
-<table class="evaluation">
   <tr>
-    <th class="table_header_h table_width_mid_s">${_('cm_eval_table_age')}</th>
-    <th class="table_header_h table_width_mid_s">${_('cm_eval_table_number')}</th>
-    <th class="table_header_h table_width_mid_s">${_('cm_eval_table_percent')}</th>
-    <th class="table_header_h table_width_long">&nbsp;</th>
+    <td class="eval_group_finished"></td>
+    <td>
+      <div class="evaluation odd-row">
+      <h3><a name="eval_7">${_('cm_eval_header_7')}</a></h3>
+      <h4>${_('cm_eval_head_where_to_place_youngster')}</h4>
+      <table class="evaluation">
+         <tr>
+          <th class="table_header_h table_width_mid_l">${_('cm_eval_table_place')}</th>
+          <th class="table_header_h table_width_mid_s">${_('cm_eval_table_number')}</th>
+          <th class="table_header_h table_width_mid_s">${_('cm_eval_table_percent')}</th>
+          <th class="table_header_h table_width_mid_l">&nbsp;</th>
+        </tr>
+      <% idset = 0 %>
+      % for r in c.eval_6.itervalues():
+        % if idset==0:
+         <tr>
+           <td>${r[0]| F.NA, h}</td>
+           <td>${r[1]| F.NA, h}</td>
+           <td>(${r[2]| F.NA, h}%)</td>
+           <td></td>
+         </tr>
+         <% idset = 1 %>
+        % else:
+         <tr>
+           <td class="table_row_v_12">${r[0]| F.NA, h}</td>
+           <td class="table_row_v_12">${r[1]| F.NA, h}</td>
+           <td class="table_row_v_12">(${r[2]| F.NA, h}%)</td>
+           <td class="table_row_v_12 table_width_mid_l">&nbsp;</td>
+         </tr>
+         <% idset = 0 %>
+       % endif
+      % endfor 
+      </table>
+      <a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_6/auswertung_7_vermittelt.csv">${_('cm_eval_table_export_analysis')}</a>
+      <h4>${_('cm_eval_header_law_changed_after_place')}</h4>
+      <table class="evaluation">
+         <tr>
+          <th class="table_header_h table_width_mid_l">${_('cm_eval_table_law_change')}</th>
+          <th class="table_header_h table_width_mid_s">${_('cm_eval_table_number')}</th>
+          <th class="table_header_h table_width_mid_s">${_('cm_eval_table_percent')}</th>
+          <th class="table_header_h table_width_mid_l">&nbsp;</th>
+        </tr>
+      <% idset = 0 %>
+      % for r in c.eval_7.itervalues():
+        % if idset==0:
+         <tr>
+           <td>${r[0]| F.NA, h}</td>
+           <td>${r[1]| F.NA, h}</td>
+           <td>(${r[2]| F.NA, h}%)</td>
+           <td></td>
+         </tr>
+         <% idset = 1 %>
+         % else:
+         <tr>
+           <td class="table_row_v_12">${r[0]| F.NA, h}</td>
+           <td class="table_row_v_12">${r[1]| F.NA, h}</td>
+           <td class="table_row_v_12">(${r[2]| F.NA, h}%)</td>
+           <td class="table_row_v_12 table_width_mid_l">&nbsp;</td>
+         </tr>
+         <% idset = 0 %>
+       % endif
+      % endfor 
+      </table>
+      <a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_7/auswertung_7_rechtskreis.csv">${_('cm_eval_table_export_analysis')}</a>
+      </div>
+    </td>
   </tr>
-<% idset = 0 %>
-% for v in c.eval_8:
-  % if idset==0:
-  <tr>
-    <td>${v[0]| F.NA, h}</td>
-    <td>${v[1]| F.NA, h}</td>
-    <td>${v[2]| F.NA, h}%</td>
-  <td></td>
-  </tr>
-  <% idset = 1 %>
-  % else:
-  <tr>
-    <td class="table_row_v_12">${v[0]| F.NA, h}</td>
-    <td class="table_row_v_12">${v[1]| F.NA, h}</td>
-    <td class="table_row_v_12">${v[2]| F.NA, h}%</td>
-    <td class="table_row_v_12 table_width_long">&nbsp;</td>
-  </tr>
-  <% idset = 0 %>
-  % endif
-% endfor
 </table>
-<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_8/auswertung_3_alter.csv">${_('cm_eval_table_export_analysis')}</a>
-</div>
-<div class="evaluation even-row">
-<h3><a name="eval_4">${_('cm_eval_header_4')| F.NA, h}</a></h3>
-<table class="evaluation">
-  <tr>
-    <th class="table_header_h table_width_long">${_('cm_eval_table_category')}</th>
-    <th class="table_header_h table_width_mid_s">${_('cm_eval_table_number')}</th>
-    <th class="table_header_h table_width_mid_s">${_('cm_eval_table_percent')}</th>
-    <th class="table_header_h table_width_mid_s">&nbsp;</th>
-  </tr>
-  <tr>
-    <td>${_('cm_eval_label_migration_background')}</td>
-    <td>${c.eval_3[0][0]| F.NA, h}</td>
-    <td>(${c.eval_3[0][1]| F.NA, h}%)</td>
-    <td class="table_width_mid_s"></td>
-  </tr>
-  <tr>
-    <td>${_('cm_eval_label_no_migration_background')}</td>
-    <td>${c.eval_3[1][0]| F.NA, h}</td>
-    <td>(${c.eval_3[1][1]| F.NA, h}%)</td>
-    <td class="table_width_mid_s"></td>
-  </tr>
-  <tr>
-    <td>${_('cm_eval_label_ka_migration_background')}</td>
-    <td>${c.eval_3[2][0]| F.NA, h}</td>
-    <td>(${c.eval_3[2][1]| F.NA, h}%)</td>
-    <td class="table_width_mid_s"></td>
-  </tr>
-</table>
-<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_3/auswertung_4_migration.csv">${_('cm_eval_table_export_analysis')}</a>
-</div>
-<div class="evaluation odd-row">
-<h3><a name="eval_5">${_('cm_eval_header_5')}</a></h3>
-<h4>${_('cm_eval_header_access_youngster_to_agency')}</h4>
-<table class="evaluation">
-   <tr>
-    <th class="table_header_h table_width_long">${_('cm_eval_table_access')}</th>
-    <th class="table_header_h table_width_mid_s">${_('cm_eval_table_number')}</th>
-    <th class="table_header_h table_width_mid_s">${_('cm_eval_table_percent')}</th>
-    <th class="table_header_h table_width_mid_s">&nbsp;</th>
-  </tr> 
-<% idset = 0 %>
-% for r in c.eval_4.itervalues():
-  % if idset==0:
-   <tr>
-     <td>${r[0]}</td>
-     <td>${r[1]| F.NA, h}</td>
-     <td>(${r[2]| F.NA, h}%)</td>
-     <td></td>
-   </tr>
-   <% idset = 1 %>
-    % else:
-    <tr>
-      <td class="table_row_v_12 table_width_long">${r[0]}</td>
-      <td class="table_row_v_12">${r[1]| F.NA, h}</td>
-      <td class="table_row_v_12">(${r[2]| F.NA, h}%)</td>
-      <td class="table_row_v_12 table_width_mid_s ">&nbsp;</td>
-    </tr>
-    <% idset = 0 %>
-  % endif
-% endfor 
-</table>
-<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_4/auswertung_5_zugang.csv">${_('cm_eval_table_export_analysis')}</a>
-<h4>${_('cm_eval_head_law_access_agency')}</h4>
-<table class="evaluation">
-   <tr>
-    <th class="table_header_h table_width_mid_l">${_('cm_eval_table_law')}</th>
-    <th class="table_header_h table_width_mid_s">${_('cm_eval_table_number')}</th>
-    <th class="table_header_h table_width_mid_s">${_('cm_eval_table_percent')}</th>
-    <th class="table_header_h table_width_mid_l">&nbsp;</th>
-  </tr> 
-<% idset = 0 %>
-% for r in c.eval_5.itervalues():
-  % if idset==0:
-   <tr>
-     <td>${r[0]| F.NA, h}</td>
-     <td>${r[1]| F.NA, h}</td>
-     <td>(${r[2]| F.NA, h}%)</td>
-     <td></td>
-   </tr>
-   <% idset = 1 %>
-  % else:
-   <tr>
-     <td class="table_row_v_12">${r[0]| F.NA, h}</td>
-     <td class="table_row_v_12">${r[1]| F.NA, h}</td>
-     <td class="table_row_v_12">(${r[2]| F.NA, h}%)</td>
-     <td class="table_row_v_12 table_width_mid_l">&nbsp;</td>
-   </tr>
-   <% idset = 0 %>
-  % endif
-% endfor 
-</table>
-<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_5/auswertung_5_rechtskreis.csv">${_('cm_eval_table_export_analysis')}</a>
-</div>
-<div class="evaluation even-row">
-<h3><a name="eval_6">${_('cm_eval_header_6')}</a></h3>
-<table class="evaluation">
-  <tr>
-    <th class="table_header_h table_width_long">${_('cm_eval_table_offer')}</th>
-    <th class="table_header_h table_width_mid_s">${_('cm_eval_table_number')}</th>
-    <th class="table_header_h table_width_mid_s">${_('cm_eval_table_percent')}</th>
-    <th class="table_header_h table_width_mid_s">&nbsp;</th>
-  </tr>
-<% idset = 0 %>
-% for r in c.eval_9:
-  % if idset==0:
-  <tr>
-    <td>${r[0]| F.NA, h}</td>
-    <td>${r[1]| F.NA, h}</td>
-    <td>(${r[2]| F.NA, h}%)</td>
-    <td></td>
-  </tr>
-  <% idset = 1 %>
-  % else:
-   <tr>
-     <td class="table_row_v_12">${r[0]| F.NA, h}</td>
-     <td class="table_row_v_12">${r[1]| F.NA, h}</td>
-     <td class="table_row_v_12">(${r[2]| F.NA, h}%)</td>
-     <td class="table_row_v_12 table_width_mid_s">&nbsp;</td>
-   </tr>
-   <% idset = 0 %>
-  % endif
-% endfor 
-</table>
-<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_9/auswertung_6_bedarf.csv">${_('cm_eval_table_export_analysis')}</a>
-</div>
-<div class="evaluation odd-row">
-<h3><a name="eval_7">${_('cm_eval_header_7')}</a></h3>
-<h4>${_('cm_eval_head_where_to_place_youngster')}</h4>
-<table class="evaluation">
-   <tr>
-    <th class="table_header_h table_width_mid_l">${_('cm_eval_table_place')}</th>
-    <th class="table_header_h table_width_mid_s">${_('cm_eval_table_number')}</th>
-    <th class="table_header_h table_width_mid_s">${_('cm_eval_table_percent')}</th>
-    <th class="table_header_h table_width_mid_l">&nbsp;</th>
-  </tr>
-<% idset = 0 %>
-% for r in c.eval_6.itervalues():
-  % if idset==0:
-   <tr>
-     <td>${r[0]| F.NA, h}</td>
-     <td>${r[1]| F.NA, h}</td>
-     <td>(${r[2]| F.NA, h}%)</td>
-     <td></td>
-   </tr>
-   <% idset = 1 %>
-  % else:
-   <tr>
-     <td class="table_row_v_12">${r[0]| F.NA, h}</td>
-     <td class="table_row_v_12">${r[1]| F.NA, h}</td>
-     <td class="table_row_v_12">(${r[2]| F.NA, h}%)</td>
-     <td class="table_row_v_12 table_width_mid_l">&nbsp;</td>
-   </tr>
-   <% idset = 0 %>
- % endif
-% endfor 
-</table>
-<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_6/auswertung_7_vermittelt.csv">${_('cm_eval_table_export_analysis')}</a>
-<h4>${_('cm_eval_header_law_changed_after_place')}</h4>
-<table class="evaluation">
-   <tr>
-    <th class="table_header_h table_width_mid_l">${_('cm_eval_table_law_change')}</th>
-    <th class="table_header_h table_width_mid_s">${_('cm_eval_table_number')}</th>
-    <th class="table_header_h table_width_mid_s">${_('cm_eval_table_percent')}</th>
-    <th class="table_header_h table_width_mid_l">&nbsp;</th>
-  </tr>
-<% idset = 0 %>
-% for r in c.eval_7.itervalues():
-  % if idset==0:
-   <tr>
-     <td>${r[0]| F.NA, h}</td>
-     <td>${r[1]| F.NA, h}</td>
-     <td>(${r[2]| F.NA, h}%)</td>
-     <td></td>
-   </tr>
-   <% idset = 1 %>
-   % else:
-   <tr>
-     <td class="table_row_v_12">${r[0]| F.NA, h}</td>
-     <td class="table_row_v_12">${r[1]| F.NA, h}</td>
-     <td class="table_row_v_12">(${r[2]| F.NA, h}%)</td>
-     <td class="table_row_v_12 table_width_mid_l">&nbsp;</td>
-   </tr>
-   <% idset = 0 %>
- % endif
-% endfor 
-</table>
-<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_7/auswertung_7_rechtskreis.csv">${_('cm_eval_table_export_analysis')}</a>
-</div>



More information about the Mpuls-commits mailing list