[Mpuls-commits] r30 - in trunk: . formed waskaweb/controllers waskaweb/i18n waskaweb/i18n/de/LC_MESSAGES waskaweb/lib waskaweb/model waskaweb/public/styles waskaweb/templates waskaweb/templates/administration waskaweb/templates/administration/dialogs waskaweb/templates/casemanagement waskaweb/templates/casemanagement/dialogs waskaweb/templates/documents waskaweb/templates/documents/dialogs waskaweb/templates/start waskaweb/templates/statement waskaweb/templates/statement/dialogs waskaweb/templates/usersettings waskaweb/templates/usersettings/dialogs
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Aug 13 15:08:07 CEST 2008
Author: thomas
Date: 2008-08-13 15:08:05 +0200 (Wed, 13 Aug 2008)
New Revision: 30
Added:
trunk/waskaweb/lib/timelog.py
trunk/waskaweb/templates/administration/dialogs/success_delete_user.mako
trunk/waskaweb/templates/casemanagement/dialogs/confirm_delete_aid.mako
trunk/waskaweb/templates/casemanagement/dialogs/confirm_delete_attachment.mako
trunk/waskaweb/templates/casemanagement/dialogs/delete_attachment_success.mako
trunk/waskaweb/templates/casemanagement/dialogs/success_case_close.mako
trunk/waskaweb/templates/casemanagement/dialogs/success_delete.mako
trunk/waskaweb/templates/casemanagement/dialogs/success_delete_aid.mako
trunk/waskaweb/templates/casemanagement/dialogs/success_delete_cm.mako
trunk/waskaweb/templates/casemanagement/dialogs/success_restore.mako
trunk/waskaweb/templates/documents/dialogs/delete_attachment_success.mako
trunk/waskaweb/templates/documents/dialogs/delete_document_success.mako
Modified:
trunk/ChangeLog.txt
trunk/Changes.txt
trunk/NEWS
trunk/development_wsgi.ini
trunk/formed/formedtree_web.xml
trunk/waskaweb/controllers/administration.py
trunk/waskaweb/controllers/case.py
trunk/waskaweb/controllers/case_overview.py
trunk/waskaweb/controllers/document.py
trunk/waskaweb/controllers/rg_aid.py
trunk/waskaweb/controllers/statement.py
trunk/waskaweb/controllers/usersettings.py
trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
trunk/waskaweb/i18n/waskaweb.pot
trunk/waskaweb/lib/app_globals.py
trunk/waskaweb/lib/base.py
trunk/waskaweb/lib/evaluation.py
trunk/waskaweb/lib/helpers.py
trunk/waskaweb/lib/renderer.py
trunk/waskaweb/lib/validators.py
trunk/waskaweb/model/case.py
trunk/waskaweb/model/navigation.py
trunk/waskaweb/model/repeatgroup.py
trunk/waskaweb/public/styles/all.css
trunk/waskaweb/public/styles/color3.css
trunk/waskaweb/public/styles/print.css
trunk/waskaweb/public/styles/screen.css
trunk/waskaweb/templates/administration/dialogs/confirm_deleteuser.mako
trunk/waskaweb/templates/administration/dialogs/notificate_delete_user_helper.mako
trunk/waskaweb/templates/administration/dialogs/notificate_deleteuser.mako
trunk/waskaweb/templates/administration/edit_user.mako
trunk/waskaweb/templates/administration/new_user.mako
trunk/waskaweb/templates/casemanagement/bundle_editor.mako
trunk/waskaweb/templates/casemanagement/bundle_standin.mako
trunk/waskaweb/templates/casemanagement/caselist.mako
trunk/waskaweb/templates/casemanagement/dialogs/notificate_bundle_seteditor.mako
trunk/waskaweb/templates/casemanagement/dialogs/notificate_bundle_setstandin.mako
trunk/waskaweb/templates/casemanagement/dialogs/notificate_import_dub.mako
trunk/waskaweb/templates/casemanagement/digest.mako
trunk/waskaweb/templates/casemanagement/formular.mako
trunk/waskaweb/templates/casemanagement/main.mako
trunk/waskaweb/templates/casemanagement/organisation.mako
trunk/waskaweb/templates/casemanagement/overview.mako
trunk/waskaweb/templates/documents/case_overview.mako
trunk/waskaweb/templates/documents/dialogs/success_attachment.mako
trunk/waskaweb/templates/login.mako
trunk/waskaweb/templates/start/help.mako
trunk/waskaweb/templates/statement/dialogs/missing_statement.mako
trunk/waskaweb/templates/statement/edit.mako
trunk/waskaweb/templates/usersettings/change_password.mako
trunk/waskaweb/templates/usersettings/change_password_login.mako
trunk/waskaweb/templates/usersettings/dialogs/notificate_setpassword.mako
trunk/waskaweb/templates/usersettings/edit_standin.mako
Log:
Load 9a2a807fdddd into trunk.
Modified: trunk/ChangeLog.txt
===================================================================
--- trunk/ChangeLog.txt 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/ChangeLog.txt 2008-08-13 13:08:05 UTC (rev 30)
@@ -1,3 +1,237 @@
+2008-02-01 Torsten Irlaender <torsten.irlaender at intevation.de>
+
+ * waskaweb/model/case.py, waskaweb/model/repeatgroup.py: Added "uuid"
+ paramater to create_ds functions. Modified SQL-statement.
+
+ All new datasets will be generated with an unique uuid. This will
+ make it possible to identify each single datases across many KAs,
+ which is needed to implement the update functionallity for im- and
+ export of XML.
+ uuid defaults to "None" which means generating a new uuid for the
+ dataset. If an uuid is given (import of a exported case) there will
+ be some logic in the futuer which checks if we need to create a new
+ dataset with the given uuid or update an existing dataset.
+
+ * waskaweb/templates/casemanagement/formular.mako: Reactivated the
+ printfunction for the aidplan in aid overview. Seems it got lost
+ while restructuring the aidoverview.
+
+2008-02-01 Benjamin Kirschner <benni.kirschner at intevation.de>
+
+ * waskaweb/controllers/case.py
+ waskaweb/model/navigation.py:
+ torstens changes on print version. formulars are now serialized
+ correctly. Headers of the formulars are not correct, but it is an
+ improvment to the former version.
+
+ * waskaweb/public/styles/print.css:
+ Small changes on print version. In IE7 the print version
+ looks quite good. Every formular starts with a new page.
+ FF has some problem because of floatings. I have to improve
+ the print version in FF. Print overview page not finished yet.
+
+2008-01-31 Torsten Irlaender <torsten.irlaender at intevation.de>
+
+ * waskaweb/controllers/case_overview.py,
+ waskaweb/templates/casemanagement/overview: Added selectionbox for
+ admin users to search for cases of a particular user.
+
+ * waskaweb/controllers/case.py,
+ waskaweb/i18n/de/LC_MESSAGES/waskaweb.po,
+ waskaweb/public/styles/screen.css,
+ waskaweb/templates/casemanagement/main.mako,
+ waskaweb/templates/casemanagement/organisation.mako: Changed naming
+ along the workflow of opening and closing cases. Moved the option to
+ open and close a case to the organisation so that it isn't so
+ exposed in the main-menu. Added note that openening and closing of a
+ case isn't related to finishing a case in the meaning of
+ Case-Management.
+ Added Notification Dialog on succsessfully reopening a case.
+
+ * waskaweb/i18n/de/LC_MESSAGES/waskaweb.po,
+ waskaweb/lib/renderer.py,
+ waskaweb/public/styles/all.css: Better use of space in the
+ aid-overview.
+
+ * waskaweb/i18n/de/LC_MESSAGES/waskaweb.po, waskaweb/i18n/waskaweb.pot
+ waskaweb/model/case.py,
+ waskaweb/templates/casemanagement/digest.mako: Added additional
+ telephonenumbers to the digest. Added clickable email-addresses.
+
+2008-01-30 Benjamin Kirschner <benni.kirschner at intevation.de>
+
+ * waskaweb/controllers/case.py:
+ Added user feedback to dialog "restore"
+ * waskaweb/public/styles/screen.css:
+ Small fix on grey box:
+
+ * waskaweb/controllers/case.py
+ A waskaweb/templates/casemanagement/dialogs/success_delete.mako
+ A waskaweb/templates/casemanagement/dialogs/success_delete_cm.mako
+ A waskaweb/templates/casemanagement/dialogs/success_restore.mako
+ waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
+ waskaweb/i18n/waskaweb.pot:
+ Added user feedback to "delete case" and "restore case" in
+ case_overview.
+
+2008-01-30 Benjamin Kirschner <benni.kirschner at intevation.de>
+ * waskaweb/public/styles/screen.css
+ waskaweb/public/styles/color3.css
+ waskaweb/templates/statement/edit.mako:
+ Small format changes on text. Important information is now in grey box.
+
+ * waskaweb/controllers/case.py:
+ Fix on ISE when importing none case-pdf.
+
+ * waskaweb/public/styles/screen.css
+ waskaweb/public/styles/color3.css
+ waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
+ waskaweb/i18n/waskaweb.pot
+ waskaweb/templates/casemanagement/digest.mako:
+ Added "parent" information to overview. This information
+ was requested by casemanagers during beta.
+
+2008-01-30 Torsten Irlaender <torsten.irlaender at intevation.de>
+
+ * waskaweb/templates/usersettings/edit_standin.mako,
+ waskaweb/templates/administration/show_user_body.mako,
+ waskaweb/templates/casemanagement/caselist.mako: Fixed Issue221.
+ Changed ordering of first and lastname in standin-dialog of the
+ usersettings and case overview.
+
+ * waskaweb/lib/helpers.py, waskaweb/templates/login.mako: Added
+ function which extracts the name of the ka from the client
+ certificate. The name is now displayed on the loginscreen
+
+ * waskaweb/model/case.py: Added further informations to the case
+ digest. Added contact information of the parents of the kid.
+ Changed SQL-query. Results are now fetched by name and not by index.
+ This makes the query more robust.
+
+ * controllers/rg_aid.py: Fixed issue33. Deleting aid: If the user
+ clicks not in the confirmation dialog, waska stys now in edit mode.
+ Dialog is now displayed in the correct context: case mode not start
+ mode
+
+ * formed/formedtree_web.xml: Fixed f05 of issue87: Setting some fieldssets
+ to invisible (actvities of the juvenile)
+
+ * waskaweb/templates/casemanagement/digest.mako: Added links to
+ email-address of the contacts
+
+ * waskaweb/i18n/de/LC_MESSAGES/waskaweb.po,
+ waskaweb/i18n/waskaweb.pot,
+ waskaweb/templates/casemanagement/bundle_editor.mako,
+ waskaweb/templates/casemanagement/bundle_standin.mako: Fixed issue
+ partially issue202. Added breadcrumbs to the confirmation dialog of
+ of bundled actions.
+
+ * waskaweb/templates/casemanagement/dialogs/notificate_bundle_seteditor.mako,
+ waskaweb/templates/casemanagement/dialogs/notificate_bundle_setstandin.mako:
+ Navipath now looks the same as in other dialogs now.
+
+
+
+
+2008-01-29 Sascha L. Teichmann <teichmann at intevation.de>
+
+ * waskaweb/lib/base.py: Fix for issue227. The import of
+ the needed HTTPUnauthorized was hashed. Why?
+
+2008-01-29 Torsten Irlaender <torsten.irlaender at intevation.de>
+
+ * waskaweb/lib/validators.py,
+ waskaweb/templates/usersettings/change_password.mako: Fixed
+ issue222: Partially missing and wrong wording in errordialog on
+ setting userpassword.
+
+2008-01-29 Sascha L. Teichmann <teichmann at intevation.de>
+
+ * development_wsgi.ini: Configured time logger.
+
+ * waskaweb/lib/app_globals.py: Feef time logger from config
+
+ * waskaweb/lib/base.py: Probe time when calling controller.
+
+ * waskaweb/lib/timelog.py: New the time logger.
+
+2008-01-29 Torsten Irlaender <torsten.irlaender at intevation.de>
+
+ * waskaweb/model/case.py: Removed debugging output. Changed
+ "print"-statements so that they print to stderr instead of stdout.
+
+ * waskaweb/templates/administration/edit_user.mako: Added translation
+ matrix for error-messages.
+
+ * waskaweb/i18n/de/LC_MESSAGES/waskaweb.po,
+ waskaweb/i18n/waskaweb.pot, waskaweb/model/case.py,
+ waskaweb/templates/casemanagement/digest.mako: Added mobile
+ telephone to the case-digest.
+
+ * waskaweb/templates/casemanagement/organisation.mako: Changed
+ order of first and lastname in the userlisting to lastname,
+ firstname.
+
+ * waskaweb/controllers/rg_aid.py, waskaweb/model/repeatgroup.py:
+ Refactored model of the repeat group which should make them more
+ flexible and readable. Added Factory class to load and create new
+ repeat groups.
+
+ * waskaweb/model/navigation.py: Renamed "Kontaktdaten" to "Externe
+ Ansprechpartner" in formular outline.
+
+2008-01-28 Benjamin Kirschner <benni.kirschner at intevation.de>
+
+ * waskaweb/templates/administration/new_user.mako:
+ Errors are not longer displayed with the exclamation mark
+ but with highlighting of the input fields and red colored
+ label text.
+
+2008-01-28 Benjamin Kirschner <benni.kirschner at intevation.de>
+
+ * waskaweb/templates/casemanagement/organisation.mako:
+ Added " " to table because ie doesn't display table
+ borders without content
+
+ * waskaweb/templates/start/help.mako:
+ Added small text which guides to waska-anwender.
+
+ * waskaweb/controllers/administration.py
+ waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
+ waskaweb/i18n/waskaweb.pot
+ waskaweb/templates/administration/dialogs/notificate_delete_user_helper.mako:
+ Changed dialog icon (consistent to the other dialogs) and added
+ two different msgs so users recognize the difference between
+ "Fallakten übertragen - Nutzer löschen" and "Fallakten übertragen -
+ Weitere Fallakten vorhanden".
+
+
+2008-01-28 Benjamin Kirschner <benni.kirschner at intevation.de>
+
+ * waskaweb/lib/renderer.py
+ waskaweb/templates/usersettings/change_password_login.mako
+ waskaweb/templates/usersettings/change_password.mako
+ waskaweb/templates/administration/edit_user.mako
+ waskaweb/public/styles/color3.css:
+ Errors are not longer displayed with the exclamation mark
+ but with highlighting of the input fields and red colored
+ label text.
+
+ * waskaweb/templates/casemanagement/overview.mako:
+ Changed search according to issue220 to method "post"
+
+ * waskaweb/templates/documents/case_overview.mako:
+ Only cm_ka is able to delete case related documents.
+ Delete function isn't displayed to admin_ka anymore.
+
+2008-01-28 Sascha L. Teichmann <teichmann at intevation.de>
+
+ * Changes.txt: Summarized changes from Beta 14 to 18.
+
+2008-01-25 Torsten Irlaender <torsten.irlaender at intevation.de>
+
+ * waskaweb/i18n/de/LC_MESSAGES/waskaweb.po: Tagged Beta 18
+
2008-01-25 Benjamin Kirschner <benni.kirschner at intevation.de>
* waskaweb/controllers/administration.py
waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
Modified: trunk/Changes.txt
===================================================================
--- trunk/Changes.txt 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/Changes.txt 2008-08-13 13:08:05 UTC (rev 30)
@@ -1,3 +1,42 @@
+Beta 18:
+
+ Neu:
+
+ * CM KA: Suchfilter in der Fallaktenübersicht. Oder-Verknüpfung aus
+ "eigene", "in Vertretung", "geschlossen" und "geschlossen".
+
+ * Admin KA: Suchfilter in der Fallaktenübersicht. Oder-Verknüpfung
+ "offen", "geschlossen" und schwebend gelöscht.
+
+ * Fallakten werden als schwebend gelöscht markiert, sobald die
+ Einverständniserklärung als nicht vorliegend gesetzt wurde.
+
+ * Das gebündelte Löschen für den Benutzer implementiert.
+
+ * Intern wurde den Fallakten ein Status zugewiesen:
+ 1 - Offen
+ 2 - Geschlossen
+ 3 - schwebend gelöscht
+ 4 - schwebend anonymisiert (noch nicht im Workflow)
+ 5 - anonymisiert (noch nicht im Workflow)
+
+ * Admin KA: In den agenturweiten Einstellungen kann jetzt die Zeit
+ (in Tagen) angegeben werden, bis geschlossene Akten dem Admin KA
+ zum Löschen vorgelegt werden. (Noch nicht im Workflow)
+
+ * Icons in der Fallaktenübersicht der Fallakte. Bearbeiter,
+ Vertretung, offen, geschlossen, schwebend gelöscht, recycle-bar.
+
+ * Neue Dialoge für das (schwebende) Löschen von Fallakten durch
+ den Benutzer.
+
+ Verbessert:
+
+ * Encoding-Probleme im Dokumenten-, und Benutzereinstellung-Controllern
+ behoben.
+
+ * HTML-Escaping in Warn- und Hinweis-Dialogen ergänzt.
+
Beta 14:
Neu:
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/NEWS 2008-08-13 13:08:05 UTC (rev 30)
@@ -1,3 +1,40 @@
+01.02.2008 Torsten
+
+ * Das Ausdrucken des Förderplans ist wieder aus der Übersicht der
+ Unterstützungsangebote möglich. Die Funktion war
+ wegen technischen Überarbeitungen zeitwilig nicht mehr verfügbar.
+
+ * Der Druck der gesamten Fallakte wurde verbessert. Die Fallakte
+ enthält nun alle Inhalte in der korrekten Reihenfolge. Allerdings
+ sind auf Formularseiten, die auf tieferen Ebenen liegen die
+ Überschriften noch nicht korrekt.
+
+31.01.2008 Torsten
+
+ * Der Admin hat nun ein Auswahlliste um nach Fällen eines bestimmten
+ Nutzers zu suchen.
+
+ * Aufgrund von Mißverständnissen in der Benutzung der Funktionen zum
+ Schließen und Öffenen eines Falls, wurden die Benennung der
+ Funktionen abgeändert. Weiter wurden sie aus dem Bereichsmenü in die
+ Organisation verschoben. Um weitere Mißverständnisse zu vermeiden
+ wurde ein Hinweistext unmittelbar an die Funktion gesetzt.
+
+Mo 28. Jan 15:11:01 CET 2008 Torsten
+
+ * Fehler in den Formularen werden nicht mehr mit Icons gekennzeichnet
+ (Formatierungsproblmene). Statt dessen wird das Forumlarfeld farbig
+ markiert.
+
+ * Die Zusammenfassung der Fallakte wurde um die Mobilfunknummer
+ erweitert. (Rückmeldung Beta-Phase)
+
+ * Auflistung der Benutzer in der Organisation der Fallakte ist nun in
+ in der Form "Nachname, Vorname" (Rückmeldung Beta-Phase)
+
+ * der Punkt "Kontaktdaten" in der Gliederung wurde in "Externe
+ Ansprechpartner" umbenannt (Rückmeldung Beta-Phase)
+
Do 24. Jan 14:30:00 CET 2008 Torsten
* Die Fallübersicht wurde für die Nutzer um weiter Suchfilter er-
@@ -18,8 +55,10 @@
* Der Workflow beim Löschen von Fallakten wurde geändert. Fallakten
können nun von dem Bearbeiter zum Löschen freigegeben werden. Die
Fallakte sind dann "Schwebend gelöscht" und tauchen nicht mehr in
- der Übersicht auf. Administratoren können diese Fallakte dann
- tatsächlich löschen, oder aber wiederherstellen.
+ der Uebersicht auf. Administratoren können diese Fallakte dann
+ tatsächlich löschen, oder aber wiederherstellen
+ Bereits bestehende Fallakten fuer die keine EE vorliegt, werden als
+ "schwebend geloescht" markiert.
* Die Fallakte kann nun den Zustand "Abgeschlossen" bzw. "Offen"
annehmen.
Modified: trunk/development_wsgi.ini
===================================================================
--- trunk/development_wsgi.ini 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/development_wsgi.ini 2008-08-13 13:08:05 UTC (rev 30)
@@ -25,6 +25,10 @@
pdf2xfa_host = 192.168.11.17
pdf2xfa_port = 1111
+# for measure the time per request
+time_host = 192.168.11.17
+time_port = 9020
+
# set this to 'false' if you do not want the application
# to handle static content.
serve_static = true
Modified: trunk/formed/formedtree_web.xml
===================================================================
--- trunk/formed/formedtree_web.xml 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/formed/formedtree_web.xml 2008-08-13 13:08:05 UTC (rev 30)
@@ -274,7 +274,7 @@
<bool formularname="keine_Bezugsperson" description="keine Bezugsperson" name="keine_bezugsperson" target="i"/>
</group>
<group description="Aktivitäten des Jugendlichen" name="aktivitaetendesjugendlichen" target="c">
- <group description="Hobbies" name="hobbies">
+ <group description="Hobbies" name="hobbies" invisible="s">
<choice formularname="Hobbies" description="Hobbies" name="hobbies_1" size="1">
<bool checked="s" description="Keine Angabe" value="-1" name="keineangabe"/>
<bool description="Ja" value="1" name="Ja"/>
@@ -282,7 +282,7 @@
</choice>
<text formularname="Hobbies_text" description="Nennung Hobbies" maxlength="60" name="hobbies_text" size="40"/>
</group>
- <group description="Mitarbeit in Organisationen und Vereinen" name="mitarbeitinorganisationenundvereinen">
+ <group description="Mitarbeit in Organisationen und Vereinen" name="mitarbeitinorganisationenundvereinen" invisible="s">
<choice formularname="Mitarbeit_Organisationen" description="Mitarbeit Organisationen und Vereinen" name="mitarbeit_organisationen" size="1">
<bool checked="s" description="Keine Angabe" value="-1" name="keineangabe"/>
<bool description="Ja" value="1" name="Ja"/>
@@ -290,7 +290,7 @@
</choice>
<text formularname="Organisationen_Vereine_text" description="Nennung Mitarbeit" maxlength="60" name="organisationen_vereine_text" size="40"/>
</group>
- <group description="Sonstiges" name="sonstiges">
+ <group description="Sonstiges" name="sonstiges" invisible="s">
<choice formularname="Sonstiges" description="Sonstiges" name="sonstiges_1" size="1">
<bool checked="s" description="Keine Angabe" value="-1" name="keineangabe"/>
<bool description="Ja" value="1" name="Ja"/>
Modified: trunk/waskaweb/controllers/administration.py
===================================================================
--- trunk/waskaweb/controllers/administration.py 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/controllers/administration.py 2008-08-13 13:08:05 UTC (rev 30)
@@ -35,9 +35,10 @@
DELETE_USER_CONFIRM_QUESTION = _('adm_delete_user_confirm_text')
DIALOG_CONFIRM_SETEDITOR = _('adm_set_editor_header')
-SETEDITOR_NOTIFICATION_SUCCESS = _('adm_set_editor_success_text')
-SETEDITOR_NOTIFICATION_SUCCESS_REST = _('adm_set_editor_success_text_rest')
-
+SETEDITOR_NOTIFICATION_SUCCESS = _('adm_set_editor_success_text')
+SETEDITOR_NOTIFICATION_SUCCESS_REST = _('adm_set_editor_success_text_rest')
+SETEDITOR_NOTIFICATION_SUCCESS_HEAD = _('adm_set_editor_success_text_head')
+SETEDITOR_NOTIFICATION_SUCCESS_REST_HEAD= _('adm_set_editor_success_text_rest_head')
class AdministrationController(BaseController):
def index(self):
@@ -173,7 +174,7 @@
c.success_for = DELETE_USER_SUCCESS_HEADER
c.success_text = DELETE_USER_SUCCESS_TEXT
c.url_ok = "/administration/overviewUser"
- return render('/administration/dialogs/notificate_deleteuser.mako')
+ return render('/administration/dialogs/success_delete_user.mako')
else:
c.context = "../main.mako"
@@ -202,10 +203,13 @@
num = case_bundle.setEditor(form_result.get('editor'))
rest = all_cases.numDatasets() - case_bundle.numDatasets()
c.url_ok = "/administration/deleteUser/%s/1" % form_result.get('user_id')
+ c.success_for = SETEDITOR_NOTIFICATION_SUCCESS_HEAD
if rest > 0:
- c.notification_text = SETEDITOR_NOTIFICATION_SUCCESS_REST % (new_editor.first_name, new_editor.last_name, del_user.first_name, del_user.last_name)
+ c.success_for = SETEDITOR_NOTIFICATION_SUCCESS_REST_HEAD
+ c.success_text = SETEDITOR_NOTIFICATION_SUCCESS_REST % (new_editor.first_name, new_editor.last_name, del_user.first_name, del_user.last_name)
else:
- c.notification_text = SETEDITOR_NOTIFICATION_SUCCESS % (new_editor.first_name, new_editor.last_name, del_user.first_name, del_user.last_name)
+ c.success_for = SETEDITOR_NOTIFICATION_SUCCESS_HEAD
+ c.success_text = SETEDITOR_NOTIFICATION_SUCCESS % (new_editor.first_name, new_editor.last_name, del_user.first_name, del_user.last_name)
return render('/administration/dialogs/notificate_delete_user_helper.mako')
except formencode.Invalid, error:
return self.deleteUser(form_result.get('user_id'), '1')
Modified: trunk/waskaweb/controllers/case.py
===================================================================
--- trunk/waskaweb/controllers/case.py 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/controllers/case.py 2008-08-13 13:08:05 UTC (rev 30)
@@ -44,18 +44,18 @@
PRINTALL_NOTIFICATION = u'Gesamte Fallakte drucken'
PRINTALL_NOTIFICATION_TEXT = u'Leider ist die von Ihnen aufgerufene Funktion in der BETA Version dieser Anwendung noch nicht enthalten.'
-DELETE_CONFIRM = u"""Löschen Fallakte"""
+DELETE_CONFIRM = u"""Fallakte löschen?"""
DELETE_CONFIRM_TEXT = u"""Wollen Sie wirklich die Fallakte löschen und die Daten unwiederbringlich verlieren?"""
MARKDELETE_CONFIRM_TEXT = u"""Wollen Sie wirklich die Fallakte zum Löschen freigeben? Die Fallakte steht Ihnen danach nicht mehr zur Bearbeitung zur Verfügung und wird durch die Administration gelöscht werden."""
-RESTORE_CONFIRM = u"""Wiederherstellen Fallakte"""
+RESTORE_CONFIRM = u"""Fallakte wiederherstellen?"""
RESTORE_CONFIRM_TEXT = u"""Wollen Sie wirklich die Fallakte wiederherstellen? Die Fallakte ist danach wieder für die Nutzer bearbeitbar."""
-CLOSE_CONFIRM = u"""Schließen Fallakte"""
-CLOSE_CONFIRM_TEXT = u"""Wollen Sie wirklich die Fallakte schließen? Das CM wird dann als beendet betrachtet"""
+CLOSE_CONFIRM = u"""Fallakte schließen?"""
+CLOSE_CONFIRM_TEXT = u"""Wollen Sie wirklich die Fallakte schließen?"""
-OPEN_CONFIRM = u"""Geschlossene Fallakte öffnen"""
-OPEN_CONFIRM_TEXT = u"""Wollen Sie wirklich die Fallakte wieder öffnen? Das CM wird dann wird dann nicht als beendet betrachtet."""
+OPEN_CONFIRM = u"""Geschlossene Fallakte öffnen?"""
+OPEN_CONFIRM_TEXT = u"""Wollen Sie wirklich die Fallakte wieder öffnen?"""
class CaseController(CasebaseController):
@@ -129,9 +129,19 @@
formular = []
c.print_version = 1
for ti in self.navigation.getAllItems():
+ if ti.key in ['27', '28', '29', '30']: continue #ignoring empty aid pages
content, navigation = self._getRenderdFormElements(ti, id, ro_mode=True)
formular.append("""<h1 class="print_new_page">%s</h1>""" % ti.description)
formular.append(content)
+ if ti.key == '14': # found aid-overview
+ aid_list = AidList(id)
+ print "inhalt aid list %s" % (len(aid_list.getDatasets()))
+ for aid in aid_list.getDatasets():
+ ti_rg = self.navigation.getTreeItem(aid.page_id)
+ content, navigation = self._getRenderdFormElements(ti_rg, aid.id, ro_mode=True)
+ formular.append("""<h1 class="print_new_page">%s</h1>""" % ti_rg.description)
+ formular.append(content)
+
c.formular = "<br>".join(formular)
return render('/casemanagement/formular.mako')
@@ -365,6 +375,8 @@
return render('/casemanagement/dialogs/notificate_import_dub.mako')
except StandardError, err:
return self.importCase()
+ except:
+ return self.importCase()
return self.select(str(case.id), "0")
@checkRole(('admin_ka', 'cm_ka', 'pt_dlr'))
@@ -468,6 +480,10 @@
if confirmed == 1:
case = self._loadCase(id)
case.setState(3)
+ c.success_for = u'Fallakte gelöscht!'
+ c.success_text = u'Die Fallakte wurde zum löschen an die Administration weitergeleitet.'
+ c.url_ok = h.url_for(controller="/case_overview")
+ return render('/casemanagement/dialogs/success_delete_cm.mako')
redirect_to(controller="/case_overview")
else:
c.context = "../main.mako"
@@ -485,7 +501,11 @@
if confirmed == 1:
case = self._loadCase(id)
if case.delete():
- redirect_to(controller="/case_overview")
+ c.success_for = u'Fallakte gelöscht!'
+ c.success_text = u'Bitte klicken Sie "OK", um fortzufahren.'
+ c.url_ok = h.url_for(controller="/case_overview")
+ return render('/casemanagement/dialogs/success_delete.mako')
+ #redirect_to(controller="/case_overview")
# TODO: Create Errorpage
return "Error! Could not delete ds."
else:
@@ -504,7 +524,11 @@
if confirmed == 1:
case = self._loadCase(id)
case.setState(1)
- redirect_to(controller="/case_overview")
+ c.success_for = u'Fallakte wiederhergestellt!'
+ c.success_text = u'Bitte klicken Sie "OK", um fortzufahren.'
+ c.url_ok = h.url_for(controller="/case_overview")
+ return render('/casemanagement/dialogs/success_restore.mako')
+ #redirect_to(controller="/case_overview")
else:
c.context = "../main.mako"
c.confirm_for = RESTORE_CONFIRM
@@ -520,13 +544,16 @@
c.ds_id = id
if confirmed == 1:
case = self._setState(id, 1)
- return self.digest(id)
+ c.url_ok = h.url_for(controller="/case", action="organisation", id=id)
+ c.success_for = u'Fallakte geöffnet!'
+ c.success_text = u'Die Fallakte wurde erfolgreich geöffnet.'
+ return render('/casemanagement/dialogs/success_case_close.mako')
else:
c.context = "main.mako"
c.confirm_for = OPEN_CONFIRM
c.question = OPEN_CONFIRM_TEXT
c.url_yes = "/case/open/%s/1" % id
- c.url_no = "/case_overview/"
+ c.url_no = h.url_for(controller="/case", action="organisation", id=id)
return render('/casemanagement/dialogs/confirm_open.mako')
@checkRole('cm_ka')
@@ -536,13 +563,16 @@
c.ds_id = id
if confirmed == 1:
case = self._setState(id, 2)
- redirect_to(controller="/case_overview")
+ c.url_ok = h.url_for(controller="/case", action="organisation", id=id)
+ c.success_for = u'Fallakte geschlossen!'
+ c.success_text = u'Geschlossene Fallakten können Sie in der Fallaktenübersicht durch anklicken des Suchfilters "Geschlossen" einsehen.'
+ return render('/casemanagement/dialogs/success_case_close.mako')
else:
c.context = "main.mako"
c.confirm_for = CLOSE_CONFIRM
c.question = CLOSE_CONFIRM_TEXT
c.url_yes = "/case/close/%s/1" % id
- c.url_no = "/case_overview/"
+ c.url_no = h.url_for(controller="/case", action="organisation", id=id)
return render('/casemanagement/dialogs/confirm_close.mako')
# vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8:
Modified: trunk/waskaweb/controllers/case_overview.py
===================================================================
--- trunk/waskaweb/controllers/case_overview.py 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/controllers/case_overview.py 2008-08-13 13:08:05 UTC (rev 30)
@@ -20,22 +20,22 @@
DIALOG_EMPTY_SELECTION = u'''Keine Fallakten ausgewählt.'''
DIALOG_EMPTY_SELECTION_EXPLAINATION = u'''Sie haben keine Fallakten ausgewählt für die Sie die gewählte Aktion ausführen können. Bitte klicken Sie auf "OK", um zur Fallaktenübersicht zu gelangen und dort Fallakten auszuwählen.'''
-DIALOG_CONFIRM_DELETE = u'''Fallakten löschen'''
+DIALOG_CONFIRM_DELETE = u'''Fallakten löschen?'''
DIALOG_CONFIRM_EXPLAINATION = u'''Wollen Sie wirklich die folgenden Fallakten löschen?%s'''
-DIALOG_CONFIRM_SETEDITOR = u"""Fallakten übertragen"""
-SETEDITOR_NOTIFICATION_SUCCSESS = u"""Es wurden %s Fallakten erfolgreich an <strong>%s %s</strong> übertragen. Klicken Sie auf 'OK', um zur Fallaktenübersicht zu gelangen."""
-SETEDITOR_NOTIFICATION_ERROR = u"""Bei dem Übertragen der Fallakten ist eine Fehler aufgetreten. Klicken Sie auf 'OK', um zur Fallaktenübersicht zu gelangen."""
+DIALOG_CONFIRM_SETEDITOR = u"""Fallakten übertragen!"""
+SETEDITOR_NOTIFICATION_SUCCSESS = u"""Es wurden %s Fallakten erfolgreich an <strong>%s %s</strong> übertragen. Klicken Sie auf "OK", um zur Fallaktenübersicht zu gelangen."""
+SETEDITOR_NOTIFICATION_ERROR = u"""Bei dem Übertragen der Fallakten ist eine Fehler aufgetreten. Klicken Sie auf "OK", um zur Fallaktenübersicht zu gelangen."""
DIALOG_CONFIRM_SETSTANDIN = u"""Vertretung zuweisen"""
-SETSTANDIN_NOTIFICATION_SUCCSESS = u"""Es wurde für %s Fallakten erfolgreich die Vertretung gesetzt. Klicken Sie auf 'OK', um zur Fallaktenübersicht zu gelangen."""
-SETSTANDIN_NOTIFICATION_ERROR = u"""Bei dem Zuweisen der Vertretung für die Fallakten ist ein Fehler aufgetreten. Klicken Sie auf 'OK', um zur Fallaktenübersicht zu gelangen."""
+SETSTANDIN_NOTIFICATION_SUCCSESS = u"""Es wurde für %s Fallakten erfolgreich die Vertretung gesetzt. Klicken Sie auf "OK", um zur Fallaktenübersicht zu gelangen."""
+SETSTANDIN_NOTIFICATION_ERROR = u"""Bei dem Zuweisen der Vertretung für die Fallakten ist ein Fehler aufgetreten. Klicken Sie auf "OK", um zur Fallaktenübersicht zu gelangen."""
SETSTANDIN_NOTIFICATION_EMPTYLIST = u"""Es wurde für keine Fälle die Vertretung übertragen."""
-DELETE_NOTIFICATION_SUCCSESS = u'''Es wurden %s Fallakten erfolgreich gelöscht. Klicken Sie auf 'OK', um zur Fallaktenübersicht zu gelangen.'''
-DELETE_NOTIFICATION_ERROR = u'''Bei dem Löschen der Fallakten ist ein Fehler aufgetreten. Klicken Sie auf 'OK', um zur Fallaktenübersicht zu gelangen.'''
-MARKDELETE_NOTIFICATION_SUCCSESS = u'''Es wurden %s Fallakten erfolgreich zum Löschen freigegeben. Klicken Sie auf 'OK', um zur Fallaktenübersicht zu gelangen.'''
-MARKDELETE_NOTIFICATION_ERROR = u'''Bei dem Freigeben zum Löschen der Fallakten ist ein Fehler aufgetreten. Klicken Sie auf 'OK', um zur Fallaktenübersicht zu gelangen.'''
+DELETE_NOTIFICATION_SUCCSESS = u'''Es wurden %s Fallakten erfolgreich gelöscht. Klicken Sie auf "OK", um zur Fallaktenübersicht zu gelangen.'''
+DELETE_NOTIFICATION_ERROR = u'''Bei dem Löschen der Fallakten ist ein Fehler aufgetreten. Klicken Sie auf "OK", um zur Fallaktenübersicht zu gelangen.'''
+MARKDELETE_NOTIFICATION_SUCCSESS = u'''Es wurden %s Fallakten erfolgreich zum Löschen freigegeben. Klicken Sie auf "OK", um zur Fallaktenübersicht zu gelangen.'''
+MARKDELETE_NOTIFICATION_ERROR = u'''Bei dem Freigeben zum Löschen der Fallakten ist ein Fehler aufgetreten. Klicken Sie auf "OK", um zur Fallaktenübersicht zu gelangen.'''
DELETE_NOTIFICATION_EMPTYLIST = u'''Es wurden keine Fälle gelöscht.'''
class CaseOverviewController(CasebaseController):
@@ -53,6 +53,9 @@
user = session['USER_AUTHORIZED']
# editor or standin setting will be ignored for admin users. They will
# be overwritten in case-controller
+ ulo = UserListObject()
+ filter = [u.id for u in ulo.getAdminList()]
+ c.userlist = ulo.getUserList(filter)
default_search_options = ['own:%s' % user.id, 'state:1']
c.cases.search(";".join(default_search_options))
c.cases.sortByLastname()
@@ -68,10 +71,15 @@
try:
c.form_result = validator.to_python(request.params)
c.cases = CaseOverview()
+ ulo = UserListObject()
+ filter = [u.id for u in ulo.getAdminList()]
+ c.userlist = ulo.getUserList(filter)
search_str = []
user = session['USER_AUTHORIZED']
# editor or standin setting will be ignored for admin users. They will
# be overwritten in case-controller
+ if c.form_result.get('editor', '-1') != '-1':
+ search_str.append('editor:%s' % c.form_result.get('editor'))
if c.form_result.get('show_own') == '1':
search_str.append('own:%s' % user.id)
if c.form_result.get('show_other') == '1':
Modified: trunk/waskaweb/controllers/document.py
===================================================================
--- trunk/waskaweb/controllers/document.py 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/controllers/document.py 2008-08-13 13:08:05 UTC (rev 30)
@@ -23,17 +23,26 @@
log = logging.getLogger(__name__)
-SET_DOCUMENT_SUCCESS_HEADER = u"""Dokument hinzugefügt!"""
-SET_DOCUMENT_SUCCESS_TEXT = u"""Klicken Sie auf OK um fortzufahren."""
-SET_DOCUMENT_FAILED_HEADER = u"""Kein Dokument hinzugefügt!"""
-SET_DOCUMENT_FAILED_TEXT = u"""Klicken Sie auf OK um fortzufahren."""
-SET_ATTACHMENT_SUCCESS_HEADER = u"""Anlage hinzugefügt!"""
-SET_ATTACHMENT_SUCCESS_TEXT = u"""Klicken Sie auf OK um fortzufahren."""
-SET_ATTACHMENT_FAILED_HEADER = u"""Keine Anlage hinzugefügt!"""
-SET_ATTACHMENT_FAILED_TEXT = u"""Klicken Sie auf "OK" um fortzufahren."""
+SET_DOCUMENT_SUCCESS_HEADER = u"""Dokument hinzugefügt!"""
+SET_DOCUMENT_SUCCESS_TEXT = u"""Bitte klicken Sie auf "OK", um fortzufahren."""
+SET_DOCUMENT_FAILED_HEADER = u"""Kein Dokument hinzugefügt!"""
+SET_DOCUMENT_FAILED_TEXT = u"""Vergewissern Sie sich, ob der angegebene Pfad korrekt ist. Dokumente können direkt über den "Browse" bzw. "Durchsuchen" Button ausgewählt werden. Bitte klicken Sie auf "OK", um fortzufahren. """
+SET_DOCUMENT_SUCCESS_DELETE_HEADER = u"""Dokument gelöscht! """
+SET_DOCUMENT_SUCCESS_DELETE_TEXT = u"""Bitte klicken Sie auf "OK", um fortzufahren."""
+SET_DOCUMENT_CONFIRM_DELETE_HEADER = u"""Dokument löschen?"""
+SET_DOCUMENT_CONFIRM_DELETE_TEXT = u"""Wollen Sie das Dokument wirklich löschen und die Daten unwiederbringlich verlieren?"""
+SET_ATTACHMENT_SUCCESS_HEADER = u"""Anlage hinzugefügt!"""
+SET_ATTACHMENT_SUCCESS_TEXT = u"""Bitte klicken Sie auf "OK", um fortzufahren."""
+SET_ATTACHMENT_FAILED_HEADER = u"""Keine Anlage hinzugefügt!"""
+SET_ATTACHMENT_FAILED_TEXT = u"""Vergewissern Sie sich, ob der angegebene Pfad korrekt ist. Anlagen können direkt über den "Browse" bzw. "Durchsuchen" Button ausgewählt werden. Bitte klicken Sie auf "OK", um fortzufahren."""
+SET_ATTACHMENT_SUCCESS_DELETE_HEADER = u"""Anlage gelöscht!"""
+SET_ATTACHMENT_SUCCESS_DELETE_TEXT = u"""Bitte klicken Sie auf "OK", um fortzufahren."""
+SET_ATTACHMENT_CONFIRM_DELETE_HEADER = u"""Anlage löschen?"""
+SET_ATTACHMENT_CONFIRM_DELETE_TEXT = u"""Wollen Sie die Anlage wirklich löschen und die Daten unwiederbringlich verlieren?"""
+
class DocumentController(BaseController):
@checkRole(('admin_ka', 'cm_ka'))
@@ -156,11 +165,14 @@
traceback.print_exc(file=sys.stderr)
return self.globalOverview()
#return render('/tests/trace.mako')
- return self.globalOverview()
+ c.url_ok = h.url_for(controller="/document", action="globalOverview")
+ c.success_for = SET_DOCUMENT_SUCCESS_DELETE_HEADER
+ c.success_text = SET_DOCUMENT_SUCCESS_DELETE_TEXT
+ return render('/documents/dialogs/delete_document_success.mako')
else:
c.context = "../main.mako"
- c.confirm_for = u'Dokument wirklich löschen?'
- c.question = u'Wollen Sie das Dokument wirklich löschen und die Daten unwiederbringlich verlieren?'
+ c.confirm_for = SET_DOCUMENT_CONFIRM_DELETE_HEADER
+ c.question = SET_DOCUMENT_CONFIRM_DELETE_TEXT
c.url_yes = "/document/globalDelete/%d/1" % id
c.url_no = "/document/globalOverview/"
return render('/documents/dialogs/confirm.mako')
@@ -176,13 +188,17 @@
except:
traceback.print_exc(file=sys.stderr)
#return render('/tests/trace.mako')
- redirect_to(controller="/case", action="documents", id=case)
+ c.url_ok = h.url_for(controller="/case", action="documents" , id=case)
+ c.success_for = SET_ATTACHMENT_SUCCESS_DELETE_HEADER
+ c.success_text = SET_ATTACHMENT_SUCCESS_DELETE_TEXT
+ return render('/casemanagement/dialogs/delete_attachment_success.mako', id=case)
+ #redirect_to(controller="/case", action="documents", id=case)
else:
c.context = "../main.mako"
- c.confirm_for = u'Anlage wirklich löschen'
- c.question = u'Wollen Sie die Anlage wirklich löschen und die Daten unwiederbringlich verlieren?'
+ c.confirm_for = SET_ATTACHMENT_CONFIRM_DELETE_HEADER
+ c.question = SET_ATTACHMENT_CONFIRM_DELETE_TEXT
c.url_yes = "/document/caseDelete/%d/%d/1" % (id, case)
c.url_no = h.url_for(controller="/case", action="documents", id=case)
- return render('/documents/dialogs/confirm.mako')
+ return render('/casemanagement/dialogs/confirm_delete_attachment.mako')
# vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8:
Modified: trunk/waskaweb/controllers/rg_aid.py
===================================================================
--- trunk/waskaweb/controllers/rg_aid.py 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/controllers/rg_aid.py 2008-08-13 13:08:05 UTC (rev 30)
@@ -13,11 +13,11 @@
from waskaweb.lib.base import *
from waskaweb.controllers.CaseBase import CasebaseController
from waskaweb.lib.security import checkRole
-from waskaweb.model.repeatgroup import AidObject, AidList
+from waskaweb.model.repeatgroup import AidObject, AidObjectFactory, AidList
log = logging.getLogger(__name__)
-DELETE_CONFIRM_HEADER = u'''Löschen Unterstützungsangebot'''
+DELETE_CONFIRM_HEADER = u'''Unterstützungsangebot löschen?'''
DELETE_CONFIRM_EXPLAINATION = u'''Wollen Sie wirklich das Angebot löschen und die Daten unwiederbringlich verlieren?'''
class RgAidController(CasebaseController):
@@ -78,9 +78,9 @@
case_id = request.params.getone('case_id')
page_id = request.params.getone('page_id')
aid_type = request.params.getone('aid_type')
- aid = AidObject(aid_type)
+ factory = AidObjectFactory()
+ aid = factory.create(int(aid_type))
rg_id = aid.create(int(case_id))
- #print >> sys.stderr, "aid:%s, %s, %s" % (aid, rg_id, aid.page_id)
if rg_id and aid.page_id:
return self.edit(str(rg_id), aid.page_id)
else:
@@ -97,18 +97,23 @@
ds_type = self._checkInt(ds_type)
confirmed = self._checkBool(confirmed)
if confirmed == 1:
- aid = AidObject(ds_type, rg_id)
+ factory = AidObjectFactory()
+ aid = factory.load(int(ds_type), int(rg_id))
if aid.delete():
# Redirect to the overview page: 14 should be the correct page key
- redirect_to('/case/edit/%s/14' % session.get('case').id)
+ c.success_for = u'Angebot gelöscht!'
+ c.success_text = u'Klicken Sie auf OK um fortzufahren.'
+ c.url_ok = "/case/edit/%s/14" % session.get('case').id
+ return render('/casemanagement/dialogs/success_delete_aid.mako')
+ #redirect_to('/case/edit/%s/14' % session.get('case').id)
else:
return "Error! Could not delete ds."
else:
- c.context = "../main.mako"
+ session_case = session.get('case')
c.confirm_for = DELETE_CONFIRM_HEADER
c.question = DELETE_CONFIRM_EXPLAINATION
c.url_yes = "/rg_aid/delete/%s/%s/1" % (rg_id, ds_type)
- c.url_no = "/case/show/%s/14" % session.get('case').id
- return render('/casemanagement/dialogs/confirm.mako')
+ c.url_no = "/case/edit/%s/14" % (session_case.id)
+ return render('/casemanagement/dialogs/confirm_delete_aid.mako')
# vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8:
Modified: trunk/waskaweb/controllers/statement.py
===================================================================
--- trunk/waskaweb/controllers/statement.py 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/controllers/statement.py 2008-08-13 13:08:05 UTC (rev 30)
@@ -21,9 +21,9 @@
ACCEPT_QUESTION = u"""Sie haben angegeben, das eine Einverständniserklärung des Jugendlichen zur Erfassung, Verarbeitung und Speicherung personenbezogener Daten vorliegt. Sind Sie sicher das diese Angabe korrekt ist?"""
DECLINE_QUESTION = u"""Sie haben angegeben, das keine Einverständniserklärung des Jugendlichen zur Erfassung, Verarbeitung und Speicherung personenbezogener Daten vorliegt. Dies bedeutet das die bislang gespeicherten Daten der Fallakte zur Wahrung des Datenschutzes gelöscht werden und unwiederbringlich verloren gehen. Sind Sie sicher das diese Angabe korrekt ist?"""
SET_EE_SUCCESS_HEADER = u"""Einwilligungserklärung gesetzt!"""
-SET_EE_SUCCESS_TEXT = u"""Klicken Sie auf "OK" um fortzufahren."""
+SET_EE_SUCCESS_TEXT = u"""Klicken Sie auf "OK", um fortzufahren."""
SET_EE_DECLINE_SUCCESS_HEADER = u"""Daten wurden gelöscht!"""
-SET_EE_DECLINE_SUCCESS_TEXT = u"""Die personenbezogenen Daten der Fallakte wurden gelöscht. Klicken Sie auf OK um fortzufahren"""
+SET_EE_DECLINE_SUCCESS_TEXT = u"""Die personenbezogenen Daten der Fallakte wurden gelöscht. Klicken Sie auf "OK", um fortzufahren"""
class StatementController(CasebaseController):
def __before__(self):
Modified: trunk/waskaweb/controllers/usersettings.py
===================================================================
--- trunk/waskaweb/controllers/usersettings.py 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/controllers/usersettings.py 2008-08-13 13:08:05 UTC (rev 30)
@@ -16,8 +16,8 @@
log = logging.getLogger(__name__)
-SET_PASSWORD_NOTIFICATION_HEADER = u"""Änderung des Benutzerpasswortes"""
-SET_PASSWORD_NOTIFICATION_TEXT = u"""Ihr Passwort wurde erfolgreich geändert. Bitte klicken Sie auf "OK", um zu den Benutzereinstellungen zu gelangen."""
+SET_PASSWORD_NOTIFICATION_HEADER = u"""Benutzerpasswort geändert!"""
+SET_PASSWORD_NOTIFICATION_TEXT = u"""Ihr Passwort wurde erfolgreich geändert. Bitte klicken Sie auf "OK" um fortzufahren."""
class UsersettingsController(BaseController):
@@ -56,8 +56,8 @@
user.password = new_pass
session['USER_AUTHORIZED'] = user
session.save()
- c.notification_for = SET_PASSWORD_NOTIFICATION_HEADER
- c.notification_text = SET_PASSWORD_NOTIFICATION_TEXT
+ c.success_for = SET_PASSWORD_NOTIFICATION_HEADER
+ c.success_text = SET_PASSWORD_NOTIFICATION_TEXT
c.url_ok = h.url_for(controller="usersettings", action="showSettings", id=user.id)
else:
return "Password could not be changed"
Modified: trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
===================================================================
--- trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po 2008-08-13 13:08:05 UTC (rev 30)
@@ -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-01-25 10:39+0100\n"
+"POT-Creation-Date: 2008-02-01 15:49+0100\n"
"PO-Revision-Date: 2007-10-14 20:33+0200\n"
"Last-Translator: Torsten Irländer<torsten.irlaender at intevation.de>\n"
"Language-Team: de <LL at li.org>\n"
@@ -19,7 +19,7 @@
#: waskaweb/controllers/administration.py:23
msgid "adm_reset_user_password"
-msgstr "Benutzerpasswort wirklich zurücksetzen?"
+msgstr "Benutzerpasswort zurücksetzen?"
#: waskaweb/controllers/administration.py:24
msgid "adm_reset_user_password_question"
@@ -34,7 +34,8 @@
#: waskaweb/controllers/administration.py:32
msgid "adm_delete_user_success_text"
msgstr ""
-"Der Benutzer wurde erfolgreich gelöscht. Klicken Sie auf OK um fortzufahren."
+"Der Benutzer wurde erfolgreich gelöscht. Bitte klicken Sie auf OK um "
+"fortzufahren."
#: waskaweb/controllers/administration.py:29
msgid "adm_delete_user_notification_header"
@@ -45,12 +46,12 @@
msgstr ""
"Der Benutzer kann nicht gelöscht werden, da er noch als Hauptbearbeiter für "
"einige Fallakten eingetragen ist. Bitte weisen Sie den entsprechenden "
-"Fallakten einen neuen Bearbeiter zu. Klicken Sie auf OK, um wieder zur "
-"Benutzerübersicht zu gelangen."
+"Fallakten einen neuen Bearbeiter zu. Bitte klicken Sie auf OK um "
+"fortzufahren."
#: waskaweb/controllers/administration.py:34
msgid "adm_delete_user_confirm_header"
-msgstr "Benutzer wirklich löschen"
+msgstr "Benutzer löschen?"
#: waskaweb/controllers/administration.py:35
msgid "adm_delete_user_confirm_text"
@@ -63,127 +64,129 @@
#: waskaweb/controllers/administration.py:38
msgid "adm_set_editor_success_text"
-msgstr "Fallakte(n) wurden an %s, %s übertragen. Klicken Sie OK um %s, %s zu löschen."
+msgstr ""
+"Fallakten wurden an %s, %s übertragen. Bitte klicken Sie auf OK, um %s, %s "
+"zu löschen."
#: waskaweb/controllers/administration.py:39
msgid "adm_set_editor_success_text_rest"
msgstr ""
-"Fallakten wurden an %s, %s übertragen. %s, %s verfügt weiterhin über Fallakten. Klicken Sie "
-"auf OK, um fortzufahren."
+"Fallakten wurden an %s, %s übertragen. %s, %s verfügt weiterhin über "
+"Fallakten. Bitte klicken Sie auf OK, um fortzufahren."
+#: waskaweb/controllers/administration.py:40
+msgid "adm_set_editor_success_text_head"
+msgstr "Fallakten übertragen!"
+
+#: waskaweb/controllers/administration.py:41
+msgid "adm_set_editor_success_text_rest_head"
+msgstr "Fallakten übertragen. Weitere Fallakten vorhanden!"
+
#: waskaweb/lib/renderer.py:208
msgid "cm_rg_aid_overview_table_institution"
msgstr "Institution"
#: waskaweb/lib/renderer.py:209
msgid "cm_rg_aid_overview_table_offer_type"
-msgstr "Angebotsform"
+msgstr "Form"
#: waskaweb/lib/renderer.py:210
msgid "cm_rg_aid_overview_table_actions"
msgstr "Aktionen"
-#: waskaweb/lib/renderer.py:211
-msgid "cm_rg_aid_overview_table_show"
-msgstr "Anzeigen"
-
#: waskaweb/lib/renderer.py:212
msgid "cm_rg_aid_overview_table_edit"
msgstr "Bearbeiten"
-#: waskaweb/lib/renderer.py:213
-msgid "cm_rg_aid_overview_table_"
-msgstr "Löschen"
-
-#: waskaweb/lib/renderer.py:214
+#: waskaweb/lib/renderer.py:215
msgid "cm_rg_aid_overview_table_no_offer_found"
msgstr "Keine Angebote gefunden"
-#: waskaweb/lib/renderer.py:215
+#: waskaweb/lib/renderer.py:216
msgid "cm_rg_aid_overview_legend_legend"
msgstr "Legende:"
-#: waskaweb/lib/renderer.py:216
+#: waskaweb/lib/renderer.py:217
msgid "cm_rg_aid_overview_legend_bb"
msgstr "(BB)"
-#: waskaweb/lib/renderer.py:217
+#: waskaweb/lib/renderer.py:218
msgid "cm_rg_aid_overview_legend_common_educational_area"
msgstr "Allgemein bildenden Bereich"
-#: waskaweb/lib/renderer.py:218
+#: waskaweb/lib/renderer.py:219
msgid "cm_rg_aid_overview_legend_bv"
msgstr "(BV)"
-#: waskaweb/lib/renderer.py:219
+#: waskaweb/lib/renderer.py:220
msgid "cm_rg_aid_overview_legend_vocational_preparation"
msgstr "Bereich der Berufsvorbereitung"
-#: waskaweb/lib/renderer.py:220
+#: waskaweb/lib/renderer.py:221
msgid "cm_rg_aid_overview_legend_bq"
msgstr "(BQ)"
-#: waskaweb/lib/renderer.py:221
+#: waskaweb/lib/renderer.py:222
msgid "cm_rg_aid_overview_legend_qualifications"
msgstr "Berufliche Qualifizierung"
-#: waskaweb/lib/renderer.py:222
+#: waskaweb/lib/renderer.py:223
msgid "cm_rg_aid_overview_legend_lb"
msgstr "(LB)"
-#: waskaweb/lib/renderer.py:223
+#: waskaweb/lib/renderer.py:224
msgid "cm_rg_aid_overview_legend_life_skills"
msgstr "Lebensbewältigung"
-#: waskaweb/lib/renderer.py:224
+#: waskaweb/lib/renderer.py:225
msgid "cm_rg_aid_overview_legend_new_offer"
msgstr "Neues Angebot hinzufügen"
-#: waskaweb/model/case.py:848
+#: waskaweb/model/case.py:879
#: waskaweb/templates/casemanagement/caselist.mako:37
#: waskaweb/templates/casemanagement/caselist.mako:74
msgid "case_state_label_open"
msgstr "Offen"
-#: waskaweb/model/case.py:849
+#: waskaweb/model/case.py:880
#: waskaweb/templates/casemanagement/caselist.mako:39
#: waskaweb/templates/casemanagement/caselist.mako:76
msgid "case_state_label_closed"
msgstr "Geschlossen"
-#: waskaweb/model/case.py:850
+#: waskaweb/model/case.py:881
msgid "case_state_label_outstanding_delete"
msgstr "Schwebend gelöscht"
-#: waskaweb/model/case.py:851
+#: waskaweb/model/case.py:882
msgid "case_state_label_outstanding_anon"
msgstr "Schwebend anonymisiert"
-#: waskaweb/model/case.py:852
+#: waskaweb/model/case.py:883
msgid "case_state_label_anon"
msgstr "Anonymisiert"
-#: waskaweb/templates/login.mako:3
+#: waskaweb/templates/login.mako:4
msgid "login_header_waska_login"
msgstr "WASKA Login"
-#: waskaweb/templates/login.mako:8
+#: waskaweb/templates/login.mako:9
msgid "login_input_error"
msgstr "Falsche Eingabe"
-#: waskaweb/templates/login.mako:10
+#: waskaweb/templates/login.mako:11
msgid "login_input_error_message"
msgstr "Anmeldekennung und/oder Passwort sind nicht korrekt"
-#: waskaweb/templates/login.mako:15
+#: waskaweb/templates/login.mako:16
msgid "login_p_insert_pw_and_identifier"
msgstr "Geben Sie bitte Anmeldekennung und Passwort ein, um sich anzumelden."
-#: waskaweb/templates/login.mako:18
+#: waskaweb/templates/login.mako:19
msgid "login_label_identifier"
msgstr "Anmeldekennung:"
-#: waskaweb/templates/login.mako:26
+#: waskaweb/templates/login.mako:27
msgid "login_label_pw"
msgstr "Passwort:"
@@ -193,7 +196,7 @@
#: waskaweb/templates/logout.mako:5
msgid "logout_p_logout successful"
-msgstr "Sie haben sich erfolgreich abgemeldet. Klicken Sie auf"
+msgstr "Sie haben sich erfolgreich abgemeldet. Bitte klicken Sie auf"
#: waskaweb/templates/logout.mako:5
msgid "logout_a_login"
@@ -280,7 +283,7 @@
#: waskaweb/templates/main.mako:173
msgid "footer_version"
-msgstr "25.01.2008 | Beta 17"
+msgstr "25.01.2008 | Beta 18"
#: waskaweb/templates/main_login.mako:38
#: waskaweb/templates/start/responsible.mako:71
@@ -310,7 +313,7 @@
#: waskaweb/templates/administration/delete_user_helper.mako:6
#: waskaweb/templates/administration/edit_settings.mako:5
-#: waskaweb/templates/administration/edit_user.mako:5
+#: waskaweb/templates/administration/edit_user.mako:13
#: waskaweb/templates/administration/new_user.mako:13
#: waskaweb/templates/administration/new_user_result.mako:6
#: waskaweb/templates/administration/overview_user.mako:6
@@ -320,13 +323,15 @@
#: waskaweb/templates/administration/show_user.mako:5
#: waskaweb/templates/administration/dialogs/confirm_deleteuser.mako:5
#: waskaweb/templates/administration/dialogs/confirm_resetpassword.mako:5
+#: waskaweb/templates/administration/dialogs/notificate_delete_user_helper.mako:5
#: waskaweb/templates/administration/dialogs/notificate_deleteuser.mako:5
+#: waskaweb/templates/administration/dialogs/success_delete_user.mako:5
#: waskaweb/templates/statement/dialogs/ee_decline_success.mako:5
msgid "adm_np_root"
msgstr "Administration"
#: waskaweb/templates/administration/delete_user_helper.mako:7
-#: waskaweb/templates/administration/edit_user.mako:6
+#: waskaweb/templates/administration/edit_user.mako:14
#: waskaweb/templates/administration/new_user.mako:14
#: waskaweb/templates/administration/new_user_result.mako:7
#: waskaweb/templates/administration/overview_user.mako:7
@@ -334,16 +339,22 @@
#: waskaweb/templates/administration/show_user.mako:6
#: waskaweb/templates/administration/dialogs/confirm_deleteuser.mako:6
#: waskaweb/templates/administration/dialogs/confirm_resetpassword.mako:6
+#: waskaweb/templates/administration/dialogs/notificate_delete_user_helper.mako:6
+#: waskaweb/templates/administration/dialogs/notificate_deleteuser.mako:6
+#: waskaweb/templates/administration/dialogs/success_delete_user.mako:6
#: waskaweb/templates/statement/dialogs/ee_decline_success.mako:6
msgid "adm_np_overview"
msgstr "Benutzerübersicht"
#: waskaweb/templates/administration/delete_user_helper.mako:8
-#: waskaweb/templates/administration/dialogs/notificate_deleteuser.mako:6
+#: waskaweb/templates/administration/dialogs/confirm_deleteuser.mako:8
+#: waskaweb/templates/administration/dialogs/notificate_delete_user_helper.mako:7
msgid "adm_np_deleteuser"
msgstr "Benutzer löschen"
#: waskaweb/templates/administration/delete_user_helper.mako:9
+#: waskaweb/templates/administration/dialogs/confirm_deleteuser.mako:9
+#: waskaweb/templates/administration/dialogs/notificate_delete_user_helper.mako:8
msgid "adm_np_deleteuser_helper"
msgstr "Assistent Benutzer löschen"
@@ -360,8 +371,8 @@
"auszuwählen."
#: waskaweb/templates/administration/delete_user_helper.mako:25
-#: waskaweb/templates/casemanagement/bundle_editor.mako:26
-#: waskaweb/templates/casemanagement/organisation.mako:35
+#: waskaweb/templates/casemanagement/bundle_editor.mako:28
+#: waskaweb/templates/casemanagement/organisation.mako:36
msgid "cm_form_editor_submit"
msgstr "Fallakte übertragen"
@@ -410,30 +421,30 @@
msgid "adm_form_settings_save"
msgstr "Einstellungen speichern"
-#: waskaweb/templates/administration/edit_user.mako:7
+#: waskaweb/templates/administration/edit_user.mako:15
#: waskaweb/templates/administration/reset_password.mako:8
#: waskaweb/templates/administration/show_user.mako:7
#: waskaweb/templates/administration/dialogs/confirm_resetpassword.mako:7
msgid "adm_np_showuser"
msgstr "Benutzer anzeigen"
-#: waskaweb/templates/administration/edit_user.mako:8
+#: waskaweb/templates/administration/edit_user.mako:16
msgid "adm_np_edituser"
msgstr "Benutzer bearbeiten"
-#: waskaweb/templates/administration/edit_user.mako:12
+#: waskaweb/templates/administration/edit_user.mako:20
msgid "adm_header_edituser"
msgstr "Benutzer bearbeiten"
-#: waskaweb/templates/administration/edit_user.mako:17
+#: waskaweb/templates/administration/edit_user.mako:25
msgid "adm_actions_link_userpassreset"
msgstr "Benutzerpasswort zurücksetzen"
-#: waskaweb/templates/administration/edit_user.mako:18
+#: waskaweb/templates/administration/edit_user.mako:26
msgid "menu_adm_link_useredit_back"
msgstr "Zurück zu: Benutzeransicht"
-#: waskaweb/templates/administration/edit_user.mako:27
+#: waskaweb/templates/administration/edit_user.mako:35
#: waskaweb/templates/administration/new_user.mako:36
#: waskaweb/templates/administration/new_user_result.mako:22
#: waskaweb/templates/administration/show_user_body.mako:2
@@ -441,55 +452,59 @@
msgid "adm_form_legend_personal"
msgstr "Angaben zur Person"
-#: waskaweb/templates/administration/edit_user.mako:30
+#: waskaweb/templates/administration/edit_user.mako:38
+#: 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"
-#: waskaweb/templates/administration/edit_user.mako:38
-#: waskaweb/templates/administration/new_user.mako:47
+#: waskaweb/templates/administration/edit_user.mako:47
+#: 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:46
-#: waskaweb/templates/administration/new_user.mako:55
+#: 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"
-#: waskaweb/templates/administration/edit_user.mako:51
+#: waskaweb/templates/administration/edit_user.mako:61
msgid "adm_form_user_roomnumer"
msgstr "Raumnummer"
-#: waskaweb/templates/administration/edit_user.mako:56
-#: waskaweb/templates/administration/new_user.mako:65
+#: waskaweb/templates/administration/edit_user.mako:66
+#: waskaweb/templates/administration/new_user.mako:67
msgid "adm_form_user_branchoffice"
msgstr "Filiale"
-#: waskaweb/templates/administration/edit_user.mako:60
-#: waskaweb/templates/administration/new_user.mako:69
+#: 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:78
-#: waskaweb/templates/administration/new_user.mako:87
+#: waskaweb/templates/administration/edit_user.mako:88
+#: waskaweb/templates/administration/new_user.mako:90
#: waskaweb/templates/administration/userform_body.mako:28
msgid "adm_form_user_activated"
msgstr "Benutzer darf sich anmelden"
-#: waskaweb/templates/administration/edit_user.mako:86
-#: waskaweb/templates/administration/new_user.mako:91
+#: waskaweb/templates/administration/edit_user.mako:96
+#: waskaweb/templates/administration/new_user.mako:94
#: 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:89
-#: waskaweb/templates/administration/new_user.mako:94
+#: waskaweb/templates/administration/edit_user.mako:99
+#: waskaweb/templates/administration/new_user.mako:97
#: waskaweb/templates/administration/userform_body.mako:54
msgid "adm_form_user_submit"
msgstr "Benutzer speichern"
@@ -509,16 +524,17 @@
msgid "menu_adm_link_useroverview_back"
msgstr "Zurück zu: Benutzerübersicht"
-#: waskaweb/templates/administration/new_user.mako:60
+#: waskaweb/templates/administration/new_user.mako:62
msgid "adm_form_user_room"
msgstr "Raumnummer"
-#: waskaweb/templates/administration/new_user.mako:72
+#: 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"
-#: waskaweb/templates/administration/new_user.mako:79
+#: waskaweb/templates/administration/new_user.mako:82
msgid "adm_form_user_role"
msgstr "Benutzerrolle"
@@ -612,7 +628,7 @@
#: waskaweb/templates/casemanagement/caselist.mako:45
#: waskaweb/templates/casemanagement/caselist.mako:82
#: waskaweb/templates/documents/case_overview.mako:42
-#: waskaweb/templates/documents/case_overview.mako:51
+#: waskaweb/templates/documents/case_overview.mako:53
#: waskaweb/templates/documents/global_overview.mako:39
#: waskaweb/templates/documents/global_overview.mako:40
#: waskaweb/templates/documents/global_overview.mako:51
@@ -626,8 +642,8 @@
#: waskaweb/templates/casemanagement/caselist.mako:50
#: waskaweb/templates/casemanagement/caselist.mako:84
#: waskaweb/templates/casemanagement/caselist.mako:87
-#: waskaweb/templates/documents/case_overview.mako:43
-#: waskaweb/templates/documents/case_overview.mako:52
+#: waskaweb/templates/documents/case_overview.mako:44
+#: waskaweb/templates/documents/case_overview.mako:55
#: waskaweb/templates/documents/global_overview.mako:42
#: waskaweb/templates/documents/global_overview.mako:54
msgid "cm_overview_a_delete"
@@ -635,13 +651,12 @@
#: waskaweb/templates/administration/reset_password.mako:9
#: waskaweb/templates/administration/dialogs/confirm_resetpassword.mako:8
-#: waskaweb/templates/usersettings/dialogs/notificate_setpassword.mako:5
msgid "adm_np_resetpassword"
msgstr "Passwort zurücksetzen"
#: waskaweb/templates/administration/reset_password.mako:12
msgid "adm_header_resetpassword"
-msgstr "Benutzerpasswort zurücksgesetzt!"
+msgstr "Benutzerpasswort zurückgesetzt!"
#: waskaweb/templates/administration/reset_password.mako:13
msgid "adm_con_rp_the_password"
@@ -767,8 +782,21 @@
#: waskaweb/templates/administration/dialogs/confirm_deleteuser.mako:7
msgid "adm_np_delteuser"
-msgstr "Benutzer löschen"
+msgstr "Benutzer löschen?"
+#: waskaweb/templates/administration/dialogs/confirm_deleteuser.mako:10
+msgid "adm_np_delteuser_success"
+msgstr "Benutzer gelöscht!"
+
+#: waskaweb/templates/administration/dialogs/notificate_delete_user_helper.mako:9
+msgid "adm_np_deleteuser_helper_set_editor"
+msgstr "Fallakte übertragen"
+
+#: waskaweb/templates/administration/dialogs/notificate_deleteuser.mako:7
+#: waskaweb/templates/administration/dialogs/success_delete_user.mako:7
+msgid "adm_np_success_deleteuser"
+msgstr "Benutzer gelöscht!"
+
#: waskaweb/templates/appointments/appointment_form.mako:6
msgid "app_form_label_title"
msgstr "Titel"
@@ -958,51 +986,95 @@
#: waskaweb/templates/casemanagement/digest.mako:5
#: waskaweb/templates/casemanagement/formular.mako:34
#: waskaweb/templates/casemanagement/new_appointment.mako:5
-#: waskaweb/templates/casemanagement/organisation.mako:5
+#: waskaweb/templates/casemanagement/organisation.mako:6
#: waskaweb/templates/casemanagement/dialogs/confirm_close.mako:5
+#: waskaweb/templates/casemanagement/dialogs/confirm_delete_aid.mako:5
+#: waskaweb/templates/casemanagement/dialogs/confirm_delete_attachment.mako:4
#: waskaweb/templates/casemanagement/dialogs/confirm_open.mako:5
+#: waskaweb/templates/casemanagement/dialogs/delete_attachment_success.mako:6
+#: waskaweb/templates/casemanagement/dialogs/success_case_close.mako:5
+#: waskaweb/templates/casemanagement/dialogs/success_delete_aid.mako:5
#: waskaweb/templates/documents/case_new.mako:4
#: waskaweb/templates/documents/case_overview.mako:5
+#: waskaweb/templates/documents/dialogs/delete_attachment_success.mako:4
#: waskaweb/templates/documents/dialogs/failed_attachment.mako:4
-#: waskaweb/templates/documents/dialogs/success_attachment.mako:4
+#: waskaweb/templates/documents/dialogs/success_attachment.mako:6
msgid "cm_np_select"
msgstr "Ausgewählte Fallakte"
-#: waskaweb/templates/casemanagement/bundle_editor.mako:10
-#: waskaweb/templates/casemanagement/bundle_standin.mako:10
-#: waskaweb/templates/casemanagement/organisation.mako:11
+#: waskaweb/templates/casemanagement/bundle_editor.mako:6
+#: waskaweb/templates/casemanagement/bundle_standin.mako:6
+#: waskaweb/templates/casemanagement/evaluation.mako:4
+#: waskaweb/templates/casemanagement/evaluation_result.mako:6
+#: waskaweb/templates/casemanagement/main.mako:10
+#: waskaweb/templates/casemanagement/new.mako:5
+#: waskaweb/templates/casemanagement/overview.mako:6
+#: waskaweb/templates/casemanagement/upload.mako:5
+#: waskaweb/templates/casemanagement/dialogs/alert.mako:5
+#: waskaweb/templates/casemanagement/dialogs/confirm.mako:5
+#: waskaweb/templates/casemanagement/dialogs/confirm_delete.mako:5
+#: waskaweb/templates/casemanagement/dialogs/confirm_restore.mako:5
+#: waskaweb/templates/casemanagement/dialogs/delete_attachment_success.mako:4
+#: waskaweb/templates/casemanagement/dialogs/notificate_bundle_seteditor.mako:5
+#: waskaweb/templates/casemanagement/dialogs/notificate_bundle_setstandin.mako:5
+#: waskaweb/templates/casemanagement/dialogs/notificate_import_dub.mako:5
+#: waskaweb/templates/casemanagement/dialogs/notificate_printall.mako:5
+#: waskaweb/templates/casemanagement/dialogs/success_delete.mako:5
+#: waskaweb/templates/casemanagement/dialogs/success_delete_cm.mako:5
+#: waskaweb/templates/casemanagement/dialogs/success_restore.mako:5
+#: waskaweb/templates/casemanagement/static_form/statement.mako:5
+#: waskaweb/templates/casemanagement/static_form/statement_print.mako:5
+#: waskaweb/templates/documents/dialogs/success_attachment.mako:4
+#: waskaweb/templates/statement/dialogs/confirm.mako:5
+#: waskaweb/templates/statement/dialogs/missing_statement.mako:5
+msgid "cm_np_root"
+msgstr "Case-Management"
+
+#: waskaweb/templates/casemanagement/bundle_editor.mako:7
+#: waskaweb/templates/casemanagement/dialogs/notificate_bundle_seteditor.mako:6
+msgid "cm_np_bundled_editor"
+msgstr "Bearbeitung übertragen"
+
+#: waskaweb/templates/casemanagement/bundle_editor.mako:12
+#: waskaweb/templates/casemanagement/bundle_standin.mako:12
+#: waskaweb/templates/casemanagement/organisation.mako:12
msgid "cm_header_organisation"
msgstr "Organisation"
-#: waskaweb/templates/casemanagement/bundle_editor.mako:13
+#: waskaweb/templates/casemanagement/bundle_editor.mako:15
msgid "cm_bundle_editor_explain"
msgstr "Bitte wählen Sie den neuen Bearbeiter für die folgenden Akten aus"
-#: waskaweb/templates/casemanagement/bundle_standin.mako:13
-#: waskaweb/templates/casemanagement/organisation.mako:38
+#: waskaweb/templates/casemanagement/bundle_standin.mako:7
+#: waskaweb/templates/casemanagement/dialogs/notificate_bundle_setstandin.mako:6
+msgid "cm_np_bundled_standin"
+msgstr "Vertretung setzen"
+
+#: waskaweb/templates/casemanagement/bundle_standin.mako:15
+#: waskaweb/templates/casemanagement/organisation.mako:39
msgid "cm_header_standin"
msgstr "Vertretung"
-#: waskaweb/templates/casemanagement/bundle_standin.mako:14
+#: waskaweb/templates/casemanagement/bundle_standin.mako:16
msgid "cm_bundle_standin_explain"
msgstr "Bitte wählen Sie die neuen Vertreter für die folgenden Akten aus"
-#: waskaweb/templates/casemanagement/bundle_standin.mako:16
+#: waskaweb/templates/casemanagement/bundle_standin.mako:18
msgid "cm_bundle_standin_explain_cm_ka"
msgstr ""
"Beachten Sie, dass aus der folgenden Liste nur für die Fälle die Vertretung "
"gesetzt werden wird, für die Sie der Hauptbearbeiter sind"
-#: waskaweb/templates/casemanagement/bundle_standin.mako:28
+#: waskaweb/templates/casemanagement/bundle_standin.mako:30
msgid "attention"
msgstr "Achtung"
-#: waskaweb/templates/casemanagement/bundle_standin.mako:28
+#: waskaweb/templates/casemanagement/bundle_standin.mako:30
msgid "cm_bundle_standin_explain_attention"
msgstr "Die bereits existierenden Vertretungsregeln werden überschrieben"
-#: waskaweb/templates/casemanagement/bundle_standin.mako:50
-#: waskaweb/templates/casemanagement/organisation.mako:69
+#: waskaweb/templates/casemanagement/bundle_standin.mako:52
+#: waskaweb/templates/casemanagement/organisation.mako:70
msgid "cm_form_standin_submit"
msgstr "Vertretung ändern"
@@ -1011,13 +1083,13 @@
msgstr "Knr."
#: waskaweb/templates/casemanagement/caselist.mako:7
+msgid "cm_overview_tbl_header_lastname"
+msgstr "Name"
+
+#: waskaweb/templates/casemanagement/caselist.mako:8
msgid "cm_overview_tbl_header_firstname"
msgstr "Vorname"
-#: waskaweb/templates/casemanagement/caselist.mako:8
-msgid "cm_overview_tbl_header_lastname"
-msgstr "Name"
-
#: waskaweb/templates/casemanagement/caselist.mako:10
msgid "cm_overview_tbl_header_editor"
msgstr "Bearbeiter"
@@ -1080,14 +1152,16 @@
"Fallaktenformular"
#: waskaweb/templates/casemanagement/digest.mako:18
-msgid "cm_header_digest_personal"
-msgstr "Angaben zur Person"
+msgid "cm_header_digest_youth"
+msgstr "Angaben zum Jugendlichen"
#: waskaweb/templates/casemanagement/digest.mako:21
+#: waskaweb/templates/casemanagement/digest.mako:75
msgid "cm_digest_tbl_label_lastname"
msgstr "Name"
#: waskaweb/templates/casemanagement/digest.mako:25
+#: waskaweb/templates/casemanagement/digest.mako:79
msgid "cm_digest_tbl_label_firstname"
msgstr "Vorname"
@@ -1100,44 +1174,40 @@
msgstr "Alter"
#: waskaweb/templates/casemanagement/digest.mako:37
-msgid "cm_digest_header_address"
-msgstr "Kontaktdaten"
+#: waskaweb/templates/casemanagement/digest.mako:83
+msgid "cm_digest_tbl_label_email"
+msgstr "E-Mail"
-#: waskaweb/templates/casemanagement/digest.mako:40
+#: waskaweb/templates/casemanagement/digest.mako:47
msgid "cm_digest_tbl_label_street"
msgstr "Straße"
-#: waskaweb/templates/casemanagement/digest.mako:44
+#: waskaweb/templates/casemanagement/digest.mako:51
msgid "cm_digest_tbl_label_plz"
msgstr "PLZ"
-#: waskaweb/templates/casemanagement/digest.mako:48
+#: waskaweb/templates/casemanagement/digest.mako:55
msgid "cm_digest_tbl_label_city"
msgstr "Ort"
-#: waskaweb/templates/casemanagement/digest.mako:52
+#: waskaweb/templates/casemanagement/digest.mako:59
+#: waskaweb/templates/casemanagement/digest.mako:93
msgid "cm_digest_tbl_label_telephone"
-msgstr "Telefon"
+msgstr "Festnetz"
-#: waskaweb/templates/casemanagement/evaluation.mako:4
-#: waskaweb/templates/casemanagement/evaluation_result.mako:6
-#: waskaweb/templates/casemanagement/main.mako:10
-#: waskaweb/templates/casemanagement/new.mako:5
-#: waskaweb/templates/casemanagement/overview.mako:6
-#: waskaweb/templates/casemanagement/upload.mako:5
-#: waskaweb/templates/casemanagement/dialogs/alert.mako:5
-#: waskaweb/templates/casemanagement/dialogs/confirm.mako:5
-#: waskaweb/templates/casemanagement/dialogs/confirm_delete.mako:5
-#: waskaweb/templates/casemanagement/dialogs/confirm_restore.mako:5
-#: waskaweb/templates/casemanagement/dialogs/notificate_import_dub.mako:5
-#: waskaweb/templates/casemanagement/dialogs/notificate_printall.mako:5
-#: waskaweb/templates/casemanagement/static_form/statement.mako:5
-#: waskaweb/templates/casemanagement/static_form/statement_print.mako:5
-#: waskaweb/templates/statement/dialogs/confirm.mako:5
-#: waskaweb/templates/statement/dialogs/missing_statement.mako:5
-msgid "cm_np_root"
-msgstr "Case-Management"
+#: waskaweb/templates/casemanagement/digest.mako:63
+#: waskaweb/templates/casemanagement/digest.mako:97
+msgid "cm_digest_tbl_label_mobiletelephone"
+msgstr "Mobil"
+#: waskaweb/templates/casemanagement/digest.mako:67
+msgid "cm_digest_tbl_label_telephone_more"
+msgstr "Weitere Telefonnummern"
+
+#: waskaweb/templates/casemanagement/digest.mako:72
+msgid "cm_header_digest_parent"
+msgstr "Angaben zum Erziehungsberechtigten"
+
#: waskaweb/templates/casemanagement/evaluation.mako:5
#: waskaweb/templates/casemanagement/evaluation_result.mako:7
msgid "cm_np_evaluate"
@@ -1412,7 +1482,7 @@
msgstr "In Bearbeitung nehmen"
#: waskaweb/templates/casemanagement/formular.mako:22
-#: waskaweb/templates/casemanagement/formular.mako:88
+#: waskaweb/templates/casemanagement/formular.mako:91
msgid "cm_actions_link_printout"
msgstr "Druckversion"
@@ -1420,12 +1490,18 @@
msgid "cm_error_header_false_forminput"
msgstr "Fehlerhafte Formulareingabe"
+#: waskaweb/templates/casemanagement/formular.mako:88
+msgid "cm_actions_link_printoutAidPlanStatement"
+msgstr "Förderplan drucken"
+
#: waskaweb/templates/casemanagement/help.mako:3
msgid "cm_help_header_help_for_dossier"
msgstr "Hilfe zum Fallakten-Formular"
#: waskaweb/templates/casemanagement/main.mako:11
#: waskaweb/templates/casemanagement/overview.mako:7
+#: waskaweb/templates/casemanagement/dialogs/delete_attachment_success.mako:5
+#: waskaweb/templates/documents/dialogs/success_attachment.mako:5
#: waskaweb/templates/statement/dialogs/missing_statement.mako:6
msgid "cm_np_overview"
msgstr "Fallaktenübersicht"
@@ -1435,6 +1511,7 @@
msgstr "Name"
#: waskaweb/templates/casemanagement/main.mako:22
+#: waskaweb/templates/casemanagement/organisation.mako:96
msgid "cm_info_status"
msgstr "Status"
@@ -1466,35 +1543,27 @@
msgid "cm_menu_link_print"
msgstr "Gesamte Akte drucken"
-#: waskaweb/templates/casemanagement/main.mako:57
-msgid "cm_menu_link_close"
-msgstr "Fallakte abschließen"
-
-#: waskaweb/templates/casemanagement/main.mako:60
-msgid "cm_menu_link_open"
-msgstr "CM wiederaufnehmen"
-
-#: waskaweb/templates/casemanagement/main.mako:67
+#: waskaweb/templates/casemanagement/main.mako:61
msgid "cm_menu_header_seperator"
msgstr "Überblick"
-#: waskaweb/templates/casemanagement/main.mako:70
+#: waskaweb/templates/casemanagement/main.mako:64
msgid "cm_menu_link_digest"
msgstr "Zusammenfassung"
-#: waskaweb/templates/casemanagement/main.mako:72
+#: waskaweb/templates/casemanagement/main.mako:66
msgid "cm_menu_link_organisation"
msgstr "Organisation"
-#: waskaweb/templates/casemanagement/main.mako:73
+#: waskaweb/templates/casemanagement/main.mako:67
msgid "cm_menu_link_appointment"
msgstr "Termine"
-#: waskaweb/templates/casemanagement/main.mako:74
+#: waskaweb/templates/casemanagement/main.mako:68
msgid "cm_menu_link_documents"
msgstr "Anlagen"
-#: waskaweb/templates/casemanagement/main.mako:80
+#: waskaweb/templates/casemanagement/main.mako:74
msgid "cm_menu_header_structure"
msgstr "Gliederung"
@@ -1508,9 +1577,9 @@
msgid "cm_new_p_please_consider_statement"
msgstr ""
"Bitte beachten Sie, dass die Einverständniserklärung die Grundlage zur "
-"Erfassung personenbezogener Daten ist. Klicken Sie hierzu auf die Auswahl "
-"'Erklärung drucken'. Bitte nutzen Sie den 'Zurück'-Knopf Ihres Browsers, um "
-"nach dem Drucken auf diese Seite zurückzukehren."
+"Erfassung personenbezogener Daten ist. Bitte klicken Sie hierzu auf die "
+"Auswahl 'Erklärung drucken'. Bitte nutzen Sie den 'Zurück'-Knopf Ihres "
+"Browsers, um nach dem Drucken auf diese Seite zurückzukehren."
#: waskaweb/templates/casemanagement/new.mako:35
msgid "cm_new_con_acceptance_statement_true"
@@ -1523,36 +1592,44 @@
msgid "cm_menu_link_appointment_back"
msgstr "Zurück zu: Terminübersicht"
-#: waskaweb/templates/casemanagement/organisation.mako:6
+#: waskaweb/templates/casemanagement/organisation.mako:7
msgid "cm_np_organisation"
msgstr "Organisation"
-#: waskaweb/templates/casemanagement/organisation.mako:14
+#: waskaweb/templates/casemanagement/organisation.mako:15
msgid "cm_organisation_con_whois_cm_replace"
msgstr ""
"Diese Seite zeigt an, wer der Mitarbeiter dieser Fallakte ist und wer die "
"Vertretung für die Bearbeitung übernimmt."
-#: waskaweb/templates/casemanagement/organisation.mako:15
+#: waskaweb/templates/casemanagement/organisation.mako:16
msgid "cm_header_organisation_editor"
msgstr "Bearbeiter"
-#: waskaweb/templates/casemanagement/organisation.mako:18
+#: waskaweb/templates/casemanagement/organisation.mako:19
msgid "cm_organisation_tbl_label_lastname"
msgstr "Nachname"
-#: waskaweb/templates/casemanagement/organisation.mako:21
+#: waskaweb/templates/casemanagement/organisation.mako:22
msgid "cm_organisation_tbl_label_firstname"
msgstr "Vorname"
-#: waskaweb/templates/casemanagement/organisation.mako:24
+#: waskaweb/templates/casemanagement/organisation.mako:25
msgid "cm_organisation_tbl_label_telephone"
msgstr "Telefon"
-#: waskaweb/templates/casemanagement/organisation.mako:74
+#: waskaweb/templates/casemanagement/organisation.mako:75
msgid "cm_organisation_table_cm"
msgstr "Bearbeiter"
+#: waskaweb/templates/casemanagement/organisation.mako:99
+msgid "cm_menu_link_close"
+msgstr "Fallakte schließen"
+
+#: waskaweb/templates/casemanagement/organisation.mako:102
+msgid "cm_menu_link_open"
+msgstr "Fallakte öffnen"
+
#: waskaweb/templates/casemanagement/overview.mako:9
msgid "cm_header_overview"
msgstr "Fallaktenübersicht"
@@ -1568,7 +1645,7 @@
msgstr ""
"Hier wird eine Auflistung der Fälle des angemeldeten Benutzers angezeigt"
-#: waskaweb/templates/casemanagement/overview.mako:21
+#: waskaweb/templates/casemanagement/overview.mako:29
msgid "cm_form_overview_search_submit"
msgstr "Suchen"
@@ -1592,57 +1669,102 @@
#: waskaweb/templates/casemanagement/dialogs/confirm.mako:6
#: waskaweb/templates/casemanagement/dialogs/confirm_delete.mako:6
msgid "cm_np_delete"
-msgstr "Fallakte löschen"
+msgstr "Fallakte löschen?"
#: waskaweb/templates/casemanagement/dialogs/confirm_close.mako:6
msgid "cm_np_close"
msgstr "Fallakte schließen"
+#: waskaweb/templates/casemanagement/dialogs/confirm_delete_aid.mako:6
+#: waskaweb/templates/casemanagement/dialogs/success_delete_aid.mako:6
+msgid "cm_np_case_aid"
+msgstr "Akte: Unterstützungsangebote"
+
+#: waskaweb/templates/casemanagement/dialogs/confirm_delete_aid.mako:7
+msgid "cm_np_confirm_aid_delete"
+msgstr "Angebot löschen?"
+
+#: waskaweb/templates/casemanagement/dialogs/confirm_delete_attachment.mako:5
+#: waskaweb/templates/documents/dialogs/success_attachment.mako:7
+msgid "cm_np_att_overview"
+msgstr "Anlagenübersicht"
+
+#: waskaweb/templates/casemanagement/dialogs/confirm_delete_attachment.mako:6
+msgid "cm_np_attachment_confirm"
+msgstr "Anlage löschen?"
+
#: waskaweb/templates/casemanagement/dialogs/confirm_open.mako:6
msgid "cm_np_open"
msgstr "CM wiederaufnehmen"
#: waskaweb/templates/casemanagement/dialogs/confirm_restore.mako:6
msgid "cm_np_restore"
-msgstr "Fallakte wiederherstellen"
+msgstr "Fallakte wiederherstellen?"
+#: waskaweb/templates/casemanagement/dialogs/delete_attachment_success.mako:7
+#: waskaweb/templates/documents/case_new.mako:5
+#: waskaweb/templates/documents/case_overview.mako:6
+#: waskaweb/templates/documents/dialogs/delete_attachment_success.mako:5
+#: waskaweb/templates/documents/dialogs/failed_attachment.mako:5
+msgid "cm_np_doc_overview"
+msgstr "Anlagenübersicht"
+
+#: waskaweb/templates/casemanagement/dialogs/delete_attachment_success.mako:8
+#: waskaweb/templates/documents/dialogs/delete_attachment_success.mako:6
+msgid "cm_np_delete_attachment_success"
+msgstr "Anlage gelöscht!"
+
+#: waskaweb/templates/casemanagement/dialogs/notificate_import_dub.mako:7
+msgid "cm_np_import_failed"
+msgstr "Import fehlgeschlagen!"
+
+#: waskaweb/templates/casemanagement/dialogs/success_case_close.mako:6
+msgid "cm_np_close_success"
+msgstr "Fallakte abgeschlossen!"
+
+#: waskaweb/templates/casemanagement/dialogs/success_delete.mako:6
+#: waskaweb/templates/casemanagement/dialogs/success_delete_cm.mako:6
+msgid "cm_np_delete_success"
+msgstr "Fallakte gelöscht!"
+
+#: waskaweb/templates/casemanagement/dialogs/success_delete_aid.mako:7
+msgid "cm_np_success_aid_delete"
+msgstr "Angebot gelöscht!"
+
+#: waskaweb/templates/casemanagement/dialogs/success_restore.mako:6
+msgid "cm_np_restore_success"
+msgstr "Wiederherstellen erfolgreich!"
+
#: waskaweb/templates/casemanagement/static_form/statement_print.mako:6
msgid "cm_np_statement"
msgstr "Einwilligungserklärung"
-#: waskaweb/templates/dialogs/alert.mako:2
+#: waskaweb/templates/dialogs/alert.mako:3
msgid "dialog_header_alert"
msgstr "Achtung!"
-#: waskaweb/templates/dialogs/alert.mako:5
-#: waskaweb/templates/dialogs/failed.mako:5
-#: waskaweb/templates/dialogs/success.mako:5
+#: waskaweb/templates/dialogs/alert.mako:6
+#: waskaweb/templates/dialogs/failed.mako:6
+#: waskaweb/templates/dialogs/success.mako:6
msgid "dialog_header_confirm_option_ok"
msgstr "OK"
-#: waskaweb/templates/dialogs/alert.mako:6
+#: waskaweb/templates/dialogs/alert.mako:7
msgid "dialog_header_confirm_option_cancel"
msgstr "Abbrechen"
-#: waskaweb/templates/dialogs/confirm.mako:5
+#: waskaweb/templates/dialogs/confirm.mako:6
msgid "dialog_header_confirm_option_yes"
msgstr "Ja"
-#: waskaweb/templates/dialogs/confirm.mako:6
+#: waskaweb/templates/dialogs/confirm.mako:7
msgid "dialog_header_confirm_option_no"
msgstr "Nein"
-#: waskaweb/templates/dialogs/notification.mako:5
+#: waskaweb/templates/dialogs/notification.mako:6
msgid "dialog_header_notification_option_ok"
msgstr "OK"
-#: waskaweb/templates/documents/case_new.mako:5
-#: waskaweb/templates/documents/case_overview.mako:6
-#: waskaweb/templates/documents/dialogs/failed_attachment.mako:5
-#: waskaweb/templates/documents/dialogs/success_attachment.mako:5
-msgid "cm_np_doc_overview"
-msgstr "Anlagenübersicht"
-
#: waskaweb/templates/documents/case_new.mako:6
msgid "cm_np_doc_upload"
msgstr "Anlage hinzufügen"
@@ -1690,7 +1812,7 @@
msgid "doc_overview_tbl_header_actions"
msgstr "Aktionen"
-#: waskaweb/templates/documents/case_overview.mako:61
+#: waskaweb/templates/documents/case_overview.mako:65
#: waskaweb/templates/documents/global_overview.mako:64
msgid "doc_overview_nofilesfound"
msgstr "Es wurden keine Dateien gefunden"
@@ -1698,6 +1820,7 @@
#: waskaweb/templates/documents/global_overview.mako:6
#: waskaweb/templates/documents/global_upload.mako:4
#: waskaweb/templates/documents/dialogs/confirm.mako:4
+#: waskaweb/templates/documents/dialogs/delete_document_success.mako:4
#: waskaweb/templates/documents/dialogs/failed_document.mako:4
#: waskaweb/templates/documents/dialogs/success_documents.mako:4
msgid "doc_np_overview"
@@ -1727,17 +1850,24 @@
#: waskaweb/templates/documents/dialogs/confirm.mako:5
msgid "doc_np_delete"
-msgstr "Dokument löschen"
+msgstr "Dokument löschen?"
+#: waskaweb/templates/documents/dialogs/delete_document_success.mako:5
+msgid "cm_np_delete_document_success"
+msgstr "Dokument gelöscht!"
+
#: waskaweb/templates/documents/dialogs/failed_attachment.mako:6
#: waskaweb/templates/documents/dialogs/failed_document.mako:6
msgid "cm_np_doc_failed"
-msgstr "Es ist ein Fehler bei dem Hinzufügen des Dokuments aufgetreten"
+msgstr "Fehler beim Hinzufügen"
-#: waskaweb/templates/documents/dialogs/success_attachment.mako:6
+#: waskaweb/templates/documents/dialogs/success_attachment.mako:8
+msgid "cm_np_attachment_success"
+msgstr "Anlage hinzugefügt"
+
#: waskaweb/templates/documents/dialogs/success_documents.mako:6
msgid "cm_np_doc_success"
-msgstr "Das Dokument wurde erfolgreich hinzugefügt"
+msgstr "Dokument hinzugefügt"
#: waskaweb/templates/start/responsible.mako:4
msgid "responsible_info_sponsorship"
@@ -1766,7 +1896,7 @@
"zur Erfassung, Verarbeitung und Nutzung personenbezogener Daten seitens des "
"Jugendlichen vor."
-#: waskaweb/templates/statement/edit.mako:9
+#: waskaweb/templates/statement/edit.mako:6
msgid "statement_edit_p_statement_decision"
msgstr ""
"Sie können in diesem Dialog bestätigen, dass die Einverständniserklärung nun "
@@ -1774,25 +1904,25 @@
"Jugendlichen abgegeben wird. In diesem Fall wird die gewählte Fallakte "
"anonymisiert und ist nicht mehr bearbeitbar."
-#: waskaweb/templates/statement/edit.mako:13
+#: waskaweb/templates/statement/edit.mako:7
msgid "statement_edit_p_statement_form"
msgstr ""
"Bitte beachten Sie, dass die Einverständniserklärung der schriftlichen Form "
"bedarf. Dazu steht Ihnen eine"
-#: waskaweb/templates/statement/edit.mako:13
+#: waskaweb/templates/statement/edit.mako:7
msgid "statement_edit_a_statement_form_printversion"
msgstr " Druckversion dieser Erklärung"
-#: waskaweb/templates/statement/edit.mako:13
+#: waskaweb/templates/statement/edit.mako:7
msgid "statement_edit_p_statement_form_end"
msgstr "zur Verfügung."
-#: waskaweb/templates/statement/edit.mako:20
+#: waskaweb/templates/statement/edit.mako:12
msgid "statement_label_statement_yes"
msgstr "Die Einwilligungserklärung liegt vor."
-#: waskaweb/templates/statement/edit.mako:24
+#: waskaweb/templates/statement/edit.mako:16
msgid "statement_label_statement_no"
msgstr "Die Einwilligungserklärung liegt nicht vor."
@@ -1802,7 +1932,7 @@
#: waskaweb/templates/statement/dialogs/ee_decline_success.mako:7
msgid "np_adm_statement_declined"
-msgstr "Daten gelöscht"
+msgstr "Daten gelöscht!"
#: waskaweb/templates/statement/dialogs/missing_statement.mako:7
msgid "cm_np_show"
@@ -1853,27 +1983,31 @@
msgid "statement_dialog_a_ok"
msgstr "OK"
-#: waskaweb/templates/usersettings/change_password.mako:6
+#: waskaweb/templates/usersettings/change_password.mako:10
msgid "adm_header_changepassword"
msgstr "Benutzerpasswort ändern"
-#: waskaweb/templates/usersettings/change_password.mako:11
+#: waskaweb/templates/usersettings/change_password.mako:15
#: waskaweb/templates/usersettings/edit_standin.mako:11
msgid "sm_menu_link_settings_back"
msgstr "Zurück zu: Mein Konto"
-#: waskaweb/templates/usersettings/change_password.mako:21
+#: waskaweb/templates/usersettings/change_password.mako:25
+#: waskaweb/templates/usersettings/change_password.mako:28
#: waskaweb/templates/usersettings/change_password_login.mako:20
+#: waskaweb/templates/usersettings/change_password_login.mako:23
msgid "adm_form_newuser_passwd"
msgstr "Passwort"
-#: waskaweb/templates/usersettings/change_password.mako:29
-#: waskaweb/templates/usersettings/change_password_login.mako:28
+#: waskaweb/templates/usersettings/change_password.mako:34
+#: waskaweb/templates/usersettings/change_password.mako:37
+#: waskaweb/templates/usersettings/change_password_login.mako:29
+#: waskaweb/templates/usersettings/change_password_login.mako:32
msgid "adm_form_newuser_passwd_confirm"
msgstr "Passwort (Wiederholung)"
-#: waskaweb/templates/usersettings/change_password.mako:36
-#: waskaweb/templates/usersettings/change_password_login.mako:36
+#: waskaweb/templates/usersettings/change_password.mako:42
+#: waskaweb/templates/usersettings/change_password_login.mako:38
msgid "adm_form_changepassword_submit"
msgstr "Passwort ändern"
@@ -1937,6 +2071,31 @@
msgid "usersettings_p_overview_personal_data"
msgstr "Hier sehen sie eine Übersicht Ihrer persönlichen Daten."
+#: waskaweb/templates/usersettings/dialogs/notificate_setpassword.mako:5
+msgid "adm_np_changepassword"
+msgstr "Benutzerpasswort geändert!"
+
+#~ msgid "cm_header_digest_personal"
+#~ msgstr "Angaben zum Jugendlichen"
+
+#~ msgid "cm_digest_header_address"
+#~ msgstr "Kontaktdaten"
+
+#~ msgid "cm_np_condfirm_aid_delete"
+#~ msgstr "Unterstützungsangebot löschen?"
+
+#~ msgid "att_np_delete"
+#~ msgstr "Anlage löschen"
+
+#~ msgid "att_np_overview"
+#~ msgstr "Anlagenübersicht"
+
+#~ msgid "cm_rg_aid_overview_table_show"
+#~ msgstr "Anzeigen"
+
+#~ msgid "cm_rg_aid_overview_table_"
+#~ msgstr "Löschen"
+
#~ msgid "cm_header_search"
#~ msgstr "Suche"
@@ -1977,9 +2136,6 @@
#~ msgid "cm_rg_aid_overview_header_overview_support_offer"
#~ msgstr "Übersicht Unterstützungsangebote"
-#~ msgid "cm_actions_link_printoutAidPlanStatement"
-#~ msgstr "Förderplan drucken"
-
#~ msgid "cm_rg_aid_overview_option_common_educational_area"
#~ msgstr "allg. bildender Bereich (BB)"
Modified: trunk/waskaweb/i18n/waskaweb.pot
===================================================================
--- trunk/waskaweb/i18n/waskaweb.pot 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/i18n/waskaweb.pot 2008-08-13 13:08:05 UTC (rev 30)
@@ -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-01-25 12:48+0100\n"
+"POT-Creation-Date: 2008-02-01 15:49+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -63,6 +63,14 @@
msgid "adm_set_editor_success_text_rest"
msgstr ""
+#: waskaweb/controllers/administration.py:40
+msgid "adm_set_editor_success_text_head"
+msgstr ""
+
+#: waskaweb/controllers/administration.py:41
+msgid "adm_set_editor_success_text_rest_head"
+msgstr ""
+
#: waskaweb/lib/renderer.py:208
msgid "cm_rg_aid_overview_table_institution"
msgstr ""
@@ -75,105 +83,97 @@
msgid "cm_rg_aid_overview_table_actions"
msgstr ""
-#: waskaweb/lib/renderer.py:211
-msgid "cm_rg_aid_overview_table_show"
-msgstr ""
-
#: waskaweb/lib/renderer.py:212
msgid "cm_rg_aid_overview_table_edit"
msgstr ""
-#: waskaweb/lib/renderer.py:213
-msgid "cm_rg_aid_overview_table_"
-msgstr ""
-
-#: waskaweb/lib/renderer.py:214
+#: waskaweb/lib/renderer.py:215
msgid "cm_rg_aid_overview_table_no_offer_found"
msgstr ""
-#: waskaweb/lib/renderer.py:215
+#: waskaweb/lib/renderer.py:216
msgid "cm_rg_aid_overview_legend_legend"
msgstr ""
-#: waskaweb/lib/renderer.py:216
+#: waskaweb/lib/renderer.py:217
msgid "cm_rg_aid_overview_legend_bb"
msgstr ""
-#: waskaweb/lib/renderer.py:217
+#: waskaweb/lib/renderer.py:218
msgid "cm_rg_aid_overview_legend_common_educational_area"
msgstr ""
-#: waskaweb/lib/renderer.py:218
+#: waskaweb/lib/renderer.py:219
msgid "cm_rg_aid_overview_legend_bv"
msgstr ""
-#: waskaweb/lib/renderer.py:219
+#: waskaweb/lib/renderer.py:220
msgid "cm_rg_aid_overview_legend_vocational_preparation"
msgstr ""
-#: waskaweb/lib/renderer.py:220
+#: waskaweb/lib/renderer.py:221
msgid "cm_rg_aid_overview_legend_bq"
msgstr ""
-#: waskaweb/lib/renderer.py:221
+#: waskaweb/lib/renderer.py:222
msgid "cm_rg_aid_overview_legend_qualifications"
msgstr ""
-#: waskaweb/lib/renderer.py:222
+#: waskaweb/lib/renderer.py:223
msgid "cm_rg_aid_overview_legend_lb"
msgstr ""
-#: waskaweb/lib/renderer.py:223
+#: waskaweb/lib/renderer.py:224
msgid "cm_rg_aid_overview_legend_life_skills"
msgstr ""
-#: waskaweb/lib/renderer.py:224
+#: waskaweb/lib/renderer.py:225
msgid "cm_rg_aid_overview_legend_new_offer"
msgstr ""
-#: waskaweb/model/case.py:848 waskaweb/templates/casemanagement/caselist.mako:37
+#: waskaweb/model/case.py:879 waskaweb/templates/casemanagement/caselist.mako:37
#: waskaweb/templates/casemanagement/caselist.mako:74
msgid "case_state_label_open"
msgstr ""
-#: waskaweb/model/case.py:849 waskaweb/templates/casemanagement/caselist.mako:39
+#: waskaweb/model/case.py:880 waskaweb/templates/casemanagement/caselist.mako:39
#: waskaweb/templates/casemanagement/caselist.mako:76
msgid "case_state_label_closed"
msgstr ""
-#: waskaweb/model/case.py:850
+#: waskaweb/model/case.py:881
msgid "case_state_label_outstanding_delete"
msgstr ""
-#: waskaweb/model/case.py:851
+#: waskaweb/model/case.py:882
msgid "case_state_label_outstanding_anon"
msgstr ""
-#: waskaweb/model/case.py:852
+#: waskaweb/model/case.py:883
msgid "case_state_label_anon"
msgstr ""
-#: waskaweb/templates/login.mako:3
+#: waskaweb/templates/login.mako:4
msgid "login_header_waska_login"
msgstr ""
-#: waskaweb/templates/login.mako:8
+#: waskaweb/templates/login.mako:9
msgid "login_input_error"
msgstr ""
-#: waskaweb/templates/login.mako:10
+#: waskaweb/templates/login.mako:11
msgid "login_input_error_message"
msgstr ""
-#: waskaweb/templates/login.mako:15
+#: waskaweb/templates/login.mako:16
msgid "login_p_insert_pw_and_identifier"
msgstr ""
-#: waskaweb/templates/login.mako:18
+#: waskaweb/templates/login.mako:19
msgid "login_label_identifier"
msgstr ""
-#: waskaweb/templates/login.mako:26
+#: waskaweb/templates/login.mako:27
msgid "login_label_pw"
msgstr ""
@@ -295,7 +295,7 @@
#: waskaweb/templates/administration/delete_user_helper.mako:6
#: waskaweb/templates/administration/edit_settings.mako:5
-#: waskaweb/templates/administration/edit_user.mako:5
+#: waskaweb/templates/administration/edit_user.mako:13
#: waskaweb/templates/administration/new_user.mako:13
#: waskaweb/templates/administration/new_user_result.mako:6
#: waskaweb/templates/administration/overview_user.mako:6
@@ -305,13 +305,15 @@
#: waskaweb/templates/administration/show_user.mako:5
#: waskaweb/templates/administration/dialogs/confirm_deleteuser.mako:5
#: waskaweb/templates/administration/dialogs/confirm_resetpassword.mako:5
+#: waskaweb/templates/administration/dialogs/notificate_delete_user_helper.mako:5
#: waskaweb/templates/administration/dialogs/notificate_deleteuser.mako:5
+#: waskaweb/templates/administration/dialogs/success_delete_user.mako:5
#: waskaweb/templates/statement/dialogs/ee_decline_success.mako:5
msgid "adm_np_root"
msgstr ""
#: waskaweb/templates/administration/delete_user_helper.mako:7
-#: waskaweb/templates/administration/edit_user.mako:6
+#: waskaweb/templates/administration/edit_user.mako:14
#: waskaweb/templates/administration/new_user.mako:14
#: waskaweb/templates/administration/new_user_result.mako:7
#: waskaweb/templates/administration/overview_user.mako:7
@@ -319,16 +321,22 @@
#: waskaweb/templates/administration/show_user.mako:6
#: waskaweb/templates/administration/dialogs/confirm_deleteuser.mako:6
#: waskaweb/templates/administration/dialogs/confirm_resetpassword.mako:6
+#: waskaweb/templates/administration/dialogs/notificate_delete_user_helper.mako:6
+#: waskaweb/templates/administration/dialogs/notificate_deleteuser.mako:6
+#: waskaweb/templates/administration/dialogs/success_delete_user.mako:6
#: waskaweb/templates/statement/dialogs/ee_decline_success.mako:6
msgid "adm_np_overview"
msgstr ""
#: waskaweb/templates/administration/delete_user_helper.mako:8
-#: waskaweb/templates/administration/dialogs/notificate_deleteuser.mako:6
+#: waskaweb/templates/administration/dialogs/confirm_deleteuser.mako:8
+#: waskaweb/templates/administration/dialogs/notificate_delete_user_helper.mako:7
msgid "adm_np_deleteuser"
msgstr ""
#: waskaweb/templates/administration/delete_user_helper.mako:9
+#: waskaweb/templates/administration/dialogs/confirm_deleteuser.mako:9
+#: waskaweb/templates/administration/dialogs/notificate_delete_user_helper.mako:8
msgid "adm_np_deleteuser_helper"
msgstr ""
@@ -341,8 +349,8 @@
msgstr ""
#: waskaweb/templates/administration/delete_user_helper.mako:25
-#: waskaweb/templates/casemanagement/bundle_editor.mako:26
-#: waskaweb/templates/casemanagement/organisation.mako:35
+#: waskaweb/templates/casemanagement/bundle_editor.mako:28
+#: waskaweb/templates/casemanagement/organisation.mako:36
msgid "cm_form_editor_submit"
msgstr ""
@@ -391,30 +399,30 @@
msgid "adm_form_settings_save"
msgstr ""
-#: waskaweb/templates/administration/edit_user.mako:7
+#: waskaweb/templates/administration/edit_user.mako:15
#: waskaweb/templates/administration/reset_password.mako:8
#: waskaweb/templates/administration/show_user.mako:7
#: waskaweb/templates/administration/dialogs/confirm_resetpassword.mako:7
msgid "adm_np_showuser"
msgstr ""
-#: waskaweb/templates/administration/edit_user.mako:8
+#: waskaweb/templates/administration/edit_user.mako:16
msgid "adm_np_edituser"
msgstr ""
-#: waskaweb/templates/administration/edit_user.mako:12
+#: waskaweb/templates/administration/edit_user.mako:20
msgid "adm_header_edituser"
msgstr ""
-#: waskaweb/templates/administration/edit_user.mako:17
+#: waskaweb/templates/administration/edit_user.mako:25
msgid "adm_actions_link_userpassreset"
msgstr ""
-#: waskaweb/templates/administration/edit_user.mako:18
+#: waskaweb/templates/administration/edit_user.mako:26
msgid "menu_adm_link_useredit_back"
msgstr ""
-#: waskaweb/templates/administration/edit_user.mako:27
+#: waskaweb/templates/administration/edit_user.mako:35
#: waskaweb/templates/administration/new_user.mako:36
#: waskaweb/templates/administration/new_user_result.mako:22
#: waskaweb/templates/administration/show_user_body.mako:2
@@ -422,55 +430,59 @@
msgid "adm_form_legend_personal"
msgstr ""
-#: waskaweb/templates/administration/edit_user.mako:30
+#: waskaweb/templates/administration/edit_user.mako:38
+#: 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 ""
-#: waskaweb/templates/administration/edit_user.mako:38
-#: waskaweb/templates/administration/new_user.mako:47
+#: waskaweb/templates/administration/edit_user.mako:47
+#: 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:46
-#: waskaweb/templates/administration/new_user.mako:55
+#: 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 ""
-#: waskaweb/templates/administration/edit_user.mako:51
+#: waskaweb/templates/administration/edit_user.mako:61
msgid "adm_form_user_roomnumer"
msgstr ""
-#: waskaweb/templates/administration/edit_user.mako:56
-#: waskaweb/templates/administration/new_user.mako:65
+#: waskaweb/templates/administration/edit_user.mako:66
+#: waskaweb/templates/administration/new_user.mako:67
msgid "adm_form_user_branchoffice"
msgstr ""
-#: waskaweb/templates/administration/edit_user.mako:60
-#: waskaweb/templates/administration/new_user.mako:69
+#: 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:78
-#: waskaweb/templates/administration/new_user.mako:87
+#: waskaweb/templates/administration/edit_user.mako:88
+#: waskaweb/templates/administration/new_user.mako:90
#: waskaweb/templates/administration/userform_body.mako:28
msgid "adm_form_user_activated"
msgstr ""
-#: waskaweb/templates/administration/edit_user.mako:86
-#: waskaweb/templates/administration/new_user.mako:91
+#: waskaweb/templates/administration/edit_user.mako:96
+#: waskaweb/templates/administration/new_user.mako:94
#: waskaweb/templates/administration/userform_body.mako:36
msgid "adm_form_user_newpass"
msgstr ""
-#: waskaweb/templates/administration/edit_user.mako:89
-#: waskaweb/templates/administration/new_user.mako:94
+#: waskaweb/templates/administration/edit_user.mako:99
+#: waskaweb/templates/administration/new_user.mako:97
#: waskaweb/templates/administration/userform_body.mako:54
msgid "adm_form_user_submit"
msgstr ""
@@ -490,16 +502,17 @@
msgid "menu_adm_link_useroverview_back"
msgstr ""
-#: waskaweb/templates/administration/new_user.mako:60
+#: waskaweb/templates/administration/new_user.mako:62
msgid "adm_form_user_room"
msgstr ""
-#: waskaweb/templates/administration/new_user.mako:72
+#: 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 ""
-#: waskaweb/templates/administration/new_user.mako:79
+#: waskaweb/templates/administration/new_user.mako:82
msgid "adm_form_user_role"
msgstr ""
@@ -592,7 +605,7 @@
#: waskaweb/templates/casemanagement/caselist.mako:45
#: waskaweb/templates/casemanagement/caselist.mako:82
#: waskaweb/templates/documents/case_overview.mako:42
-#: waskaweb/templates/documents/case_overview.mako:51
+#: waskaweb/templates/documents/case_overview.mako:53
#: waskaweb/templates/documents/global_overview.mako:39
#: waskaweb/templates/documents/global_overview.mako:40
#: waskaweb/templates/documents/global_overview.mako:51
@@ -606,8 +619,8 @@
#: waskaweb/templates/casemanagement/caselist.mako:50
#: waskaweb/templates/casemanagement/caselist.mako:84
#: waskaweb/templates/casemanagement/caselist.mako:87
-#: waskaweb/templates/documents/case_overview.mako:43
-#: waskaweb/templates/documents/case_overview.mako:52
+#: waskaweb/templates/documents/case_overview.mako:44
+#: waskaweb/templates/documents/case_overview.mako:55
#: waskaweb/templates/documents/global_overview.mako:42
#: waskaweb/templates/documents/global_overview.mako:54
msgid "cm_overview_a_delete"
@@ -615,7 +628,6 @@
#: waskaweb/templates/administration/reset_password.mako:9
#: waskaweb/templates/administration/dialogs/confirm_resetpassword.mako:8
-#: waskaweb/templates/usersettings/dialogs/notificate_setpassword.mako:5
msgid "adm_np_resetpassword"
msgstr ""
@@ -749,6 +761,19 @@
msgid "adm_np_delteuser"
msgstr ""
+#: waskaweb/templates/administration/dialogs/confirm_deleteuser.mako:10
+msgid "adm_np_delteuser_success"
+msgstr ""
+
+#: waskaweb/templates/administration/dialogs/notificate_delete_user_helper.mako:9
+msgid "adm_np_deleteuser_helper_set_editor"
+msgstr ""
+
+#: waskaweb/templates/administration/dialogs/notificate_deleteuser.mako:7
+#: waskaweb/templates/administration/dialogs/success_delete_user.mako:7
+msgid "adm_np_success_deleteuser"
+msgstr ""
+
#: waskaweb/templates/appointments/appointment_form.mako:6
msgid "app_form_label_title"
msgstr ""
@@ -938,49 +963,93 @@
#: waskaweb/templates/casemanagement/digest.mako:5
#: waskaweb/templates/casemanagement/formular.mako:34
#: waskaweb/templates/casemanagement/new_appointment.mako:5
-#: waskaweb/templates/casemanagement/organisation.mako:5
+#: waskaweb/templates/casemanagement/organisation.mako:6
#: waskaweb/templates/casemanagement/dialogs/confirm_close.mako:5
+#: waskaweb/templates/casemanagement/dialogs/confirm_delete_aid.mako:5
+#: waskaweb/templates/casemanagement/dialogs/confirm_delete_attachment.mako:4
#: waskaweb/templates/casemanagement/dialogs/confirm_open.mako:5
+#: waskaweb/templates/casemanagement/dialogs/delete_attachment_success.mako:6
+#: waskaweb/templates/casemanagement/dialogs/success_case_close.mako:5
+#: waskaweb/templates/casemanagement/dialogs/success_delete_aid.mako:5
#: waskaweb/templates/documents/case_new.mako:4
#: waskaweb/templates/documents/case_overview.mako:5
+#: waskaweb/templates/documents/dialogs/delete_attachment_success.mako:4
#: waskaweb/templates/documents/dialogs/failed_attachment.mako:4
-#: waskaweb/templates/documents/dialogs/success_attachment.mako:4
+#: waskaweb/templates/documents/dialogs/success_attachment.mako:6
msgid "cm_np_select"
msgstr ""
-#: waskaweb/templates/casemanagement/bundle_editor.mako:10
-#: waskaweb/templates/casemanagement/bundle_standin.mako:10
-#: waskaweb/templates/casemanagement/organisation.mako:11
+#: waskaweb/templates/casemanagement/bundle_editor.mako:6
+#: waskaweb/templates/casemanagement/bundle_standin.mako:6
+#: waskaweb/templates/casemanagement/evaluation.mako:4
+#: waskaweb/templates/casemanagement/evaluation_result.mako:6
+#: waskaweb/templates/casemanagement/main.mako:10
+#: waskaweb/templates/casemanagement/new.mako:5
+#: waskaweb/templates/casemanagement/overview.mako:6
+#: waskaweb/templates/casemanagement/upload.mako:5
+#: waskaweb/templates/casemanagement/dialogs/alert.mako:5
+#: waskaweb/templates/casemanagement/dialogs/confirm.mako:5
+#: waskaweb/templates/casemanagement/dialogs/confirm_delete.mako:5
+#: waskaweb/templates/casemanagement/dialogs/confirm_restore.mako:5
+#: waskaweb/templates/casemanagement/dialogs/delete_attachment_success.mako:4
+#: waskaweb/templates/casemanagement/dialogs/notificate_bundle_seteditor.mako:5
+#: waskaweb/templates/casemanagement/dialogs/notificate_bundle_setstandin.mako:5
+#: waskaweb/templates/casemanagement/dialogs/notificate_import_dub.mako:5
+#: waskaweb/templates/casemanagement/dialogs/notificate_printall.mako:5
+#: waskaweb/templates/casemanagement/dialogs/success_delete.mako:5
+#: waskaweb/templates/casemanagement/dialogs/success_delete_cm.mako:5
+#: waskaweb/templates/casemanagement/dialogs/success_restore.mako:5
+#: waskaweb/templates/casemanagement/static_form/statement.mako:5
+#: waskaweb/templates/casemanagement/static_form/statement_print.mako:5
+#: waskaweb/templates/documents/dialogs/success_attachment.mako:4
+#: waskaweb/templates/statement/dialogs/confirm.mako:5
+#: waskaweb/templates/statement/dialogs/missing_statement.mako:5
+msgid "cm_np_root"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/bundle_editor.mako:7
+#: waskaweb/templates/casemanagement/dialogs/notificate_bundle_seteditor.mako:6
+msgid "cm_np_bundled_editor"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/bundle_editor.mako:12
+#: waskaweb/templates/casemanagement/bundle_standin.mako:12
+#: waskaweb/templates/casemanagement/organisation.mako:12
msgid "cm_header_organisation"
msgstr ""
-#: waskaweb/templates/casemanagement/bundle_editor.mako:13
+#: waskaweb/templates/casemanagement/bundle_editor.mako:15
msgid "cm_bundle_editor_explain"
msgstr ""
-#: waskaweb/templates/casemanagement/bundle_standin.mako:13
-#: waskaweb/templates/casemanagement/organisation.mako:38
+#: waskaweb/templates/casemanagement/bundle_standin.mako:7
+#: waskaweb/templates/casemanagement/dialogs/notificate_bundle_setstandin.mako:6
+msgid "cm_np_bundled_standin"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/bundle_standin.mako:15
+#: waskaweb/templates/casemanagement/organisation.mako:39
msgid "cm_header_standin"
msgstr ""
-#: waskaweb/templates/casemanagement/bundle_standin.mako:14
+#: waskaweb/templates/casemanagement/bundle_standin.mako:16
msgid "cm_bundle_standin_explain"
msgstr ""
-#: waskaweb/templates/casemanagement/bundle_standin.mako:16
+#: waskaweb/templates/casemanagement/bundle_standin.mako:18
msgid "cm_bundle_standin_explain_cm_ka"
msgstr ""
-#: waskaweb/templates/casemanagement/bundle_standin.mako:28
+#: waskaweb/templates/casemanagement/bundle_standin.mako:30
msgid "attention"
msgstr ""
-#: waskaweb/templates/casemanagement/bundle_standin.mako:28
+#: waskaweb/templates/casemanagement/bundle_standin.mako:30
msgid "cm_bundle_standin_explain_attention"
msgstr ""
-#: waskaweb/templates/casemanagement/bundle_standin.mako:50
-#: waskaweb/templates/casemanagement/organisation.mako:69
+#: waskaweb/templates/casemanagement/bundle_standin.mako:52
+#: waskaweb/templates/casemanagement/organisation.mako:70
msgid "cm_form_standin_submit"
msgstr ""
@@ -989,11 +1058,11 @@
msgstr ""
#: waskaweb/templates/casemanagement/caselist.mako:7
-msgid "cm_overview_tbl_header_firstname"
+msgid "cm_overview_tbl_header_lastname"
msgstr ""
#: waskaweb/templates/casemanagement/caselist.mako:8
-msgid "cm_overview_tbl_header_lastname"
+msgid "cm_overview_tbl_header_firstname"
msgstr ""
#: waskaweb/templates/casemanagement/caselist.mako:10
@@ -1053,14 +1122,16 @@
msgstr ""
#: waskaweb/templates/casemanagement/digest.mako:18
-msgid "cm_header_digest_personal"
+msgid "cm_header_digest_youth"
msgstr ""
#: waskaweb/templates/casemanagement/digest.mako:21
+#: waskaweb/templates/casemanagement/digest.mako:75
msgid "cm_digest_tbl_label_lastname"
msgstr ""
#: waskaweb/templates/casemanagement/digest.mako:25
+#: waskaweb/templates/casemanagement/digest.mako:79
msgid "cm_digest_tbl_label_firstname"
msgstr ""
@@ -1073,44 +1144,40 @@
msgstr ""
#: waskaweb/templates/casemanagement/digest.mako:37
-msgid "cm_digest_header_address"
+#: waskaweb/templates/casemanagement/digest.mako:83
+msgid "cm_digest_tbl_label_email"
msgstr ""
-#: waskaweb/templates/casemanagement/digest.mako:40
+#: waskaweb/templates/casemanagement/digest.mako:47
msgid "cm_digest_tbl_label_street"
msgstr ""
-#: waskaweb/templates/casemanagement/digest.mako:44
+#: waskaweb/templates/casemanagement/digest.mako:51
msgid "cm_digest_tbl_label_plz"
msgstr ""
-#: waskaweb/templates/casemanagement/digest.mako:48
+#: waskaweb/templates/casemanagement/digest.mako:55
msgid "cm_digest_tbl_label_city"
msgstr ""
-#: waskaweb/templates/casemanagement/digest.mako:52
+#: waskaweb/templates/casemanagement/digest.mako:59
+#: waskaweb/templates/casemanagement/digest.mako:93
msgid "cm_digest_tbl_label_telephone"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation.mako:4
-#: waskaweb/templates/casemanagement/evaluation_result.mako:6
-#: waskaweb/templates/casemanagement/main.mako:10
-#: waskaweb/templates/casemanagement/new.mako:5
-#: waskaweb/templates/casemanagement/overview.mako:6
-#: waskaweb/templates/casemanagement/upload.mako:5
-#: waskaweb/templates/casemanagement/dialogs/alert.mako:5
-#: waskaweb/templates/casemanagement/dialogs/confirm.mako:5
-#: waskaweb/templates/casemanagement/dialogs/confirm_delete.mako:5
-#: waskaweb/templates/casemanagement/dialogs/confirm_restore.mako:5
-#: waskaweb/templates/casemanagement/dialogs/notificate_import_dub.mako:5
-#: waskaweb/templates/casemanagement/dialogs/notificate_printall.mako:5
-#: waskaweb/templates/casemanagement/static_form/statement.mako:5
-#: waskaweb/templates/casemanagement/static_form/statement_print.mako:5
-#: waskaweb/templates/statement/dialogs/confirm.mako:5
-#: waskaweb/templates/statement/dialogs/missing_statement.mako:5
-msgid "cm_np_root"
+#: waskaweb/templates/casemanagement/digest.mako:63
+#: waskaweb/templates/casemanagement/digest.mako:97
+msgid "cm_digest_tbl_label_mobiletelephone"
msgstr ""
+#: waskaweb/templates/casemanagement/digest.mako:67
+msgid "cm_digest_tbl_label_telephone_more"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/digest.mako:72
+msgid "cm_header_digest_parent"
+msgstr ""
+
#: waskaweb/templates/casemanagement/evaluation.mako:5
#: waskaweb/templates/casemanagement/evaluation_result.mako:7
msgid "cm_np_evaluate"
@@ -1381,7 +1448,7 @@
msgstr ""
#: waskaweb/templates/casemanagement/formular.mako:22
-#: waskaweb/templates/casemanagement/formular.mako:88
+#: waskaweb/templates/casemanagement/formular.mako:91
msgid "cm_actions_link_printout"
msgstr ""
@@ -1389,12 +1456,18 @@
msgid "cm_error_header_false_forminput"
msgstr ""
+#: waskaweb/templates/casemanagement/formular.mako:88
+msgid "cm_actions_link_printoutAidPlanStatement"
+msgstr ""
+
#: waskaweb/templates/casemanagement/help.mako:3
msgid "cm_help_header_help_for_dossier"
msgstr ""
#: waskaweb/templates/casemanagement/main.mako:11
#: waskaweb/templates/casemanagement/overview.mako:7
+#: waskaweb/templates/casemanagement/dialogs/delete_attachment_success.mako:5
+#: waskaweb/templates/documents/dialogs/success_attachment.mako:5
#: waskaweb/templates/statement/dialogs/missing_statement.mako:6
msgid "cm_np_overview"
msgstr ""
@@ -1404,6 +1477,7 @@
msgstr ""
#: waskaweb/templates/casemanagement/main.mako:22
+#: waskaweb/templates/casemanagement/organisation.mako:96
msgid "cm_info_status"
msgstr ""
@@ -1435,35 +1509,27 @@
msgid "cm_menu_link_print"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:57
-msgid "cm_menu_link_close"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/main.mako:60
-msgid "cm_menu_link_open"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/main.mako:67
+#: waskaweb/templates/casemanagement/main.mako:61
msgid "cm_menu_header_seperator"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:70
+#: waskaweb/templates/casemanagement/main.mako:64
msgid "cm_menu_link_digest"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:72
+#: waskaweb/templates/casemanagement/main.mako:66
msgid "cm_menu_link_organisation"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:73
+#: waskaweb/templates/casemanagement/main.mako:67
msgid "cm_menu_link_appointment"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:74
+#: waskaweb/templates/casemanagement/main.mako:68
msgid "cm_menu_link_documents"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:80
+#: waskaweb/templates/casemanagement/main.mako:74
msgid "cm_menu_header_structure"
msgstr ""
@@ -1485,34 +1551,42 @@
msgid "cm_menu_link_appointment_back"
msgstr ""
-#: waskaweb/templates/casemanagement/organisation.mako:6
+#: waskaweb/templates/casemanagement/organisation.mako:7
msgid "cm_np_organisation"
msgstr ""
-#: waskaweb/templates/casemanagement/organisation.mako:14
+#: waskaweb/templates/casemanagement/organisation.mako:15
msgid "cm_organisation_con_whois_cm_replace"
msgstr ""
-#: waskaweb/templates/casemanagement/organisation.mako:15
+#: waskaweb/templates/casemanagement/organisation.mako:16
msgid "cm_header_organisation_editor"
msgstr ""
-#: waskaweb/templates/casemanagement/organisation.mako:18
+#: waskaweb/templates/casemanagement/organisation.mako:19
msgid "cm_organisation_tbl_label_lastname"
msgstr ""
-#: waskaweb/templates/casemanagement/organisation.mako:21
+#: waskaweb/templates/casemanagement/organisation.mako:22
msgid "cm_organisation_tbl_label_firstname"
msgstr ""
-#: waskaweb/templates/casemanagement/organisation.mako:24
+#: waskaweb/templates/casemanagement/organisation.mako:25
msgid "cm_organisation_tbl_label_telephone"
msgstr ""
-#: waskaweb/templates/casemanagement/organisation.mako:74
+#: waskaweb/templates/casemanagement/organisation.mako:75
msgid "cm_organisation_table_cm"
msgstr ""
+#: waskaweb/templates/casemanagement/organisation.mako:99
+msgid "cm_menu_link_close"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/organisation.mako:102
+msgid "cm_menu_link_open"
+msgstr ""
+
#: waskaweb/templates/casemanagement/overview.mako:9
msgid "cm_header_overview"
msgstr ""
@@ -1525,7 +1599,7 @@
msgid "cm_overview_con_list_dossiers_cm"
msgstr ""
-#: waskaweb/templates/casemanagement/overview.mako:21
+#: waskaweb/templates/casemanagement/overview.mako:29
msgid "cm_form_overview_search_submit"
msgstr ""
@@ -1555,6 +1629,24 @@
msgid "cm_np_close"
msgstr ""
+#: waskaweb/templates/casemanagement/dialogs/confirm_delete_aid.mako:6
+#: waskaweb/templates/casemanagement/dialogs/success_delete_aid.mako:6
+msgid "cm_np_case_aid"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/dialogs/confirm_delete_aid.mako:7
+msgid "cm_np_confirm_aid_delete"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/dialogs/confirm_delete_attachment.mako:5
+#: waskaweb/templates/documents/dialogs/success_attachment.mako:7
+msgid "cm_np_att_overview"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/dialogs/confirm_delete_attachment.mako:6
+msgid "cm_np_attachment_confirm"
+msgstr ""
+
#: waskaweb/templates/casemanagement/dialogs/confirm_open.mako:6
msgid "cm_np_open"
msgstr ""
@@ -1563,42 +1655,69 @@
msgid "cm_np_restore"
msgstr ""
+#: waskaweb/templates/casemanagement/dialogs/delete_attachment_success.mako:7
+#: waskaweb/templates/documents/case_new.mako:5
+#: waskaweb/templates/documents/case_overview.mako:6
+#: waskaweb/templates/documents/dialogs/delete_attachment_success.mako:5
+#: waskaweb/templates/documents/dialogs/failed_attachment.mako:5
+msgid "cm_np_doc_overview"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/dialogs/delete_attachment_success.mako:8
+#: waskaweb/templates/documents/dialogs/delete_attachment_success.mako:6
+msgid "cm_np_delete_attachment_success"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/dialogs/notificate_import_dub.mako:7
+msgid "cm_np_import_failed"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/dialogs/success_case_close.mako:6
+msgid "cm_np_close_success"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/dialogs/success_delete.mako:6
+#: waskaweb/templates/casemanagement/dialogs/success_delete_cm.mako:6
+msgid "cm_np_delete_success"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/dialogs/success_delete_aid.mako:7
+msgid "cm_np_success_aid_delete"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/dialogs/success_restore.mako:6
+msgid "cm_np_restore_success"
+msgstr ""
+
#: waskaweb/templates/casemanagement/static_form/statement_print.mako:6
msgid "cm_np_statement"
msgstr ""
-#: waskaweb/templates/dialogs/alert.mako:2
+#: waskaweb/templates/dialogs/alert.mako:3
msgid "dialog_header_alert"
msgstr ""
-#: waskaweb/templates/dialogs/alert.mako:5 waskaweb/templates/dialogs/failed.mako:5
-#: waskaweb/templates/dialogs/success.mako:5
+#: waskaweb/templates/dialogs/alert.mako:6 waskaweb/templates/dialogs/failed.mako:6
+#: waskaweb/templates/dialogs/success.mako:6
msgid "dialog_header_confirm_option_ok"
msgstr ""
-#: waskaweb/templates/dialogs/alert.mako:6
+#: waskaweb/templates/dialogs/alert.mako:7
msgid "dialog_header_confirm_option_cancel"
msgstr ""
-#: waskaweb/templates/dialogs/confirm.mako:5
+#: waskaweb/templates/dialogs/confirm.mako:6
msgid "dialog_header_confirm_option_yes"
msgstr ""
-#: waskaweb/templates/dialogs/confirm.mako:6
+#: waskaweb/templates/dialogs/confirm.mako:7
msgid "dialog_header_confirm_option_no"
msgstr ""
-#: waskaweb/templates/dialogs/notification.mako:5
+#: waskaweb/templates/dialogs/notification.mako:6
msgid "dialog_header_notification_option_ok"
msgstr ""
-#: waskaweb/templates/documents/case_new.mako:5
-#: waskaweb/templates/documents/case_overview.mako:6
-#: waskaweb/templates/documents/dialogs/failed_attachment.mako:5
-#: waskaweb/templates/documents/dialogs/success_attachment.mako:5
-msgid "cm_np_doc_overview"
-msgstr ""
-
#: waskaweb/templates/documents/case_new.mako:6
msgid "cm_np_doc_upload"
msgstr ""
@@ -1646,7 +1765,7 @@
msgid "doc_overview_tbl_header_actions"
msgstr ""
-#: waskaweb/templates/documents/case_overview.mako:61
+#: waskaweb/templates/documents/case_overview.mako:65
#: waskaweb/templates/documents/global_overview.mako:64
msgid "doc_overview_nofilesfound"
msgstr ""
@@ -1654,6 +1773,7 @@
#: waskaweb/templates/documents/global_overview.mako:6
#: waskaweb/templates/documents/global_upload.mako:4
#: waskaweb/templates/documents/dialogs/confirm.mako:4
+#: waskaweb/templates/documents/dialogs/delete_document_success.mako:4
#: waskaweb/templates/documents/dialogs/failed_document.mako:4
#: waskaweb/templates/documents/dialogs/success_documents.mako:4
msgid "doc_np_overview"
@@ -1685,12 +1805,19 @@
msgid "doc_np_delete"
msgstr ""
+#: waskaweb/templates/documents/dialogs/delete_document_success.mako:5
+msgid "cm_np_delete_document_success"
+msgstr ""
+
#: waskaweb/templates/documents/dialogs/failed_attachment.mako:6
#: waskaweb/templates/documents/dialogs/failed_document.mako:6
msgid "cm_np_doc_failed"
msgstr ""
-#: waskaweb/templates/documents/dialogs/success_attachment.mako:6
+#: waskaweb/templates/documents/dialogs/success_attachment.mako:8
+msgid "cm_np_attachment_success"
+msgstr ""
+
#: waskaweb/templates/documents/dialogs/success_documents.mako:6
msgid "cm_np_doc_success"
msgstr ""
@@ -1719,27 +1846,27 @@
msgid "statement_edit_p_no_statement"
msgstr ""
-#: waskaweb/templates/statement/edit.mako:9
+#: waskaweb/templates/statement/edit.mako:6
msgid "statement_edit_p_statement_decision"
msgstr ""
-#: waskaweb/templates/statement/edit.mako:13
+#: waskaweb/templates/statement/edit.mako:7
msgid "statement_edit_p_statement_form"
msgstr ""
-#: waskaweb/templates/statement/edit.mako:13
+#: waskaweb/templates/statement/edit.mako:7
msgid "statement_edit_a_statement_form_printversion"
msgstr ""
-#: waskaweb/templates/statement/edit.mako:13
+#: waskaweb/templates/statement/edit.mako:7
msgid "statement_edit_p_statement_form_end"
msgstr ""
-#: waskaweb/templates/statement/edit.mako:20
+#: waskaweb/templates/statement/edit.mako:12
msgid "statement_label_statement_yes"
msgstr ""
-#: waskaweb/templates/statement/edit.mako:24
+#: waskaweb/templates/statement/edit.mako:16
msgid "statement_label_statement_no"
msgstr ""
@@ -1795,27 +1922,31 @@
msgid "statement_dialog_a_ok"
msgstr ""
-#: waskaweb/templates/usersettings/change_password.mako:6
+#: waskaweb/templates/usersettings/change_password.mako:10
msgid "adm_header_changepassword"
msgstr ""
-#: waskaweb/templates/usersettings/change_password.mako:11
+#: waskaweb/templates/usersettings/change_password.mako:15
#: waskaweb/templates/usersettings/edit_standin.mako:11
msgid "sm_menu_link_settings_back"
msgstr ""
-#: waskaweb/templates/usersettings/change_password.mako:21
+#: waskaweb/templates/usersettings/change_password.mako:25
+#: waskaweb/templates/usersettings/change_password.mako:28
#: waskaweb/templates/usersettings/change_password_login.mako:20
+#: waskaweb/templates/usersettings/change_password_login.mako:23
msgid "adm_form_newuser_passwd"
msgstr ""
-#: waskaweb/templates/usersettings/change_password.mako:29
-#: waskaweb/templates/usersettings/change_password_login.mako:28
+#: waskaweb/templates/usersettings/change_password.mako:34
+#: waskaweb/templates/usersettings/change_password.mako:37
+#: waskaweb/templates/usersettings/change_password_login.mako:29
+#: waskaweb/templates/usersettings/change_password_login.mako:32
msgid "adm_form_newuser_passwd_confirm"
msgstr ""
-#: waskaweb/templates/usersettings/change_password.mako:36
-#: waskaweb/templates/usersettings/change_password_login.mako:36
+#: waskaweb/templates/usersettings/change_password.mako:42
+#: waskaweb/templates/usersettings/change_password_login.mako:38
msgid "adm_form_changepassword_submit"
msgstr ""
@@ -1871,3 +2002,7 @@
msgid "usersettings_p_overview_personal_data"
msgstr ""
+#: waskaweb/templates/usersettings/dialogs/notificate_setpassword.mako:5
+msgid "adm_np_changepassword"
+msgstr ""
+
Modified: trunk/waskaweb/lib/app_globals.py
===================================================================
--- trunk/waskaweb/lib/app_globals.py 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/lib/app_globals.py 2008-08-13 13:08:05 UTC (rev 30)
@@ -8,6 +8,8 @@
import waskaweb.lib.security as security
import waskaweb.lib.pdfimporter as pdfimporter
+from waskaweb.lib.timelog import setupTimeLogging
+
import os, sys
class Globals(object):
@@ -65,3 +67,12 @@
if not pdf_host is None: pdfimporter.HOST = pdf_host
if not pdf_port is None: pdfimporter.PORT = int(pdf_port)
+ # set time logging
+ time_host = config.get('time_host')
+ time_port = config.get('time_port')
+
+ if time_host and time_port:
+ setupTimeLogging(time_host, int(time_port))
+ elif time_host:
+ setupTimeLogging(int(time_host))
+
Modified: trunk/waskaweb/lib/base.py
===================================================================
--- trunk/waskaweb/lib/base.py 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/lib/base.py 2008-08-13 13:08:05 UTC (rev 30)
@@ -3,7 +3,6 @@
Provides the BaseController class for subclassing, and other objects
utilized by Controllers.
"""
-from paste.httpexceptions import HTTPNotFound
from pylons import c, cache, config, g, request, response, session
from pylons.controllers import WSGIController
from pylons.controllers.util import abort, etag_cache, redirect_to
@@ -16,7 +15,7 @@
import waskaweb.lib.db as db
-#from paste.httpexceptions import HTTPUnauthorized
+from paste.httpexceptions import HTTPUnauthorized, HTTPNotFound
from waskaweb.lib.security import \
HOST, PORT, DBNAME, USER, getDbName, userIdentity
@@ -24,6 +23,10 @@
import sys
import md5
+from time import time
+
+from waskaweb.lib.timelog import timeLog
+
class BaseController(WSGIController):
def __init__(self):
self.db = None
@@ -79,6 +82,7 @@
# WSGIController.__call__ dispatches to the Controller method
# the request is routed to. This routing information is
# available in environ['pylons.routes_dict']
+ startTime = time()
try:
return WSGIController.__call__(self, environ, start_response)
finally:
@@ -87,6 +91,8 @@
self.db = None
db.leave(_db)
_db.closeConnections()
+ stopTime = time()
+ timeLog(stopTime - startTime)
def _checkInt(self, i):
try:
Modified: trunk/waskaweb/lib/evaluation.py
===================================================================
--- trunk/waskaweb/lib/evaluation.py 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/lib/evaluation.py 2008-08-13 13:08:05 UTC (rev 30)
@@ -252,7 +252,7 @@
f.write(u"%s;%s;%s%%\r\n" % (v[0], v[1], v[2]))
class Evaluation_6(Evaluation):
- """Vermittlung nach Beendigung"""
+ """Vermittlung"""
def __init__(self):
Evaluation.__init__(self)
Modified: trunk/waskaweb/lib/helpers.py
===================================================================
--- trunk/waskaweb/lib/helpers.py 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/lib/helpers.py 2008-08-13 13:08:05 UTC (rev 30)
@@ -96,3 +96,12 @@
else:
return "#"
+def getKAName():
+ kaname = None
+ try:
+ kaname = request.environ['SSL_CLIENT_S_DN'].split('/')[5].split('=')[1]
+ return kaname
+ except:
+ print >> sys.stderr, "Could not fetch KA-name from client certificate"
+ return ""
+ return dbname
Modified: trunk/waskaweb/lib/renderer.py
===================================================================
--- trunk/waskaweb/lib/renderer.py 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/lib/renderer.py 2008-08-13 13:08:05 UTC (rev 30)
@@ -230,15 +230,20 @@
<tr>
<th class="table_header_h table_date">Von</th>
<th class="table_header_h table_date">Bis</th>
- <th class="table_header_h table_date">%s</th>
- <th class="table_header_h table_date">%s</th>
+ <th class="table_header_h">%s</th>
+ <th class="table_header_h table_width_small">%s</th>
<th class="table_header_h table_action">%s</th>
</tr>""" % (s_inst, s_type, s_act))
idset = True
for aid in self.aidList.getDatasets():
class_str = ""
- out.append(u"""<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td>""" %
+ if idset:
+ out.append(u"""<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td>""" %
(F.NA(aid.start_date), F.NA(aid.end_date), F.NA(aid.institution), F.NA(aid.type)))
+ else:
+ out.append(u"""<tr class="table_row_v"><td>%s</td><td>%s</td><td>%s</td><td>%s</td>""" %
+ (F.NA(aid.start_date), F.NA(aid.end_date), F.NA(aid.institution), F.NA(aid.type)))
+ idset = not idset
out.append(u"""<td class="table_action"><a href="/rg_aid/%s/%s/%s">%s</a>""" %
(action,aid.id, aid.page_id, s_show))
if not self.ro_mode and h.hasRole(['cm_ka']):
@@ -418,8 +423,7 @@
out = [ label ]
if error:
- css_class.append('error')
- out.append('<a href="#error_list"><img class="smallicon" src="/images/error_small.png"></a>')
+ css_class.append('error_box')
out.append(
'<select size="%s" class="%s" %s %s %s %s>\n' % (
@@ -526,7 +530,7 @@
self.toTarget(Item(out), bool.getTarget())
def _renderLabel(self, description, name, help=None, newline=True):
-
+ error = self.formdata.getError(name)
if help: helpmsg = help
else: helpmsg = ""
@@ -535,8 +539,13 @@
if description:
if name:
- return '<label for="%s"><a name="f_%s">%s</a> %s</label>%s\n' % (
- escape(name, True), escape(name, True), escape(description), helpmsg, newline)
+ if error:
+ return '<label for="%s" class="error_font"><a name="f_%s">%s</a> %s</label>%s\n' % (
+ escape(name, True), escape(name, True), escape(description), helpmsg, newline)
+ else:
+ return '<label for="%s"><a name="f_%s">%s</a> %s</label>%s\n' % (
+ escape(name, True), escape(name, True), escape(description), helpmsg, newline)
+
return "%s " % escape(description)
return ""
@@ -570,8 +579,7 @@
name = ""
if error:
- css_class.append('error')
- out.append('<a href="#error_list"><img class="smallicon" src="/images/error_small.png"></a>')
+ css_class.append('error')
if not self.ro_mode:
out.append('<textarea class="%s" %s %s %s %s>%s</textarea><br>\n' % (
@@ -610,8 +618,7 @@
else: disabled = ""
if error:
- css_class.append('error')
- out.append('<a href="#error_list"><img class="smallicon" src="/images/error_small.png"></a>')
+ css_class.append('error_box')
out.append( '<input type="text" size="10" maxlength="10" class="%s" %s %s %s %s><br>\n' % (
" ".join(css_class), disabled, name, value, SET_MODIFICATION))
@@ -653,8 +660,7 @@
name = ""
if error:
- css_class.append('error')
- out.append('<a href="#error_list"><img class="smallicon" src="/images/error_small.png"></a>')
+ css_class.append('error_box')
out.append('<input type="text" class="%s" %s %s %s %s %s %s><br>\n' % (
" ".join(css_class), disabled, size, length, name, value, SET_MODIFICATION))
@@ -699,8 +705,8 @@
else: disabled = ""
if error:
- css_class.append('error')
- out.append('<a href="#error_list"><img class="smallicon" src="/images/error_small.png"></a>')
+ css_class.append('error_box')
+
out.append('<input type="text" class="%s" %s %s %s %s %s><br>\n' % (
" ".join(css_class), disabled, size, name, value, SET_MODIFICATION))
Added: trunk/waskaweb/lib/timelog.py
===================================================================
--- trunk/waskaweb/lib/timelog.py 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/lib/timelog.py 2008-08-13 13:08:05 UTC (rev 30)
@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (c) 2007 by Intevation GmbH
+# Authors:
+# Sascha L. Teichmann <teichmann at intevation.de>
+#
+
+import logging
+import logging.handlers as handlers
+
+from threading import Lock
+
+import sys
+
+MAX_TIME_LIST_LEN = 5
+
+__TIME_LOCK = Lock()
+
+__TIME_LIST = []
+
+__LOGGER = None
+
+def setupTimeLogging(host='localhost', port=handlers.DEFAULT_TCP_LOGGING_PORT):
+ print >> sys.stderr, "time logging: %s port %d" % (host, port)
+ global __LOGGER
+ __LOGGER = logging.getLogger('waska.timelog')
+ socketHandler = handlers.SocketHandler(host, port)
+ __LOGGER.addHandler(socketHandler)
+ __LOGGER.setLevel(logging.INFO)
+
+def timeLog(t):
+ try:
+ __TIME_LOCK.acquire()
+
+ if len(__TIME_LIST) < MAX_TIME_LIST_LEN-1:
+ __TIME_LIST.append(t)
+ else:
+ __TIME_LIST.append(t)
+ avg = float(sum(__TIME_LIST))/MAX_TIME_LIST_LEN
+ del __TIME_LIST[:]
+ if __LOGGER is not None:
+ __LOGGER.info("%f" % avg)
+
+ finally:
+ __TIME_LOCK.release()
+
+
+# vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8:
Modified: trunk/waskaweb/lib/validators.py
===================================================================
--- trunk/waskaweb/lib/validators.py 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/lib/validators.py 2008-08-13 13:08:05 UTC (rev 30)
@@ -19,7 +19,7 @@
'too_few': u'Ihr Passwort muss mindestens %(min)i '
u'Zeichen lang sein',
'non_letter': u'Sie müssen mindestens %(non_letter)i '
- u'nicht Buchstaben in ihrem Passwort verwenden',
+ u'Nicht-Buchstaben in ihrem Passwort verwenden.',
'only_ascii': u'Das Passwort darf nur aus ASCII-Zeichen bestehen.'
}
Modified: trunk/waskaweb/model/case.py
===================================================================
--- trunk/waskaweb/model/case.py 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/model/case.py 2008-08-13 13:08:05 UTC (rev 30)
@@ -16,6 +16,7 @@
from pylons.i18n import _, ungettext, N_
from waskaweb.lib.db import db
from waskaweb.lib.base import session, g, h
+import waskaweb.lib.filters as F
from waskaweb.lib.pdfimporter import asXFA, FieldExtractor
from waskaweb.model.user import UserObject
from waskaweb.model.agency import Agency
@@ -50,15 +51,15 @@
LOAD_CASESTATE_SQL = """SELECT id, status, zugriff from ka_status_tbl_view WHERE master_id = %(id)s"""
SET_CASESTATE_SQL = """UPDATE ka_status_tbl_view SET status = %(status)s WHERE id = %(id)s"""
-LOAD_CASE_DIGEST_SQL = """SELECT name_1, vorname_1, kundennummer, date_part('year', age(geburtsdatum::timestamp)) as alter, plz, strasse, wohnort, vorwahl, telefon_1, einverstaendniserklaerung from master_tbl_view WHERE id = %(id)s"""
+LOAD_CASE_DIGEST_SQL = """SELECT name_1, vorname_1, kundennummer, date_part('year', age(geburtsdatum::timestamp)) as alter, plz, strasse, wohnort, vorwahl, telefon_1, mobiltelefon, telefon_sonstige, email, einverstaendniserklaerung, name_2, vorname_2, vorwahl_1, telefon_1_1, mobiltelefon_1, email_1 from master_tbl_view WHERE id = %(id)s"""
LOAD_CASE_SQL = """SELECT name_1, vorname_1, bearbeiter_id, kundennummer from master_tbl_view WHERE id = %(id)s"""
DELETE_CASE_SQL = """select delete_master_ds(%(id)s)"""
-CREATE_CASE_SQL = """SELECT create_master_ds()"""
+CREATE_CASE_SQL = """SELECT create_master_ds(%(uuid)s)"""
INIT_CASE_SQL= """UPDATE page_0_view SET name_kompetenzagentur = %(ka_name)s, fkz = %(fkz)s, vorname = %(vorname)s, name = %(nachname)s WHERE id = %(id)s"""
-CREATE_RG_KOMPETENZ_DS = """SELECT create_rg_kompetenz_ds(%(id)s)"""
+CREATE_RG_KOMPETENZ_DS = """SELECT create_rg_kompetenz_ds(%(id)s, %(uuid)s)"""
LOAD_STANDIN_SQL = """SELECT n.benutzer_id FROM nm_benutzer_master_tbl_view n
JOIN master_tbl_view m ON
@@ -124,7 +125,7 @@
case.setEditor(user_id)
num += 1
except:
- print "Could not set editor for case in bundle"
+ print >> sys.stderr, "Could not set editor for case in bundle"
return num
def setStandin(self, user_ids):
@@ -137,7 +138,7 @@
standin.setUser(user_ids)
num += 1
except:
- print "Could not set standin for case in bundle"
+ print >> sys.stderr, "Could not set standin for case in bundle"
return num
def delete(self):
@@ -149,7 +150,7 @@
case.delete()
num += 1
except:
- print "Could not delete Case from bundle"
+ print >> sys.stderr, "Could not delete Case from bundle"
return num
def markDelete(self):
@@ -162,7 +163,7 @@
state.setState(3)
num += 1
except:
- print "Could not mark Case to delete from bundle"
+ print >> sys.stderr, "Could not mark Case to delete from bundle"
return num
class CaseOverview:
@@ -186,13 +187,12 @@
try:
key, value = [x.strip() for x in option.split(":")]
if key in self.VALID_OPTIONS:
- print key
if key == 'state':
allowed_states.append(int(value))
else:
options[key] = value
except ValueError:
- print "Found invalid search syntax in options"
+ print >> sys.stderr, "Found invalid search syntax in options"
else:
search.append(option)
@@ -313,7 +313,7 @@
new_case_id = self._createTablesForImport(tbls)
return self.loadById(new_case_id)
- def createNew(self, init=True):
+ def createNew(self, init=True, uuid=None):
'''This method creates a new case in the database and takes care about
creating the right dependencies for repeat groups. If 'init' is true
will get initiated. This method returns the case object'''
@@ -322,13 +322,13 @@
try:
conn = db.getConnection()
cur = conn.cursor()
- cur.execute(CREATE_CASE_SQL)
+ cur.execute(CREATE_CASE_SQL, {'uuid': uuid})
id = cur.fetchone()[0]
conn.commit()
finally:
db.recycleConnection(conn, cur)
# XXX: This a workaround the RGs
- self._createDependencies(id)
+ self._createDependencies(id, uuid)
except:
traceback.print_exc(file=sys.stderr)
return None
@@ -358,13 +358,13 @@
finally:
db.recycleConnection(conn, cur)
- def _createDependencies(self, id):
+ def _createDependencies(self, id, uuid=None):
con, cur = None, None
try:
con = db.getConnection()
# create one Kompetenzfestellung
cur = con.cursor()
- cur.execute(CREATE_RG_KOMPETENZ_DS, { 'id': id })
+ cur.execute(CREATE_RG_KOMPETENZ_DS, { 'id': id, 'uuid': uuid})
komp_id = cur.fetchone()[0]
cur.close(); cur = None
@@ -392,7 +392,7 @@
finally:
db.recycleConnection(con, cur)
- def _createTablesForImport(self, relations):
+ def _createTablesForImport(self, relations, uuid=None):
masterId, kompetenzId = None, None
con, cur = None, None
@@ -401,14 +401,22 @@
con = db.getConnection()
# a master dataset has to be created each time
cur = con.cursor()
- cur.execute(CREATE_CASE_SQL)
+
+ # TODO: It seems that the following lines of code are doing already
+ # implemented functionality. Think about cleaning up here but i do
+ # not fully understand what is happening exctly here. Maybe the
+ # next two outcommented lines could do the trick.
+ #case = self.creatNew()
+ #masterId = case.id
+
+ cur.execute(CREATE_CASE_SQL, {'uuid': uuid})
masterId = cur.fetchone()[0]
cur.close(); cur = None
createdTables['master_tbl'] = masterId
# kompetenz rg has to be created each time
cur = con.cursor()
- cur.execute(CREATE_RG_KOMPETENZ_DS, { 'id': masterId })
+ cur.execute(CREATE_RG_KOMPETENZ_DS, { 'id': masterId, 'uuid': uuid })
rid = cur.fetchone()[0]
cur.close(); cur = None
con.commit()
@@ -427,7 +435,7 @@
print >> sys.stderr, "Kann Statement zur Erzeugung von '%s' nicht finden." % name
continue
cur = con.cursor()
- cur.execute(stmnt, { 'id': masterId })
+ cur.execute(stmnt, { 'id': masterId, 'uuid': uuid })
id = cur.fetchone()[0]
cur.close(); cur = None
@@ -533,17 +541,27 @@
class CaseDigest:
def __init__(self, id):
- self.id = id
- self.first_name = ''
- self.last_name = ''
- self.knr = ''
- self.age = ''
- self.plz = ''
- self.city = ''
- self.street = ''
- self.telephone = ''
- self.statement = False
+ self.id = id
+ self.first_name = ''
+ self.last_name = ''
+ self.knr = ''
+ self.age = ''
+ self.plz = ''
+ self.city = ''
+ self.street = ''
+ self.telephone = ''
+ self.telephone_more = ''
+ self.mobiletel = ''
+ self.statement = False
+ # Parents of the children
+ self.parent_first_name = ''
+ self.parent_last_name = ''
+ self.parent_telephone_1 = ''
+ self.parent_telephone_2 = ''
+ self.parent_mobiletel = ''
+ self.parent_email = ''
+
self._loadFromDB(id)
def hasSignedPrivacyStatement(self):
@@ -555,23 +573,36 @@
conn, c = None, None
try:
conn = db.getConnection()
- c = conn.cursor()
+ c = conn.cursor(cursor_factory=psycopg2.extras.DictCursor)
fields = {'id': id}
c.execute(LOAD_CASE_DIGEST_SQL, fields)
result = c.fetchone()
finally:
db.recycleConnection(conn, c)
- self.last_name = unicode(str(result[0]), 'utf-8')
- self.first_name = unicode(str(result[1]), 'utf-8')
- self.knr = unicode(str(result[2]), 'utf-8')
- if result[3]: self.age = "%.0f" % result[3]
- else: self.age = ""
- self.plz = unicode(str(result[4]), 'utf-8')
- self.street = unicode(str(result[5]), 'utf-8')
- self.city = unicode(str(result[6]), 'utf-8')
- self.telephone_1 = u"%s" % unicode(str(result[7]), 'utf-8')
- self.telephone_2 = u"%s" % unicode(str(result[8]), 'utf-8')
- self.statement = (result[9] >= 0)
+
+ self.last_name = unicode(str(result.get('name_1', '')), 'utf-8')
+ self.first_name = unicode(str(result.get('vorname_1', '')), 'utf-8')
+ self.knr = unicode(str(result.get('kundennummer')), 'utf-8')
+ self.plz = unicode(str(result.get('plz', '')), 'utf-8')
+ self.street = unicode(str(result.get('strasse', '')), 'utf-8')
+ self.city = unicode(str(result.get('wohnort', '')), 'utf-8')
+ self.telephone_1 = unicode(str(result.get('vorwahl', '')), 'utf-8')
+ self.telephone_2 = unicode(str(result.get('telefon_1', '')), 'utf-8')
+ self.mobiletel = unicode(str(result.get('mobiltelefon', '')), 'utf-8')
+ self.telephone_more = F.NA(unicode(str(result.get('telefon_sonstige', '')), 'utf-8')).replace('\n', '<br>')
+
+ self.email = unicode(str(result.get('email', '')), 'utf-8')
+ self.age = result.get('alter') and "%.0f" % result.get('alter') or ""
+ self.statement = (result.get('einverstaendniserklaerung') >= 0)
+
+ # Parents of the kids
+ self.parent_first_name = unicode(str(result.get('vorname_2', '')), 'utf-8')
+ self.parent_last_name = unicode(str(result.get('name_2', '')), 'utf-8')
+ self.parent_telephone_1 = unicode(str(result.get('vorwahl_1', '')), 'utf-8')
+ self.parent_telephone_2 = unicode(str(result.get('telefon_1_1', '')), 'utf-8')
+ self.parent_mobiletel = unicode(str(result.get('mobiltelefon_1', '')), 'utf-8')
+ self.parent_email = unicode(str(result.get('email_1', '')), 'utf-8')
+
except:
traceback.print_exc(file=sys.stderr)
Modified: trunk/waskaweb/model/navigation.py
===================================================================
--- trunk/waskaweb/model/navigation.py 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/model/navigation.py 2008-08-13 13:08:05 UTC (rev 30)
@@ -152,7 +152,7 @@
self.children = [
make("page_0")("0", "page_0", "Zuständigkeiten, Eingangsdaten"),
- make("page_25")("26", "page_25", "Kontaktdaten"),
+ make("page_25")("26", "page_25", "Externe Ansprechpartner"),
make("page_1")("36", "page_1", "Angaben zur Person", [
make("page_1")("1", "page_1", "Persönliche Angaben"),
make("page_2")("3", "page_2", "Familiäre Situation"),
@@ -203,16 +203,23 @@
if child.children:
self.buildParents(child.children, child)
- def getAllItems(self):
+ def getAllItems(self, children=None, found=None):
'''Returns a serialized list of treeitems'''
- stack = [self.children]
+ if children:
+ children = [children]
+ else:
+ children = [self.children]
+ stack = children or[self.children]
+ page_id = found or []
items = []
while stack:
children = stack.pop()
for c in children:
+ if c.page in page_id: continue
items.append(c)
+ page_id.append(c.page)
if c.children:
- stack.append(c.children)
+ items.extend(self.getAllItems(c.children, page_id))
return items
def getTreeItem(self, key):
Modified: trunk/waskaweb/model/repeatgroup.py
===================================================================
--- trunk/waskaweb/model/repeatgroup.py 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/model/repeatgroup.py 2008-08-13 13:08:05 UTC (rev 30)
@@ -14,70 +14,52 @@
from waskaweb.lib.db import db
FETCH_AID_LIST_SQL = """SELECT id FROM %s WHERE master_id = %s"""
-CREATE_RG_BILDEN_DS = """SELECT create_rg_bilden_ds(%(id)s)"""
-CREATE_RG_LEBEN_DS = """SELECT create_rg_leben_ds(%(id)s)"""
-CREATE_RG_QUALI_DS = """SELECT create_rg_quali_ds(%(id)s)"""
-CREATE_RG_BERUF_DS = """SELECT create_rg_beruf_ds(%(id)s)"""
+CREATE_RG_BILDEN_DS = """SELECT create_rg_bilden_ds(%(id)s, %(uuid)s)"""
+CREATE_RG_LEBEN_DS = """SELECT create_rg_leben_ds(%(id)s, %(uuid)s)"""
+CREATE_RG_QUALI_DS = """SELECT create_rg_quali_ds(%(id)s, %(uuid)s)"""
+CREATE_RG_BERUF_DS = """SELECT create_rg_beruf_ds(%(id)s, %(uuid)s)"""
DELETE_RG_BILDEN_DS = """select delete_rg_bilden_ds(%(id)s)"""
DELETE_RG_LEBEN_DS = """select delete_rg_leben_ds(%(id)s)"""
DELETE_RG_QUALI_DS = """select delete_rg_quali_ds(%(id)s)"""
DELETE_RG_BERUF_DS = """select delete_rg_beruf_ds(%(id)s)"""
-AID_0_DB_TBL = "rg_angebote_bildenden_bereich_tbl_view"
-AID_1_DB_TBL = "rg_angebote_berufsvorbereitung_tbl_view"
-AID_2_DB_TBL = "rg_angebote_berufliche_qualifizierung_tbl_view"
-AID_3_DB_TBL = "rg_angebote_lebensbewaeltigung_tbl_view"
-FETCH_AID_0_SQL = """SELECT id, angebotsform as form, art_der_unterstuetzung as type, durchfuehrende_institution as institute, unterstuetzung_start as start, unterstuetzung_ende as end FROM rg_angebote_bildenden_bereich_tbl_view WHERE id = %s"""
-FETCH_AID_1_SQL = """SELECT id, angebotsform_1 as form, art_der_unterstuetzung_1 as type, durchfuehrende_institution_1 as institute, unterstuetzung_start_1 as start, unterstuetzung_ende_1 as end FROM rg_angebote_berufsvorbereitung_tbl_view WHERE id = %s"""
-FETCH_AID_2_SQL = """SELECT id, angebotsform_2 as form, angebote_im_bereich as type, durchfuehrende_institution_2 as institute, unterstuetzung_start_2 as start, unterstuetzung_ende_2 as end FROM rg_angebote_berufliche_qualifizierung_tbl_view WHERE id = %s"""
-FETCH_AID_3_SQL = """SELECT id, angebotsform_3 as form, art_der_unterstuetzung_2 as type, durchfuehrende_institution_3 as institute, unterstuetzung_start_3 as start, unterstuetzung_ende_3 as end FROM rg_angebote_lebensbewaeltigung_tbl_view WHERE id = %s"""
+LOAD_RG_BILDEN_DS = """SELECT id, angebotsform as form, art_der_unterstuetzung as type, durchfuehrende_institution as institute, unterstuetzung_start as start, unterstuetzung_ende as end FROM rg_angebote_bildenden_bereich_tbl_view WHERE id = %s"""
-AID = {"0": ["BB", "27", CREATE_RG_BILDEN_DS, AID_0_DB_TBL, DELETE_RG_BILDEN_DS],
- "1": ["BV", "28", CREATE_RG_BERUF_DS, AID_1_DB_TBL, DELETE_RG_BERUF_DS],
- "2": ["BQ", "29", CREATE_RG_QUALI_DS, AID_2_DB_TBL, DELETE_RG_QUALI_DS],
- "3": ["LB", "30", CREATE_RG_LEBEN_DS, AID_3_DB_TBL, DELETE_RG_LEBEN_DS]}
+LOAD_RG_BERUF_DS = """SELECT id, angebotsform_1 as form, art_der_unterstuetzung_1 as type, durchfuehrende_institution_1 as institute, unterstuetzung_start_1 as start, unterstuetzung_ende_1 as end FROM rg_angebote_berufsvorbereitung_tbl_view WHERE id = %s"""
+LOAD_RG_QUALI_DS= """SELECT id, angebotsform_2 as form, angebote_im_bereich as type, durchfuehrende_institution_2 as institute, unterstuetzung_start_2 as start, unterstuetzung_ende_2 as end FROM rg_angebote_berufliche_qualifizierung_tbl_view WHERE id = %s"""
+LOAD_RG_LEBEN_DS= """SELECT id, angebotsform_3 as form, art_der_unterstuetzung_2 as type, durchfuehrende_institution_3 as institute, unterstuetzung_start_3 as start, unterstuetzung_ende_3 as end FROM rg_angebote_lebensbewaeltigung_tbl_view WHERE id = %s"""
+RG_BILDEN_DB_TBL = "rg_angebote_bildenden_bereich_tbl_view"
+RG_BERUF_DB_TBL = "rg_angebote_berufsvorbereitung_tbl_view"
+RG_QUALI_DB_TBL = "rg_angebote_berufliche_qualifizierung_tbl_view"
+RG_LEBEN_DB_TBL = "rg_angebote_lebensbewaeltigung_tbl_view"
+
class AidList:
def __init__(self, case_id):
self.aid_list = []
+ for rg_type in range(0,4):
+ list = self._loadCases(rg_type, case_id)
+ self.aid_list.extend(self._buildAidObjects(rg_type, list))
+
+ def _buildAidObjects(self, type_id, list):
+ aid_list = []
+ factory = AidObjectFactory()
+ for id in list:
+ aid_list.append(factory.load(type_id, id))
+ return aid_list
+
+ def _loadCases(self, type_id, case_id):
conn, c = None, None
+ if type_id == 0: table = RG_BILDEN_DB_TBL
+ if type_id == 1: table = RG_BERUF_DB_TBL
+ if type_id == 2: table = RG_QUALI_DB_TBL
+ if type_id == 3: table = RG_LEBEN_DB_TBL
try:
try:
conn = db.getConnection()
- # Bildenden Bereich
c = conn.cursor()
- sql = FETCH_AID_LIST_SQL % (AID_0_DB_TBL, case_id)
- #print >> sys.stderr, str(sql)
+ sql = FETCH_AID_LIST_SQL % (table, case_id)
c.execute(sql)
- for r in c.fetchall():
- self.aid_list.append(
- AidObject(0, r[0], FETCH_AID_0_SQL))
- c.close(); c = None
- # Berufsvorbereitung
- c = conn.cursor()
- sql = FETCH_AID_LIST_SQL % (AID_1_DB_TBL, case_id)
- #print >> sys.stderr, str(sql)
- c.execute(sql)
- for r in c.fetchall():
- self.aid_list.append(AidObject(
- 1, r[0], FETCH_AID_1_SQL))
- c.close(); c = None
- # Berufliche Qualifizierung
- c = conn.cursor()
- sql = FETCH_AID_LIST_SQL % (AID_2_DB_TBL, case_id)
- #print >> sys.stderr, str(sql)
- c.execute(sql)
- for r in c.fetchall():
- self.aid_list.append(
- AidObject(2, r[0], FETCH_AID_2_SQL))
- c.close(); c = None
- # Bildenden Bereich
- c = conn.cursor()
- sql = FETCH_AID_LIST_SQL % (AID_3_DB_TBL, case_id)
- #print >> sys.stderr, str(sql)
- c.execute(sql)
- for r in c.fetchall():
- self.aid_list.append(AidObject(
- 3, r[0], FETCH_AID_3_SQL))
+ return [id[0] for id in c.fetchall()]
finally:
db.recycleConnection(conn, c)
except StandardError, err:
@@ -92,82 +74,153 @@
def listDatasetIds(self, limit, ofs):
return [ds.id for ds in self.ds_list]
+class AidObjectFactory:
+
+ def load(self, type_id, aid_id):
+ if type_id == 0: return AidObject_BB(aid_id)
+ if type_id == 1: return AidObject_BV(aid_id)
+ if type_id == 2: return AidObject_BQ(aid_id)
+ if type_id == 3: return AidObject_LB(aid_id)
+ return None
+
+ def create(self, type_id):
+ if type_id == 0: return AidObject_BB()
+ if type_id == 1: return AidObject_BV()
+ if type_id == 2: return AidObject_BQ()
+ if type_id == 3: return AidObject_LB()
+ return None
+
class AidObject:
- def __init__(self, aid_type=None, id=None, sql=None):
- self.id = id
- self.start_date = "-/-"
- self.end_date = "-/-"
- self.type = "-/-"
- self.institution = "-/-"
- self.aid_form = "-/-"
- self.type_name = "-/-"
+ def __init__(self, id):
+ self.id = id
+ self.start_date = "-/-"
+ self.end_date = "-/-"
+ self.instutution = "-/-"
+ self.aid_form = "-/-"
+ self.type = "-/-"
- self.type_id = aid_type
- self.page_id = None
+ self.type_id = None
+ self.page_id = None
+
+ def load(self, id):
+ r = self._load(id)
try:
- self.type = AID[str(aid_type)][0]
- self.page_id = AID[str(aid_type)][1]
- except:
+ self.id = r[0]
+ self.form = unicode(str(r[1]), 'utf-8')
+ self.type_name = unicode(str(r[2]), 'utf-8')
+ self.institution = unicode(str(r[3]), 'utf-8')
+ self.start_date = r[4].strftime('%d.%m.%Y')
+ self.end_date = r[5].strftime('%d.%m.%Y')
+ except AttributeError:
+ # Not all fields does have a value here. Nothing worse... so ignore it.
pass
- #Do we load an object?
- if id and sql:
- self._fetchData(id, sql)
+ def create(self, id, uuid=None):
+ return self._create(id, uuid)
- def _fetchData(self, id, sql):
+ def delete(self):
+ return self._delete()
+
+ def _load(self, id):
conn, cur = None, None
try:
try:
conn = db.getConnection()
- cur = conn.cursor()
- sql = sql % id
+ cur = conn.cursor()
+ sql = self.load_sql % id
cur.execute(sql)
- #print >> sys.stderr, "%s" % sql
- r = cur.fetchone()
- # Set data
- self.id = r[0]
- self.form = unicode(str(r[1]), 'utf-8')
- #self.type = r[2]
- self.institution = unicode(str(r[3]), 'utf-8')
- self.start_date = r[4].strftime('%d.%m.%Y')
- self.end_date = r[5].strftime('%d.%m.%Y')
+ r = cur.fetchone()
+ return r
finally:
db.recycleConnection(conn, cur)
except:
pass
- def create(self, case_id):
+ def _delete(self):
+ conn, cur, sql = None, None, None
try:
- conn, cur = None, None
try:
conn = db.getConnection()
cur = conn.cursor()
- sql = AID[str(self.type_id)][2]
- cur.execute(sql, { 'id': case_id })
- r = cur.fetchone()
+ cur.execute(self.delete_sql, { 'id': self.id })
conn.commit()
- # Set data
- self.id = r[0]
finally:
db.recycleConnection(conn, cur)
- except:
- traceback.print_exc(file=sys.stderr)
+ except StandardError, err:
+ print >> sys.stderr, "Error on deleting aid object", str(err), " ", sql
+ return True
- return self.id
-
- def delete(self):
- conn, cur, sql = None, None, None
+ def _create(self, case_id, uuid=None):
try:
+ conn, cur = None, None
try:
conn = db.getConnection()
cur = conn.cursor()
- sql = AID[str(self.type_id)][4] # get delete function
- cur.execute(sql, { 'id': self.id })
+ cur.execute(self.create_sql, { 'id': case_id, 'uuid': uuid })
+ r = cur.fetchone()
conn.commit()
+ self.id = r[0]
finally:
db.recycleConnection(conn, cur)
- except StandardError, err:
- print >> sys.stderr, "Error on deleting aid object", str(err), " ", sql
- return True
+ except:
+ traceback.print_exc(file=sys.stderr)
+ return self.id
+
+class AidObject_BB(AidObject):
+
+ def __init__(self, id=None):
+ AidObject.__init__(self, id)
+ self.type = "BB"
+ self.type_id = 0
+ self.page_id = 27
+
+ self.load_sql = LOAD_RG_BILDEN_DS
+ self.create_sql = CREATE_RG_BILDEN_DS
+ self.delete_sql = DELETE_RG_BILDEN_DS
+ if id:
+ self.load(id)
+
+class AidObject_BV(AidObject):
+
+ def __init__(self, id=None):
+ AidObject.__init__(self, id)
+ self.type = "BV"
+ self.type_id = 1
+ self.page_id = 28
+
+ self.load_sql = LOAD_RG_BERUF_DS
+ self.create_sql = CREATE_RG_BERUF_DS
+ self.delete_sql = DELETE_RG_BERUF_DS
+ if id:
+ self.load(id)
+
+class AidObject_BQ(AidObject):
+
+ def __init__(self, id=None):
+ AidObject.__init__(self, id)
+ self.type = "BQ"
+ self.type_id = 2
+ self.page_id = 29
+
+ self.load_sql = LOAD_RG_QUALI_DS
+ self.create_sql = CREATE_RG_QUALI_DS
+ self.delete_sql = DELETE_RG_QUALI_DS
+ if id:
+ self.load(id)
+
+class AidObject_LB(AidObject):
+
+ def __init__(self, id=None):
+ AidObject.__init__(self, id)
+ self.type = "LB"
+ self.type_id = 3
+ self.page_id = 30
+
+ self.load_sql = LOAD_RG_LEBEN_DS
+ self.create_sql = CREATE_RG_LEBEN_DS
+ self.delete_sql = DELETE_RG_LEBEN_DS
+ if id:
+ self.load(id)
+
# vim:set ts=4 sw=4 si et sta sts=4:
Modified: trunk/waskaweb/public/styles/all.css
===================================================================
--- trunk/waskaweb/public/styles/all.css 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/public/styles/all.css 2008-08-13 13:08:05 UTC (rev 30)
@@ -13,9 +13,9 @@
/* 1. Table Formats */
/*------------------*/
-label a, label input, select {
+/*label a, label input, select {
margin-bottom:0.2em;
-}
+}*/
table {
border-spacing: 0;
@@ -27,7 +27,8 @@
}
table th {
- padding: 0.1em 0.6em 0.1 0.25em;
+ padding: 0 0.6em 0 0.25em!important;
+ padding: 0.1em 0.6em 0.1em 0.25em;
}
table th.number_field {
@@ -35,6 +36,7 @@
}
table td {
+ padding: 0 1em 0 0.25em!important;
padding: 0.1em 1em 0.1em 0.25em;
}
@@ -57,11 +59,11 @@
width:3em;
}
-.table_width_mid_s, .table_id {
+.table_width_mid_s, .table_id, .table_date {
width:6em;
}
-.table_width_mid_l, .table_date {
+.table_width_mid_l {
width:9em;
}
Modified: trunk/waskaweb/public/styles/color3.css
===================================================================
--- trunk/waskaweb/public/styles/color3.css 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/public/styles/color3.css 2008-08-13 13:08:05 UTC (rev 30)
@@ -105,6 +105,9 @@
/*color:#a5103b;*/
}
+#statement_box {
+ background:#CFD1D1;
+}
/*------------------*/
/* 5. Formular */
/*------------------*/
@@ -163,3 +166,19 @@
#search_field {
background:#CFD1D1;
}
+
+
+/*------------------*/
+/* 7. Errors */
+/*------------------*/
+
+.error_box {
+ border-color:#a5103b;
+ /*border-width:3px;*/
+}
+
+.error_font, .error_font a {
+ color:#a5103b;
+}
+
+
Modified: trunk/waskaweb/public/styles/print.css
===================================================================
--- trunk/waskaweb/public/styles/print.css 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/public/styles/print.css 2008-08-13 13:08:05 UTC (rev 30)
@@ -32,21 +32,28 @@
margin-top:0em;
padding-top:0em;
padding:0;
- margin:0;
+ margin:5px 0 10px 0;
}
a {
- text-decoration : none;
- color : #000000;
+ text-decoration: none;
+ color: #000000;
}
h1 {
- margin: 0px 0px 5px 0px;
+ margin: 0px 0px 10px 0px;
padding:0;
font-size:14pt;
font-weight:bold;
}
+
+h1.print_new_page {
+ page-break-before:always;
+ clear:both;
+ float:none;
+}
+
h2, h3, h4 {
margin: 0px 0px 2px 0px;
padding:0;
@@ -62,14 +69,14 @@
background-color:white;
}
-div#content_header {
+/*div#content_header {
border:0.5pt solid;
width:250pt;
height:48pt;
margin-top:0em;
padding:2pt;
float:left;
-}
+}*/
#content_ueberschrift, #first_level_header {
margin-top:0;
@@ -79,13 +86,6 @@
}
-/*div#logo {
- margin:1px;
- float:left;
- position:absolute;
- margin-left: 5pt;
-}*/
-
#infofield {
border:0.5pt solid;
margin:0pt 0pt 0 0pt;
@@ -95,6 +95,7 @@
font-size: 9pt;
height:52pt;
width:140pt;
+ display:none;
}
/*div#infofield br {display:none;}*/
@@ -142,3 +143,15 @@
table td, table th {
border-bottom:0.5pt solid;
}
+
+fieldset {
+ page-break-inside:avoid;
+ clear:both;
+ float:none
+}
+
+/*.waska_form_element {
+ float:none;
+}*/
+
+
Modified: trunk/waskaweb/public/styles/screen.css
===================================================================
--- trunk/waskaweb/public/styles/screen.css 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/public/styles/screen.css 2008-08-13 13:08:05 UTC (rev 30)
@@ -83,7 +83,7 @@
a.button {
border: 1px;
- margin-right: 3em;
+ margin-right: 1em;
border-style: solid ;
padding: 0 2em;
text-decoration:none;
@@ -402,7 +402,11 @@
background-position:1.1em 0.4em;
}
+.note {
+ font-size: 0.8em;
+}
+
#content_header #modusfield ul, #content_header #modusfield li, #content_header_small #modusfield ul, #content_header_small #modusfield li{
display:inline;
list-style-type:none;
@@ -459,6 +463,45 @@
div#clearer {clear:both;}
.clearer {clear:left;}
+#statement_text p {
+ padding:0.5em 0;
+}
+
+#statement_form {
+ padding: 0.4em 0;
+}
+
+#statement_box {
+ padding:0.4em 1em;
+ width:25em;
+}
+
+#statement_box input {
+ margin:0.3em 0 0.2em 0.4em!important;
+ margin:0 0 0 0.4em;
+}
+
+#statement_box label {
+ padding-left:0.2em;
+}
+
+#statement_submit {
+ margin: 0.4em 0 0.4em 1em !important;
+}
+
+#statement_signed, #statement_not_signed {
+ margin:1em 1em 0.2em 0.4em;
+}
+
+.digest_table_left, .digest_table_right {
+ float:left;
+ width:26em;
+}
+
+.digest_table_left {
+ margin-right:0.4em;
+}
+
/*--------------*/
/* 6. Login */
/*--------------*/
@@ -636,7 +679,7 @@
}
-#show_own, #show_closed, #show_other, #show_open {
+#show_own, #show_closed, #show_other, #show_open, #show_markdelete {
margin:0 0 0.3em 0 !important;
margin:0;
}
Modified: trunk/waskaweb/templates/administration/dialogs/confirm_deleteuser.mako
===================================================================
--- trunk/waskaweb/templates/administration/dialogs/confirm_deleteuser.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/administration/dialogs/confirm_deleteuser.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -5,5 +5,8 @@
<li><a href="/administration">${_('adm_np_root')}</a></li>
<li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
<li><a href="#">${_('adm_np_delteuser')}</a></li>
+ <li><a href="/administration/deleteUser/${c.delete_user_id}">${_('adm_np_deleteuser')}</a></li>
+ <li><a href="/administration/deleteUser/${c.delete_user_id}/1">${_('adm_np_deleteuser_helper')}</a></li>i
+ <li><a href="#">${_('adm_np_delteuser_success')}</a></li>
</%def>
<%include file="../../dialogs/confirm.mako" />
Modified: trunk/waskaweb/templates/administration/dialogs/notificate_delete_user_helper.mako
===================================================================
--- trunk/waskaweb/templates/administration/dialogs/notificate_delete_user_helper.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/administration/dialogs/notificate_delete_user_helper.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -2,8 +2,10 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case">Fallakten</a></li>
- <li><a href="/case_overview">Fallaktenübersicht</a></li>
- <li><a href="#">Fallakten Bearbeiter setzen</a></li>
+ <li><a href="/administration">${_('adm_np_root')}</a></li>
+ <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
+ <li><a href="/administration/deleteUser/${c.delete_user_id}">${_('adm_np_deleteuser')}</a></li>
+ <li><a href="/administration/deleteUser/${c.delete_user_id}/1">${_('adm_np_deleteuser_helper')}</a></li>
+ <li><a href="#">${_('adm_np_deleteuser_helper_set_editor')}</a></li>
</%def>
-<%include file="../../dialogs/notification.mako" />
+<%include file="../../dialogs/success.mako" />
Modified: trunk/waskaweb/templates/administration/dialogs/notificate_deleteuser.mako
===================================================================
--- trunk/waskaweb/templates/administration/dialogs/notificate_deleteuser.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/administration/dialogs/notificate_deleteuser.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -3,6 +3,7 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
<li><a href="/case/">${_('adm_np_root')}</a></li>
- <li><a href="#">${_('adm_np_deleteuser')}</a></li>
+ <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
+ <li><a href="#">${_('adm_np_success_deleteuser')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Added: trunk/waskaweb/templates/administration/dialogs/success_delete_user.mako
===================================================================
--- trunk/waskaweb/templates/administration/dialogs/success_delete_user.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/administration/dialogs/success_delete_user.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -0,0 +1,9 @@
+## -*- coding: utf-8 -*-
+<%inherit file="../../main.mako" />
+<%def name="buildNavipath()">
+ ${parent.buildNavipath()}
+ <li><a href="/case/">${_('adm_np_root')}</a></li>
+ <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
+ <li><a href="#">${_('adm_np_success_deleteuser')}</a></li>
+</%def>
+<%include file="../../dialogs/success.mako" />
Modified: trunk/waskaweb/templates/administration/edit_user.mako
===================================================================
--- trunk/waskaweb/templates/administration/edit_user.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/administration/edit_user.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -1,5 +1,13 @@
<%inherit file="../main.mako" />
<%! import waskaweb.lib.filters as F %>
+<%
+ formular_labels = {'firstname' : 'adm_form_user_firstname',
+ 'lastname' : 'adm_form_user_lastname',
+ 'login' : 'adm_form_user_login',
+ 'passwd' : 'adm_form_newuser_passwd',
+ 'passwd2' : 'adm_form_newuser_passwd_confirm'
+ }
+%>
<%def name="buildNavipath()">
${parent.buildNavipath()}
<li><a href="/administration">${_('adm_np_root')}</a></li>
@@ -20,29 +28,31 @@
</div>
</div>
</div>
-${self.buildFormErrors()}
+${self.buildFormErrors(formular_labels)}
<div id="admin_edit_user">
<div id="waska_form">
<form action="/administration/editUserAction" method="POST">
<fieldset><legend>${_('adm_form_legend_personal')}</legend>
+ <div class="w25">
+ % if c.form_errors.get('firstname'):
+ <label for="firstname" class="error_font">${_('adm_form_user_firstname')}</label><br>
+ <input type="text" class="field error_box" id="firstname" name="firstname" value="${c.form_result.get('firstname', c.uo.first_name)| h}">
+ % else:
+ <label for="firstname">${_('adm_form_user_firstname')}</label><br>
+ <input type="text" class="field" id="firstname" name="firstname" value="${c.form_result.get('firstname', c.uo.first_name)| h}">
+ % endif
+ </div>
+ <div class="w75">
+ % if c.form_errors.get('lastname'):
+ <label for="lastname" class="error_font">${_('adm_form_user_lastname')}</label><br>
+ <input type="text" class="field error_box" id="lasttname" name="lastname" value="${c.form_result.get('lastname', c.uo.last_name)| h}">
+ % else:
+ <label for="lastname">${_('adm_form_user_lastname')}</label><br>
+ <input type="text" class="field" id="lasttname" name="lastname" value="${c.form_result.get('lastname', c.uo.last_name)| h}">
+ % endif
+ </div>
<div class="w25">
<label
- for="firstname">${_('adm_form_user_firstname')}</label><br>
- % if c.form_errors.get('firstname'):
- <a href="#error_list"><img class="smallicon" src="/images/error_small.png"></a>
- % endif
- <input type="text" class="field" id="firstname" name="firstname" value="${c.form_result.get('firstname', c.uo.first_name)| h}">
- </div>
- <div class="w75">
- <label
- for="lastname">${_('adm_form_user_lastname')}</label><br>
- % if c.form_errors.get('lastname'):
- <a href="#error_list"><img class="smallicon" src="/images/error_small.png"></a>
- % endif
- <input type="text" class="field" id="lasttname" name="lastname" value="${c.form_result.get('lastname', c.uo.last_name)| h}">
- </div>
- <div class="w25">
- <label
for="telephone">${_('adm_form_user_telephone')}</label><br>
<input type="text" class="field" id="telephone" name="telephone" value="${c.form_result.get('telephone', c.uo.telephone)| h}">
</div>
Modified: trunk/waskaweb/templates/administration/new_user.mako
===================================================================
--- trunk/waskaweb/templates/administration/new_user.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/administration/new_user.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -35,20 +35,22 @@
<form action="/administration/createUserAction" method="POST">
<fieldset><legend>${_('adm_form_legend_personal')}</legend>
<div class="w25">
- <label
- for="firstname">${_('adm_form_user_firstname')}</label><br>
- % if c.form_errors.get('firstname'):
- <a href="#error_list"><img class="smallicon" src="/images/error_small.png"></a>
- % endif
- <input type="text" class="field" id="firstname" name="firstname">
+ % if c.form_errors.get('firstname'):
+ <label for="firstname" class="error_font">${_('adm_form_user_firstname')}</label><br>
+ <input type="text" class="field error_box" id="firstname" name="firstname">
+ % else:
+ <label for="firstname">${_('adm_form_user_firstname')}</label><br>
+ <input type="text" class="field" id="firstname" name="firstname">
+ % endif
</div>
<div class="w75">
- <label
- for="lastname">${_('adm_form_user_lastname')}</label><br>
- % if c.form_errors.get('lastname'):
- <a href="#error_list"><img class="smallicon" src="/images/error_small.png"></a>
- % endif
- <input type="text" class="field" id="lasttname" name="lastname">
+ % if c.form_errors.get('lastname'):
+ <label for="lastname" class="error_font">${_('adm_form_user_lastname')}</label><br>
+ <input type="text" class="field error_box" id="lasttname" name="lastname">
+ % else:
+ <label for="lastname">${_('adm_form_user_lastname')}</label><br>
+ <input type="text" class="field" id="lasttname" name="lastname">
+ % endif
</div>
<div class="w25">
<label
@@ -68,12 +70,13 @@
</fieldset>
<fieldset><legend>${_('adm_form_legend_login')}</legend>
<div class="w25">
- <label
- for="login">${_('adm_form_user_login')}</label><br>
- % if c.form_errors.get('login'):
- <a href="#error_list"><img class="smallicon" src="/images/error_small.png"></a>
- % endif
- <input type="text" class="field" id="login" name="login">
+ % if c.form_errors.get('login'):
+ <label for="login" class="error_font">${_('adm_form_user_login')}</label><br>
+ <input type="text" class="field error_box" id="login" name="login">
+ % else:
+ <label for="login">${_('adm_form_user_login')}</label><br>
+ <input type="text" class="field" id="login" name="login">
+ % endif
</div>
<div class="w50">
<label for="role">${_('adm_form_user_role')}</label><br>
Modified: trunk/waskaweb/templates/casemanagement/bundle_editor.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/bundle_editor.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/casemanagement/bundle_editor.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -2,7 +2,9 @@
<%inherit file="../main.mako" />
<%! import waskaweb.lib.filters as F %>
<%def name="buildNavipath()">
- ${parent.buildNavipath()}
+ ${parent.buildNavipath()}
+ <li><a href="/case">${_('cm_np_root')}</a></li>
+ <li>${_('cm_np_bundled_editor')}</li>
</%def>
<div id="content_header_small">
Modified: trunk/waskaweb/templates/casemanagement/bundle_standin.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/bundle_standin.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/casemanagement/bundle_standin.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -2,7 +2,9 @@
<%inherit file="../main.mako" />
<%! import waskaweb.lib.filters as F %>
<%def name="buildNavipath()">
- ${parent.buildNavipath()}
+ ${parent.buildNavipath()}
+ <li><a href="/case">${_('cm_np_root')}</a></li>
+ <li>${_('cm_np_bundled_standin')}</li>
</%def>
<div id="content_header_small">
Modified: trunk/waskaweb/templates/casemanagement/caselist.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/caselist.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/casemanagement/caselist.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -4,8 +4,8 @@
<tr>
<th class="table_header_h table_checkbox"> </th>
<th class="table_id table_header_h">${_('cm_overview_tbl_header_id')}</th>
+ <th class="table_name table_header_h">${_('cm_overview_tbl_header_lastname')}</th>
<th class="table_name table_header_h">${_('cm_overview_tbl_header_firstname')}</th>
- <th class="table_name table_header_h">${_('cm_overview_tbl_header_lastname')}</th>
% if h.hasRole(['admin_ka']):
<th class="table_name table_header_h">${_('cm_overview_tbl_header_editor')}</th>
% endif
@@ -18,11 +18,11 @@
<tr>
<td><input type="checkbox" name="case_id" value="${case.id}"></td>
<td>${case.knr | F.NA, h}</td>
+ <td>${h.getCaseShort(case.last_name, 15) | F.NA, h}</td>
<td>${h.getCaseShort(case.first_name, 15) | F.NA, h}</td>
- <td>${h.getCaseShort(case.last_name, 15) | F.NA, h}</td>
% if h.hasRole(['admin_ka']):
<td>
- ${case.getEditor().first_name[0] | F.NA, h}. ${case.getEditor().last_name | F.NA, h}
+ ${case.getEditor().last_name | F.NA, h}, ${case.getEditor().first_name[0] | F.NA, h}.
</td>
% endif
<td>
@@ -55,11 +55,11 @@
<tr>
<td class="table_row_h"><input type="checkbox" name="case_id" value="${case.id}"></td>
<td class="table_row_h">${case.knr | F.NA, h}</td>
+ <td class="table_row_h">${h.getCaseShort(case.last_name, 15) | F.NA, h}</td>
<td class="table_row_h">${h.getCaseShort(case.first_name, 15) | F.NA, h}</td>
- <td class="table_row_h">${h.getCaseShort(case.last_name, 15) | F.NA, h}</td>
% if h.hasRole(['admin_ka']):
<td class="table_row_h">
- ${case.getEditor().first_name[0] | F.NA, h}. ${case.getEditor().last_name | F.NA, h}
+ ${case.getEditor().last_name | F.NA, h}, ${case.getEditor().first_name[0] | F.NA, h}.
</td>
% endif
<td class="table_row_h">
Added: trunk/waskaweb/templates/casemanagement/dialogs/confirm_delete_aid.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/dialogs/confirm_delete_aid.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/casemanagement/dialogs/confirm_delete_aid.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -0,0 +1,9 @@
+## -*- coding: utf-8 -*-
+<%inherit file="../../casemanagement/main.mako" />
+<%def name="buildNavipath()">
+ ${parent.buildNavipath()}
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="#">${_('cm_np_case_aid')}</a></li>
+ <li><a href="#">${_('cm_np_confirm_aid_delete')}</a></li>
+</%def>
+<%include file="../../dialogs/confirm.mako" />
Added: trunk/waskaweb/templates/casemanagement/dialogs/confirm_delete_attachment.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/dialogs/confirm_delete_attachment.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/casemanagement/dialogs/confirm_delete_attachment.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -0,0 +1,8 @@
+<%inherit file="../../casemanagement/main.mako" />
+<%def name="buildNavipath()">
+ ${parent.buildNavipath()}
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/case/documents/${session.get('case').id}">${_('cm_np_att_overview')}</a></li>
+ <li><a href="#">${_('cm_np_attachment_confirm')}</a></li>
+</%def>
+<%include file="../../dialogs/confirm.mako" />
Added: trunk/waskaweb/templates/casemanagement/dialogs/delete_attachment_success.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/dialogs/delete_attachment_success.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/casemanagement/dialogs/delete_attachment_success.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -0,0 +1,10 @@
+<%inherit file="../../main.mako" />
+<%def name="buildNavipath()">
+ ${parent.buildNavipath()}
+ <li><a href="/case">${_('cm_np_root')}</a></li>
+ <li><a href="/case/case_overview">${_('cm_np_overview')}</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/case/documents/${session.get('case').id}">${_('cm_np_doc_overview')}</a></li>
+ <li><a href="#">${_('cm_np_delete_attachment_success')}</a></li>
+</%def>
+<%include file="../../dialogs/success.mako" />
Modified: trunk/waskaweb/templates/casemanagement/dialogs/notificate_bundle_seteditor.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/dialogs/notificate_bundle_seteditor.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/casemanagement/dialogs/notificate_bundle_seteditor.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -2,8 +2,7 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case">Fallakten</a></li>
- <li><a href="/case_overview">Fallaktenübersicht</a></li>
- <li><a href="#">Fallakten Bearbeiter setzen</a></li>
+ <li><a href="/case">${_('cm_np_root')}</a></li>
+ <li>${_('cm_np_bundled_editor')}</li>
</%def>
<%include file="../../dialogs/notification.mako" />
Modified: trunk/waskaweb/templates/casemanagement/dialogs/notificate_bundle_setstandin.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/dialogs/notificate_bundle_setstandin.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/casemanagement/dialogs/notificate_bundle_setstandin.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -2,8 +2,7 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case">Fallakten</a></li>
- <li><a href="/case_overview">Fallaktenübersicht</a></li>
- <li><a href="#">Fallakten Vertretung setzen</a></li>
+ <li><a href="/case">${_('cm_np_root')}</a></li>
+ <li>${_('cm_np_bundled_standin')}</li>
</%def>
<%include file="../../dialogs/notification.mako" />
Modified: trunk/waskaweb/templates/casemanagement/dialogs/notificate_import_dub.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/dialogs/notificate_import_dub.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/casemanagement/dialogs/notificate_import_dub.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -4,5 +4,6 @@
${parent.buildNavipath()}
<li><a href="/case/">${_('cm_np_root')}</a></li>
<li><a href="/case/import/">${_('cm_np_import')}</a></li>
+ <li><a href="#">${_('cm_np_import_failed')}</a></li>
</%def>
<%include file="../../dialogs/failed.mako" />
Added: trunk/waskaweb/templates/casemanagement/dialogs/success_case_close.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/dialogs/success_case_close.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/casemanagement/dialogs/success_case_close.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -0,0 +1,8 @@
+## -*- coding: utf-8 -*-
+<%inherit file="../main.mako" />
+<%def name="buildNavipath()">
+ ${parent.buildNavipath()}
+ <li><a href="/case/select/${session.get('case').id}/1" onclick="return checkModification();">${_('cm_np_select')}</a></li>
+ <li><a href="#">${_('cm_np_close_success')}</a></li>
+</%def>
+<%include file="../../dialogs/success.mako" />
Added: trunk/waskaweb/templates/casemanagement/dialogs/success_delete.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/dialogs/success_delete.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/casemanagement/dialogs/success_delete.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -0,0 +1,8 @@
+## -*- coding: utf-8 -*-
+<%inherit file="/main.mako" />
+<%def name="buildNavipath()">
+ ${parent.buildNavipath()}
+ <li><a href="/case">${_('cm_np_root')}</a></li>
+ <li><a href="#">${_('cm_np_delete_success')}</a></li>
+</%def>
+<%include file="../../dialogs/success.mako" />
Added: trunk/waskaweb/templates/casemanagement/dialogs/success_delete_aid.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/dialogs/success_delete_aid.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/casemanagement/dialogs/success_delete_aid.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -0,0 +1,9 @@
+## -*- coding: utf-8 -*-
+<%inherit file="../../casemanagement/main.mako" />
+<%def name="buildNavipath()">
+ ${parent.buildNavipath()}
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="#">${_('cm_np_case_aid')}</a></li>
+ <li><a href="#">${_('cm_np_success_aid_delete')}</a></li>
+</%def>
+<%include file="../../dialogs/success.mako" />
Added: trunk/waskaweb/templates/casemanagement/dialogs/success_delete_cm.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/dialogs/success_delete_cm.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/casemanagement/dialogs/success_delete_cm.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -0,0 +1,8 @@
+## -*- coding: utf-8 -*-
+<%inherit file="/main.mako" />
+<%def name="buildNavipath()">
+ ${parent.buildNavipath()}
+ <li><a href="/case">${_('cm_np_root')}</a></li>
+ <li><a href="#">${_('cm_np_delete_success')}</a></li>
+</%def>
+<%include file="../../dialogs/success.mako" />
Added: trunk/waskaweb/templates/casemanagement/dialogs/success_restore.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/dialogs/success_restore.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/casemanagement/dialogs/success_restore.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -0,0 +1,8 @@
+## -*- coding: utf-8 -*-
+<%inherit file="/main.mako" />
+<%def name="buildNavipath()">
+ ${parent.buildNavipath()}
+ <li><a href="/case">${_('cm_np_root')}</a></li>
+ <li><a href="#">${_('cm_np_restore_success')}</a></li>
+</%def>
+<%include file="../../dialogs/success.mako" />
Modified: trunk/waskaweb/templates/casemanagement/digest.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/digest.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/casemanagement/digest.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -15,11 +15,11 @@
<div class="additional_information_img"><img src="/images/info_small.png" alt="Information"/> </div>
<div class="additional_information_p">${_('cm_digest_con_digest_dossier')}<br></div>
</div>-->
-<h2>${_('cm_header_digest_personal')}</h2>
-<table>
+<h2>${_('cm_header_digest_youth')}</h2>
+<table class="digest_table_left">
<tr>
<td class="label table_header_v table_width_mid_l">${_('cm_digest_tbl_label_lastname')}</td>
- <td class="table_row_v table_description">${c.digest.last_name | F.NA, h}</td>
+ <td class="table_row_v">${c.digest.last_name | F.NA, h}</td>
</tr>
<tr>
<td class="label">${_('cm_digest_tbl_label_firstname')}</td>
@@ -33,12 +33,19 @@
<td class="label">${_('cm_digest_tbl_label_age')}</td>
<td class="table_row_v_2">${c.digest.age | F.NA, h}</td>
</tr>
+ <tr>
+ <td class="label table_header_v">${_('cm_digest_tbl_label_email')}</td>
+ % if c.digest.email != "None":
+ <td class="table_row_v"><a href="mailto:${c.digest.email | F.NA, h}">${c.digest.email | F.NA, h}</a></td>
+ % else:
+ <td class="table_row_v">${c.digest.email | F.NA, h}</td>
+ % endif
+ </tr>
</table>
-<h2>${_('cm_digest_header_address')}</h2>
-<table>
+<table class="digest_table_right">
<tr>
<td class="label table_header_v table_width_mid_l">${_('cm_digest_tbl_label_street')}</td>
- <td class="table_row_v table_description">${c.digest.street | F.NA, h}</td>
+ <td class="table_row_v">${c.digest.street | F.NA, h}</td>
</tr>
<tr>
<td class="label">${_('cm_digest_tbl_label_plz')}</td>
@@ -52,4 +59,43 @@
<td class="label">${_('cm_digest_tbl_label_telephone')}</td>
<td class="table_row_v_2">(${c.digest.telephone_1 | F.NA, h}) ${c.digest.telephone_2 | F.NA, h}</td>
</tr>
+ <tr>
+ <td class="label table_header_v">${_('cm_digest_tbl_label_mobiletelephone')}</td>
+ <td class="table_row_v">(${c.digest.mobiletel | F.NA, h})</td>
+ </tr>
+ <tr>
+ <td class="label">${_('cm_digest_tbl_label_telephone_more')}</td>
+ <td class="table_row_v_2">${c.digest.telephone_more | }</td>
+ </tr>
</table>
+
+<h2>${_('cm_header_digest_parent')}</h2>
+<table class="digest_table_left">
+ <tr>
+ <td class="label table_header_v table_width_mid_l">${_('cm_digest_tbl_label_lastname')}</td>
+ <td class="table_row_v">${c.digest.parent_last_name | F.NA, h}</td>
+ </tr>
+ <tr>
+ <td class="label">${_('cm_digest_tbl_label_firstname')}</td>
+ <td class="table_row_v_2">${c.digest.parent_first_name | F.NA, h}</td>
+ </tr>
+ <tr>
+ <td class="label table_header_v">${_('cm_digest_tbl_label_email')}</td>
+ % if c.digest.parent_email != "None":
+ <td class="table_row_v"><a href="mailto:${c.digest.parent_email | F.NA, h}">${c.digest.parent_email | F.NA, h}</a></td>
+ % else:
+ <td class="table_row_v">${c.digest.parent_email | F.NA, h}</td>
+ % endif
+ </tr>
+</table>
+<table class="digest_table_right">
+ <tr>
+ <td class="label table_header_v table_width_mid_l">${_('cm_digest_tbl_label_telephone')}</td>
+ <td class="table_row_v">(${c.digest.parent_telephone_1 | F.NA, h}) ${c.digest.parent_telephone_2 | F.NA, h}</td>
+ </tr>
+ <tr>
+ <td class="label">${_('cm_digest_tbl_label_mobiletelephone')}</td>
+ <td class="table_row_v_2">(${c.digest.parent_mobiletel | F.NA, h})</td>
+ </tr>
+</table>
+
Modified: trunk/waskaweb/templates/casemanagement/formular.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/formular.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/casemanagement/formular.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -84,6 +84,9 @@
% else:
<li><a href="/case/edit/${c.ds_id}/${c.page_id}" onclick="return checkModification();"> ${_('cm_actions_link_edit')}</a></li>
% endif
+ % if str(c.page_id) == '14':
+ <li><a href="/statement/printAidPlanStatement/${c.ds_id}" target="_blank">${_('cm_actions_link_printoutAidPlanStatement')}</a></li>
+ % endif
% endif
<li><a href="${h.getPrintUrl(c.print_form, c.ds_id, c.page_id)}" target="_blank" onclick="return checkModification();"> ${_('cm_actions_link_printout')}</a></li>
</ul>
Modified: trunk/waskaweb/templates/casemanagement/main.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/main.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/casemanagement/main.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -53,12 +53,6 @@
<li><a href="${h.url_for(controller='/case_overview')}" onclick="return checkModification();"> ${_('cm_menu_link_backtooverview')}</a></li>
<li><a href="/case/printAll/${session.get('case').id}" onclick="return checkModification();"> ${_('cm_menu_link_print')}</a></li>
- % if session.get('case').getState().getState() == 1 and h.hasRole(['cm_ka']):
- <li><a href="${h.url_for(controller='/case', action='close', id=session.get('case').id, confirmed='0')}" onclick="return checkModification();"> ${_('cm_menu_link_close')}</a></li>
- % endif
- % if session.get('case').getState().getState() == 2 and h.hasRole(['cm_ka']):
- <li><a href="${h.url_for(controller='/case', action='open', id=session.get('case').id, confirmed='0')}" onclick="return checkModification();"> ${_('cm_menu_link_open')}</a></li>
- % endif
</ul>
% endif
</div>
Modified: trunk/waskaweb/templates/casemanagement/organisation.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/organisation.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/casemanagement/organisation.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -1,3 +1,4 @@
+## -*- coding: utf-8 -*-
<%inherit file="main.mako" />
<%! import waskaweb.lib.filters as F %>
<%def name="buildNavipath()">
@@ -29,7 +30,7 @@
<input type="hidden" name="case_id" value="${session.get('case').id}">
<select name="editor">
% for user in c.user_list:
- <option value="${user.id | F.NA, h}">${user.first_name | F.NA, h} ${user.last_name | F.NA, h}</option>
+ <option value="${user.id | F.NA, h}">${user.last_name | F.NA, h}, ${user.first_name | F.NA, h}</option>
% endfor
</select>
<input type="submit" value="${_('cm_form_editor_submit')}">
@@ -41,7 +42,7 @@
<input type="hidden" name="case_id" value="${session.get('case').id}">
<table>
<tr>
- <th class="table_header_h table_checkbox"></th>
+ <th class="table_header_h table_checkbox"> </th>
<th class="table_header_h table_description">Bearbeiter</th>
</tr>
<% idset = True %>
@@ -53,14 +54,14 @@
% else:
<td><input type="checkbox" name="standin-${user.id | h}" value="${user.id | h}"></td>
% endif
- <td>${user.first_name | F.NA, h}, ${user.last_name | F.NA, h}</td>
+ <td>${user.last_name | F.NA, h}, ${user.first_name | F.NA, h}</td>
% else:
% if user.id in c.standin.getUser():
<td class="table_row_v_12"><input type="checkbox" name="standin-${user.id | h}" value="${user.id | h}" checked></td>
% else:
<td class="table_row_v_12"><input type="checkbox" name="standin-${user.id | h}" value="${user.id | h}"></td>
% endif
- <td class="table_row_v_12">${user.first_name | F.NA, h}, ${user.last_name | F.NA, h}</td>
+ <td class="table_row_v_12">${user.last_name | F.NA, h}, ${user.first_name | F.NA, h}</td>
% endif
</tr>
<% idset = not idset %>
@@ -83,7 +84,7 @@
<% idset = 1 %>
% else:
<tr>
- <td class="table_row_h">${user.first_name | F.NA, h}, ${user.last_name | F.NA, h}</td>
+ <td class="table_row_h">${user.last_name | F.NA, h}, ${user.first_name | F.NA, h}</td>
</tr>
<% idset = 0 %>
% endif
@@ -91,3 +92,21 @@
% endfor
</table>
% endif
+<br>
+<h2>${_('cm_info_status')}</h2>
+<p>Der Zustand der Fallakte ist: "<strong>${session.get('case').getState().getStateLabel() | F.NA, h}</strong>"
+% if session.get('case').getState().getState() == 1 and h.hasRole(['cm_ka']):
+<a href="${h.url_for(controller='/case', action='close', id=session.get('case').id, confirmed='0')}" onclick="return checkModification();"> ${_('cm_menu_link_close')}</a>
+% endif
+% if session.get('case').getState().getState() == 2 and h.hasRole(['cm_ka']):
+<a href="${h.url_for(controller='/case', action='open', id=session.get('case').id, confirmed='0')}" onclick="return checkModification();"> ${_('cm_menu_link_open')}</a>
+% endif
+</p>
+<div class="note">
+<p><strong>Hinweis</strong><br>Das Schließen einer Fallakte steht in keinem Zusammenhang mit dem Beenden eines Falls im Sinne des Case-Management! Um einen Fall im Sinne des Case-Management zu beenden, müssen Sie weiterhin im Abschnitt "Abschlussbewertung" der Fallakte entsprechende Angaben eintragen.<br>
+</p>
+<p>Das Schließen der Fallakte hat zwei Auswirkungen:<br>
+1. Die Fallakte wird aus der Fallaktenübersicht ausgeblendet. Sie können die Fallakte aber durch die Erweiterung der Suchfilter wieder einblenden.<br>
+2. Zur Wahrung des Datenschutzes wird eine abgeschlossene Fallakte, die länger als 3 Monate nicht bearbeitet wurde, dem Bearbeiter wiedervorgelegt und ein Löschen der Fallakte empfohlen.
+</p>
+</div>
Modified: trunk/waskaweb/templates/casemanagement/overview.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/overview.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/casemanagement/overview.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -4,7 +4,7 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
<li><a href="/case">${_('cm_np_root')}</a></li>
- <li><a href="/case/overview/">${_('cm_np_overview')}</a></li>
+ <li><a href="/case_overview">${_('cm_np_overview')}</a></li>
</%def>
<h1>${_('cm_header_overview')}</h1>
% if h.hasRole(['admin_ka']):
@@ -15,9 +15,17 @@
<!-- <p>${_('cm_overview_con_list_dossiers_cm')}</p>-->
%endif
<div id="search_field">
- <form name="case_search" action="/case_overview/search/">
+ <form method="post" name="case_search" action="/case_overview/search/">
<div>
- <input type="text" size="40" name="search_str">
+ <input type="text" size="30" name="search_str">
+ % if h.hasRole(['admin_ka']):
+ <select name="editor">
+ <option value="-1">Alle Benutzer</option>
+ % for user in c.userlist:
+ <option value="${user.id}">${user.last_name | h}, ${user.first_name | h}</option>
+ % endfor
+ </select>
+ % endif
<input type="submit" value="${_('cm_form_overview_search_submit')}">
</div>
<div id="search_criteria">
Modified: trunk/waskaweb/templates/documents/case_overview.mako
===================================================================
--- trunk/waskaweb/templates/documents/case_overview.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/documents/case_overview.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -40,7 +40,9 @@
<td>${ f.getName() | F.shorten, h}</td>
<td class="number_field">${kb(f.size)} KB</td>
<td class="table_action"><a href="/document/caseShow/${f.id}/${f.getName() | F.H}" target="_blank"><img src="/images/icons/view_red.gif" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
+ % if h.hasRole(['cm_ka']):
<a href="/document/caseDelete/${f.id}/${myid}/0"><img src="/images/icons/delete_red.gif" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
+ % endif
</td>
</tr>
<% idset = 1 %>
@@ -49,7 +51,9 @@
<td class="table_row_h">${ f.getName() | F.shorten, h}</td>
<td class="number_field table_row_h">${kb(f.size)} KB</td>
<td class="table_row_h table_action"><a href="/document/caseShow/${f.id}/${f.getName() | F.H}" target="_blank"><img src="/images/icons/view_red.gif" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
+ % if h.hasRole(['cm_ka']):
<a href="/document/caseDelete/${f.id}/${myid}/0"><img src="/images/icons/delete_red.gif" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
+ % endif
</td>
</tr>
<% idset = 0 %>
Added: trunk/waskaweb/templates/documents/dialogs/delete_attachment_success.mako
===================================================================
--- trunk/waskaweb/templates/documents/dialogs/delete_attachment_success.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/documents/dialogs/delete_attachment_success.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -0,0 +1,8 @@
+<%inherit file="../../main.mako" />
+<%def name="buildNavipath()">
+ ${parent.buildNavipath()}
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/case/documents/${session.get('case').id}">${_('cm_np_doc_overview')}</a></li>
+ <li><a href="#">${_('cm_np_delete_attachment_success')}</a></li>
+</%def>
+<%include file="../../dialogs/success.mako" />
Added: trunk/waskaweb/templates/documents/dialogs/delete_document_success.mako
===================================================================
--- trunk/waskaweb/templates/documents/dialogs/delete_document_success.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/documents/dialogs/delete_document_success.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -0,0 +1,7 @@
+<%inherit file="../../main.mako" />
+<%def name="buildNavipath()">
+ ${parent.buildNavipath()}
+ <li><a href="/document/globalOverview">${_('doc_np_overview')}</a></li>
+ <li><a href="#">${_('cm_np_delete_document_success')}</a></li>
+</%def>
+<%include file="../../dialogs/success.mako" />
Modified: trunk/waskaweb/templates/documents/dialogs/success_attachment.mako
===================================================================
--- trunk/waskaweb/templates/documents/dialogs/success_attachment.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/documents/dialogs/success_attachment.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -1,8 +1,7 @@
-<%inherit file="../../casemanagement/main.mako" />
+<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
- ${parent.buildNavipath()}
- <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
- <li><a href="/case/documents/${session.get('case').id}">${_('cm_np_doc_overview')}</a></li>
- <li><a href="#">${_('cm_np_doc_success')}</a></li>
+ ${parent.buildNavipath()}
+ <li><a href="/case/documents/${session.get('case').id}">${_('cm_np_att_overview')}</a></li>
+ <li><a href="#">${_('cm_np_attachment_success')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: trunk/waskaweb/templates/login.mako
===================================================================
--- trunk/waskaweb/templates/login.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/login.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -1,4 +1,5 @@
## -*- coding: utf-8 -*-
+<%! import waskaweb.lib.filters as F %>
<%inherit file="main_login.mako" />
<h1>${_('login_header_waska_login')}</h1>
<div id="waska_form_login">
@@ -12,7 +13,7 @@
</div>
% endif
-<p>${_('login_p_insert_pw_and_identifier')}</p>
+<p><strong>Kompetenzagentur: ${F.H(h.getKAName())}</strong><br>${_('login_p_insert_pw_and_identifier')}</p>
<form name="login" action="${h.url_for(controller='waska', action='loginAction')}" accept-charset="UTF-8" method="POST">
<div class="label">
<label for="login">${_('login_label_identifier')}</label>
Modified: trunk/waskaweb/templates/start/help.mako
===================================================================
--- trunk/waskaweb/templates/start/help.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/start/help.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -1,11 +1,8 @@
+## -*- coding: utf-8 -*-
<%inherit file="../main.mako" />
<h1>WASKA Hilfe</h1>
- <p>An dieser Stelle wird Ihnen eine Hilfe zur Verfügung stehen.</p>
- <!--
- <p>
- <form method="post" action="/usersettings/">
- <input type="checkbox" value="1" id="help_check" name="help_check" checked="checked"/>
- <label for="help_check">Hilfeboxen sichtbar</label>
- </form>
-</p>-->
-
+ <p> Die Hilfe befindet sich noch in Bearbeitung.
+ Bitte wenden Sie sich bis zur Fertigstellung an das Informationsportal
+ <a target="_blank" href="http://waska-anwender.intevation.de/index.html" >Waska-Anwender</a>.
+ Dort finden Sie sowohl <a target="_blank" href="http://waska-anwender.intevation.de/download.html">Handbücher</a>
+ für Administration und Casemanagement, als auch einen Bereich, in dem Antworten auf <a target="_blank" href="http://waska-anwender.intevation.de/faq.html">häufig gestellte Fragen</a> gegeben werden.</p>
Modified: trunk/waskaweb/templates/statement/dialogs/missing_statement.mako
===================================================================
--- trunk/waskaweb/templates/statement/dialogs/missing_statement.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/statement/dialogs/missing_statement.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -3,7 +3,7 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
<li><a href="/case/">${_('cm_np_root')}</a></li>
- <li><a href="/case/overview/">${_('cm_np_overview')}</a></li>
+ <li><a href="/case_overview">${_('cm_np_overview')}</a></li>
<li><a href="#">${_('cm_np_show')}</a></li>
</%def>
<div class="dialog" />
Modified: trunk/waskaweb/templates/statement/edit.mako
===================================================================
--- trunk/waskaweb/templates/statement/edit.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/statement/edit.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -1,30 +1,24 @@
## -*- coding: utf-8 -*-
<%inherit file="../casemanagement/main.mako" />
<h1>${_('statement_edit_header_statement')}</h1>
-<p>
-${_('statement_edit_p_no_statement')}
-</p>
-<br>
-<p>
-${_('statement_edit_p_statement_decision')}
-</p>
-<br>
-<p>
-${_('statement_edit_p_statement_form')}<a href="/statement/printPrivacyStatement/${c.ds_id}" target="_blank">${_('statement_edit_a_statement_form_printversion')}</a> ${_('statement_edit_p_statement_form_end')}
-</p>
-<br>
-<div class="waska_form">
+<div id="statement_text">
+<p>${_('statement_edit_p_no_statement')}</p>
+<p>${_('statement_edit_p_statement_decision')}</p>
+<p>${_('statement_edit_p_statement_form')}<a href="/statement/printPrivacyStatement/${c.ds_id}" target="_blank">${_('statement_edit_a_statement_form_printversion')}</a> ${_('statement_edit_p_statement_form_end')}</p>
+<div id="statement_form" class="waska_form">
<form id="waska_form" action="/statement/setPrivacyStatementAction" accept-charset="UTF-8" name="waska_form" method="POST">
- <div class="waska_form_element">
+ <div id="statement_box">
<input type="radio" id="statement_signed" name="statement_signed" value="1">
<label for="statement_signed">${_('statement_label_statement_yes')}
+ </br>
</label>
- </div>
<input type="radio" id="statement_not_signed" name="statement_signed" value="0">
<label for="statement_not_signed">${_('statement_label_statement_no')}
</label>
+ </br>
<input type="hidden" name="case_id" value="${c.ds_id | h}">
- <br>
- <input type="submit" value="Speichern" name="save">
+ <input id="statement_submit" type="submit" value="Speichern" name="save">
+ </div>
</form>
</div>
+</div>
Modified: trunk/waskaweb/templates/usersettings/change_password.mako
===================================================================
--- trunk/waskaweb/templates/usersettings/change_password.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/usersettings/change_password.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -1,6 +1,10 @@
## -*- coding: utf-8 -*-
<%inherit file="../main.mako" />
-
+<%
+ formular_labels = {'passwd' : 'adm_form_newuser_passwd',
+ 'passwd2' : 'adm_form_newuser_passwd_confirm'
+ }
+%>
<div id="content_header_small">
<div id="content_ueberschrift">
${_('adm_header_changepassword')}
@@ -13,24 +17,26 @@
</div>
</div>
</div>
-${self.buildFormErrors()}
+${self.buildFormErrors(formular_labels)}
<div id="waska_form">
<form action="${h.url_for(controller="usersettings", action="changePasswordAction")}" method="POST">
<div class="waska_form_element w25">
- <label
- for="passwd">${_('adm_form_newuser_passwd')}</label><br>
- % if c.form_errors.get('passwd'):
- <a href="#error_list"><img class="smallicon" src="/images/error_small.png"></a>
- % endif
- <input type="password" class="field" id="passwd" name="passwd">
+ % if c.form_errors.get('passwd'):
+ <label for="passwd" class="error_font">${_('adm_form_newuser_passwd')}</label><br>
+ <input type="password" class="field error_box" id="passwd" name="passwd">
+ % else:
+ <label for="passwd">${_('adm_form_newuser_passwd')}</label><br>
+ <input type="password" class="field" id="passwd" name="passwd">
+ % endif
</div>
<div class="waska_form_element w75">
- <label
- for="passwd2">${_('adm_form_newuser_passwd_confirm')}</label><br>
- % if c.form_errors.get('passwd2'):
- <a href="#error_list"><img class="smallicon" src="/images/error_small.png"></a>
- % endif
- <input type="password" class="field" id="passwd2" name="passwd2">
+ % if c.form_errors.get('passwd2'):
+ <label for="passwd2" class="error_font">${_('adm_form_newuser_passwd_confirm')}</label><br>
+ <input type="password" class="field error_box" id="passwd2" name="passwd2">
+ % else:
+ <label for="passwd2">${_('adm_form_newuser_passwd_confirm')}</label><br>
+ <input type="password" class="field" id="passwd2" name="passwd2">
+ % endif
</div>
<input type="hidden" name="uid" value="${h.getUserId()}">
<input class="btn_space" type="submit" value="${_('adm_form_changepassword_submit')}">
Modified: trunk/waskaweb/templates/usersettings/change_password_login.mako
===================================================================
--- trunk/waskaweb/templates/usersettings/change_password_login.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/usersettings/change_password_login.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -16,20 +16,22 @@
<form action="${h.url_for(controller="usersettings", action="changePasswordOnLoginAction")}" method="POST">
<fieldset><legend>${_('adm_form_legend_login')}</legend>
<div class="waska_form_element w50">
- <label
- for="passwd">${_('adm_form_newuser_passwd')}</label><br>
- % if c.form_errors.get('passwd'):
- <a href="#error_list"><img class="smallicon" src="/images/error_small.png"></a>
- % endif
- <input type="password" class="field" id="passwd" name="passwd">
+ % if c.form_errors.get('passwd'):
+ <label for="passwd" class="error_font">${_('adm_form_newuser_passwd')}</label><br>
+ <input type="password" class="field error_box" id="passwd" name="passwd">
+ % else:
+ <label for="passwd">${_('adm_form_newuser_passwd')}</label><br>
+ <input type="password" class="field" id="passwd" name="passwd">
+ % endif
</div>
<div class="waska_form_element w50">
- <label
- for="passwd2">${_('adm_form_newuser_passwd_confirm')}</label><br>
- % if c.form_errors.get('passwd2'):
- <a href="#error_list"><img class="smallicon" src="/images/error_small.png"></a>
- % endif
- <input type="password" class="field" id="passwd2" name="passwd2">
+ % if c.form_errors.get('passwd2'):
+ <label for="passwd2" class="error_font">${_('adm_form_newuser_passwd_confirm')}</label><br>
+ <input type="password" class="field error_box" id="passwd2" name="passwd2">
+ % else:
+ <label for="passwd2">${_('adm_form_newuser_passwd_confirm')}</label><br>
+ <input type="password" class="field" id="passwd2" name="passwd2">
+ % endif
</div>
</fieldset>
<input type="hidden" name="uid" value="${h.getUserId() | h}">
Modified: trunk/waskaweb/templates/usersettings/dialogs/notificate_setpassword.mako
===================================================================
--- trunk/waskaweb/templates/usersettings/dialogs/notificate_setpassword.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/usersettings/dialogs/notificate_setpassword.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -2,6 +2,6 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="#">${_('adm_np_resetpassword')}</a></li>
+ <li><a href="#">${_('adm_np_changepassword')}</a></li>
</%def>
-<%include file="../../dialogs/notification.mako" />
+<%include file="../../dialogs/success.mako" />
Modified: trunk/waskaweb/templates/usersettings/edit_standin.mako
===================================================================
--- trunk/waskaweb/templates/usersettings/edit_standin.mako 2008-08-13 13:07:37 UTC (rev 29)
+++ trunk/waskaweb/templates/usersettings/edit_standin.mako 2008-08-13 13:08:05 UTC (rev 30)
@@ -24,9 +24,9 @@
<select name="standin" id="standin">
% for u in c.userlist:
% if u.id == c.uo.standin:
- <option value="${u.id}" selected>${u.first_name | F.NA, h}, ${u.last_name | F.NA, h}</option>
+ <option value="${u.id}" selected>${u.last_name | F.NA, h}, ${u.first_name | F.NA, h}</option>
% else:
- <option value="${u.id}">${u.first_name | F.NA, h}, ${u.last_name | F.NA, h}</option>
+ <option value="${u.id}">${u.last_name | F.NA, h}, ${u.first_name | F.NA, h}</option>
% endif
% endfor
% if c.uo.standin is None:
More information about the Mpuls-commits
mailing list