[Mpuls-commits] r70 - in trunk: . waskaweb/controllers waskaweb/i18n waskaweb/i18n/de/LC_MESSAGES waskaweb/lib waskaweb/model waskaweb/public/styles waskaweb/templates/casemanagement waskaweb/templates/casemanagement/evaluation waskaweb/templates/logbook waskaweb/templates/start
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Aug 13 15:20:29 CEST 2008
Author: thomas
Date: 2008-08-13 15:20:27 +0200 (Wed, 13 Aug 2008)
New Revision: 70
Added:
trunk/waskaweb/templates/casemanagement/evaluation/evaluation_avg_effort.mako
trunk/waskaweb/templates/casemanagement/evaluation/evaluation_effort.mako
trunk/waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako
trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_0.mako
Removed:
trunk/test.ini
Modified:
trunk/ChangeLog.txt
trunk/Changes.txt
trunk/waskaweb/controllers/case.py
trunk/waskaweb/controllers/evaluate.py
trunk/waskaweb/controllers/waska.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/logbook.py
trunk/waskaweb/public/styles/all.css
trunk/waskaweb/templates/casemanagement/caselist.mako
trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako
trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako
trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako
trunk/waskaweb/templates/logbook/overview.mako
trunk/waskaweb/templates/start/responsible.mako
Log:
Load 6672ae26a382 into trunk.
Modified: trunk/ChangeLog.txt
===================================================================
--- trunk/ChangeLog.txt 2008-08-13 13:19:58 UTC (rev 69)
+++ trunk/ChangeLog.txt 2008-08-13 13:20:27 UTC (rev 70)
@@ -1,6 +1,94 @@
+2008-08-13 Torsten Irlaender <torsten.irlaender at intevation.de>
+
+ Issue515
+
+ * waskaweb/i18n/de/LC_MESSAGES/waskaweb.po,
+ waskaweb/i18n/waskaweb.pot: Renamed status "Offen" to "Bearbeitbar"
+
+ Fixed formating of floats.
+
+ * waskaweb/lib/evaluation.py: Use "," instead of "." in floats.
+
+ New Style for columns holding numbers in evalution
+
+ * waskaweb/public/styles/all.css,
+ waskaweb/templates/casemanagement/evaluation/evaluation_avg_effort.mako,
+ waskaweb/templates/casemanagement/evaluation/evaluation_effort.mako:
+ Added new Style for columns in evaluation which includes numbers.
+ Those columns are now aligned right.
+
+ Implemented export of effort evaluation
+
+ * waskaweb/controllers/case.py,
+ waskaweb/controllers/evaluate.py,
+ waskaweb/i18n/de/LC_MESSAGES/waskaweb.po,
+ waskaweb/i18n/waskaweb.pot,
+ waskaweb/lib/evaluation.py,
+ waskaweb/model/logbook.py,
+ waskaweb/templates/casemanagement/evaluation/evaluation_avg_effort.mako,
+ waskaweb/templates/casemanagement/evaluation/evaluation_effort.mako,
+ waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako,
+ waskaweb/templates/casemanagement/evaluation/evaluation_result_0.mako,
+ waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:
+ Evaluation of efforts can now be exported as CVS. Disable effort
+ evaluation on evaluation-server.
+
+ Changed version string to 1.1.0
+
+ * waskaweb/i18n/de/LC_MESSAGES/waskaweb.po: Changed date and version
+ string. This was done for a preview version
+
+2008-08-12 Sascha L. Teichmann <sascha.teichmann at intevation.de>
+
+ partial Fix for Issue539
+
+ * waskaweb/controllers/waska.py: make 'waska_auth' a secure cookie.
+
+2008-08-12 Torsten Irlaender <torsten.irlaender at intevation.de>
+
+ Implemented evaluation if logbook entrys on single cases.
+
+ * waskaweb/controllers/case.py,
+ waskaweb/model/logbook.py,
+ waskaweb/templates/logbook/overview.mako: A short evalution on the
+ logbook entries is now displayed under the logbooklisting.
+
+ Implemented evaluation of logbook in global evaluation.
+
+ * waskaweb/controllers/case.py,
+ waskaweb/controllers/evaluate.py,
+ waskaweb/i18n/de/LC_MESSAGES/waskaweb.po,
+ waskaweb/i18n/waskaweb.pot,
+ waskaweb/lib/evaluation.py,
+ waskaweb/model/logbook.py,
+ waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako,
+ waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako,
+ waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako,
+ waskaweb/templates/logbook/overview.mako,
+ waskaweb/templates/casemanagement/evaluation/evaluation_avg_effort.mako,
+ waskaweb/templates/casemanagement/evaluation/evaluation_effort.mako,
+ waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako,
+ waskaweb/templates/casemanagement/evaluation/evaluation_result_0.mako:
+ The evaluation of logbook entries was moved into the evaluation lib,
+ as it is in fact a evaluation. Regardless if the user now evaluates
+ over a single case, or over all cases the lib/evalution will do this
+ job. TODO: Formatting and Export.
+
+2008-08-07 Torsten Irlaender <torsten.irlaender at intevation.de>
+
+ Issue515
+
+ * waskaweb/model/case.py,
+ waskaweb/templates/casemanagement/caselist.mako: Handle closed cases
+ as open cases.
+
+ Unsorted:
+
+ * Changes.txt: Added issue515
+
2008-08-06 Torsten Irlaender <torsten.irlaender at intevation.de>
- Tagged Version 1.0.4
+ Tagged Version 1.0.4
Issue517:
@@ -13,6 +101,7 @@
* Changes.txt: Added issue517
* waskaweb/i18n/de/LC_MESSAGES/waskaweb.po: Changed date of version
string
+ * waskaweb/templates/start/responsible.mako: Reactivated old text.
2008-08-05 Torsten Irlaender <torsten.irlaender at intevation.de>
Modified: trunk/Changes.txt
===================================================================
--- trunk/Changes.txt 2008-08-13 13:19:58 UTC (rev 69)
+++ trunk/Changes.txt 2008-08-13 13:20:27 UTC (rev 70)
@@ -1,3 +1,9 @@
+1.0.5:
+
+ Verbessert:
+
+ * Issue515: Grafiken und Beschriftungen für "geschlossene" Fallakten
+ angepasst. Diese werden nun ebenfalls als "offene" dargestellt.
1.0.4:
Neu:
@@ -3,5 +9,5 @@
* Für die Veröffentlichung von mpuls WASKA als Freie Software wurden
- in Kopf der Quelldateien entsprechende Hinweise auf Uhrheberschaft
+ in Kopf der Quelldateien entsprechende Hinweise auf Urheberschaft
und die verwendete GNU AFFERO GENERAL PUBLIC LICENSE in der Version
3 gesetzt.
Deleted: trunk/test.ini
===================================================================
--- trunk/test.ini 2008-08-13 13:19:58 UTC (rev 69)
+++ trunk/test.ini 2008-08-13 13:20:27 UTC (rev 70)
@@ -1,21 +0,0 @@
-#
-# waskaweb - Pylons testing environment configuration
-#
-# The %(here)s variable will be replaced with the parent directory of this file
-#
-[DEFAULT]
-debug = true
-# Uncomment and replace with the address which should receive any error reports
-#email_to = you at yourdomain.com
-smtp_server = localhost
-error_email_from = paste at localhost
-
-[server:main]
-use = egg:Paste#http
-host = 0.0.0.0
-port = 5000
-
-[app:main]
-use = config:development.ini
-
-# Add additional test specific configuration options as necessary.
Modified: trunk/waskaweb/controllers/case.py
===================================================================
--- trunk/waskaweb/controllers/case.py 2008-08-13 13:19:58 UTC (rev 69)
+++ trunk/waskaweb/controllers/case.py 2008-08-13 13:20:27 UTC (rev 70)
@@ -645,6 +645,9 @@
logbook = Logbook()
logbook.loadById(id)
c.logbook = logbook
+
+ # Evaluation
+ c.eval_effort = logbook.getEvaluation()
return render('/logbook/overview.mako')
@checkRole('cm_ka')
Modified: trunk/waskaweb/controllers/evaluate.py
===================================================================
--- trunk/waskaweb/controllers/evaluate.py 2008-08-13 13:19:58 UTC (rev 69)
+++ trunk/waskaweb/controllers/evaluate.py 2008-08-13 13:20:27 UTC (rev 70)
@@ -89,6 +89,7 @@
old_case_bundle = self._getNewCaseBundle()
old_case_ids = old_case_bundle.listDatasetIds()
+ #print "old: %s new: %s" % (old_case_ids, new_case_ids)
# now only take those ids which intersects.
ids = Set(old_case_ids) & Set(new_case_ids)
@@ -102,9 +103,10 @@
return self.evaluate(form_result.get('eval_id'))
- def _getNewCaseBundle(self):
+ def _getNewCaseBundle(self, search_str=None):
user = session['USER_AUTHORIZED']
- search_str = SEARCH_STR % user.id
+ if not search_str:
+ search_str = SEARCH_STR % user.id
search = CaseSearch()
result = search.perform(search_str)
# fetch ids if the cases
@@ -129,7 +131,6 @@
rc = range_compress(ids)
return rc
-
@checkRole(('admin_ka', 'cm_ka', 'pt_dlr', 'pb_ka'))
def evaluate(self, id, reset=0):
reset = self._checkBool(reset)
@@ -148,6 +149,15 @@
session['CASE_OVERVIEW_SEARCHOPTIONS'] = {}
session.save()
try:
+ c.eval_id = id
+ if id == '0':
+ # Zeitaufwände Logbuch
+ e14 = Evaluation_14(self._getCompressedIds(reset))
+ c.eval_effort = e14.perform()
+ c.eval_avg_effort = c.eval_effort
+ c.count_total = e14.getTotal()
+ c.count_total_valid = e14.getTotalValid()
+ page = render('casemanagement/evaluation/evaluation_result_0.mako')
if id == '1':
# Verhältnis Beratungskunden
e1 = Evaluation_1(self._getCompressedIds(reset))
@@ -197,11 +207,15 @@
# Rechtskreis nach Vermittlung
e7 = Evaluation_7(self._getCompressedIds(reset))
c.eval_7 = e7.perform()
+ # Zeitaufwände Logbuch
+ e15 = Evaluation_15(self._getCompressedIds(reset))
+ c.eval_effort = e15.perform()
+ c.eval_avg_effort = c.eval_effort
page = render('casemanagement/evaluation/evaluation_result_3.mako')
form_result = session.get('CASE_OVERVIEW_SEARCHOPTIONS', {})
if form_result.has_key('eval_id'):
- del form_result['eval_id'] # do not fillout eval_id woth htmlfill
+ del form_result['eval_id'] # do not fillout eval_id with htmlfill
return formencode.htmlfill.render(unicode(page, 'utf-8'),defaults=form_result)
except:
return render('/tests/trace.mako')
@@ -333,4 +347,40 @@
traceback.print_exc(file=sys.stderr)
raise HTTPNotFound()
+ @checkRole(('admin_ka', 'cm_ka', 'pt_dlr', 'pb_ka'))
+ def exportEvaluation_14(self):
+ try:
+ e = Evaluation_14(self._getCompressedIds())
+ return self._export(e)
+ except:
+ traceback.print_exc(file=sys.stderr)
+ raise HTTPNotFound()
+
+ @checkRole(('admin_ka', 'cm_ka', 'pt_dlr', 'pb_ka'))
+ def exportEvaluation_15(self):
+ try:
+ e = Evaluation_15(self._getCompressedIds())
+ return self._export(e)
+ except:
+ traceback.print_exc(file=sys.stderr)
+ raise HTTPNotFound()
+
+ @checkRole(('admin_ka', 'cm_ka', 'pt_dlr', 'pb_ka'))
+ def exportEvaluation_16(self):
+ try:
+ e = Evaluation_16(self._getCompressedIds())
+ return self._export(e)
+ except:
+ traceback.print_exc(file=sys.stderr)
+ raise HTTPNotFound()
+
+ @checkRole(('admin_ka', 'cm_ka', 'pt_dlr', 'pb_ka'))
+ def exportEvaluation_17(self):
+ try:
+ e = Evaluation_17(self._getCompressedIds())
+ return self._export(e)
+ except:
+ traceback.print_exc(file=sys.stderr)
+ raise HTTPNotFound()
+
# vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8:
Modified: trunk/waskaweb/controllers/waska.py
===================================================================
--- trunk/waskaweb/controllers/waska.py 2008-08-13 13:19:58 UTC (rev 69)
+++ trunk/waskaweb/controllers/waska.py 2008-08-13 13:20:27 UTC (rev 70)
@@ -123,7 +123,7 @@
session['USER_AUTHORIZED'] = user
session['AUTH'] = md5.new(shared + userIdentity()).digest()
session.save()
- response.set_cookie('waska_auth', shared)
+ response.set_cookie('waska_auth', shared, secure=True)
redirect_to(action="start")
else:
c.login_failed = True
Modified: trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
===================================================================
--- trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po 2008-08-13 13:19:58 UTC (rev 69)
+++ trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po 2008-08-13 13:20:27 UTC (rev 70)
@@ -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-07-08 14:31+0200\n"
+"POT-Creation-Date: 2008-08-13 13:56+0200\n"
"PO-Revision-Date: 2007-10-14 20:33+0200\n"
"Last-Translator: Torsten Irländer<torsten.irlaender at intevation.de>\n"
"Language-Team: de <LL at li.org>\n"
@@ -17,278 +17,286 @@
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"Generated-By: Babel 0.9.1\n"
-#: waskaweb/controllers/administration.py:23
+#: waskaweb/controllers/administration.py:46
msgid "adm_reset_user_password"
msgstr "Benutzerpasswort zurücksetzen?"
-#: waskaweb/controllers/administration.py:24
+#: waskaweb/controllers/administration.py:47
msgid "adm_reset_user_password_question"
msgstr "Wollen Sie wirklich das Passwort für folgenden Benutzer zurücksetzen:"
-#: waskaweb/controllers/administration.py:26
-#: waskaweb/controllers/administration.py:35
+#: waskaweb/controllers/administration.py:49
+#: waskaweb/controllers/administration.py:58
msgid "adm_delete_user_success_header"
msgstr "Benutzer gelöscht!"
-#: waskaweb/controllers/administration.py:27
-#: waskaweb/controllers/administration.py:36
+#: waskaweb/controllers/administration.py:50
+#: waskaweb/controllers/administration.py:59
msgid "adm_delete_user_success_text"
msgstr ""
"Der Benutzer wurde erfolgreich gelöscht. Bitte klicken Sie auf OK um "
"fortzufahren."
-#: waskaweb/controllers/administration.py:29
+#: waskaweb/controllers/administration.py:52
msgid "adm_delete_selfuser_notification_header"
msgstr "Benutzer nicht gelöscht!"
-#: waskaweb/controllers/administration.py:30
+#: waskaweb/controllers/administration.py:53
msgid "adm_delete_selfuser_notification_text"
msgstr ""
"Es ist nicht möglich den aktuell angemeldeten Nutzer zu löschen. Bitte "
"klicken Sie auf OK, um fortzufahren."
-#: waskaweb/controllers/administration.py:31
+#: waskaweb/controllers/administration.py:54
msgid "adm_delete_user_notification_header"
msgstr "Benutzer nicht gelöscht!"
-#: waskaweb/controllers/administration.py:32
+#: waskaweb/controllers/administration.py:55
msgid "adm_delete_user_notification_text"
msgstr ""
"Der Benutzer kann nicht gelöscht werden, da er noch als Bearbeiter für "
"einige Fallakten eingetragen ist. Bitte weisen Sie den entsprechenden "
"Fallakten einen neuen Bearbeiter zu. Klicken Sie auf OK, um fortzufahren."
-#: waskaweb/controllers/administration.py:33
+#: waskaweb/controllers/administration.py:56
msgid "adm_delete_user_failure_header"
msgstr "Benutzer nicht angelegt!"
-#: waskaweb/controllers/administration.py:34
+#: waskaweb/controllers/administration.py:57
msgid "adm_delete_user_failure_text"
msgstr ""
"Beim Anlegen des Benutzers ist ein Fehler aufgetreten. Bitte klicken Sie auf "
"OK, um fortzufahren."
-#: waskaweb/controllers/administration.py:38
+#: waskaweb/controllers/administration.py:61
msgid "adm_new_usergroup_success_header"
msgstr "Benutzergruppe angelegt!"
-#: waskaweb/controllers/administration.py:39
+#: waskaweb/controllers/administration.py:62
msgid "adm_new_usergroup_success_text"
msgstr ""
"Die Benutzergruppe wurde erfolgreich angelegt. Bitte klicken Sie auf OK, um "
"zur Benutzergruppenübersicht fortzufahren."
-#: waskaweb/controllers/administration.py:40
+#: waskaweb/controllers/administration.py:63
msgid "adm_new_usergroup_failure_header"
msgstr "Benutzergruppe nicht angelegt!"
-#: waskaweb/controllers/administration.py:41
+#: waskaweb/controllers/administration.py:64
msgid "adm_new_usergroup_failure_text"
msgstr ""
"Beim Anlegen der Benutzergruppe ist ein Fehler aufgetreten. Bitte klicken "
"Sie auf OK, um zur Benutzergruppenübersicht fortzufahren."
-#: waskaweb/controllers/administration.py:42
+#: waskaweb/controllers/administration.py:65
msgid "adm_edit_usergroup_header"
msgstr "Benutzergruppe bearbeitet!"
-#: waskaweb/controllers/administration.py:43
+#: waskaweb/controllers/administration.py:66
msgid "adm_edit_usergroup_text"
msgstr ""
"Die Benutzergruppe wurde erfolgreich bearbeitet. Bitte klicken Sie auf OK, "
"um zur Benutzergruppenübersicht fortzufahren."
-#: waskaweb/controllers/administration.py:44
+#: waskaweb/controllers/administration.py:67
msgid "adm_delete_usergroup_confirm_header"
msgstr "Benutzergruppe löschen?"
-#: waskaweb/controllers/administration.py:45
+#: waskaweb/controllers/administration.py:68
msgid "adm_delete_usergroup_confirm_text"
msgstr ""
"Wollen Sie die Benutzergruppe löschen und die Daten unwiederbringlich "
"verlieren?"
-#: waskaweb/controllers/administration.py:46
+#: waskaweb/controllers/administration.py:69
msgid "adm_delete_usergroup_success_header"
msgstr "Benutzergruppe gelöscht!"
-#: waskaweb/controllers/administration.py:47
+#: waskaweb/controllers/administration.py:70
msgid "adm_delete_usergroup_success_text"
msgstr ""
"Die Benutzergruppe wurde erfolgreich gelöscht. Bitte klicken Sie auf OK, um "
"zur Benutzergruppenübersicht fortzufahren."
-#: waskaweb/controllers/administration.py:48
+#: waskaweb/controllers/administration.py:71
msgid "adm_delete_usergroup_failure_header"
msgstr "Benutzergruppe nicht gelöscht!"
-#: waskaweb/controllers/administration.py:49
+#: waskaweb/controllers/administration.py:72
msgid "adm_delete_usergroup_failure_text"
msgstr ""
"Bei dem Löschen der Benutzergruppe ist ein Fehler aufgetreten. Bitte klicken "
"Sie auf OK, um zur Benutzergruppenübersicht fortzufahren."
-#: waskaweb/controllers/administration.py:51
+#: waskaweb/controllers/administration.py:74
msgid "adm_delete_user_confirm_header"
msgstr "Benutzer löschen?"
-#: waskaweb/controllers/administration.py:52
+#: waskaweb/controllers/administration.py:75
msgid "adm_delete_user_confirm_text"
msgstr ""
"Wollen Sie den Benutzer <strong>%s, %s</strong> (login: %s) löschen und die "
"Daten unwiederbringlich verlieren?"
-#: waskaweb/controllers/administration.py:54
+#: waskaweb/controllers/administration.py:77
msgid "adm_set_editor_header"
msgstr "Fallakten übertragen"
-#: waskaweb/controllers/administration.py:55
+#: waskaweb/controllers/administration.py:78
msgid "adm_set_editor_success_text"
msgstr ""
"Fallakten wurden an %s, %s übertragen. Bitte klicken Sie auf OK, um %s, %s "
"zu löschen."
-#: waskaweb/controllers/administration.py:56
+#: waskaweb/controllers/administration.py:79
msgid "adm_set_editor_success_text_rest"
msgstr ""
"Fallakten wurden an %s, %s übertragen. %s, %s verfügt weiterhin über "
"Fallakten. Bitte klicken Sie auf OK, um fortzufahren."
-#: waskaweb/controllers/administration.py:57
+#: waskaweb/controllers/administration.py:80
msgid "adm_set_editor_success_text_head"
msgstr "Fallakten übertragen!"
-#: waskaweb/controllers/administration.py:58
+#: waskaweb/controllers/administration.py:81
msgid "adm_set_editor_success_text_rest_head"
msgstr "Fallakten übertragen. Weitere Fallakten vorhanden!"
-#: waskaweb/controllers/administration.py:60
+#: waskaweb/controllers/administration.py:83
msgid "adm_edit_user_header"
msgstr "Benutzereinstellungen gespeichert!"
-#: waskaweb/controllers/administration.py:61
+#: waskaweb/controllers/administration.py:84
msgid "adm_edit_user_text"
msgstr "Bitte klicken Sie auf OK, um fortzufahren."
-#: waskaweb/controllers/administration.py:63
+#: waskaweb/controllers/administration.py:86
msgid "adm_edit_agency_header"
msgstr "Agentureinstellungen gespeichert!"
-#: waskaweb/controllers/administration.py:64
+#: waskaweb/controllers/administration.py:87
msgid "adm_edit_agency_text"
msgstr "Bitte klicken Sie auf OK, um fortzufahren."
-#: waskaweb/controllers/usersettings.py:22
+#: waskaweb/controllers/usersettings.py:45
msgid "adm_edit_standin_success_header"
msgstr "Vertretung gespeichert!"
-#: waskaweb/controllers/usersettings.py:23
+#: waskaweb/controllers/usersettings.py:46
msgid "adm_edit_standin_success_text"
msgstr ""
"Ihre Standard-Vertretung wurde gespeichert. Bitte klicken Sie auf OK, um "
"fortzufahren."
-#: waskaweb/lib/evaluation.py:130
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:43
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:64
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:43
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:43
+#: waskaweb/lib/evaluation.py:171
+#: 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:186
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:50
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:50
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:116
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:50
+#: waskaweb/lib/evaluation.py:227
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:44
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:67
msgid "cm_eval_summary_header_4"
msgstr "2.2. Alters- und Geschlechterstruktur in %"
-#: waskaweb/lib/evaluation.py:230
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:51
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:51
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:183
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:51
+#: waskaweb/lib/evaluation.py:271
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:45
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:134
msgid "cm_eval_summary_header_5"
msgstr "2.3. Migrationshintergrund"
-#: waskaweb/lib/evaluation.py:280
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:95
+#: waskaweb/lib/evaluation.py:321
+#: 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:325
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:125
+#: waskaweb/lib/evaluation.py:366
+#: 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:376
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:65
+#: waskaweb/lib/evaluation.py:417
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:16
msgid "cm_eval_head_where_to_place_youngster"
msgstr "3.1.1. Wohin wurden die Jugendlichen vermittlelt?"
-#: waskaweb/lib/evaluation.py:422
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:95
+#: waskaweb/lib/evaluation.py:463
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:46
msgid "cm_eval_header_law_changed_after_place"
msgstr "3.1.2. Angaben zum Rechtskreis nach der Vermittlung"
-#: waskaweb/lib/evaluation.py:493
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:151
+#: waskaweb/lib/evaluation.py:538
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:102
msgid "cm_eval_header_on_age"
msgstr "2.2.2. Angaben zur Altersverteilung"
-#: waskaweb/lib/evaluation.py:558
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:52
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:52
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:213
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:52
+#: waskaweb/lib/evaluation.py:603
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:46
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:164
msgid "cm_eval_summary_header_6"
msgstr "2.4. Förderbedarf"
-#: waskaweb/lib/evaluation.py:622
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:63
+#: waskaweb/lib/evaluation.py:667
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:14
msgid "cm_eval_length_cm"
msgstr "2.1.1. Verweildauer im CM"
-#: waskaweb/lib/evaluation.py:663
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:90
+#: waskaweb/lib/evaluation.py:708
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:41
msgid "cm_eval_avg_length_cm"
msgstr "2.1.2. Durchschnittliche Verweildauer in Wochen"
-#: waskaweb/lib/evaluation.py:713
+#: waskaweb/lib/evaluation.py:758
msgid "cm_eval_header_graduation"
msgstr "1.3. Höchster erreichte Schulanbschluss"
-#: waskaweb/lib/evaluation.py:763
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:155
+#: waskaweb/lib/evaluation.py:808
+#: 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/renderer.py:209
+#: waskaweb/lib/evaluation.py:817
+msgid "cm_eval_header_effort"
+msgstr "Aufschlüsselung der einzelnen Tätigkeiten"
+
+#: waskaweb/lib/evaluation.py:923
+msgid "cm_eval_header_effort2"
+msgstr "Aufschlüsselung der einzelnen Tätigkeiten"
+
+#: waskaweb/lib/evaluation.py:939
+msgid "cm_eval_header_avg_effort"
+msgstr "Durchschnittliche Dauer der Tätigkeiten"
+
+#: waskaweb/lib/evaluation.py:954
+msgid "cm_eval_header_avg_effort2"
+msgstr "Durchschnittliche Dauer der Tätigkeiten"
+
+#: waskaweb/lib/renderer.py:232
msgid "cm_rg_aid_overview_table_institution"
msgstr "Institution"
-#: waskaweb/lib/renderer.py:210
+#: waskaweb/lib/renderer.py:233
msgid "cm_rg_aid_overview_table_offer_type"
msgstr "Form"
-#: waskaweb/lib/renderer.py:211
+#: waskaweb/lib/renderer.py:234
msgid "cm_rg_aid_overview_table_actions"
msgstr "Aktionen"
-#: waskaweb/lib/renderer.py:213
+#: waskaweb/lib/renderer.py:236
msgid "cm_rg_aid_overview_table_edit"
msgstr "Bearbeiten"
-#: waskaweb/lib/renderer.py:214 waskaweb/lib/renderer.py:215
+#: waskaweb/lib/renderer.py:237 waskaweb/lib/renderer.py:238
#: 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:70
-#: waskaweb/templates/casemanagement/caselist.mako:123
+#: waskaweb/templates/casemanagement/caselist.mako:75
+#: waskaweb/templates/casemanagement/caselist.mako:134
#: waskaweb/templates/casemanagement/reminderlist.mako:4
#: waskaweb/templates/documents/case_overview.mako:42
#: waskaweb/templates/documents/case_overview.mako:53
@@ -304,19 +312,19 @@
msgid "cm_overview_a_show"
msgstr "Anzeigen"
-#: waskaweb/lib/renderer.py:216 waskaweb/lib/renderer.py:217
+#: waskaweb/lib/renderer.py:239 waskaweb/lib/renderer.py:240
#: waskaweb/templates/administration/overview_user.mako:45
#: waskaweb/templates/administration/overview_user.mako:62
#: waskaweb/templates/administration/overview_usergroups.mako:35
#: waskaweb/templates/administration/overview_usergroups.mako:44
#: waskaweb/templates/appointments/appointmentlist.mako:5
-#: waskaweb/templates/casemanagement/agencylist.mako:29
-#: waskaweb/templates/casemanagement/agencylist.mako:39
+#: waskaweb/templates/casemanagement/agencylist.mako:32
+#: waskaweb/templates/casemanagement/agencylist.mako:42
#: waskaweb/templates/casemanagement/appointmentlist.mako:5
-#: waskaweb/templates/casemanagement/caselist.mako:74
-#: waskaweb/templates/casemanagement/caselist.mako:84
-#: waskaweb/templates/casemanagement/caselist.mako:127
-#: waskaweb/templates/casemanagement/caselist.mako:137
+#: 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/reminderlist.mako:7
#: waskaweb/templates/documents/case_overview.mako:44
#: waskaweb/templates/documents/case_overview.mako:55
@@ -325,71 +333,65 @@
msgid "cm_overview_a_delete"
msgstr "Löschen"
-#: waskaweb/lib/renderer.py:218
+#: waskaweb/lib/renderer.py:241
msgid "cm_rg_aid_overview_table_no_offer_found"
msgstr "Keine Angebote gefunden"
-#: waskaweb/lib/renderer.py:219
+#: waskaweb/lib/renderer.py:242
msgid "cm_rg_aid_overview_legend_legend"
msgstr "Legende:"
-#: waskaweb/lib/renderer.py:220
+#: waskaweb/lib/renderer.py:243
msgid "cm_rg_aid_overview_legend_bb"
msgstr "(BB)"
-#: waskaweb/lib/renderer.py:221
+#: waskaweb/lib/renderer.py:244
msgid "cm_rg_aid_overview_legend_common_educational_area"
msgstr "Allgemein bildenden Bereich"
-#: waskaweb/lib/renderer.py:222
+#: waskaweb/lib/renderer.py:245
msgid "cm_rg_aid_overview_legend_bv"
msgstr "(BV)"
-#: waskaweb/lib/renderer.py:223
+#: waskaweb/lib/renderer.py:246
msgid "cm_rg_aid_overview_legend_vocational_preparation"
msgstr "Bereich der Berufsvorbereitung"
-#: waskaweb/lib/renderer.py:224
+#: waskaweb/lib/renderer.py:247
msgid "cm_rg_aid_overview_legend_bq"
msgstr "(BQ)"
-#: waskaweb/lib/renderer.py:225
+#: waskaweb/lib/renderer.py:248
msgid "cm_rg_aid_overview_legend_qualifications"
msgstr "Berufliche Qualifizierung"
-#: waskaweb/lib/renderer.py:226
+#: waskaweb/lib/renderer.py:249
msgid "cm_rg_aid_overview_legend_lb"
msgstr "(LB)"
-#: waskaweb/lib/renderer.py:227
+#: waskaweb/lib/renderer.py:250
msgid "cm_rg_aid_overview_legend_life_skills"
msgstr "Lebensbewältigung"
-#: waskaweb/lib/renderer.py:228
+#: waskaweb/lib/renderer.py:251
msgid "cm_rg_aid_overview_legend_new_offer"
msgstr "Neues Angebot hinzufügen"
-#: waskaweb/model/case.py:1000
-#: waskaweb/templates/casemanagement/caselist.mako:57
-#: waskaweb/templates/casemanagement/caselist.mako:110
+#: waskaweb/model/case.py:1034 waskaweb/model/case.py:1035
+#: waskaweb/templates/casemanagement/caselist.mako:64
+#: waskaweb/templates/casemanagement/caselist.mako:123
msgid "case_state_label_open"
-msgstr "Offen"
+msgstr "Bearbeitbar"
-#: waskaweb/model/case.py:1001
-#: waskaweb/templates/casemanagement/caselist.mako:59
-#: waskaweb/templates/casemanagement/caselist.mako:112
-msgid "case_state_label_closed"
-msgstr "Geschlossen"
-
-#: waskaweb/model/case.py:1002
+#: waskaweb/model/case.py:1036
msgid "case_state_label_outstanding_delete"
msgstr "Schwebend gelöscht"
-#: waskaweb/model/case.py:1003
+#: waskaweb/model/case.py:1037
msgid "case_state_label_outstanding_anon"
msgstr "Schwebend anonymisiert"
-#: waskaweb/model/case.py:1004
+#: waskaweb/model/case.py:1038
msgid "case_state_label_anon"
msgstr "Anonymisiert"
@@ -524,7 +526,7 @@
#: waskaweb/templates/main.mako:197
msgid "footer_version"
-msgstr "06.08.2008 | Version 1.0.4"
+msgstr "13.08.2008 | Version 1.1.0 beta"
#: waskaweb/templates/main_login.mako:38
#: waskaweb/templates/start/responsible.mako:149
@@ -718,7 +720,6 @@
#: waskaweb/templates/administration/new_user.mako:36
#: waskaweb/templates/administration/new_user_result.mako:22
#: waskaweb/templates/administration/show_user_body.mako:2
-#: waskaweb/templates/administration/userform_body.mako:4
msgid "adm_form_legend_personal"
msgstr "Angaben zur Person"
@@ -726,7 +727,6 @@
#: waskaweb/templates/administration/edit_user.mako:41
#: waskaweb/templates/administration/new_user.mako:39
#: waskaweb/templates/administration/new_user.mako:42
-#: waskaweb/templates/administration/userform_body.mako:7
msgid "adm_form_user_firstname"
msgstr "Vorname"
@@ -734,13 +734,11 @@
#: waskaweb/templates/administration/edit_user.mako:50
#: waskaweb/templates/administration/new_user.mako:48
#: waskaweb/templates/administration/new_user.mako:51
-#: waskaweb/templates/administration/userform_body.mako:12
msgid "adm_form_user_lastname"
msgstr "Nachname"
#: waskaweb/templates/administration/edit_user.mako:56
#: waskaweb/templates/administration/new_user.mako:57
-#: waskaweb/templates/administration/userform_body.mako:17
msgid "adm_form_user_telephone"
msgstr "Telefon"
@@ -756,26 +754,22 @@
#: waskaweb/templates/administration/edit_user.mako:70
#: waskaweb/templates/administration/new_user.mako:71
#: waskaweb/templates/administration/new_user_result.mako:46
-#: waskaweb/templates/administration/userform_body.mako:21
#: waskaweb/templates/usersettings/change_password_login.mako:17
msgid "adm_form_legend_login"
msgstr "Angaben zum Konto"
#: waskaweb/templates/administration/edit_user.mako:88
#: waskaweb/templates/administration/new_user.mako:104
-#: waskaweb/templates/administration/userform_body.mako:28
msgid "adm_form_user_activated"
msgstr "Benutzer darf sich anmelden"
#: waskaweb/templates/administration/edit_user.mako:96
#: waskaweb/templates/administration/new_user.mako:108
-#: waskaweb/templates/administration/userform_body.mako:36
msgid "adm_form_user_newpass"
msgstr "Benutzer muss bei der nächsten Anmeldung das Passwort setzen"
#: waskaweb/templates/administration/edit_user.mako:99
#: waskaweb/templates/administration/new_user.mako:111
-#: waskaweb/templates/administration/userform_body.mako:54
msgid "adm_form_user_submit"
msgstr "Benutzer speichern"
@@ -851,7 +845,6 @@
#: waskaweb/templates/administration/new_user.mako:74
#: waskaweb/templates/administration/new_user.mako:77
-#: waskaweb/templates/administration/userform_body.mako:40
msgid "adm_form_user_login"
msgstr "Anmeldekennung"
@@ -972,8 +965,8 @@
msgstr "Benutzergruppenname"
#: waskaweb/templates/administration/overview_usergroups.mako:53
-#: waskaweb/templates/casemanagement/agencylist.mako:48
-#: waskaweb/templates/casemanagement/caselist.mako:147
+#: waskaweb/templates/casemanagement/agencylist.mako:51
+#: waskaweb/templates/casemanagement/caselist.mako:158
msgid "cm_overview_tbl_no_data_found"
msgstr "Es wurden keine Datensätze gefunden."
@@ -1121,14 +1114,6 @@
msgid "adm_np_edituser_success"
msgstr "Benutzer gespeichert!"
-#: waskaweb/templates/administration/userform_body.mako:45
-msgid "adm_form_user_passwd"
-msgstr "Passwort"
-
-#: waskaweb/templates/administration/userform_body.mako:50
-msgid "adm_form_user_passwd_confirm"
-msgstr "Passwortwiederholung"
-
#: waskaweb/templates/administration/dialogs/confirm_deleteuser.mako:7
msgid "adm_np_delteuser"
msgstr "Benutzer löschen?"
@@ -1460,6 +1445,7 @@
#: 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_result_0.mako:6
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:6
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:6
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:6
@@ -1486,20 +1472,20 @@
msgid "cm_form_overview_search_submit"
msgstr "Suchen"
-#: waskaweb/templates/casemanagement/agencylist.mako:6
+#: waskaweb/templates/casemanagement/agencylist.mako:9
msgid "cm_overview_tbl_header_fkz"
msgstr "FKZ"
-#: waskaweb/templates/casemanagement/agencylist.mako:10
+#: waskaweb/templates/casemanagement/agencylist.mako:13
msgid "cm_overview_tbl_header_number_cases"
msgstr "Anzahl Fälle"
-#: waskaweb/templates/casemanagement/agencylist.mako:14
+#: waskaweb/templates/casemanagement/agencylist.mako:17
msgid "cm_overview_tbl_header_last_update"
msgstr "Aktualisiert"
-#: waskaweb/templates/casemanagement/agencylist.mako:18
-#: waskaweb/templates/casemanagement/caselist.mako:31
+#: waskaweb/templates/casemanagement/agencylist.mako:21
+#: waskaweb/templates/casemanagement/caselist.mako:30
msgid "cm_overview_tbl_header_actions"
msgstr "Aktionen"
@@ -1518,6 +1504,7 @@
#: waskaweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako:4
#: waskaweb/templates/casemanagement/dialogs/confirm_delete_attachment.mako:4
#: waskaweb/templates/casemanagement/dialogs/confirm_markanonymize.mako:5
+#: waskaweb/templates/casemanagement/dialogs/confirm_markanonymizeFromOverview.mako:5
#: waskaweb/templates/casemanagement/dialogs/confirm_open.mako:5
#: waskaweb/templates/casemanagement/dialogs/delete_attachment_success.mako:6
#: waskaweb/templates/casemanagement/dialogs/failed_delete_appointment.mako:5
@@ -1617,44 +1604,44 @@
msgid "cm_overview_tbl_header_accesstime"
msgstr "Aktualisiert"
-#: waskaweb/templates/casemanagement/caselist.mako:30
+#: waskaweb/templates/casemanagement/caselist.mako:29
msgid "cm_overview_tbl_header_status"
msgstr "Status"
-#: waskaweb/templates/casemanagement/caselist.mako:51
-#: waskaweb/templates/casemanagement/caselist.mako:104
+#: waskaweb/templates/casemanagement/caselist.mako:58
+#: waskaweb/templates/casemanagement/caselist.mako:117
msgid "cm_overview_img_editor"
msgstr "Bearbeiter"
-#: waskaweb/templates/casemanagement/caselist.mako:53
-#: waskaweb/templates/casemanagement/caselist.mako:106
+#: waskaweb/templates/casemanagement/caselist.mako:60
+#: waskaweb/templates/casemanagement/caselist.mako:119
msgid "cm_overview_img_standin"
msgstr "Vertreter"
-#: waskaweb/templates/casemanagement/caselist.mako:61
-#: waskaweb/templates/casemanagement/caselist.mako:114
+#: waskaweb/templates/casemanagement/caselist.mako:66
+#: waskaweb/templates/casemanagement/caselist.mako:125
msgid "case_state_label_delete"
msgstr "Gelöscht"
-#: waskaweb/templates/casemanagement/caselist.mako:63
-#: waskaweb/templates/casemanagement/caselist.mako:116
+#: waskaweb/templates/casemanagement/caselist.mako:68
+#: waskaweb/templates/casemanagement/caselist.mako:127
msgid "case_state_label_markanonym"
msgstr "Schwebend anonymisiert"
-#: waskaweb/templates/casemanagement/caselist.mako:65
-#: waskaweb/templates/casemanagement/caselist.mako:118
+#: waskaweb/templates/casemanagement/caselist.mako:70
+#: waskaweb/templates/casemanagement/caselist.mako:129
msgid "case_state_label_anonym"
msgstr "Anonymisiert"
-#: waskaweb/templates/casemanagement/caselist.mako:77
-#: waskaweb/templates/casemanagement/caselist.mako:83
-#: waskaweb/templates/casemanagement/caselist.mako:130
-#: waskaweb/templates/casemanagement/caselist.mako:136
+#: waskaweb/templates/casemanagement/caselist.mako:82
+#: waskaweb/templates/casemanagement/caselist.mako:88
+#: waskaweb/templates/casemanagement/caselist.mako:141
+#: waskaweb/templates/casemanagement/caselist.mako:147
msgid "cm_overview_a_anonymize"
msgstr "Fallakte anonymisieren"
-#: waskaweb/templates/casemanagement/caselist.mako:80
-#: waskaweb/templates/casemanagement/caselist.mako:133
+#: waskaweb/templates/casemanagement/caselist.mako:85
+#: waskaweb/templates/casemanagement/caselist.mako:144
msgid "cm_overview_a_restore"
msgstr "Fallakte wiederherstellen"
@@ -1672,64 +1659,64 @@
msgid "cm_np_digest"
msgstr "Zusammenfassung der Fallakte"
-#: waskaweb/templates/casemanagement/digest.mako:12
+#: waskaweb/templates/casemanagement/digest_body.mako:5
msgid "cm_header_digest"
msgstr "Zusammenfassung der Fallakte"
-#: waskaweb/templates/casemanagement/digest.mako:56
+#: waskaweb/templates/casemanagement/digest_body.mako:51
msgid "cm_header_digest_youth"
msgstr "Angaben zum Jugendlichen"
-#: waskaweb/templates/casemanagement/digest.mako:59
-#: waskaweb/templates/casemanagement/digest.mako:113
+#: waskaweb/templates/casemanagement/digest_body.mako:54
+#: waskaweb/templates/casemanagement/digest_body.mako:108
msgid "cm_digest_tbl_label_lastname"
msgstr "Name"
-#: waskaweb/templates/casemanagement/digest.mako:63
-#: waskaweb/templates/casemanagement/digest.mako:117
+#: waskaweb/templates/casemanagement/digest_body.mako:58
+#: waskaweb/templates/casemanagement/digest_body.mako:112
msgid "cm_digest_tbl_label_firstname"
msgstr "Vorname"
-#: waskaweb/templates/casemanagement/digest.mako:67
+#: waskaweb/templates/casemanagement/digest_body.mako:62
msgid "cm_digest_tbl_label_caseid"
msgstr "Kundennummer"
-#: waskaweb/templates/casemanagement/digest.mako:71
+#: waskaweb/templates/casemanagement/digest_body.mako:66
msgid "cm_digest_tbl_label_age"
msgstr "Alter"
-#: waskaweb/templates/casemanagement/digest.mako:75
-#: waskaweb/templates/casemanagement/digest.mako:121
+#: waskaweb/templates/casemanagement/digest_body.mako:70
+#: waskaweb/templates/casemanagement/digest_body.mako:116
msgid "cm_digest_tbl_label_email"
msgstr "E-Mail"
-#: waskaweb/templates/casemanagement/digest.mako:85
+#: waskaweb/templates/casemanagement/digest_body.mako:80
msgid "cm_digest_tbl_label_street"
msgstr "Straße"
-#: waskaweb/templates/casemanagement/digest.mako:89
+#: waskaweb/templates/casemanagement/digest_body.mako:84
msgid "cm_digest_tbl_label_plz"
msgstr "PLZ"
-#: waskaweb/templates/casemanagement/digest.mako:93
+#: waskaweb/templates/casemanagement/digest_body.mako:88
msgid "cm_digest_tbl_label_city"
msgstr "Ort"
-#: waskaweb/templates/casemanagement/digest.mako:97
-#: waskaweb/templates/casemanagement/digest.mako:131
+#: waskaweb/templates/casemanagement/digest_body.mako:92
+#: waskaweb/templates/casemanagement/digest_body.mako:126
msgid "cm_digest_tbl_label_telephone"
msgstr "Festnetz"
-#: waskaweb/templates/casemanagement/digest.mako:101
-#: waskaweb/templates/casemanagement/digest.mako:135
+#: waskaweb/templates/casemanagement/digest_body.mako:96
+#: waskaweb/templates/casemanagement/digest_body.mako:130
msgid "cm_digest_tbl_label_mobiletelephone"
msgstr "Mobil"
-#: waskaweb/templates/casemanagement/digest.mako:105
+#: waskaweb/templates/casemanagement/digest_body.mako:100
msgid "cm_digest_tbl_label_telephone_more"
msgstr "Weitere Telefonnummern"
-#: waskaweb/templates/casemanagement/digest.mako:110
+#: waskaweb/templates/casemanagement/digest_body.mako:105
msgid "cm_header_digest_parent"
msgstr "Angaben zum Erziehungsberechtigten"
@@ -1970,6 +1957,7 @@
#: waskaweb/templates/casemanagement/dialogs/confirm_anonymize.mako:6
#: waskaweb/templates/casemanagement/dialogs/confirm_bundle_anonymize.mako:6
#: waskaweb/templates/casemanagement/dialogs/confirm_markanonymize.mako:6
+#: waskaweb/templates/casemanagement/dialogs/confirm_markanonymizeFromOverview.mako:6
#: waskaweb/templates/casemanagement/dialogs/failed_anonymize.mako:5
#: waskaweb/templates/casemanagement/dialogs/failed_markanonymize.mako:5
#: waskaweb/templates/casemanagement/dialogs/failed_xml_import.mako:5
@@ -2078,68 +2066,111 @@
msgid "cm_np_restore_success"
msgstr "Wiederherstellen erfolgreich!"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:7
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:7
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:7
-msgid "cm_np_evaluate_result"
-msgstr "Auswertungen"
-
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:9
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:9
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:9
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:2
msgid "cm_header_evaluate_result"
msgstr "Auswertungen"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:41
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:59
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:41
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:41
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:35
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:10
msgid "eval_group_header_all"
msgstr "1. Auswertungen über alle Jugendlichen"
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:38
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:44
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:94
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:44
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:44
msgid "cm_eval_summary_header_2"
msgstr "1.2. Zugang zur Kompetenzagentur"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:45
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:187
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:45
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:45
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:39
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:137
msgid "cm_eval_summary_header_11"
msgstr "1.3. Höchster erreichte Schulabschluss"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:47
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:47
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:59
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:47
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:41
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:10
msgid "eval_group_header_incm"
msgstr "2. Auswertungen über Jugendliche im Case-Management"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:49
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:49
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:62
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:49
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:43
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:13
msgid "cm_eval_summary_header_3"
msgstr "2.1. Verweildauer im CM"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:54
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:54
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:54
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:59
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:48
+#: 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_result_1.mako:56
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:56
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:56
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:64
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:50
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:15
msgid "cm_eval_summary_header_7"
msgstr "3.1. Vermittlung"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:61
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:51
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:78
+msgid "cm_eval_summary_header_15"
+msgstr "3.2. Zeitaufwände"
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:53
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_0.mako:10
+msgid "eval_group_header_finished2"
+msgstr "4. Auswertung über abgeschlossene Beratungsfälle"
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:55
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_0.mako:15
+msgid "cm_eval_summary_header_14"
+msgstr "4.1. Zeitaufwände"
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_0.mako:7
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:7
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:7
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:7
+msgid "cm_np_evaluate_result"
+msgstr "Auswertungen"
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_0.mako:12
+msgid "eval_group_note_finished2"
+msgstr ""
+"Folgende Auswertungen werden über abgeschlossene Beratungsfälle "
+"durchgeführt. Abgeschlossene Beratungsfälle sind Jugendliche, für die keine "
+"Notwendigkeit zur Übernahme in das Case-Management festgestellt wurde."
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_0.mako:18
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_0.mako:21
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:41
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:74
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:104
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:134
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:166
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:40
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:64
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:101
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:131
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:161
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:193
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:45
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:75
+msgid "cm_eval_table_to_overview"
+msgstr "Zur Übersicht"
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_0.mako:18
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_0.mako:21
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:41
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:74
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:104
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:134
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:166
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:40
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:64
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:101
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:131
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:161
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:193
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:45
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:75
+msgid "cm_eval_table_export_analysis"
+msgstr "Auswertung exportieren"
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:12
msgid "eval_group_note_all"
msgstr ""
"Folgende Auswertungen werden über alle WASKA erfassten Jugendlichen "
@@ -2147,99 +2178,67 @@
"Management befinden, dieses bereits abgeschlossen haben, oder noch nicht in "
"das CM aufgenommen wurden."
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:67
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:18
msgid "cm_eval_table_adolescent"
msgstr "Jugendliche"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:68
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:99
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:129
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:159
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:191
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:121
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:155
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:187
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:217
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:69
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:99
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:19
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:49
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:79
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:109
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:141
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:72
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:106
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:138
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:168
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:20
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:50
msgid "cm_eval_table_number"
msgstr "Anzahl"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:69
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:100
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:130
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:160
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:192
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:122
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:156
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:188
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:218
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:70
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:100
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:20
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:50
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:80
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:110
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:142
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:73
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:107
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:139
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:169
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:21
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:51
msgid "cm_eval_table_percent"
msgstr "Prozent"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:73
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:24
msgid "cm_eval_table_all_customer"
msgstr "Gesamt Jugendliche"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:79
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:30
msgid "cm_eval_table_consult_customer"
msgstr "Davon Beratungskunden"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:85
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:36
msgid "cm_eval_table_taken_over_to_cm"
msgstr "Davon in das CM übernommen"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:91
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:124
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:154
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:184
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:216
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:89
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:113
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:150
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:180
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:210
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:242
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:94
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:124
-msgid "cm_eval_table_to_overview"
-msgstr "Zur Übersicht"
-
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:91
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:124
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:154
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:184
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:216
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:89
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:113
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:150
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:180
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:210
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:242
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:94
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:124
-msgid "cm_eval_table_export_analysis"
-msgstr "Auswertung exportieren"
-
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:98
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:48
msgid "cm_eval_table_access"
msgstr "Zugang"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:128
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:78
msgid "cm_eval_table_law"
msgstr "Rechtkreis"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:158
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:108
msgid "cm_eval_table_work"
msgstr "Status"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:190
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:140
msgid "cm_eval_table_graduation"
msgstr "Abschluss"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:60
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:11
msgid "eval_group_note_incm"
msgstr ""
"Diese Auswertung wird nur über Jugendliche geführt, die in das Case-"
@@ -2248,69 +2247,69 @@
"Förderplanung erstellt wurde und ein Bedarf zur Förderung eingetragen wurde</"
"strong>."
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:66
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:17
msgid "cm_eval_table_month"
msgstr "Woche"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:67
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:93
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:18
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:44
msgid "cm_eval_table_completed"
msgstr "Abgeschlossen"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:68
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:94
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:19
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:45
msgid "cm_eval_table_aborted"
msgstr "Abgebrochen"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:117
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:68
msgid "cm_eval_header_on_gender"
msgstr "2.2.1. Angaben zur Geschlechtsstruktur"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:120
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:71
msgid "cm_eval_table_gender"
msgstr "Geschlecht"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:126
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:77
msgid "cm_eval_label_male"
msgstr "männlich"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:132
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:83
msgid "cm_eval_label_female"
msgstr "weiblich"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:138
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:89
msgid "cm_eval_label_intersexual"
msgstr "intersexuell"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:144
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:95
msgid "cm_eval_label_unknown"
msgstr "Keine Angabe"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:154
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:105
msgid "cm_eval_table_age"
msgstr "Alter"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:186
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:137
msgid "cm_eval_table_category"
msgstr "Kategorie"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:192
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:143
msgid "cm_eval_label_migration_background"
msgstr "Migrationshintergrund"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:198
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:149
msgid "cm_eval_label_no_migration_background"
msgstr "Kein Migrationshintergrund"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:204
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:155
msgid "cm_eval_label_ka_migration_background"
msgstr "Keine Angabe"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:216
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:167
msgid "cm_eval_table_offer"
msgstr "Angebot"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:61
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:12
msgid "eval_group_note_finished"
msgstr ""
"Diese Auswertung wird nur über die Jugendlichen geführt, die das Case-"
@@ -2319,11 +2318,11 @@
"Punkt 'Art der Beendigung' gemacht wurde. Das CM wird sowohl bei regulären "
"als auch bei Abbruch als abgeschlossen gewertet."
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:68
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:19
msgid "cm_eval_table_place"
msgstr "Vermittlung"
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:98
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:49
msgid "cm_eval_table_law_change"
msgstr "Rechtskreis"
@@ -2468,14 +2467,6 @@
msgid "cm_overview_a_keepactive"
msgstr "Aufbewahrung verlängern"
-#: waskaweb/templates/start/responsible.mako:82
-msgid "responsible_info_sponsorship"
-msgstr "Information zur Trägerschaft"
-
-#: waskaweb/templates/start/responsible.mako:85
-msgid "responsible_project_sponsorship"
-msgstr "Projektträger"
-
#: waskaweb/templates/start/responsible.mako:126
msgid "responsible_realisation"
msgstr "Realisation"
@@ -2698,6 +2689,21 @@
msgid "adm_np_changepassword"
msgstr "Benutzerpasswort geändert!"
+#~ msgid "case_state_label_closed"
+#~ msgstr "Geschlossen"
+
+#~ msgid "adm_form_user_passwd"
+#~ msgstr "Passwort"
+
+#~ msgid "adm_form_user_passwd_confirm"
+#~ msgstr "Passwortwiederholung"
+
+#~ msgid "responsible_info_sponsorship"
+#~ msgstr "Information zur Trägerschaft"
+
+#~ msgid "responsible_project_sponsorship"
+#~ msgstr "Projektträger"
+
#~ msgid "app_con_list_all_appointments"
#~ msgstr "Hier wird eine Auflistung aller Termine angezeigt"
Modified: trunk/waskaweb/i18n/waskaweb.pot
===================================================================
--- trunk/waskaweb/i18n/waskaweb.pot 2008-08-13 13:19:58 UTC (rev 69)
+++ trunk/waskaweb/i18n/waskaweb.pot 2008-08-13 13:20:27 UTC (rev 70)
@@ -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-07-08 14:31+0200\n"
+"POT-Creation-Date: 2008-08-13 13:56+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,249 +17,257 @@
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 0.9.1\n"
-#: waskaweb/controllers/administration.py:23
+#: waskaweb/controllers/administration.py:46
msgid "adm_reset_user_password"
msgstr ""
-#: waskaweb/controllers/administration.py:24
+#: waskaweb/controllers/administration.py:47
msgid "adm_reset_user_password_question"
msgstr ""
-#: waskaweb/controllers/administration.py:26
-#: waskaweb/controllers/administration.py:35
+#: waskaweb/controllers/administration.py:49
+#: waskaweb/controllers/administration.py:58
msgid "adm_delete_user_success_header"
msgstr ""
-#: waskaweb/controllers/administration.py:27
-#: waskaweb/controllers/administration.py:36
+#: waskaweb/controllers/administration.py:50
+#: waskaweb/controllers/administration.py:59
msgid "adm_delete_user_success_text"
msgstr ""
-#: waskaweb/controllers/administration.py:29
+#: waskaweb/controllers/administration.py:52
msgid "adm_delete_selfuser_notification_header"
msgstr ""
-#: waskaweb/controllers/administration.py:30
+#: waskaweb/controllers/administration.py:53
msgid "adm_delete_selfuser_notification_text"
msgstr ""
-#: waskaweb/controllers/administration.py:31
+#: waskaweb/controllers/administration.py:54
msgid "adm_delete_user_notification_header"
msgstr ""
-#: waskaweb/controllers/administration.py:32
+#: waskaweb/controllers/administration.py:55
msgid "adm_delete_user_notification_text"
msgstr ""
-#: waskaweb/controllers/administration.py:33
+#: waskaweb/controllers/administration.py:56
msgid "adm_delete_user_failure_header"
msgstr ""
-#: waskaweb/controllers/administration.py:34
+#: waskaweb/controllers/administration.py:57
msgid "adm_delete_user_failure_text"
msgstr ""
-#: waskaweb/controllers/administration.py:38
+#: waskaweb/controllers/administration.py:61
msgid "adm_new_usergroup_success_header"
msgstr ""
-#: waskaweb/controllers/administration.py:39
+#: waskaweb/controllers/administration.py:62
msgid "adm_new_usergroup_success_text"
msgstr ""
-#: waskaweb/controllers/administration.py:40
+#: waskaweb/controllers/administration.py:63
msgid "adm_new_usergroup_failure_header"
msgstr ""
-#: waskaweb/controllers/administration.py:41
+#: waskaweb/controllers/administration.py:64
msgid "adm_new_usergroup_failure_text"
msgstr ""
-#: waskaweb/controllers/administration.py:42
+#: waskaweb/controllers/administration.py:65
msgid "adm_edit_usergroup_header"
msgstr ""
-#: waskaweb/controllers/administration.py:43
+#: waskaweb/controllers/administration.py:66
msgid "adm_edit_usergroup_text"
msgstr ""
-#: waskaweb/controllers/administration.py:44
+#: waskaweb/controllers/administration.py:67
msgid "adm_delete_usergroup_confirm_header"
msgstr ""
-#: waskaweb/controllers/administration.py:45
+#: waskaweb/controllers/administration.py:68
msgid "adm_delete_usergroup_confirm_text"
msgstr ""
-#: waskaweb/controllers/administration.py:46
+#: waskaweb/controllers/administration.py:69
msgid "adm_delete_usergroup_success_header"
msgstr ""
-#: waskaweb/controllers/administration.py:47
+#: waskaweb/controllers/administration.py:70
msgid "adm_delete_usergroup_success_text"
msgstr ""
-#: waskaweb/controllers/administration.py:48
+#: waskaweb/controllers/administration.py:71
msgid "adm_delete_usergroup_failure_header"
msgstr ""
-#: waskaweb/controllers/administration.py:49
+#: waskaweb/controllers/administration.py:72
msgid "adm_delete_usergroup_failure_text"
msgstr ""
-#: waskaweb/controllers/administration.py:51
+#: waskaweb/controllers/administration.py:74
msgid "adm_delete_user_confirm_header"
msgstr ""
-#: waskaweb/controllers/administration.py:52
+#: waskaweb/controllers/administration.py:75
msgid "adm_delete_user_confirm_text"
msgstr ""
-#: waskaweb/controllers/administration.py:54
+#: waskaweb/controllers/administration.py:77
msgid "adm_set_editor_header"
msgstr ""
-#: waskaweb/controllers/administration.py:55
+#: waskaweb/controllers/administration.py:78
msgid "adm_set_editor_success_text"
msgstr ""
-#: waskaweb/controllers/administration.py:56
+#: waskaweb/controllers/administration.py:79
msgid "adm_set_editor_success_text_rest"
msgstr ""
-#: waskaweb/controllers/administration.py:57
+#: waskaweb/controllers/administration.py:80
msgid "adm_set_editor_success_text_head"
msgstr ""
-#: waskaweb/controllers/administration.py:58
+#: waskaweb/controllers/administration.py:81
msgid "adm_set_editor_success_text_rest_head"
msgstr ""
-#: waskaweb/controllers/administration.py:60
+#: waskaweb/controllers/administration.py:83
msgid "adm_edit_user_header"
msgstr ""
-#: waskaweb/controllers/administration.py:61
+#: waskaweb/controllers/administration.py:84
msgid "adm_edit_user_text"
msgstr ""
-#: waskaweb/controllers/administration.py:63
+#: waskaweb/controllers/administration.py:86
msgid "adm_edit_agency_header"
msgstr ""
-#: waskaweb/controllers/administration.py:64
+#: waskaweb/controllers/administration.py:87
msgid "adm_edit_agency_text"
msgstr ""
-#: waskaweb/controllers/usersettings.py:22
+#: waskaweb/controllers/usersettings.py:45
msgid "adm_edit_standin_success_header"
msgstr ""
-#: waskaweb/controllers/usersettings.py:23
+#: waskaweb/controllers/usersettings.py:46
msgid "adm_edit_standin_success_text"
msgstr ""
-#: waskaweb/lib/evaluation.py:130
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:43
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:64
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:43
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:43
+#: waskaweb/lib/evaluation.py:171
+#: 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:186
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:50
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:50
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:116
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:50
+#: waskaweb/lib/evaluation.py:227
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:44
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:67
msgid "cm_eval_summary_header_4"
msgstr ""
-#: waskaweb/lib/evaluation.py:230
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:51
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:51
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:183
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:51
+#: waskaweb/lib/evaluation.py:271
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:45
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:134
msgid "cm_eval_summary_header_5"
msgstr ""
-#: waskaweb/lib/evaluation.py:280
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:95
+#: waskaweb/lib/evaluation.py:321
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:45
msgid "cm_eval_header_access_youngster_to_agency"
msgstr ""
-#: waskaweb/lib/evaluation.py:325
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:125
+#: waskaweb/lib/evaluation.py:366
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:75
msgid "cm_eval_head_law_access_agency"
msgstr ""
-#: waskaweb/lib/evaluation.py:376
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:65
+#: waskaweb/lib/evaluation.py:417
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:16
msgid "cm_eval_head_where_to_place_youngster"
msgstr ""
-#: waskaweb/lib/evaluation.py:422
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:95
+#: waskaweb/lib/evaluation.py:463
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:46
msgid "cm_eval_header_law_changed_after_place"
msgstr ""
-#: waskaweb/lib/evaluation.py:493
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:151
+#: waskaweb/lib/evaluation.py:538
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:102
msgid "cm_eval_header_on_age"
msgstr ""
-#: waskaweb/lib/evaluation.py:558
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:52
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:52
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:213
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:52
+#: waskaweb/lib/evaluation.py:603
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:46
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:164
msgid "cm_eval_summary_header_6"
msgstr ""
-#: waskaweb/lib/evaluation.py:622
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:63
+#: waskaweb/lib/evaluation.py:667
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:14
msgid "cm_eval_length_cm"
msgstr ""
-#: waskaweb/lib/evaluation.py:663
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:90
+#: waskaweb/lib/evaluation.py:708
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:41
msgid "cm_eval_avg_length_cm"
msgstr ""
-#: waskaweb/lib/evaluation.py:713
+#: waskaweb/lib/evaluation.py:758
msgid "cm_eval_header_graduation"
msgstr ""
-#: waskaweb/lib/evaluation.py:763
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:155
+#: waskaweb/lib/evaluation.py:808
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:105
msgid "cm_eval_header_work"
msgstr ""
-#: waskaweb/lib/renderer.py:209
+#: waskaweb/lib/evaluation.py:817
+msgid "cm_eval_header_effort"
+msgstr ""
+
+#: waskaweb/lib/evaluation.py:923
+msgid "cm_eval_header_effort2"
+msgstr ""
+
+#: waskaweb/lib/evaluation.py:939
+msgid "cm_eval_header_avg_effort"
+msgstr ""
+
+#: waskaweb/lib/evaluation.py:954
+msgid "cm_eval_header_avg_effort2"
+msgstr ""
+
+#: waskaweb/lib/renderer.py:232
msgid "cm_rg_aid_overview_table_institution"
msgstr ""
-#: waskaweb/lib/renderer.py:210
+#: waskaweb/lib/renderer.py:233
msgid "cm_rg_aid_overview_table_offer_type"
msgstr ""
-#: waskaweb/lib/renderer.py:211
+#: waskaweb/lib/renderer.py:234
msgid "cm_rg_aid_overview_table_actions"
msgstr ""
-#: waskaweb/lib/renderer.py:213
+#: waskaweb/lib/renderer.py:236
msgid "cm_rg_aid_overview_table_edit"
msgstr ""
-#: waskaweb/lib/renderer.py:214 waskaweb/lib/renderer.py:215
+#: waskaweb/lib/renderer.py:237 waskaweb/lib/renderer.py:238
#: 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:70
-#: waskaweb/templates/casemanagement/caselist.mako:123
+#: waskaweb/templates/casemanagement/caselist.mako:75
+#: waskaweb/templates/casemanagement/caselist.mako:134
#: waskaweb/templates/casemanagement/reminderlist.mako:4
#: waskaweb/templates/documents/case_overview.mako:42
#: waskaweb/templates/documents/case_overview.mako:53
@@ -275,19 +283,19 @@
msgid "cm_overview_a_show"
msgstr ""
-#: waskaweb/lib/renderer.py:216 waskaweb/lib/renderer.py:217
+#: waskaweb/lib/renderer.py:239 waskaweb/lib/renderer.py:240
#: waskaweb/templates/administration/overview_user.mako:45
#: waskaweb/templates/administration/overview_user.mako:62
#: waskaweb/templates/administration/overview_usergroups.mako:35
#: waskaweb/templates/administration/overview_usergroups.mako:44
#: waskaweb/templates/appointments/appointmentlist.mako:5
-#: waskaweb/templates/casemanagement/agencylist.mako:29
-#: waskaweb/templates/casemanagement/agencylist.mako:39
+#: waskaweb/templates/casemanagement/agencylist.mako:32
+#: waskaweb/templates/casemanagement/agencylist.mako:42
#: waskaweb/templates/casemanagement/appointmentlist.mako:5
-#: waskaweb/templates/casemanagement/caselist.mako:74
-#: waskaweb/templates/casemanagement/caselist.mako:84
-#: waskaweb/templates/casemanagement/caselist.mako:127
-#: waskaweb/templates/casemanagement/caselist.mako:137
+#: 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/reminderlist.mako:7
#: waskaweb/templates/documents/case_overview.mako:44
#: waskaweb/templates/documents/case_overview.mako:55
@@ -296,69 +304,65 @@
msgid "cm_overview_a_delete"
msgstr ""
-#: waskaweb/lib/renderer.py:218
+#: waskaweb/lib/renderer.py:241
msgid "cm_rg_aid_overview_table_no_offer_found"
msgstr ""
-#: waskaweb/lib/renderer.py:219
+#: waskaweb/lib/renderer.py:242
msgid "cm_rg_aid_overview_legend_legend"
msgstr ""
-#: waskaweb/lib/renderer.py:220
+#: waskaweb/lib/renderer.py:243
msgid "cm_rg_aid_overview_legend_bb"
msgstr ""
-#: waskaweb/lib/renderer.py:221
+#: waskaweb/lib/renderer.py:244
msgid "cm_rg_aid_overview_legend_common_educational_area"
msgstr ""
-#: waskaweb/lib/renderer.py:222
+#: waskaweb/lib/renderer.py:245
msgid "cm_rg_aid_overview_legend_bv"
msgstr ""
-#: waskaweb/lib/renderer.py:223
+#: waskaweb/lib/renderer.py:246
msgid "cm_rg_aid_overview_legend_vocational_preparation"
msgstr ""
-#: waskaweb/lib/renderer.py:224
+#: waskaweb/lib/renderer.py:247
msgid "cm_rg_aid_overview_legend_bq"
msgstr ""
-#: waskaweb/lib/renderer.py:225
+#: waskaweb/lib/renderer.py:248
msgid "cm_rg_aid_overview_legend_qualifications"
msgstr ""
-#: waskaweb/lib/renderer.py:226
+#: waskaweb/lib/renderer.py:249
msgid "cm_rg_aid_overview_legend_lb"
msgstr ""
-#: waskaweb/lib/renderer.py:227
+#: waskaweb/lib/renderer.py:250
msgid "cm_rg_aid_overview_legend_life_skills"
msgstr ""
-#: waskaweb/lib/renderer.py:228
+#: waskaweb/lib/renderer.py:251
msgid "cm_rg_aid_overview_legend_new_offer"
msgstr ""
-#: waskaweb/model/case.py:1000 waskaweb/templates/casemanagement/caselist.mako:57
-#: waskaweb/templates/casemanagement/caselist.mako:110
+#: waskaweb/model/case.py:1034 waskaweb/model/case.py:1035
+#: waskaweb/templates/casemanagement/caselist.mako:64
+#: waskaweb/templates/casemanagement/caselist.mako:123
msgid "case_state_label_open"
msgstr ""
-#: waskaweb/model/case.py:1001 waskaweb/templates/casemanagement/caselist.mako:59
-#: waskaweb/templates/casemanagement/caselist.mako:112
-msgid "case_state_label_closed"
-msgstr ""
-
-#: waskaweb/model/case.py:1002
+#: waskaweb/model/case.py:1036
msgid "case_state_label_outstanding_delete"
msgstr ""
-#: waskaweb/model/case.py:1003
+#: waskaweb/model/case.py:1037
msgid "case_state_label_outstanding_anon"
msgstr ""
-#: waskaweb/model/case.py:1004
+#: waskaweb/model/case.py:1038
msgid "case_state_label_anon"
msgstr ""
@@ -678,7 +682,6 @@
#: waskaweb/templates/administration/new_user.mako:36
#: waskaweb/templates/administration/new_user_result.mako:22
#: waskaweb/templates/administration/show_user_body.mako:2
-#: waskaweb/templates/administration/userform_body.mako:4
msgid "adm_form_legend_personal"
msgstr ""
@@ -686,7 +689,6 @@
#: waskaweb/templates/administration/edit_user.mako:41
#: waskaweb/templates/administration/new_user.mako:39
#: waskaweb/templates/administration/new_user.mako:42
-#: waskaweb/templates/administration/userform_body.mako:7
msgid "adm_form_user_firstname"
msgstr ""
@@ -694,13 +696,11 @@
#: waskaweb/templates/administration/edit_user.mako:50
#: waskaweb/templates/administration/new_user.mako:48
#: waskaweb/templates/administration/new_user.mako:51
-#: waskaweb/templates/administration/userform_body.mako:12
msgid "adm_form_user_lastname"
msgstr ""
#: waskaweb/templates/administration/edit_user.mako:56
#: waskaweb/templates/administration/new_user.mako:57
-#: waskaweb/templates/administration/userform_body.mako:17
msgid "adm_form_user_telephone"
msgstr ""
@@ -716,26 +716,22 @@
#: waskaweb/templates/administration/edit_user.mako:70
#: waskaweb/templates/administration/new_user.mako:71
#: waskaweb/templates/administration/new_user_result.mako:46
-#: waskaweb/templates/administration/userform_body.mako:21
#: waskaweb/templates/usersettings/change_password_login.mako:17
msgid "adm_form_legend_login"
msgstr ""
#: waskaweb/templates/administration/edit_user.mako:88
#: waskaweb/templates/administration/new_user.mako:104
-#: waskaweb/templates/administration/userform_body.mako:28
msgid "adm_form_user_activated"
msgstr ""
#: waskaweb/templates/administration/edit_user.mako:96
#: waskaweb/templates/administration/new_user.mako:108
-#: waskaweb/templates/administration/userform_body.mako:36
msgid "adm_form_user_newpass"
msgstr ""
#: waskaweb/templates/administration/edit_user.mako:99
#: waskaweb/templates/administration/new_user.mako:111
-#: waskaweb/templates/administration/userform_body.mako:54
msgid "adm_form_user_submit"
msgstr ""
@@ -811,7 +807,6 @@
#: waskaweb/templates/administration/new_user.mako:74
#: waskaweb/templates/administration/new_user.mako:77
-#: waskaweb/templates/administration/userform_body.mako:40
msgid "adm_form_user_login"
msgstr ""
@@ -931,8 +926,8 @@
msgstr ""
#: waskaweb/templates/administration/overview_usergroups.mako:53
-#: waskaweb/templates/casemanagement/agencylist.mako:48
-#: waskaweb/templates/casemanagement/caselist.mako:147
+#: waskaweb/templates/casemanagement/agencylist.mako:51
+#: waskaweb/templates/casemanagement/caselist.mako:158
msgid "cm_overview_tbl_no_data_found"
msgstr ""
@@ -1080,14 +1075,6 @@
msgid "adm_np_edituser_success"
msgstr ""
-#: waskaweb/templates/administration/userform_body.mako:45
-msgid "adm_form_user_passwd"
-msgstr ""
-
-#: waskaweb/templates/administration/userform_body.mako:50
-msgid "adm_form_user_passwd_confirm"
-msgstr ""
-
#: waskaweb/templates/administration/dialogs/confirm_deleteuser.mako:7
msgid "adm_np_delteuser"
msgstr ""
@@ -1419,6 +1406,7 @@
#: 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_result_0.mako:6
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:6
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:6
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:6
@@ -1445,20 +1433,20 @@
msgid "cm_form_overview_search_submit"
msgstr ""
-#: waskaweb/templates/casemanagement/agencylist.mako:6
+#: waskaweb/templates/casemanagement/agencylist.mako:9
msgid "cm_overview_tbl_header_fkz"
msgstr ""
-#: waskaweb/templates/casemanagement/agencylist.mako:10
+#: waskaweb/templates/casemanagement/agencylist.mako:13
msgid "cm_overview_tbl_header_number_cases"
msgstr ""
-#: waskaweb/templates/casemanagement/agencylist.mako:14
+#: waskaweb/templates/casemanagement/agencylist.mako:17
msgid "cm_overview_tbl_header_last_update"
msgstr ""
-#: waskaweb/templates/casemanagement/agencylist.mako:18
-#: waskaweb/templates/casemanagement/caselist.mako:31
+#: waskaweb/templates/casemanagement/agencylist.mako:21
+#: waskaweb/templates/casemanagement/caselist.mako:30
msgid "cm_overview_tbl_header_actions"
msgstr ""
@@ -1477,6 +1465,7 @@
#: waskaweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako:4
#: waskaweb/templates/casemanagement/dialogs/confirm_delete_attachment.mako:4
#: waskaweb/templates/casemanagement/dialogs/confirm_markanonymize.mako:5
+#: waskaweb/templates/casemanagement/dialogs/confirm_markanonymizeFromOverview.mako:5
#: waskaweb/templates/casemanagement/dialogs/confirm_open.mako:5
#: waskaweb/templates/casemanagement/dialogs/delete_attachment_success.mako:6
#: waskaweb/templates/casemanagement/dialogs/failed_delete_appointment.mako:5
@@ -1575,44 +1564,44 @@
msgid "cm_overview_tbl_header_accesstime"
msgstr ""
-#: waskaweb/templates/casemanagement/caselist.mako:30
+#: waskaweb/templates/casemanagement/caselist.mako:29
msgid "cm_overview_tbl_header_status"
msgstr ""
-#: waskaweb/templates/casemanagement/caselist.mako:51
-#: waskaweb/templates/casemanagement/caselist.mako:104
+#: waskaweb/templates/casemanagement/caselist.mako:58
+#: waskaweb/templates/casemanagement/caselist.mako:117
msgid "cm_overview_img_editor"
msgstr ""
-#: waskaweb/templates/casemanagement/caselist.mako:53
-#: waskaweb/templates/casemanagement/caselist.mako:106
+#: waskaweb/templates/casemanagement/caselist.mako:60
+#: waskaweb/templates/casemanagement/caselist.mako:119
msgid "cm_overview_img_standin"
msgstr ""
-#: waskaweb/templates/casemanagement/caselist.mako:61
-#: waskaweb/templates/casemanagement/caselist.mako:114
+#: waskaweb/templates/casemanagement/caselist.mako:66
+#: waskaweb/templates/casemanagement/caselist.mako:125
msgid "case_state_label_delete"
msgstr ""
-#: waskaweb/templates/casemanagement/caselist.mako:63
-#: waskaweb/templates/casemanagement/caselist.mako:116
+#: waskaweb/templates/casemanagement/caselist.mako:68
+#: waskaweb/templates/casemanagement/caselist.mako:127
msgid "case_state_label_markanonym"
msgstr ""
-#: waskaweb/templates/casemanagement/caselist.mako:65
-#: waskaweb/templates/casemanagement/caselist.mako:118
+#: waskaweb/templates/casemanagement/caselist.mako:70
+#: waskaweb/templates/casemanagement/caselist.mako:129
msgid "case_state_label_anonym"
msgstr ""
-#: waskaweb/templates/casemanagement/caselist.mako:77
-#: waskaweb/templates/casemanagement/caselist.mako:83
-#: waskaweb/templates/casemanagement/caselist.mako:130
-#: waskaweb/templates/casemanagement/caselist.mako:136
+#: waskaweb/templates/casemanagement/caselist.mako:82
+#: waskaweb/templates/casemanagement/caselist.mako:88
+#: waskaweb/templates/casemanagement/caselist.mako:141
+#: waskaweb/templates/casemanagement/caselist.mako:147
msgid "cm_overview_a_anonymize"
msgstr ""
-#: waskaweb/templates/casemanagement/caselist.mako:80
-#: waskaweb/templates/casemanagement/caselist.mako:133
+#: waskaweb/templates/casemanagement/caselist.mako:85
+#: waskaweb/templates/casemanagement/caselist.mako:144
msgid "cm_overview_a_restore"
msgstr ""
@@ -1628,64 +1617,64 @@
msgid "cm_np_digest"
msgstr ""
-#: waskaweb/templates/casemanagement/digest.mako:12
+#: waskaweb/templates/casemanagement/digest_body.mako:5
msgid "cm_header_digest"
msgstr ""
-#: waskaweb/templates/casemanagement/digest.mako:56
+#: waskaweb/templates/casemanagement/digest_body.mako:51
msgid "cm_header_digest_youth"
msgstr ""
-#: waskaweb/templates/casemanagement/digest.mako:59
-#: waskaweb/templates/casemanagement/digest.mako:113
+#: waskaweb/templates/casemanagement/digest_body.mako:54
+#: waskaweb/templates/casemanagement/digest_body.mako:108
msgid "cm_digest_tbl_label_lastname"
msgstr ""
-#: waskaweb/templates/casemanagement/digest.mako:63
-#: waskaweb/templates/casemanagement/digest.mako:117
+#: waskaweb/templates/casemanagement/digest_body.mako:58
+#: waskaweb/templates/casemanagement/digest_body.mako:112
msgid "cm_digest_tbl_label_firstname"
msgstr ""
-#: waskaweb/templates/casemanagement/digest.mako:67
+#: waskaweb/templates/casemanagement/digest_body.mako:62
msgid "cm_digest_tbl_label_caseid"
msgstr ""
-#: waskaweb/templates/casemanagement/digest.mako:71
+#: waskaweb/templates/casemanagement/digest_body.mako:66
msgid "cm_digest_tbl_label_age"
msgstr ""
-#: waskaweb/templates/casemanagement/digest.mako:75
-#: waskaweb/templates/casemanagement/digest.mako:121
+#: waskaweb/templates/casemanagement/digest_body.mako:70
+#: waskaweb/templates/casemanagement/digest_body.mako:116
msgid "cm_digest_tbl_label_email"
msgstr ""
-#: waskaweb/templates/casemanagement/digest.mako:85
+#: waskaweb/templates/casemanagement/digest_body.mako:80
msgid "cm_digest_tbl_label_street"
msgstr ""
-#: waskaweb/templates/casemanagement/digest.mako:89
+#: waskaweb/templates/casemanagement/digest_body.mako:84
msgid "cm_digest_tbl_label_plz"
msgstr ""
-#: waskaweb/templates/casemanagement/digest.mako:93
+#: waskaweb/templates/casemanagement/digest_body.mako:88
msgid "cm_digest_tbl_label_city"
msgstr ""
-#: waskaweb/templates/casemanagement/digest.mako:97
-#: waskaweb/templates/casemanagement/digest.mako:131
+#: waskaweb/templates/casemanagement/digest_body.mako:92
+#: waskaweb/templates/casemanagement/digest_body.mako:126
msgid "cm_digest_tbl_label_telephone"
msgstr ""
-#: waskaweb/templates/casemanagement/digest.mako:101
-#: waskaweb/templates/casemanagement/digest.mako:135
+#: waskaweb/templates/casemanagement/digest_body.mako:96
+#: waskaweb/templates/casemanagement/digest_body.mako:130
msgid "cm_digest_tbl_label_mobiletelephone"
msgstr ""
-#: waskaweb/templates/casemanagement/digest.mako:105
+#: waskaweb/templates/casemanagement/digest_body.mako:100
msgid "cm_digest_tbl_label_telephone_more"
msgstr ""
-#: waskaweb/templates/casemanagement/digest.mako:110
+#: waskaweb/templates/casemanagement/digest_body.mako:105
msgid "cm_header_digest_parent"
msgstr ""
@@ -1914,6 +1903,7 @@
#: waskaweb/templates/casemanagement/dialogs/confirm_anonymize.mako:6
#: waskaweb/templates/casemanagement/dialogs/confirm_bundle_anonymize.mako:6
#: waskaweb/templates/casemanagement/dialogs/confirm_markanonymize.mako:6
+#: waskaweb/templates/casemanagement/dialogs/confirm_markanonymizeFromOverview.mako:6
#: waskaweb/templates/casemanagement/dialogs/failed_anonymize.mako:5
#: waskaweb/templates/casemanagement/dialogs/failed_markanonymize.mako:5
#: waskaweb/templates/casemanagement/dialogs/failed_xml_import.mako:5
@@ -2022,238 +2012,246 @@
msgid "cm_np_restore_success"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:7
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:7
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:7
-msgid "cm_np_evaluate_result"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:9
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:9
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:9
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:2
msgid "cm_header_evaluate_result"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:41
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:59
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:41
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:41
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:35
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:10
msgid "eval_group_header_all"
msgstr ""
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:38
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:44
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:94
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:44
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:44
msgid "cm_eval_summary_header_2"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:45
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:187
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:45
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:45
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:39
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:137
msgid "cm_eval_summary_header_11"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:47
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:47
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:59
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:47
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:41
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:10
msgid "eval_group_header_incm"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:49
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:49
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:62
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:49
+#: 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_result_1.mako:54
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:54
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:54
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:59
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:48
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:10
msgid "eval_group_header_finished"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:56
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:56
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:56
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:64
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:50
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:15
msgid "cm_eval_summary_header_7"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:61
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:51
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:78
+msgid "cm_eval_summary_header_15"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:53
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_0.mako:10
+msgid "eval_group_header_finished2"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:55
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_0.mako:15
+msgid "cm_eval_summary_header_14"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_0.mako:7
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:7
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:7
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:7
+msgid "cm_np_evaluate_result"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_0.mako:12
+msgid "eval_group_note_finished2"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_0.mako:18
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_0.mako:21
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:41
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:74
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:104
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:134
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:166
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:40
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:64
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:101
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:131
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:161
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:193
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:45
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:75
+msgid "cm_eval_table_to_overview"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_0.mako:18
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_0.mako:21
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:41
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:74
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:104
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:134
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:166
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:40
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:64
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:101
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:131
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:161
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:193
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:45
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:75
+msgid "cm_eval_table_export_analysis"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:12
msgid "eval_group_note_all"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:67
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:18
msgid "cm_eval_table_adolescent"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:68
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:99
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:129
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:159
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:191
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:121
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:155
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:187
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:217
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:69
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:99
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:19
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:49
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:79
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:109
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:141
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:72
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:106
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:138
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:168
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:20
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:50
msgid "cm_eval_table_number"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:69
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:100
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:130
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:160
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:192
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:122
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:156
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:188
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:218
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:70
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:100
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:20
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:50
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:80
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:110
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:142
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:73
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:107
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:139
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:169
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:21
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:51
msgid "cm_eval_table_percent"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:73
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:24
msgid "cm_eval_table_all_customer"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:79
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:30
msgid "cm_eval_table_consult_customer"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:85
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:36
msgid "cm_eval_table_taken_over_to_cm"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:91
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:124
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:154
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:184
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:216
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:89
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:113
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:150
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:180
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:210
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:242
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:94
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:124
-msgid "cm_eval_table_to_overview"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:91
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:124
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:154
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:184
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:216
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:89
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:113
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:150
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:180
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:210
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:242
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:94
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:124
-msgid "cm_eval_table_export_analysis"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:98
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:48
msgid "cm_eval_table_access"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:128
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:78
msgid "cm_eval_table_law"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:158
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:108
msgid "cm_eval_table_work"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:190
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:140
msgid "cm_eval_table_graduation"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:60
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:11
msgid "eval_group_note_incm"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:66
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:17
msgid "cm_eval_table_month"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:67
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:93
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:18
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:44
msgid "cm_eval_table_completed"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:68
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:94
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:19
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:45
msgid "cm_eval_table_aborted"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:117
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:68
msgid "cm_eval_header_on_gender"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:120
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:71
msgid "cm_eval_table_gender"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:126
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:77
msgid "cm_eval_label_male"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:132
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:83
msgid "cm_eval_label_female"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:138
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:89
msgid "cm_eval_label_intersexual"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:144
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:95
msgid "cm_eval_label_unknown"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:154
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:105
msgid "cm_eval_table_age"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:186
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:137
msgid "cm_eval_table_category"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:192
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:143
msgid "cm_eval_label_migration_background"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:198
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:149
msgid "cm_eval_label_no_migration_background"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:204
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:155
msgid "cm_eval_label_ka_migration_background"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:216
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:167
msgid "cm_eval_table_offer"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:61
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:12
msgid "eval_group_note_finished"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:68
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:19
msgid "cm_eval_table_place"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:98
+#: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:49
msgid "cm_eval_table_law_change"
msgstr ""
@@ -2397,14 +2395,6 @@
msgid "cm_overview_a_keepactive"
msgstr ""
-#: waskaweb/templates/start/responsible.mako:82
-msgid "responsible_info_sponsorship"
-msgstr ""
-
-#: waskaweb/templates/start/responsible.mako:85
-msgid "responsible_project_sponsorship"
-msgstr ""
-
#: waskaweb/templates/start/responsible.mako:126
msgid "responsible_realisation"
msgstr ""
Modified: trunk/waskaweb/lib/evaluation.py
===================================================================
--- trunk/waskaweb/lib/evaluation.py 2008-08-13 13:19:58 UTC (rev 69)
+++ trunk/waskaweb/lib/evaluation.py 2008-08-13 13:20:27 UTC (rev 70)
@@ -34,6 +34,7 @@
import cStringIO as StringIO
from waskaweb.model.agency import AgencyBundle
+from waskaweb.model.logbook import KIND2TEXT, AVGKIND2TEXT, SUMKIND2TEXT
from waskaweb.lib.db import db
from waskaweb.lib.search import AgencySearch
from waskaweb.lib.sql_helper import where_ids
@@ -809,4 +810,148 @@
for v in p.itervalues():
f.write("%s;%s;%s%%\r\n" % (v[0], v[1], v[2]))
+class Evaluation_14(Evaluation):
+ """Zeitaufwände aus dem Logbuch abgeschlossene Beratungsfälle"""
+ def __init__(self, compressed_ids):
+ Evaluation.__init__(self, compressed_ids)
+ self.export_label = _('cm_eval_header_effort')
+ self.sql = """SELECT sum(l.dauer) AS dauer, count(l.dauer) AS anzahl, l.art
+ FROM ka_logbuch_tbl_view l
+ JOIN master_tbl_eval_total_view m
+ ON m.id = l.master_id
+ WHERE m.id NOT IN (SELECT id from master_tbl_eval_incm_view)
+ AND m.kompetenzfeststellung = 0
+ AND %s
+ AND l.dauer IS NOT NULL
+ GROUP BY l.art
+ ORDER BY l.art
+ """ % self.where_clause(self.compressed_ids, "l.master_id")
+
+ def perform(self):
+ #{'art': [anzahl, dauer]}
+ result = { '-2': [0,0],
+ '-1': [0,0],
+ '1': [0,0],
+ '2': [0,0],
+ '3': [0,0],
+ '4': [0,0],
+ '5': [0,0],
+ '6': [0,0],
+ '7': [0,0],
+ '8': [0,0],
+ '9': [0,0],
+ '10': [0,0],
+ 'sum_cat1': [0,0],
+ 'sum_cat2': [0,0],
+ 'sum_cat3': [0,0],
+ 'sum_cat4': [0,0],
+ 'sum_all': [0,0],
+ 'avg_cat1': [0,0],
+ 'avg_cat2': [0,0],
+ 'avg_cat3': [0,0],
+ 'avg_cat4': [0,0],
+ 'avg_all': [0,0]
+ }
+ try:
+ try:
+ conn = db.getConnection()
+ cur = conn.cursor()
+ cur.execute(self.sql)
+ count = 0
+ while True:
+ row = cur.fetchone()
+ if not row: break
+ count += 1
+ duration = int(h.timedelta_in_minutes(row[0]))
+ num = row[1]
+ type = str(row[2])
+
+ result[type][0] += num
+ result[type][1] += duration
+
+ if type in ['1','2','3','4','9','10']:
+ result['sum_cat1'][0] += num
+ result['sum_cat1'][1] += int(duration)
+ if type in ['5','6','7','8']:
+ result['sum_cat2'][0] += num
+ result['sum_cat2'][1] += int(duration)
+ if type in ['-1']:
+ result['sum_cat3'][0] += num
+ result['sum_cat3'][1] += int(duration)
+ if type in ['-2']:
+ result['sum_cat4'][0] += num
+ result['sum_cat4'][1] += int(duration)
+
+ result['sum_all'][0] += num
+ result['sum_all'][1] += int(duration)
+
+ divisor = count
+ if divisor == 0:
+ divisor = 1
+
+ result['avg_cat1'][0] = count
+ result['avg_cat1'][1] = h.formatNumber(float(result['sum_cat1'][1] / divisor))
+ result['avg_cat2'][0] = count
+ result['avg_cat2'][1] = h.formatNumber(float(result['sum_cat2'][1] / divisor))
+ result['avg_cat3'][0] = count
+ result['avg_cat3'][1] = h.formatNumber(float(result['sum_cat3'][1] / divisor))
+ result['avg_cat4'][0] = count
+ result['avg_cat4'][1] = h.formatNumber(float(result['sum_cat4'][1] / divisor))
+ result['avg_all'][0] = count
+ result['avg_all'][1] = h.formatNumber(float(result['sum_all'][1] / divisor))
+
+ return result
+ except StandardError, e:
+ traceback.print_exc(file=sys.stderr)
+ print >> sys.stderr, "No results for eval 14"
+ finally:
+ db.recycleConnection(conn, cur)
+
+ def doExport(self, f):
+ p = self.perform()
+ f.write(u"#%s - %s Fälle (Auswertung: Abgeschlossene Beratung)\r\n" % (self.export_label, p['avg_all'][0]))
+ f.write(u"Aktivität;Anzahl;Dauer\r\n")
+ items = ['sum_cat1','1','2','3','4','9','10','sum_cat2','5','6','7','8','-1','-2','sum_all']
+ for key in items:
+ v = p.get(key)
+ f.write("%s;%s;%s\r\n" % (KIND2TEXT.get(key, SUMKIND2TEXT.get(key)), v[0], v[1]))
+
+class Evaluation_15(Evaluation_14):
+ """Zeitaufwände aus dem Logbuch (abgeschlossene CM-Fälle)"""
+ def __init__(self, compressed_ids):
+ Evaluation_14.__init__(self, compressed_ids)
+ self.export_label = _('cm_eval_header_effort2')
+ self.sql = """SELECT sum(l.dauer) AS dauer, count(l.dauer) AS anzahl, l.art
+ FROM ka_logbuch_tbl_view l
+ JOIN master_tbl_eval_incm_view m
+ ON m.id = l.master_id
+ WHERE m.art_beendigung <> -1
+ AND %s
+ AND l.dauer IS NOT NULL
+ GROUP BY l.art
+ ORDER BY l.art
+ """ % self.where_clause(self.compressed_ids, "l.master_id")
+
+class Evaluation_16(Evaluation_14):
+ """Durchschnitt Zeitaufwand abgeschlossene Beratung"""
+ def __init__(self, compressed_ids):
+ Evaluation_14.__init__(self, compressed_ids)
+ self.export_label = _('cm_eval_header_avg_effort')
+
+ def doExport(self, f):
+ p = self.perform()
+ f.write(u"#%s - %s Fälle (Auswertung: Abgeschlossene Beratung)\r\n" % (self.export_label, p['avg_all'][0]))
+ f.write(u"Aktivität;Durchschnitt Aufwand\r\n")
+ items = ['avg_cat1','avg_cat2','avg_cat3','avg_cat4','avg_all']
+ for key in items:
+ v = p.get(key)
+ f.write("%s;%s\r\n" % (AVGKIND2TEXT.get(key), v[1]))
+
+class Evaluation_17(Evaluation_15):
+ """Durchschnitt Zeitaufwand abgeschlossene Beratung"""
+ def __init__(self, compressed_ids):
+ Evaluation_15.__init__(self, compressed_ids)
+ self.export_label = _('cm_eval_header_avg_effort2')
+
+
# vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8:
Modified: trunk/waskaweb/model/case.py
===================================================================
--- trunk/waskaweb/model/case.py 2008-08-13 13:19:58 UTC (rev 69)
+++ trunk/waskaweb/model/case.py 2008-08-13 13:20:27 UTC (rev 70)
@@ -1032,7 +1032,7 @@
def getStateLabel(self):
state_labels = {'1' : _('case_state_label_open'),
- '2' : _('case_state_label_closed'),
+ '2' : _('case_state_label_open'),
'3' : _('case_state_label_outstanding_delete'),
'4' : _('case_state_label_outstanding_anon'),
'5' : _('case_state_label_anon')
Modified: trunk/waskaweb/model/logbook.py
===================================================================
--- trunk/waskaweb/model/logbook.py 2008-08-13 13:19:58 UTC (rev 69)
+++ trunk/waskaweb/model/logbook.py 2008-08-13 13:20:27 UTC (rev 70)
@@ -30,24 +30,41 @@
from waskaweb.lib.db import db
import waskaweb.lib.helpers as h
+from waskaweb.lib.sql_helper import range_compress
+from waskaweb.model.case import CaseBundle
from datetime import timedelta
KIND2TEXT = {
- -2: u'Sonstiges',
- -1: u'Keine Angabe',
- 0: u'Automatischer Eintrag',
- 1: u'Gespräch mit dem Jugendlichen',
- 2: u'Telefonat mit dem Jugendlichen',
- 3: u'Begleitung des Jugendlichen zu externen Stellen',
- 4: u'Betreuung des Jugendlichen',
- 5: u'Schriftverkehr',
- 6: u'Gespräch/Telefonat mit Kooperationspartnern',
- 7: u'Gespräch/Telefonat mit Dritten',
- 8: u'Fallkonferenz (Fallbesprechung, Supervision)',
- 9: u'Erstgespräch',
- 10: u'Kompetentfeststellung' }
+ '-2': u'Sonstiges',
+ '-1': u'Keine Angabe',
+ '0': u'Automatischer Eintrag',
+ '1': u'Gespräch mit dem Jugendlichen',
+ '2': u'Telefonat mit dem Jugendlichen',
+ '3': u'Begleitung des Jugendlichen zu externen Stellen',
+ '4': u'Betreuung des Jugendlichen',
+ '5': u'Schriftverkehr',
+ '6': u'Gespräch/Telefonat mit Kooperationspartnern',
+ '7': u'Gespräch/Telefonat mit Dritten',
+ '8': u'Fallkonferenz (Fallbesprechung, Supervision)',
+ '9': u'Erstgespräch',
+ '10': u'Kompetentfeststellung' }
+# sum_cat1 = 1,2,3,4,9,10, sum_cat2 = 5,6,7,8
+SUMKIND2TEXT = {
+ 'sum_cat1': u'unmittelbare Arbeit mit dem Jugendlichen',
+ 'sum_cat2': u'Arbeit mit den Dritten',
+ 'sum_cat3': u'Sonstiges',
+ 'sum_cat4': u'Keine Angabe',
+ 'sum_all': u'Gesamt' }
+
+AVGKIND2TEXT = {
+ 'avg_cat1': u'unmittelbare Arbeit mit dem Jugendlichen',
+ 'avg_cat2': u'Arbeit mit den Dritten',
+ 'avg_cat3': u'Sonstiges',
+ 'avg_cat4': u'Keine Angabe',
+ 'avg_all': u'Gesamt' }
+
LOAD_LOGBOOK = """
SELECT l.id AS id, datum, b.vorname AS vorname, b.nachname AS nachname, art, kurz_notiz, notiz, dauer
FROM ka_logbuch_tbl_view l LEFT JOIN ka_benutzer_tbl_view b
@@ -150,7 +167,7 @@
def getKind(self, empty='-/-'):
if self.art == -2:
return "Sonstiges: %s" % self.getShortNotice(empty)
- return KIND2TEXT.get(self.art, empty);
+ return KIND2TEXT.get(str(self.art), empty);
def setKind(self, art):
self.art = art
@@ -271,6 +288,13 @@
finally:
db.recycleConnection(conn, cur)
+ def getEvaluation(self):
+ # Build casebundle with on single case
+ from waskaweb.lib.evaluation import Evaluation_14
+ cb = CaseBundle([self.mid])
+ eval = Evaluation_14(range_compress(cb.listDatasetIds()))
+ return eval.perform()
+
class LogbookEntryChecker:
def __init__(self, params, check_case_id=True):
errors = []
Modified: trunk/waskaweb/public/styles/all.css
===================================================================
--- trunk/waskaweb/public/styles/all.css 2008-08-13 13:19:58 UTC (rev 69)
+++ trunk/waskaweb/public/styles/all.css 2008-08-13 13:20:27 UTC (rev 70)
@@ -116,6 +116,10 @@
text-align: left;
}
+table.evaluation td.num, th.num {
+ text-align: right;
+}
+
td.eval_group_finished {
width: 1em;
background-image: url('/images/eval_finished_bg.png');
Modified: trunk/waskaweb/templates/casemanagement/caselist.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/caselist.mako 2008-08-13 13:19:58 UTC (rev 69)
+++ trunk/waskaweb/templates/casemanagement/caselist.mako 2008-08-13 13:20:27 UTC (rev 70)
@@ -60,10 +60,8 @@
<img src="/images/icons/stand-in_grey.gif" border="0" alt="${_('cm_overview_img_standin')}" title="${_('cm_overview_img_standin')}">
% endif
% endif
- % if case.getState().getState() == 1:
+ % if case.getState().getState() in (1,2):
<img src="/images/icons/work_in_progress_grey.gif" border="0" alt="${_('case_state_label_open')}" title="${_('case_state_label_open')}">
- % elif case.getState().getState() == 2:
- <img src="/images/icons/done_grey.gif" border="0" alt="${_('case_state_label_closed')}" title="${_('case_state_label_closed')}">
% elif case.getState().getState() == 3:
<img src="/images/icons/delete_grey.gif" border="0" alt="${_('case_state_label_delete')}" title="${_('case_state_label_delete')}">
% elif case.getState().getState() == 4:
@@ -121,10 +119,8 @@
<img src="/images/icons/stand-in_grey.gif" border="0" alt="${_('cm_overview_img_standin')}" title="${_('cm_overview_img_standin')}">
% endif
% endif
- % if case.getState().getState() == 1:
+ % if case.getState().getState() in (1,2):
<img src="/images/icons/work_in_progress_grey.gif" border="0" alt="${_('case_state_label_open')}" title="${_('case_state_label_open')}">
- % elif case.getState().getState() == 2:
- <img src="/images/icons/done_grey.gif" border="0" alt="${_('case_state_label_closed')}" title="${_('case_state_label_closed')}">
% elif case.getState().getState() == 3:
<img src="/images/icons/delete_grey.gif" border="0" alt="${_('case_state_label_delete')}" title="${_('case_state_label_delete')}">
% elif case.getState().getState() == 4:
Added: trunk/waskaweb/templates/casemanagement/evaluation/evaluation_avg_effort.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/evaluation/evaluation_avg_effort.mako 2008-08-13 13:19:58 UTC (rev 69)
+++ trunk/waskaweb/templates/casemanagement/evaluation/evaluation_avg_effort.mako 2008-08-13 13:20:27 UTC (rev 70)
@@ -0,0 +1,22 @@
+## -*- coding: utf-8 -*-
+<table class="evaluation">
+ <tr>
+ <th class="table_header_h table_width_long">Aktivität</th>
+ <th class="table_header_h table_width_mid_s num">Durchschnitt Aufwand (Minuten)</th>
+ </tr>
+ <tr>
+ <td>unmittelbare Arbeit mit dem Jugendlichen:</td><td class="num">${c.eval_avg_effort['avg_cat1'][1]}</td>
+ </tr>
+ <tr class="table_row_v_12">
+ <td>Arbeit mit den Dritten:</td><td class="num">${c.eval_avg_effort['avg_cat2'][1]}</td>
+ </tr>
+ <tr>
+ <td>Sonstiges</td><td class="num">${c.eval_avg_effort['avg_cat3'][1]}</td>
+ </tr>
+ <tr class="table_row_v_12">
+ <td>Keine Angabe</td><td class="num">${c.eval_avg_effort['avg_cat4'][1]}</td>
+ </tr>
+ <tr>
+ <td>GESAMT</td><td class="num">${c.eval_avg_effort['avg_all'][1]}</td>
+ </tr>
+</table>
Added: trunk/waskaweb/templates/casemanagement/evaluation/evaluation_effort.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/evaluation/evaluation_effort.mako 2008-08-13 13:19:58 UTC (rev 69)
+++ trunk/waskaweb/templates/casemanagement/evaluation/evaluation_effort.mako 2008-08-13 13:20:27 UTC (rev 70)
@@ -0,0 +1,53 @@
+## -*- coding: utf-8 -*-
+<table class="evaluation">
+ <tr>
+ <th class="table_header_h table_width_long">Aktivität</th>
+ <th class="table_header_h table_width_mid_s num">Anzahl</th>
+ <th class="table_header_h table_width_mid_s num">Aufwand (Minuten)</th>
+ </tr>
+ <tr>
+ <td><b>unmittelbare Arbeit mit dem Jugendlichen:</td><td class="num"><b>${c.eval_effort['sum_cat1'][0]}</b></td><td class="num"><b>${c.eval_effort['sum_cat1'][1]}</b></td>
+ </tr>
+ <tr>
+ <td> Gespräch mit dem Jugendlichen</td><td class="num">${c.eval_effort['1'][0]}</td><td class="num">${c.eval_effort['1'][1]}</td>
+ </tr>
+ <tr>
+ <td> Telefonat mit dem Jugendlichen</td><td class="num">${c.eval_effort['2'][0]}</td><td class="num">${c.eval_effort['2'][1]}</td>
+ </tr>
+ <tr>
+ <td> Begleitung des Jugendlichen zu externen Stellen</td><td class="num">${c.eval_effort['3'][0]}</td><td class="num">${c.eval_effort['3'][1]}</td>
+ </tr>
+ <tr>
+ <td> Betreuung des Jugendlichen</td><td class="num">${c.eval_effort['4'][0]}</td><td class="num">${c.eval_effort['4'][1]}</td>
+ </tr>
+ <tr>
+ <td> Erstgespräch</td><td class="num">${c.eval_effort['9'][0]}</td><td class="num">${c.eval_effort['9'][1]}</td>
+ </tr>
+ <tr>
+ <td> Kompetenzfeststellung</td><td class="num">${c.eval_effort['10'][0]}</td><td class="num">${c.eval_effort['10'][1]}</td>
+ </tr>
+ <tr class="table_row_v_12">
+ <td><b>Arbeit mit den Dritten:</b></td><td class="num"><b>${c.eval_effort['sum_cat2'][0]}</td><td class="num"><b>${c.eval_effort['sum_cat2'][1]}</b></td>
+ </tr>
+ <tr class="table_row_v_12">
+ <td> Schriftverkehr</td><td class="num">${c.eval_effort['5'][0]}</td><td class="num">${c.eval_effort['5'][1]}</td>
+ </tr>
+ <tr class="table_row_v_12">
+ <td> Gespräch/Telefonat mit Kooperationspartnern</td><td class="num">${c.eval_effort['6'][0]}</td><td class="num">${c.eval_effort['6'][1]}</td>
+ </tr>
+ <tr class="table_row_v_12">
+ <td> Gespräch/Telefonat mit Dritten</td><td class="num">${c.eval_effort['7'][0]}</td><td class="num">${c.eval_effort['7'][1]}</td>
+ </tr>
+ <tr class="table_row_v_12">
+ <td> Fallkonferenz</td><td class="num">${c.eval_effort['8'][0]}</td><td class="num">${c.eval_effort['8'][1]}</td>
+ </tr>
+ <tr>
+ <td><b>Sonstiges</b></td><td class="num">${c.eval_effort['-2'][0]}</td><td class="num">${c.eval_effort['-2'][1]}</td>
+ </tr>
+ <tr class="table_row_v_12">
+ <td><b>Keine Angabe</b></td><td class="num">${c.eval_effort['-1'][0]}</td><td class="num">${c.eval_effort['-1'][1]}</td>
+ </tr>
+ <tr>
+ <td><b>GESAMT</b></td><td class="num"><b>${c.eval_effort['sum_all'][0]}</b></td><td class="num"><b>${c.eval_effort['sum_all'][1]}</b></td>
+ </tr>
+</table>
Added: trunk/waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako 2008-08-13 13:19:58 UTC (rev 69)
+++ trunk/waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako 2008-08-13 13:20:27 UTC (rev 70)
@@ -0,0 +1,60 @@
+## -*- coding: utf-8 -*-
+<h1><a name="top">${_('cm_header_evaluate_result')}</a>${h.getHelp('cm_evaluate_result_note')}</h1>
+<strong>Hinweis:</strong> Es wurden ${c.count_total_valid} von ${c.count_total} im System gespeicherten Fallakten ausgewertet.
+% if not session.get('hide_search_option_on_eval', False):
+<h2>Zeitraum angeben</h2>
+ <div id="search_field">
+ <form method="post" name="case_search" action="/evaluate/search/">
+ <input type="hidden" name="eval_id" value="${c.eval_id}">
+ <div>
+ Zeitraum:
+ <select name="quarter">
+ <option value="-1">Keine Auswahl</option>
+ <option value="1">1. Quartal</option>
+ <option value="2">2. Quartal</option>
+ <option value="3">3. Quartal</option>
+ <option value="4">4. Quartal</option>
+ </select>
+ Jahr:
+ <select name="year">
+ <option value="-1">Keine Auswahl</option>
+ <option value="2006">2006</option>
+ <option value="2007">2007</option>
+ <option value="2008">2008</option>
+ <option value="2009">2009</option>
+ <option value="2010">2010</option>
+ <option value="2011">2011</option>
+ <option value="2012">2012</option>
+ </select>
+ <input type="submit" value="Auswerten">
+ ${h.getHelp('help_eval_search_criteria')}
+ </div>
+ </form>
+ </div>
+% endif
+<h2>${_('eval_group_header_all')}</h2>
+<ul>
+ <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=1)}#eval_1">${_('cm_eval_summary_header_1')}</a></li>
+ <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=1)}#eval_2">${_('cm_eval_summary_header_2')}</a></li>
+ <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=1)}#eval_11">${_('cm_eval_summary_header_11')}</a></li>
+</ul>
+<h2>${_('eval_group_header_incm')}</h2>
+<ul>
+ <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=2)}#eval_3">${_('cm_eval_summary_header_3')}</a></li>
+ <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=2)}#eval_4">${_('cm_eval_summary_header_4')}</a></li>
+ <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=2)}#eval_5">${_('cm_eval_summary_header_5')}</a></li>
+ <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=2)}#eval_6">${_('cm_eval_summary_header_6')}</a></li>
+</ul>
+<h2>${_('eval_group_header_finished')}</h2>
+<ul>
+ <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=3)}#eval_7">${_('cm_eval_summary_header_7')}</a></li>
+ % if not c.isEvaluationServer:
+ <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=3)}#eval_effort">${_('cm_eval_summary_header_15')}</a></li>
+ % endif
+</ul>
+% if not c.isEvaluationServer:
+ <h2>${_('eval_group_header_finished2')}</h2>
+ <ul>
+ <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=0)}#eval_efforeffortt">${_('cm_eval_summary_header_14')}</a></li>
+ </ul>
+% endif
Added: trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_0.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_0.mako 2008-08-13 13:19:58 UTC (rev 69)
+++ trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_0.mako 2008-08-13 13:20:27 UTC (rev 70)
@@ -0,0 +1,22 @@
+## -*- coding: utf-8 -*-
+<%inherit file="../../main.mako" />
+<%! import waskaweb.lib.filters as F %>
+<%def name="buildNavipath()">
+ ${parent.buildNavipath()}
+ <li><a href="/case">${_('cm_np_root')}</a></li>
+ <li><a href="/evaluate/evaluate/1/1">${_('cm_np_evaluate_result')}</a></li>
+</%def>
+<%include file="/casemanagement/evaluation/evaluation_navigation.mako"/>
+<h1>${_('eval_group_header_finished2')}</h1>
+<p>
+${_('eval_group_note_finished2')}
+</p>
+<div class="evaluation odd-row first-row">
+<h3><a name="eval_avg_effort">${_('cm_eval_summary_header_14')}</a></h3>
+<h4>4.1.1. Aufschlüsselung der einzelnen Tätigkeiten von ${c.eval_effort['avg_all'][0]} Fällen</h4>
+<%include file="/casemanagement/evaluation/evaluation_effort.mako"/>
+<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_14/auswertung_4_1_1.csv">${_('cm_eval_table_export_analysis')}</a>
+<h4>4.1.2. Durchschnittliche Dauer bei ${c.eval_avg_effort['avg_all'][0]} Fällen</h4>
+<%include file="/casemanagement/evaluation/evaluation_avg_effort.mako"/>
+<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_16/auswertung_4_1_2.csv">${_('cm_eval_table_export_analysis')}</a>
+</div>
Modified: trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako 2008-08-13 13:19:58 UTC (rev 69)
+++ trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako 2008-08-13 13:20:27 UTC (rev 70)
@@ -6,57 +6,7 @@
<li><a href="/case">${_('cm_np_root')}</a></li>
<li><a href="/evaluate/evaluate/1/1">${_('cm_np_evaluate_result')}</a></li>
</%def>
-<h1><a name="top">${_('cm_header_evaluate_result')}</a>${h.getHelp('cm_evaluate_result_note')}</h1>
-<strong>Hinweis:</strong> Es wurden ${c.count_total_valid} von ${c.count_total} im System gespeicherten Fallakten ausgewertet.
-% if not session.get('hide_search_option_on_eval', False):
-<h2>Zeitraum angeben</h2>
- <div id="search_field">
- <form method="post" name="case_search" action="/evaluate/search/">
- <input type="hidden" name="eval_id" value="1">
- <div>
- Zeitraum:
- <select name="quarter">
- <option value="-1">Keine Auswahl</option>
- <option value="1">1. Quartal</option>
- <option value="2">2. Quartal</option>
- <option value="3">3. Quartal</option>
- <option value="4">4. Quartal</option>
- </select>
- Jahr:
- <select name="year">
- <option value="-1">Keine Auswahl</option>
- <option value="2006">2006</option>
- <option value="2007">2007</option>
- <option value="2008">2008</option>
- <option value="2009">2009</option>
- <option value="2010">2010</option>
- <option value="2011">2011</option>
- <option value="2012">2012</option>
- </select>
- <input type="submit" value="Auswerten">
- ${h.getHelp('help_eval_search_criteria')}
- </div>
- </form>
- </div>
-% endif
-<h2>${_('eval_group_header_all')}</h2>
-<ul>
- <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=1)}#eval_1">${_('cm_eval_summary_header_1')}</a></li>
- <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=1)}#eval_2">${_('cm_eval_summary_header_2')}</a></li>
- <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=1)}#eval_11">${_('cm_eval_summary_header_11')}</a></li>
-</ul>
-<h2>${_('eval_group_header_incm')}</h2>
-<ul>
- <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=2)}#eval_3">${_('cm_eval_summary_header_3')}</a></li>
- <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=2)}#eval_4">${_('cm_eval_summary_header_4')}</a></li>
- <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=2)}#eval_5">${_('cm_eval_summary_header_5')}</a></li>
- <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=2)}#eval_6">${_('cm_eval_summary_header_6')}</a></li>
-</ul>
-<h2>${_('eval_group_header_finished')}</h2>
-<ul>
- <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=3)}#eval_7">${_('cm_eval_summary_header_7')}</a></li>
-</ul>
-
+<%include file="/casemanagement/evaluation/evaluation_navigation.mako"/>
<h1>${_('eval_group_header_all')}</h1>
<p>
${_('eval_group_note_all')}
Modified: trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako 2008-08-13 13:19:58 UTC (rev 69)
+++ trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako 2008-08-13 13:20:27 UTC (rev 70)
@@ -6,57 +6,7 @@
<li><a href="/case">${_('cm_np_root')}</a></li>
<li><a href="/evaluate/evaluate/2/1">${_('cm_np_evaluate_result')}</a></li>
</%def>
-<h1><a name="top">${_('cm_header_evaluate_result')}</a>${h.getHelp('cm_evaluate_result_note')}</h1>
-<strong>Hinweis:</strong> Es wurden ${c.count_total_valid} von ${c.count_total} im System gespeicherten Fallakten ausgewertet.
-% if not session.get('hide_search_option_on_eval', False):
-<h2>Zeitraum angeben</h2>
- <div id="search_field">
- <form method="post" name="case_search" action="/evaluate/search/">
- <input type="hidden" name="eval_id" value="2">
- <div>
- Zeitraum:
- <select name="quarter">
- <option value="-1">Keine Auswahl</option>
- <option value="1">1. Quartal</option>
- <option value="2">2. Quartal</option>
- <option value="3">3. Quartal</option>
- <option value="4">4. Quartal</option>
- </select>
- Jahr:
- <select name="year">
- <option value="-1">Keine Auswahl</option>
- <option value="2006">2006</option>
- <option value="2007">2007</option>
- <option value="2008">2008</option>
- <option value="2009">2009</option>
- <option value="2010">2010</option>
- <option value="2011">2011</option>
- <option value="2012">2012</option>
- </select>
- <input type="submit" value="Auswerten">
- ${h.getHelp('help_eval_search_criteria')}
- </div>
- </form>
- </div>
-% endif;
-<h2>${_('eval_group_header_all')}</h2>
-<ul>
- <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=1)}#eval_1">${_('cm_eval_summary_header_1')}</a></li>
- <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=1)}#eval_2">${_('cm_eval_summary_header_2')}</a></li>
- <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=1)}#eval_11">${_('cm_eval_summary_header_11')}</a></li>
-</ul>
-<h2>${_('eval_group_header_incm')}</h2>
-<ul>
- <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=2)}#eval_3">${_('cm_eval_summary_header_3')}</a></li>
- <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=2)}#eval_4">${_('cm_eval_summary_header_4')}</a></li>
- <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=2)}#eval_5">${_('cm_eval_summary_header_5')}</a></li>
- <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=2)}#eval_6">${_('cm_eval_summary_header_6')}</a></li>
-</ul>
-<h2>${_('eval_group_header_finished')}</h2>
-<ul>
- <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=3)}#eval_7">${_('cm_eval_summary_header_7')}</a></li>
-</ul>
-
+<%include file="/casemanagement/evaluation/evaluation_navigation.mako"/>
<h1>${_('eval_group_header_incm')}</h1>
<p>${_('eval_group_note_incm')}</p>
<div class="evaluation odd-row first-row">
Modified: trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako 2008-08-13 13:19:58 UTC (rev 69)
+++ trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako 2008-08-13 13:20:27 UTC (rev 70)
@@ -6,57 +6,7 @@
<li><a href="/case">${_('cm_np_root')}</a></li>
<li><a href="/evaluate/evaluate/3/1">${_('cm_np_evaluate_result')}</a></li>
</%def>
-<h1><a name="top">${_('cm_header_evaluate_result')}</a>${h.getHelp('cm_evaluate_result_note')}</h1>
-<strong>Hinweis:</strong> Es wurden ${c.count_total_valid} von ${c.count_total} im System gespeicherten Fallakten ausgewertet.
-% if not session.get('hide_search_option_on_eval', False):
-<h2>Zeitraum angeben</h2>
- <div id="search_field">
- <form method="post" name="case_search" action="/evaluate/search/">
- <input type="hidden" name="eval_id" value="3">
- <div>
- Zeitraum:
- <select name="quarter">
- <option value="-1">Keine Auswahl</option>
- <option value="1">1. Quartal</option>
- <option value="2">2. Quartal</option>
- <option value="3">3. Quartal</option>
- <option value="4">4. Quartal</option>
- </select>
- Jahr:
- <select name="year">
- <option value="-1">Keine Auswahl</option>
- <option value="2006">2006</option>
- <option value="2007">2007</option>
- <option value="2008">2008</option>
- <option value="2009">2009</option>
- <option value="2010">2010</option>
- <option value="2011">2011</option>
- <option value="2012">2012</option>
- </select>
- <input type="submit" value="Auswerten">
- ${h.getHelp('help_eval_search_criteria')}
- </div>
- </form>
- </div>
-% endif;
-<h2>${_('eval_group_header_all')}</h2>
-<ul>
- <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=1)}#eval_1">${_('cm_eval_summary_header_1')}</a></li>
- <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=1)}#eval_2">${_('cm_eval_summary_header_2')}</a></li>
- <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=1)}#eval_11">${_('cm_eval_summary_header_11')}</a></li>
-</ul>
-<h2>${_('eval_group_header_incm')}</h2>
-<ul>
- <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=2)}#eval_3">${_('cm_eval_summary_header_3')}</a></li>
- <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=2)}#eval_4">${_('cm_eval_summary_header_4')}</a></li>
- <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=2)}#eval_5">${_('cm_eval_summary_header_5')}</a></li>
- <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=2)}#eval_6">${_('cm_eval_summary_header_6')}</a></li>
-</ul>
-<h2>${_('eval_group_header_finished')}</h2>
-<ul>
- <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=3)}#eval_7">${_('cm_eval_summary_header_7')}</a></li>
-</ul>
-
+<%include file="/casemanagement/evaluation/evaluation_navigation.mako"/>
<h1>${_('eval_group_header_finished')}</h1>
<p>
${_('eval_group_note_finished')}
@@ -124,3 +74,12 @@
</table>
<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_7/auswertung_3_1_2.csv">${_('cm_eval_table_export_analysis')}</a>
</div>
+<div class="evaluation odd-row">
+<h3><a name="eval_effort">${_('cm_eval_summary_header_15')}</a></h3>
+<h4>3.2.1. Aufschlüsselung der einzelnen Tätigkeiten von ${c.eval_effort['avg_all'][0]} Fällen</h4>
+<%include file="/casemanagement/evaluation/evaluation_effort.mako"/>
+<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_15/auswertung_3.2.1.csv">${_('cm_eval_table_export_analysis')}</a>
+<h4>3.2.2. Durchschnittliche Dauer bei ${c.eval_avg_effort['avg_all'][0]} Fällen</h4>
+<%include file="/casemanagement/evaluation/evaluation_avg_effort.mako"/>
+<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_17/auswertung_3.2.2.csv">${_('cm_eval_table_export_analysis')}</a>
+</div>
Modified: trunk/waskaweb/templates/logbook/overview.mako
===================================================================
--- trunk/waskaweb/templates/logbook/overview.mako 2008-08-13 13:19:58 UTC (rev 69)
+++ trunk/waskaweb/templates/logbook/overview.mako 2008-08-13 13:20:27 UTC (rev 70)
@@ -56,3 +56,5 @@
</tr>
% endif
</table>
+<h3>Auswertung</h3>
+<%include file="/casemanagement/evaluation/evaluation_effort.mako"/>
Modified: trunk/waskaweb/templates/start/responsible.mako
===================================================================
--- trunk/waskaweb/templates/start/responsible.mako 2008-08-13 13:19:58 UTC (rev 69)
+++ trunk/waskaweb/templates/start/responsible.mako 2008-08-13 13:20:27 UTC (rev 70)
@@ -3,81 +3,81 @@
<%def name="buildNavipath()">
<li><a href="#" onclick="return checkModification();">${_('sm_menu_link_responsible')}</a></li>
</%def>
-<div class="traeger">
- <div class="traeger_name">
- <h2>Förderung</h2>
- <div class="traeger_name_text">
- <p>WASKA wurde von 2007-2008 im Auftrag des Projektträgers im Deutschen
- Zentrum für Luft- und Raumfahrt e.V. (PT-DLR) im Rahmen des Programms
- "Kompetenzagenturen" (Durchführungsphase) enwickelt. Das Programm
- "Kompetenzagenturen" (Durchführungsphase) wurde gefördert vom
- Bundesministerium für Familie, Senioren, Frauen und Jugend (BMFSFJ) aus
- Mitteln des Europäischen Sozialfonds (ESF)</p>
- </div>
- <div class="traeger_name_img">
- <a href="http://www.bmfsfj.de/" target="_blank">
- <img class="" title="Logo bmfsj" alt="Logo bmfsj"
- src="/images/BMFSFJ_C_M_web.jpg" border="0" >
- </a>
- <a href="http://ec.europa.eu/employment_social/esf2000/index_de.html" target="_blank">
- <img class="" title="Logo europäische union - europäischer sozialfonds"
- alt="Logo europäische union - europäischer sozialfonds"
- src="/images/eu_logo_4c_pos_web2.jpg" border="0" >
- </a>
- </div>
- </div>
-</div>
-<div class="traeger">
- <div class="traeger_name">
- <h2>mpuls WASKA</h2>
- <div class="traeger_name_text">
- <p>
- mpuls WASKA wurde seitens des Projektträgers im Deutschen Zentrum für Luft- und
- Raumfahrt e.V. (PT-DLR) von Dr. Olga Burkova, Max Kamp und Frank Tönnissen
- (Projektleitung) entwickelt und eingeführt.
- </p>
- </div>
- <div class="traeger_name_img">
- <a href="http://www.dlr.de/" target="_blank"><img class="" title="Logo Deutsches Luft- und Raumfahrtzentrum"
- alt="Logo Deutsches Luft- und Raumfahrtzentrum" src="/images/logo_dlr.png" style="border:0">
- </a>
- </div>
- </div>
-</div>
-<div class="traeger">
- <div class="traeger_name">
- <h2>Lizenz</h2>
- <div class="traeger_name_text">
- <p>WASKA is free software: you can redistribute it and/or modify it under
- the terms of the GNU Affero General Public License as published by the
- Free Software Foundation, either version 3 of the License, or (at your
- option) any later version.</p>
- </div>
- <div class="traeger_name_img">
- <a href="http://www.gnu.org/licenses/agpl.html" target="_blank">
- <img src="/images/agplv3-155x51.png" alt="Logo GPL3" style="border:0">
- </a>
- </div>
- </div>
-</div>
-<div class="traeger">
- <div class="traeger_name">
- <h2>Technische Umsetzung</h2>
- <div class="traeger_name_text">
- <p>Design und Implementation der Software durch die Intevation GmbH:
- Frank Koormann (Projektleitung), Sascha Teichmann und Torsten Irländer,
- unterstützt durch Bernhard Reiter, Benjamin Kirschner, Bernhard Herzog
- und Sascha Wilde.</p>
- <p>Unterstützung beim Datenbankkonzept durch <a href="http://www.dataintransit.com" target="_blank">data in transit</a> (Jutta Horstmann)</p>
- </div>
- <div class="traeger_name_img">
- <a href="http://www.intevation.de/" target="_blank">
- <img src="/images/logo_intevation.png" alt="Logo Intevation" style="border:0">
- </a>
- </div>
- </div>
-</div>
-
+##<div class="traeger">
+## <div class="traeger_name">
+## <h2>Förderung</h2>
+## <div class="traeger_name_text">
+## <p>WASKA wurde von 2007-2008 im Auftrag des Projektträgers im Deutschen
+## Zentrum für Luft- und Raumfahrt e.V. (PT-DLR) im Rahmen des Programms
+## "Kompetenzagenturen" (Durchführungsphase) enwickelt. Das Programm
+## "Kompetenzagenturen" (Durchführungsphase) wurde gefördert vom
+## Bundesministerium für Familie, Senioren, Frauen und Jugend (BMFSFJ) aus
+## Mitteln des Europäischen Sozialfonds (ESF)</p>
+## </div>
+## <div class="traeger_name_img">
+## <a href="http://www.bmfsfj.de/" target="_blank">
+## <img class="" title="Logo bmfsj" alt="Logo bmfsj"
+## src="/images/BMFSFJ_C_M_web.jpg" border="0" >
+## </a>
+## <a href="http://ec.europa.eu/employment_social/esf2000/index_de.html" target="_blank">
+## <img class="" title="Logo europäische union - europäischer sozialfonds"
+## alt="Logo europäische union - europäischer sozialfonds"
+## src="/images/eu_logo_4c_pos_web2.jpg" border="0" >
+## </a>
+## </div>
+## </div>
+##</div>
+##<div class="traeger">
+## <div class="traeger_name">
+## <h2>mpuls WASKA</h2>
+## <div class="traeger_name_text">
+## <p>
+## mpuls WASKA wurde seitens des Projektträgers im Deutschen Zentrum für Luft- und
+## Raumfahrt e.V. (PT-DLR) von Dr. Olga Burkova, Max Kamp und Frank Tönnissen
+## (Projektleitung) entwickelt und eingeführt.
+## </p>
+## </div>
+## <div class="traeger_name_img">
+## <a href="http://www.dlr.de/" target="_blank"><img class="" title="Logo Deutsches Luft- und Raumfahrtzentrum"
+## alt="Logo Deutsches Luft- und Raumfahrtzentrum" src="/images/logo_dlr.png" style="border:0">
+## </a>
+## </div>
+## </div>
+##</div>
+##<div class="traeger">
+## <div class="traeger_name">
+## <h2>Lizenz</h2>
+## <div class="traeger_name_text">
+## <p>WASKA is free software: you can redistribute it and/or modify it under
+## the terms of the GNU Affero General Public License as published by the
+## Free Software Foundation, either version 3 of the License, or (at your
+## option) any later version.</p>
+## </div>
+## <div class="traeger_name_img">
+## <a href="http://www.gnu.org/licenses/agpl.html" target="_blank">
+## <img src="/images/agplv3-155x51.png" alt="Logo GPL3" style="border:0">
+## </a>
+## </div>
+## </div>
+##</div>
+##<div class="traeger">
+## <div class="traeger_name">
+## <h2>Technische Umsetzung</h2>
+## <div class="traeger_name_text">
+## <p>Design und Implementation der Software durch die Intevation GmbH:
+## Frank Koormann (Projektleitung), Sascha Teichmann und Torsten Irländer,
+## unterstützt durch Bernhard Reiter, Benjamin Kirschner, Bernhard Herzog
+## und Sascha Wilde.</p>
+## <p>Unterstützung beim Datenbankkonzept durch <a href="http://www.dataintransit.com" target="_blank">data in transit</a> (Jutta Horstmann)</p>
+## </div>
+## <div class="traeger_name_img">
+## <a href="http://www.intevation.de/" target="_blank">
+## <img src="/images/logo_intevation.png" alt="Logo Intevation" style="border:0">
+## </a>
+## </div>
+## </div>
+##</div>
+##
##<div>
##<h1>${_('responsible_info_sponsorship')}</h1>
##<div class="traeger">
@@ -121,47 +121,47 @@
##
##</div>
##
-##<div class="traeger">
-##<div class="traeger_name">
-##<h2>${_('responsible_realisation')}</h2>
-## <div class="traeger_name_text">
-## <p>Intevation GmbH, Osnabrück</p>
-## <p> Realisation und Programmierung der Webanwendung</p>
-## </div>
-## <div class="traeger_name_img">
-## <a href="http://www.intevation.de/" target="_blank">
-## <img src="/images/logo_intevation.png" alt="Logo Intevation" style="border:0">
-## </a>
-## </div>
-##
-##<div class="traeger_contact">
-## <p>Ansprechpartner</p>
-## <div class="traeger_contact_field">
-## <p> Frank Koormann, Tel.: +49 541 33508-30</p>
-## </div>
-##</div>
-##</div>
-##</div>
-##<div class="traeger">
-##<div class="traeger_name">
-##<h2>Förderung</h2>
-## <div class="traeger_name_text">
-## <p>${_('main_login_bmf_phrase')}</p>
-## </div>
-## <div class="traeger_name_img">
-## <a href="http://www.bmfsfj.de/" target="_blank">
-## <img class="" title="Logo bmfsj" alt="Logo bmfsj"
-## src="/images/BMFSFJ_C_M_web.jpg" border="0" >
-## </a>
-## <a href="http://ec.europa.eu/employment_social/esf2000/index_de.html" target="_blank">
-## <img class="" title="Logo europäische union - europäischer sozialfonds"
-## alt="Logo europäische union - europäischer sozialfonds"
-## src="/images/eu_logo_4c_pos_web2.jpg" border="0" >
-## </a>
-## </div>
-##</div>
-##</div>
-##</div>
+<div class="traeger">
+<div class="traeger_name">
+<h2>${_('responsible_realisation')}</h2>
+ <div class="traeger_name_text">
+ <p>Intevation GmbH, Osnabrück</p>
+ <p> Realisation und Programmierung der Webanwendung</p>
+ </div>
+ <div class="traeger_name_img">
+ <a href="http://www.intevation.de/" target="_blank">
+ <img src="/images/logo_intevation.png" alt="Logo Intevation" style="border:0">
+ </a>
+ </div>
+
+<div class="traeger_contact">
+ <p>Ansprechpartner</p>
+ <div class="traeger_contact_field">
+ <p> Frank Koormann, Tel.: +49 541 33508-30</p>
+ </div>
+</div>
+</div>
+</div>
+<div class="traeger">
+<div class="traeger_name">
+<h2>Förderung</h2>
+ <div class="traeger_name_text">
+ <p>${_('main_login_bmf_phrase')}</p>
+ </div>
+ <div class="traeger_name_img">
+ <a href="http://www.bmfsfj.de/" target="_blank">
+ <img class="" title="Logo bmfsj" alt="Logo bmfsj"
+ src="/images/BMFSFJ_C_M_web.jpg" border="0" >
+ </a>
+ <a href="http://ec.europa.eu/employment_social/esf2000/index_de.html" target="_blank">
+ <img class="" title="Logo europäische union - europäischer sozialfonds"
+ alt="Logo europäische union - europäischer sozialfonds"
+ src="/images/eu_logo_4c_pos_web2.jpg" border="0" >
+ </a>
+ </div>
+</div>
+</div>
+</div>
<div class="clearer"></div>
More information about the Mpuls-commits
mailing list