[Mpuls-commits] r89 - in waska/trunk: . waskaweb/controllers waskaweb/i18n waskaweb/i18n/de/LC_MESSAGES waskaweb/public/styles waskaweb/templates/casemanagement
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Aug 27 14:42:25 CEST 2008
Author: torsten
Date: 2008-08-27 14:42:24 +0200 (Wed, 27 Aug 2008)
New Revision: 89
Added:
waska/trunk/waskaweb/templates/casemanagement/phase.mako
Modified:
waska/trunk/ChangeLog.txt
waska/trunk/waskaweb/controllers/agency_overview.py
waska/trunk/waskaweb/controllers/case.py
waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
waska/trunk/waskaweb/i18n/waskaweb.pot
waska/trunk/waskaweb/public/styles/color3.css
waska/trunk/waskaweb/public/styles/screen.css
waska/trunk/waskaweb/templates/casemanagement/main.mako
Log:
Added template for switching phases
Modified: waska/trunk/ChangeLog.txt
===================================================================
--- waska/trunk/ChangeLog.txt 2008-08-26 13:07:51 UTC (rev 88)
+++ waska/trunk/ChangeLog.txt 2008-08-27 12:42:24 UTC (rev 89)
@@ -1,3 +1,17 @@
+2008-08-27 Torsten Irlaender <torsten.irlaender at intevation.de>
+
+ Added template for switching phases
+
+ * waskaweb/i18n/waskaweb.pot,
+ waskaweb/i18n/de/LC_MESSAGES/waskaweb.po,
+ waskaweb/controllers/agency_overview.py,
+ waskaweb/controllers/case.py,
+ waskaweb/public/styles/screen.css,
+ waskaweb/public/styles/color3.css,
+ waskaweb/templates/casemanagement/main.mako,
+ waskaweb/templates/casemanagement/phase.mako: New template. Added
+ styles for coloring. New translations.
+
2008-08-26 Sascha L. Teichmann <sascha.teichmann at intevation.de>
* waskaweb/controllers/case.py,
Modified: waska/trunk/waskaweb/controllers/agency_overview.py
===================================================================
--- waska/trunk/waskaweb/controllers/agency_overview.py 2008-08-26 13:07:51 UTC (rev 88)
+++ waska/trunk/waskaweb/controllers/agency_overview.py 2008-08-27 12:42:24 UTC (rev 89)
@@ -355,7 +355,6 @@
content_disposition = 'attachment; filename="fallakten-export.xml"',
content_encoding = 'UTF-8',
cache_control = 'must-revalidate',
- content_disposition = 'attachment; filename="fallakten-export.xml"',
pragma = 'public')
return data(request.environ, self.start_response)
except:
Modified: waska/trunk/waskaweb/controllers/case.py
===================================================================
--- waska/trunk/waskaweb/controllers/case.py 2008-08-26 13:07:51 UTC (rev 88)
+++ waska/trunk/waskaweb/controllers/case.py 2008-08-27 12:42:24 UTC (rev 89)
@@ -676,7 +676,6 @@
def phase(self, id):
id = self._checkInt(id)
case = self._loadCase(id)
-
return render('/casemanagement/phase.mako')
@checkRole('cm_ka')
Modified: waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
===================================================================
--- waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po 2008-08-26 13:07:51 UTC (rev 88)
+++ waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po 2008-08-27 12:42:24 UTC (rev 89)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: waskaweb 0.0.0\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2008-08-19 15:27+0200\n"
+"POT-Creation-Date: 2008-08-27 14:34+0200\n"
"PO-Revision-Date: 2007-10-14 20:33+0200\n"
"Last-Translator: Torsten Irländer<torsten.irlaender at intevation.de>\n"
"Language-Team: de <LL at li.org>\n"
@@ -272,27 +272,27 @@
msgid "cm_eval_header_avg_effort2"
msgstr "Durchschnittliche Dauer der Tätigkeiten"
-#: waskaweb/lib/renderer.py:232
+#: waskaweb/lib/renderer.py:244
msgid "cm_rg_aid_overview_table_institution"
msgstr "Institution"
-#: waskaweb/lib/renderer.py:233
+#: waskaweb/lib/renderer.py:245
msgid "cm_rg_aid_overview_table_offer_type"
msgstr "Form"
-#: waskaweb/lib/renderer.py:234
+#: waskaweb/lib/renderer.py:246
msgid "cm_rg_aid_overview_table_actions"
msgstr "Aktionen"
-#: waskaweb/lib/renderer.py:236
+#: waskaweb/lib/renderer.py:248
msgid "cm_rg_aid_overview_table_edit"
msgstr "Bearbeiten"
-#: waskaweb/lib/renderer.py:237
+#: waskaweb/lib/renderer.py:249
msgid "cm_rg_aid_overview_table_goal"
msgstr "Zielsetzung"
-#: waskaweb/lib/renderer.py:238 waskaweb/lib/renderer.py:239
+#: waskaweb/lib/renderer.py:250 waskaweb/lib/renderer.py:251
#: waskaweb/templates/administration/overview_user.mako:43
#: waskaweb/templates/administration/overview_user.mako:60
#: waskaweb/templates/administration/overview_usergroups.mako:34
@@ -316,7 +316,7 @@
msgid "cm_overview_a_show"
msgstr "Anzeigen"
-#: waskaweb/lib/renderer.py:240 waskaweb/lib/renderer.py:241
+#: waskaweb/lib/renderer.py:252 waskaweb/lib/renderer.py:253
#: waskaweb/templates/administration/overview_user.mako:45
#: waskaweb/templates/administration/overview_user.mako:62
#: waskaweb/templates/administration/overview_usergroups.mako:35
@@ -337,65 +337,65 @@
msgid "cm_overview_a_delete"
msgstr "Löschen"
-#: waskaweb/lib/renderer.py:242
+#: waskaweb/lib/renderer.py:254
msgid "cm_rg_aid_overview_table_no_offer_found"
msgstr "Keine Angebote gefunden"
-#: waskaweb/lib/renderer.py:243
+#: waskaweb/lib/renderer.py:255
msgid "cm_rg_aid_overview_legend_legend"
msgstr "Legende:"
-#: waskaweb/lib/renderer.py:244
+#: waskaweb/lib/renderer.py:256
msgid "cm_rg_aid_overview_legend_bb"
msgstr "(BB)"
-#: waskaweb/lib/renderer.py:245
+#: waskaweb/lib/renderer.py:257
msgid "cm_rg_aid_overview_legend_common_educational_area"
msgstr "Allgemein bildenden Bereich"
-#: waskaweb/lib/renderer.py:246
+#: waskaweb/lib/renderer.py:258
msgid "cm_rg_aid_overview_legend_bv"
msgstr "(BV)"
-#: waskaweb/lib/renderer.py:247
+#: waskaweb/lib/renderer.py:259
msgid "cm_rg_aid_overview_legend_vocational_preparation"
msgstr "Bereich der Berufsvorbereitung"
-#: waskaweb/lib/renderer.py:248
+#: waskaweb/lib/renderer.py:260
msgid "cm_rg_aid_overview_legend_bq"
msgstr "(BQ)"
-#: waskaweb/lib/renderer.py:249
+#: waskaweb/lib/renderer.py:261
msgid "cm_rg_aid_overview_legend_qualifications"
msgstr "Berufliche Qualifizierung"
-#: waskaweb/lib/renderer.py:250
+#: waskaweb/lib/renderer.py:262
msgid "cm_rg_aid_overview_legend_lb"
msgstr "(LB)"
-#: waskaweb/lib/renderer.py:251
+#: waskaweb/lib/renderer.py:263
msgid "cm_rg_aid_overview_legend_life_skills"
msgstr "Lebensbewältigung"
-#: waskaweb/lib/renderer.py:252
+#: waskaweb/lib/renderer.py:264
msgid "cm_rg_aid_overview_legend_new_offer"
msgstr "Neues Angebot hinzufügen"
-#: waskaweb/model/case.py:1034 waskaweb/model/case.py:1035
+#: waskaweb/model/case.py:1081 waskaweb/model/case.py:1082
#: waskaweb/templates/casemanagement/caselist.mako:64
#: waskaweb/templates/casemanagement/caselist.mako:123
msgid "case_state_label_open"
msgstr "Bearbeitbar"
-#: waskaweb/model/case.py:1036
+#: waskaweb/model/case.py:1083
msgid "case_state_label_outstanding_delete"
msgstr "Schwebend gelöscht"
-#: waskaweb/model/case.py:1037
+#: waskaweb/model/case.py:1084
msgid "case_state_label_outstanding_anon"
msgstr "Schwebend anonymisiert"
-#: waskaweb/model/case.py:1038
+#: waskaweb/model/case.py:1085
msgid "case_state_label_anon"
msgstr "Anonymisiert"
@@ -530,7 +530,7 @@
#: waskaweb/templates/main.mako:197
msgid "footer_version"
-msgstr "13.08.2008 | Version 1.1.0 beta"
+msgstr "21.08.2008 | Version 1.1.0 beta2"
#: waskaweb/templates/main_login.mako:38
#: waskaweb/templates/start/responsible.mako:149
@@ -1337,7 +1337,7 @@
#: waskaweb/templates/appointments/overview_body.mako:7
#: waskaweb/templates/appointments/remindlist_body.mako:7
-#: waskaweb/templates/logbook/overview.mako:30
+#: waskaweb/templates/logbook/overview.mako:43
#: waskaweb/templates/start/globalappointmentlist.mako:11
msgid "app_overview_tbl_header_actions"
msgstr "Aktionen"
@@ -1430,6 +1430,7 @@
#: waskaweb/templates/casemanagement/main.mako:10
#: waskaweb/templates/casemanagement/new.mako:5
#: waskaweb/templates/casemanagement/overview.mako:6
+#: waskaweb/templates/casemanagement/phase.mako:5
#: waskaweb/templates/casemanagement/upload.mako:6
#: waskaweb/templates/casemanagement/dialogs/alert.mako:5
#: waskaweb/templates/casemanagement/dialogs/bundle_noselection.mako:5
@@ -1501,6 +1502,7 @@
#: waskaweb/templates/casemanagement/newLogbookEntry.mako:8
#: waskaweb/templates/casemanagement/new_appointment.mako:5
#: waskaweb/templates/casemanagement/organisation.mako:6
+#: waskaweb/templates/casemanagement/phase.mako:6
#: waskaweb/templates/casemanagement/showAppointment.mako:4
#: waskaweb/templates/casemanagement/dialogs/confirm_anonymize.mako:5
#: waskaweb/templates/casemanagement/dialogs/confirm_close.mako:5
@@ -1526,6 +1528,7 @@
#: waskaweb/templates/logbook/edit.mako:11
#: waskaweb/templates/logbook/new.mako:11
#: waskaweb/templates/logbook/overview.mako:6
+#: waskaweb/templates/logbook/overview_print.mako:6
#: waskaweb/templates/logbook/show.mako:5
#: waskaweb/templates/logbook/dialogs/confirm_delete_logbook_entry.mako:5
#: waskaweb/templates/logbook/dialogs/failed_create_logbook_entry.mako:5
@@ -1795,74 +1798,85 @@
msgstr "Name"
#: waskaweb/templates/casemanagement/main.mako:21
+#: waskaweb/templates/casemanagement/phase.mako:14
+msgid "cm_info_phase"
+msgstr "Phase"
+
+#: waskaweb/templates/casemanagement/main.mako:22
msgid "cm_info_status"
msgstr "Status"
-#: waskaweb/templates/casemanagement/main.mako:23
+#: waskaweb/templates/casemanagement/main.mako:24
msgid "cm_info_nr"
msgstr "Kundennr."
-#: waskaweb/templates/casemanagement/main.mako:29
+#: waskaweb/templates/casemanagement/main.mako:30
msgid "cm_main_header_data_protection"
msgstr "Datenschutz"
-#: waskaweb/templates/casemanagement/main.mako:34
+#: waskaweb/templates/casemanagement/main.mako:35
msgid "cm_main_set_statement"
msgstr "Erklärung Status setzen"
-#: waskaweb/templates/casemanagement/main.mako:36
+#: waskaweb/templates/casemanagement/main.mako:37
msgid "cm_main_revoke_statement"
msgstr "Erklärung zurückziehen"
-#: waskaweb/templates/casemanagement/main.mako:39
+#: waskaweb/templates/casemanagement/main.mako:40
msgid "cm_main_anonymize_case"
msgstr "Fallakte anonymisieren"
-#: waskaweb/templates/casemanagement/main.mako:40
+#: waskaweb/templates/casemanagement/main.mako:41
msgid "statement_list_statement"
msgstr "Verfügbare Erklärungen"
-#: waskaweb/templates/casemanagement/main.mako:50
+#: waskaweb/templates/casemanagement/main.mako:51
msgid "cm_menu_header_cases"
msgstr "Fallakte"
-#: waskaweb/templates/casemanagement/main.mako:55
+#: waskaweb/templates/casemanagement/main.mako:56
msgid "cm_menu_link_backtooverview"
msgstr "Zurück zur Übersicht"
-#: waskaweb/templates/casemanagement/main.mako:56
+#: waskaweb/templates/casemanagement/main.mako:57
msgid "cm_menu_link_print"
msgstr "Gesamte Akte drucken"
-#: waskaweb/templates/casemanagement/main.mako:57
+#: waskaweb/templates/casemanagement/main.mako:58
msgid "cm_menu_link_printempty"
msgstr "Gesamte Akte leer drucken"
-#: waskaweb/templates/casemanagement/main.mako:59
+#: waskaweb/templates/casemanagement/main.mako:60
msgid "cm_menu_link_create_reminder"
msgstr "Wiedervorlage anlegen"
-#: waskaweb/templates/casemanagement/main.mako:66
+#: waskaweb/templates/casemanagement/main.mako:67
msgid "cm_menu_header_seperator"
msgstr "Überblick"
-#: waskaweb/templates/casemanagement/main.mako:69
+#: waskaweb/templates/casemanagement/main.mako:70
msgid "cm_menu_link_digest"
msgstr "Zusammenfassung"
-#: waskaweb/templates/casemanagement/main.mako:71
+#: waskaweb/templates/casemanagement/main.mako:72
+#: waskaweb/templates/casemanagement/phase.mako:7
+#: waskaweb/templates/casemanagement/phase.mako:10
+msgid "case_cm_phase"
+msgstr "Phase im CM"
+
+#: waskaweb/templates/casemanagement/main.mako:73
msgid "cm_menu_link_organisation"
msgstr "Organisation"
-#: waskaweb/templates/casemanagement/main.mako:72
+#: waskaweb/templates/casemanagement/main.mako:74
msgid "cm_menu_link_appointment"
msgstr "Termine"
-#: waskaweb/templates/casemanagement/main.mako:74
+#: waskaweb/templates/casemanagement/main.mako:76
msgid "cm_menu_link_documents"
msgstr "Anlagen"
-#: waskaweb/templates/casemanagement/main.mako:80
+#: waskaweb/templates/casemanagement/main.mako:82
msgid "cm_menu_header_structure"
msgstr "Gliederung"
@@ -1933,6 +1947,18 @@
msgstr ""
"Hier wird eine Auflistung der Fälle des angemeldeten Benutzers angezeigt"
+#: waskaweb/templates/casemanagement/phase.mako:16
+msgid "case_cm_phase_required_fields"
+msgstr "Pflichtfelder"
+
+#: waskaweb/templates/casemanagement/phase.mako:17
+msgid "case_cm_phase_time"
+msgstr "Zeitpunkt"
+
+#: waskaweb/templates/casemanagement/phase.mako:18
+msgid "case_cm_phase_change"
+msgstr "Phasenwechsel"
+
#: waskaweb/templates/casemanagement/showAppointment.mako:18
msgid "sm_menu_link_edit_appointment"
msgstr "In Bearbeitung nehmen"
@@ -2697,6 +2723,12 @@
msgid "adm_np_changepassword"
msgstr "Benutzerpasswort geändert!"
+#~ msgid "case_cm_phase_number"
+#~ msgstr "Nummer"
+
+#~ msgid "case_cm_phase_duration"
+#~ msgstr "Dauer"
+
#~ msgid "case_state_label_closed"
#~ msgstr "Geschlossen"
Modified: waska/trunk/waskaweb/i18n/waskaweb.pot
===================================================================
--- waska/trunk/waskaweb/i18n/waskaweb.pot 2008-08-26 13:07:51 UTC (rev 88)
+++ waska/trunk/waskaweb/i18n/waskaweb.pot 2008-08-27 12:42:24 UTC (rev 89)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: waskaweb 0.0.0\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2008-08-19 15:27+0200\n"
+"POT-Creation-Date: 2008-08-27 14:34+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -243,27 +243,27 @@
msgid "cm_eval_header_avg_effort2"
msgstr ""
-#: waskaweb/lib/renderer.py:232
+#: waskaweb/lib/renderer.py:244
msgid "cm_rg_aid_overview_table_institution"
msgstr ""
-#: waskaweb/lib/renderer.py:233
+#: waskaweb/lib/renderer.py:245
msgid "cm_rg_aid_overview_table_offer_type"
msgstr ""
-#: waskaweb/lib/renderer.py:234
+#: waskaweb/lib/renderer.py:246
msgid "cm_rg_aid_overview_table_actions"
msgstr ""
-#: waskaweb/lib/renderer.py:236
+#: waskaweb/lib/renderer.py:248
msgid "cm_rg_aid_overview_table_edit"
msgstr ""
-#: waskaweb/lib/renderer.py:237
+#: waskaweb/lib/renderer.py:249
msgid "cm_rg_aid_overview_table_goal"
msgstr ""
-#: waskaweb/lib/renderer.py:238 waskaweb/lib/renderer.py:239
+#: waskaweb/lib/renderer.py:250 waskaweb/lib/renderer.py:251
#: waskaweb/templates/administration/overview_user.mako:43
#: waskaweb/templates/administration/overview_user.mako:60
#: waskaweb/templates/administration/overview_usergroups.mako:34
@@ -287,7 +287,7 @@
msgid "cm_overview_a_show"
msgstr ""
-#: waskaweb/lib/renderer.py:240 waskaweb/lib/renderer.py:241
+#: waskaweb/lib/renderer.py:252 waskaweb/lib/renderer.py:253
#: waskaweb/templates/administration/overview_user.mako:45
#: waskaweb/templates/administration/overview_user.mako:62
#: waskaweb/templates/administration/overview_usergroups.mako:35
@@ -308,65 +308,65 @@
msgid "cm_overview_a_delete"
msgstr ""
-#: waskaweb/lib/renderer.py:242
+#: waskaweb/lib/renderer.py:254
msgid "cm_rg_aid_overview_table_no_offer_found"
msgstr ""
-#: waskaweb/lib/renderer.py:243
+#: waskaweb/lib/renderer.py:255
msgid "cm_rg_aid_overview_legend_legend"
msgstr ""
-#: waskaweb/lib/renderer.py:244
+#: waskaweb/lib/renderer.py:256
msgid "cm_rg_aid_overview_legend_bb"
msgstr ""
-#: waskaweb/lib/renderer.py:245
+#: waskaweb/lib/renderer.py:257
msgid "cm_rg_aid_overview_legend_common_educational_area"
msgstr ""
-#: waskaweb/lib/renderer.py:246
+#: waskaweb/lib/renderer.py:258
msgid "cm_rg_aid_overview_legend_bv"
msgstr ""
-#: waskaweb/lib/renderer.py:247
+#: waskaweb/lib/renderer.py:259
msgid "cm_rg_aid_overview_legend_vocational_preparation"
msgstr ""
-#: waskaweb/lib/renderer.py:248
+#: waskaweb/lib/renderer.py:260
msgid "cm_rg_aid_overview_legend_bq"
msgstr ""
-#: waskaweb/lib/renderer.py:249
+#: waskaweb/lib/renderer.py:261
msgid "cm_rg_aid_overview_legend_qualifications"
msgstr ""
-#: waskaweb/lib/renderer.py:250
+#: waskaweb/lib/renderer.py:262
msgid "cm_rg_aid_overview_legend_lb"
msgstr ""
-#: waskaweb/lib/renderer.py:251
+#: waskaweb/lib/renderer.py:263
msgid "cm_rg_aid_overview_legend_life_skills"
msgstr ""
-#: waskaweb/lib/renderer.py:252
+#: waskaweb/lib/renderer.py:264
msgid "cm_rg_aid_overview_legend_new_offer"
msgstr ""
-#: waskaweb/model/case.py:1034 waskaweb/model/case.py:1035
+#: waskaweb/model/case.py:1081 waskaweb/model/case.py:1082
#: waskaweb/templates/casemanagement/caselist.mako:64
#: waskaweb/templates/casemanagement/caselist.mako:123
msgid "case_state_label_open"
msgstr ""
-#: waskaweb/model/case.py:1036
+#: waskaweb/model/case.py:1083
msgid "case_state_label_outstanding_delete"
msgstr ""
-#: waskaweb/model/case.py:1037
+#: waskaweb/model/case.py:1084
msgid "case_state_label_outstanding_anon"
msgstr ""
-#: waskaweb/model/case.py:1038
+#: waskaweb/model/case.py:1085
msgid "case_state_label_anon"
msgstr ""
@@ -1298,7 +1298,7 @@
#: waskaweb/templates/appointments/overview_body.mako:7
#: waskaweb/templates/appointments/remindlist_body.mako:7
-#: waskaweb/templates/logbook/overview.mako:30
+#: waskaweb/templates/logbook/overview.mako:43
#: waskaweb/templates/start/globalappointmentlist.mako:11
msgid "app_overview_tbl_header_actions"
msgstr ""
@@ -1391,6 +1391,7 @@
#: waskaweb/templates/casemanagement/main.mako:10
#: waskaweb/templates/casemanagement/new.mako:5
#: waskaweb/templates/casemanagement/overview.mako:6
+#: waskaweb/templates/casemanagement/phase.mako:5
#: waskaweb/templates/casemanagement/upload.mako:6
#: waskaweb/templates/casemanagement/dialogs/alert.mako:5
#: waskaweb/templates/casemanagement/dialogs/bundle_noselection.mako:5
@@ -1462,6 +1463,7 @@
#: waskaweb/templates/casemanagement/newLogbookEntry.mako:8
#: waskaweb/templates/casemanagement/new_appointment.mako:5
#: waskaweb/templates/casemanagement/organisation.mako:6
+#: waskaweb/templates/casemanagement/phase.mako:6
#: waskaweb/templates/casemanagement/showAppointment.mako:4
#: waskaweb/templates/casemanagement/dialogs/confirm_anonymize.mako:5
#: waskaweb/templates/casemanagement/dialogs/confirm_close.mako:5
@@ -1486,6 +1488,7 @@
#: waskaweb/templates/documents/dialogs/failed_attachment.mako:4
#: waskaweb/templates/logbook/edit.mako:11 waskaweb/templates/logbook/new.mako:11
#: waskaweb/templates/logbook/overview.mako:6
+#: waskaweb/templates/logbook/overview_print.mako:6
#: waskaweb/templates/logbook/show.mako:5
#: waskaweb/templates/logbook/dialogs/confirm_delete_logbook_entry.mako:5
#: waskaweb/templates/logbook/dialogs/failed_create_logbook_entry.mako:5
@@ -1753,74 +1756,85 @@
msgstr ""
#: waskaweb/templates/casemanagement/main.mako:21
+#: waskaweb/templates/casemanagement/phase.mako:14
+msgid "cm_info_phase"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/main.mako:22
msgid "cm_info_status"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:23
+#: waskaweb/templates/casemanagement/main.mako:24
msgid "cm_info_nr"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:29
+#: waskaweb/templates/casemanagement/main.mako:30
msgid "cm_main_header_data_protection"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:34
+#: waskaweb/templates/casemanagement/main.mako:35
msgid "cm_main_set_statement"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:36
+#: waskaweb/templates/casemanagement/main.mako:37
msgid "cm_main_revoke_statement"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:39
+#: waskaweb/templates/casemanagement/main.mako:40
msgid "cm_main_anonymize_case"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:40
+#: waskaweb/templates/casemanagement/main.mako:41
msgid "statement_list_statement"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:50
+#: waskaweb/templates/casemanagement/main.mako:51
msgid "cm_menu_header_cases"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:55
+#: waskaweb/templates/casemanagement/main.mako:56
msgid "cm_menu_link_backtooverview"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:56
+#: waskaweb/templates/casemanagement/main.mako:57
msgid "cm_menu_link_print"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:57
+#: waskaweb/templates/casemanagement/main.mako:58
msgid "cm_menu_link_printempty"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:59
+#: waskaweb/templates/casemanagement/main.mako:60
msgid "cm_menu_link_create_reminder"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:66
+#: waskaweb/templates/casemanagement/main.mako:67
msgid "cm_menu_header_seperator"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:69
+#: waskaweb/templates/casemanagement/main.mako:70
msgid "cm_menu_link_digest"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:71
+#: waskaweb/templates/casemanagement/main.mako:72
+#: waskaweb/templates/casemanagement/phase.mako:7
+#: waskaweb/templates/casemanagement/phase.mako:10
+msgid "case_cm_phase"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/main.mako:73
msgid "cm_menu_link_organisation"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:72
+#: waskaweb/templates/casemanagement/main.mako:74
msgid "cm_menu_link_appointment"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:74
+#: waskaweb/templates/casemanagement/main.mako:76
msgid "cm_menu_link_documents"
msgstr ""
-#: waskaweb/templates/casemanagement/main.mako:80
+#: waskaweb/templates/casemanagement/main.mako:82
msgid "cm_menu_header_structure"
msgstr ""
@@ -1879,6 +1893,18 @@
msgid "cm_overview_con_list_dossiers_cm"
msgstr ""
+#: waskaweb/templates/casemanagement/phase.mako:16
+msgid "case_cm_phase_required_fields"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/phase.mako:17
+msgid "case_cm_phase_time"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/phase.mako:18
+msgid "case_cm_phase_change"
+msgstr ""
+
#: waskaweb/templates/casemanagement/showAppointment.mako:18
msgid "sm_menu_link_edit_appointment"
msgstr ""
Modified: waska/trunk/waskaweb/public/styles/color3.css
===================================================================
--- waska/trunk/waskaweb/public/styles/color3.css 2008-08-26 13:07:51 UTC (rev 88)
+++ waska/trunk/waskaweb/public/styles/color3.css 2008-08-27 12:42:24 UTC (rev 89)
@@ -128,8 +128,24 @@
#statement_box {
background:#d5d5d5; /**/
+}
+table#cmphases td.required_field a.required_missing {
+ color:#a5103b;
}
+
+table#cmphases td.cm_phase_state {
+ background:#d5d5d5;
+}
+table#cmphases td.cm_phase_state_valid {
+ background:green;
+}
+
+table#cmphases td.cm_phase_state_invalid {
+ background:#a5103b
+}
+
+
/*------------------*/
/* 5. Formular */
/*------------------*/
Modified: waska/trunk/waskaweb/public/styles/screen.css
===================================================================
--- waska/trunk/waskaweb/public/styles/screen.css 2008-08-26 13:07:51 UTC (rev 88)
+++ waska/trunk/waskaweb/public/styles/screen.css 2008-08-27 12:42:24 UTC (rev 89)
@@ -536,6 +536,18 @@
margin-right:0.4em;
}
+table#cmphases td {
+ height: 2.5em;
+}
+table#cmphases td.required_field {
+ font-size: 0.8em;
+}
+
+table#cmphases td.cm_phase_state {
+ text-align: center;
+ font-weight: bold;
+}
+
/*--------------*/
/* 6. Login */
/*--------------*/
Modified: waska/trunk/waskaweb/templates/casemanagement/main.mako
===================================================================
--- waska/trunk/waskaweb/templates/casemanagement/main.mako 2008-08-26 13:07:51 UTC (rev 88)
+++ waska/trunk/waskaweb/templates/casemanagement/main.mako 2008-08-27 12:42:24 UTC (rev 89)
@@ -18,6 +18,7 @@
<strong>${_('cm_info_name')}:</strong>
${h.getCaseShort(session.get('case').first_name, 15) | F.NA, h}
${h.getCaseShort(session.get('case').last_name, 15) | F.NA, h}<br>
+ <strong>${_('cm_info_phase')}:</strong> Beratung (läuft)<br>
<strong>${_('cm_info_status')}:</strong>
${session.get('case').getState().getStateLabel() | F.NA, h}<br>
<strong>${_('cm_info_nr')}:</strong> ${session.get('case').knr | F.NA, h}
@@ -68,7 +69,7 @@
<ul>
<li><a href="/case/digest/${session.get('case').id}" onclick="return checkModification();"> ${_('cm_menu_link_digest')}</a></li>
% if h.hasRole(['cm_ka', 'admin_ka']):
- <li><a href="/case/phase/${session.get('case').id}" onclick="return checkModification();"> Phase im CM</a></li>
+ <li><a href="/case/phase/${session.get('case').id}" onclick="return checkModification();"> ${_('case_cm_phase')}</a></li>
<li><a href="/case/organisation/${session.get('case').id}" onclick="return checkModification();"> ${_('cm_menu_link_organisation')}</a></li>
<li><a href="/case/appointments/${session.get('case').id}" onclick="return checkModification();"> ${_('cm_menu_link_appointment')}</a></li>
<li><a href="/case/logbook/${session.get('case').id}" onclick="return checkModification();"> Tagebuch</a></li>
Added: waska/trunk/waskaweb/templates/casemanagement/phase.mako
===================================================================
--- waska/trunk/waskaweb/templates/casemanagement/phase.mako 2008-08-26 13:07:51 UTC (rev 88)
+++ waska/trunk/waskaweb/templates/casemanagement/phase.mako 2008-08-27 12:42:24 UTC (rev 89)
@@ -0,0 +1,145 @@
+## -*- coding: utf-8 -*-
+<%inherit file="main.mako" />
+<%def name="buildNavipath()">
+ ${parent.buildNavipath()}
+ <li><a href="/case/">${_('cm_np_root')}</a></li>
+ <li><a href="/case/select/${session.get('case').id}">${_('cm_np_select')}</a></li>
+ <li><a href="#">${_('case_cm_phase')}</a></li>
+</%def>
+<div class="waska_form">
+<h1>${_('case_cm_phase')}</h1>
+<form>
+ <table id="cmphases">
+ <tr>
+ <th class="table_header_h" width="18%">${_('cm_info_phase')}</th>
+ <th class="table_header_h" width="3%"></th>
+ <th class="table_header_h" width="44%">${_('case_cm_phase_required_fields')}</th>
+ <th class="table_header_h" width="15%">${_('case_cm_phase_time')}</th>
+ <th style="text-align:right" class="table_header_h" width="20%">${_('case_cm_phase_change')}</th>
+ </tr>
+ ##
+ ## BERATUNG
+ ##
+ ## Start Beratung
+ <tr>
+ <td rowspan="2" class="cm_phase_state">Beratung (läuft)</td>
+ <td class="cm_phase_state_valid"></td>
+ <td class="required_field"><a href="#">Datum Erstgespräch</a></td>
+ <td >01.01.2008</td>
+ <td style="text-align:right">
+ <input type="submit" value="Start Beratung" name="start_beratung" disabled="disabled">
+ </td>
+ </tr>
+ ## Ende Beratung
+ <tr>
+ <td class="table_row_h cm_phase_state_invalid"></td>
+ <td class="table_row_h required_field">
+ <a href="#">Datum Ende Beratung</a>,
+ <a href="#">Datum Feststellung Übernahme in das CM</a>,
+ <a href="#" class="required_missing"> Geburtsdatum</a>,
+ <a href="#">Geschlecht</a>,
+ <a href="#">Muttersprache</a>,
+ <a href="#">Geburtsland Mutter</a>,
+ <a href="#">Geburtsland Vater</a>,
+ <a href="#">Geburtsland Jugendlicher</a>,
+ <a href="#">Feststellung Übernahme in das CM</a>
+ </td>
+ <td class="table_row_h">01.03.2008</td>
+ <td style="text-align:right" class="table_row_h">
+ <input type="submit" value="Ende Beratung" name="ende_beratung" disabled="disabled">
+ </td>
+ </tr>
+ ##
+ ## CASEMANAGEMENT
+ ##
+ ## Start CM
+ <tr>
+ <td rowspan="2" class="cm_phase_state">CM</td>
+ <td class="cm_phase_state_invalid"></td>
+ <td class="required_field">
+ <a href="#">Datum Feststellung Übernahme in das CM</a>,
+ <a href="#" class="required_missing">Datum Vereinbarung Förderplan</a>
+ </td>
+ <td >01.03.2008</td>
+ <td style="text-align:right">
+ <input type="submit" value="Start CM" name="start_beratung" disabled="disabled">
+ </td>
+ </tr>
+ ## Ende CM
+ <tr>
+ <td class="table_row_h cm_phase_state_invalid"></td>
+ <td class="table_row_h required_field">
+ <a href="#" class="required_missing">Beendigung CM</a>,
+ <a href="#" class="required_missing">Art der Beendigung</a>,
+ <a href="#" class="required_missing">Vermittlung</a>,
+ <a href="#">Höchster erreichte Schulabschluss</a>,
+ <a href="#">Ausserbetreibliche Ausbildung</a>,
+ <a href="#">Betriebliche Ausbildung</a>,
+ <a href="#">Erwerbstätigkeit</a>,
+ <a href="#">Arbeitslosigkeit</a>,
+ <a href="#">Dauer Arbeitslosikkeit</a>,
+ <a href="#">Bezug ALG1</a>,
+ <a href="#">Bezug ALG2</a>
+ </td>
+ <td class="table_row_h">-/-</td>
+ <td style="text-align:right" class="table_row_h">
+ <input type="submit" value="Ende CM" name="ende_beratung" disabled="disabled">
+ </td>
+ </tr>
+ ##
+ ## NACHBETREUUNG
+ ##
+ ## Start Nachbetreuung
+ <tr>
+ <td rowspan="2" class="cm_phase_state">Nach- betreuung</td>
+ <td class="cm_phase_state_invalid"></td>
+ <td class="required_field">
+ <a href="#" class="required_missing">Datum Beginn Nachbetreuung</a>
+ </td>
+ <td >-/-</td>
+ <td style="text-align:right">
+ <input type="submit" value="Start NB" name="start_nachbetreuung" disabled="disabled">
+ </td>
+ </tr>
+ ## Ende Nachbetreuung
+ <tr>
+ <td class="table_row_h cm_phase_state_invalid"></td>
+ <td class="table_row_h required_field">
+ <a href="#" class="required_missing">Datum Beendigung Nachbetreuung</a>
+ </td>
+ <td class="table_row_h">-/-</td>
+ <td style="text-align:right" class="table_row_h">
+ <input type="submit" value="Ende NB" name="ende_nachbetreuung" disabled="disabled">
+ </td>
+ </tr>
+ </table>
+</form>
+</div>
+##
+## DAUER DER PHASEN
+##
+<div>
+ <h2>Dauer der Phasen</h2>
+ <table>
+ <tr>
+ <th class="table_header_h">Phase</th>
+ <th style="text-align:right" class="table_header_h">Dauer in Wochen</th>
+ </tr>
+ <tr>
+ <td>Beratungskunde</td>
+ <td style="text-align:right">???</td>
+ </tr>
+ <tr>
+ <td>CM</td>
+ <td style="text-align:right">???</td>
+ </tr>
+ <tr>
+ <td>Nachbetreuung</td>
+ <td style="text-align:right">???</td>
+ </tr>
+ <tr>
+ <td style="border-top:1px solid"><strong>Gesamt</strong></td>
+ <td style="border-top:1px solid; text-align:right"><strong>???</strong></td>
+ </tr>
+ </table>
+</div>
More information about the Mpuls-commits
mailing list