[Mpuls-commits] r5137 - in wasko/trunk: . waskoweb/controllers waskoweb/i18n waskoweb/i18n/de/LC_MESSAGES waskoweb/lib waskoweb/templates/casemanagement
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Jun 29 11:48:23 CEST 2011
Author: ludwig
Date: 2011-06-29 11:48:22 +0200 (Wed, 29 Jun 2011)
New Revision: 5137
Modified:
wasko/trunk/ChangeLog
wasko/trunk/waskoweb/controllers/case.py
wasko/trunk/waskoweb/i18n/de/LC_MESSAGES/waskoweb.po
wasko/trunk/waskoweb/i18n/waskoweb.pot
wasko/trunk/waskoweb/lib/validators.py
wasko/trunk/waskoweb/templates/casemanagement/wiederaufnahme.mako
Log:
I1201010 Created two new fields in wiederaufnahme.mako and
make them usable.
Modified: wasko/trunk/ChangeLog
===================================================================
--- wasko/trunk/ChangeLog 2011-06-28 13:52:27 UTC (rev 5136)
+++ wasko/trunk/ChangeLog 2011-06-29 09:48:22 UTC (rev 5137)
@@ -1,3 +1,17 @@
+2011-06-29 Ludwig Reiter <ludwig.reiter at intevation.de>
+
+ * waskoweb/i18n/waskoweb.pot,
+ waskoweb/i18n/de/LC_MESSAGES/waskoweb.po,
+ waskoweb/controllers/case.py,
+ waskoweb/lib/validators.py,
+ waskoweb/templates/casemanagement/wiederaufnahme.mako:
+ I1201010 Created two new fields in wiederaufnahme.mako and
+ make them usable.
+ There are now two ways for a reopening:
+ 1. after successful reintegration into school
+ 2. or after successful reintegration into professional school.
+ Translation of the changes.
+
2011-06-28 Ludwig Reiter <ludwig.reiter at intevation.de>
* waskoweb/controllers/caselifetime.py,
Modified: wasko/trunk/waskoweb/controllers/case.py
===================================================================
--- wasko/trunk/waskoweb/controllers/case.py 2011-06-28 13:52:27 UTC (rev 5136)
+++ wasko/trunk/waskoweb/controllers/case.py 2011-06-29 09:48:22 UTC (rev 5137)
@@ -144,7 +144,6 @@
form_result['cm_wiederauf_genehm_1'] = '1'
form_result['cm2c'] = '1'
form_result['fn'] = '_WA'
- form_result['cm_dok_end_art'] = '1'
form_result['datum_cm_start'] = form_result['cm_wiederauf_genehm_datum_1']
case = self._createCase(form_result)
return self.select(str(case.id))
Modified: wasko/trunk/waskoweb/i18n/de/LC_MESSAGES/waskoweb.po
===================================================================
--- wasko/trunk/waskoweb/i18n/de/LC_MESSAGES/waskoweb.po 2011-06-28 13:52:27 UTC (rev 5136)
+++ wasko/trunk/waskoweb/i18n/de/LC_MESSAGES/waskoweb.po 2011-06-29 09:48:22 UTC (rev 5137)
@@ -8,7 +8,7 @@
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
"POT-Creation-Date: 2011-05-19 20:50+0200\n"
-"PO-Revision-Date: 2011-05-31 11:29+0200\n"
+"PO-Revision-Date: 2011-06-29 11:34+0200\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: de <LL at li.org>\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
@@ -17,147 +17,11 @@
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 0.9.4\n"
-#: waskoweb/controllers/caselifetime.py:30
-msgid "Reopen case?"
-msgstr "Fall wiederaufnehmen?"
-
-#: waskoweb/controllers/caselifetime.py:31
-msgid ""
-"Do you want to reopen the case? Then the current case document will be\n"
-"anonymized and important parts of the case document copied from phase A "
-"and\n"
-"phase B in the new case document. You will work with the new case "
-"document."
-msgstr ""
-"Wollen Sie den Fall wiederaufnehmen? Dabei wird die aktuelle Fallakte "
-"anonymisiert und relevante Teile der Fallakte aus Phase A und Phase B in "
-"eine neue Fallakte kopiert. Sie werden dann in dieser neuen Fallakte "
-"weiterarbeiten."
-
-#: waskoweb/controllers/caselifetime.py:36
-msgid "Do you want to reopen the case for 3 months?"
-msgstr "Wiederaufnahme des jungen Menschen um 3 Monate verlängern?"
-
-#: waskoweb/controllers/caselifetime.py:37
-msgid ""
-"Do you want to reopen the case for 3 months? You can edit the case "
-"document\n"
-"again."
-msgstr ""
-"Wollen Sie die Wiederaufnahme des jungen Menschen um 3 Monate verlängern?"
-" Die Fallakte steht danach weiter zur Bearbeitung."
-
-#: waskoweb/controllers/caselifetime.py:41
-msgid "Do you want to document not accepted reopening?"
-msgstr "Nicht genehmigte Wiederaufnahme dokumentieren?/"
-
-#: waskoweb/controllers/caselifetime.py:42
-msgid ""
-"You have entered, that no acceptence is available. If you continue, "
-"reopening, extension or addition will not be possible."
-msgstr ""
-"Sie haben angegeben, dass keine Genehmigung für die Wiederaufnahme "
-"vorliegt! Wenn Sie fortfahren, wird keine weitere Wiederaufnahme, "
-"Verlängerung oder Neuaufnahme mehr möglich sein."
-
-#: waskoweb/controllers/caselifetime.py:46
-#: waskoweb/controllers/caselifetime.py:51
-msgid "Case document successfully reopened."
-msgstr "Fallakte erfolgreich wiederaufgenommen."
-
-#: waskoweb/controllers/caselifetime.py:47
-msgid ""
-"The case document has been successfully reopened. Click on OK to open the"
-"\n"
-"reopened case document."
-msgstr ""
-"Die Fallakte wurde erfolgreich wiederaufgenommen. Klicken Sie auf \"OK\","
-" um die wiederaufgenommene Fallakte zu öffnen."
-
-#: waskoweb/controllers/caselifetime.py:52
-msgid ""
-"The case document has been successfully reopened. Click on OK to get to "
-"the\n"
-"entry documentation of the case document."
-msgstr ""
-"Die Fallakte wurde erfolgreich wiederaufgenommen. Klicken Sie auf \"OK\","
-" um zur \"Eingangsdokumentation\" der Fallakte zu gelangen."
-
-#: waskoweb/controllers/caselifetime.py:56
-msgid "Not accepted reopening documented."
-msgstr "Nicht genehmigte Wiederaufnahme dokumentiert."
-
-#: waskoweb/controllers/caselifetime.py:57
-msgid ""
-"The not accepted reopening was documented. Click on OK to get to the\n"
-"entry documentation of the case document."
-msgstr ""
-"Die nicht genehmigte Wiederaufnahme wurde dokumentiert. Klicken Sie auf "
-"\"OK\", um zur \"Eingangsdokumentation\" der Fallakte zu gelangen."
-
-#: waskoweb/controllers/caselifetime.py:62
-msgid "Do you want to document the not accepted new subscription?"
-msgstr "Nicht genehmigte Neuaufnahme dokumentieren?"
-
-#: waskoweb/controllers/caselifetime.py:63
-msgid ""
-"You entered, that no acceptence of the new subscription is available.\n"
-"If you continue, no new addition of this case will be possible."
-msgstr ""
-"Sie haben angegeben, das keine Genehmigung für die Neuaufnahme vorliegt! "
-"Wenn Sie fortfahren, wird für diese Fallakte keine erneute Neuaufnahme "
-"mehr möglich sein."
-
-#: waskoweb/controllers/caselifetime.py:67
-msgid "Not accepted new subscription documented."
-msgstr "Nicht genehmigte Neuaufnahme dokumentiert."
-
-#: waskoweb/controllers/caselifetime.py:68
-msgid ""
-"The not accepted new subscription was documented. Click on OK to get to "
-"the\n"
-"entry documentation of the case document."
-msgstr ""
-"Die nicht genehmigte Neuaufnahme wurde dokumentiert. Klicken Sie auf "
-"\"OK\", um zur \"Eingangsdokumentation\" der Fallakte zu gelangen."
-
-#: waskoweb/controllers/caselifetime.py:72
-msgid "Do you want to renew the case?"
-msgstr "Fall neu aufnehmen?"
-
-#: waskoweb/controllers/caselifetime.py:73
-msgid ""
-"Do you want to renew the case? Then the current case document will be\n"
-"anonymized and important parts of phase A and phase B will be copied into"
-" a\n"
-"new case document. You will work on the new case document then."
-msgstr ""
-"Wollen Sie den Fall wirklich neu aufnehmen? Dabei wird die aktuelle "
-"Fallakte anonymisiert und relevante Teile der Fallakte aus Phase A und "
-"Phase B in eine neue Fallakte kopiert. Sie werden dann in dieser neuen "
-"Fallakte weiterarbeiten."
-
-#: waskoweb/controllers/caselifetime.py:78
-msgid "The case document was renewed."
-msgstr "Fallakte neu aufgenommen."
-
-#: waskoweb/controllers/caselifetime.py:79
-msgid ""
-"The case document was renewed. Click on OK to open the new case document."
-"\n"
-"Please check the data and update them, if needed. The old case document\n"
-"was given to the administration for Anonymizing."
-msgstr ""
-"Die Fallakte wurde erfolgreich neu aufgenommen. Klicken Sie auf \"OK\", "
-"um die neue Fallakte zu öffnen. Bitte überprüfen Sie die Angaben auf "
-"Richtigkeit und aktualisieren Sie ggf. die Daten. Die alte Fallakte wurde"
-" der Administration zur Anonymisierung vorgelegt."
-
-#: waskoweb/controllers/caselifetime.py:84
+#: waskoweb/controllers/caselifetime.py:294
msgid "Entry documentation aborted."
msgstr "Eingangsdokumentation abgebrochen."
-#: waskoweb/controllers/caselifetime.py:85
+#: waskoweb/controllers/caselifetime.py:295
msgid ""
"The entry documentation was successfully aborted. The case document was "
"given\n"
@@ -168,7 +32,11 @@
"wurde der Administration zur Löschung vorgelegt. Klicken Sie auf \"OK\", "
"um zu Fallaktenübersicht zu gelangen."
-#: waskoweb/controllers/caselifetime.py:90
+#: waskoweb/controllers/caselifetime.py:302
+msgid "Do you want to abort the entry documentation?"
+msgstr "Eingangsdokumentation abbrechen?"
+
+#: waskoweb/controllers/caselifetime.py:303
msgid ""
"Do you really want to abort the entry documentation and free the case "
"document\n"
@@ -181,44 +49,98 @@
"Bearbeitung zur Verfügung und wird der Administration zum Löschen "
"vorgelegt."
-#: waskoweb/controllers/caselifetime.py:94
-msgid "Do you want to abort the entry documentation?"
-msgstr "Eingangsdokumentation abbrechen?"
-
-#: waskoweb/controllers/caselifetime.py:397
+#: waskoweb/controllers/caselifetime.py:339
msgid "Extension of the integration process"
msgstr "Verlängerung des Integrationsprozess"
-#: waskoweb/controllers/caselifetime.py:398
+#: waskoweb/controllers/caselifetime.py:340
msgid "For this case a extension of the integration process was documented."
msgstr "Für den Fall wurde eine Verlängerung des Integrationsprozess dokumentiert."
-#: waskoweb/controllers/caselifetime.py:441
-#: waskoweb/controllers/caselifetime.py:449
-#: waskoweb/controllers/caselifetime.py:471
+#: waskoweb/controllers/caselifetime.py:383
+#: waskoweb/controllers/caselifetime.py:391
+#: waskoweb/controllers/caselifetime.py:419
msgid "Addition"
msgstr "Neuaufnahme"
-#: waskoweb/controllers/caselifetime.py:442
-#: waskoweb/controllers/caselifetime.py:450
+#: waskoweb/controllers/caselifetime.py:384
+#: waskoweb/controllers/caselifetime.py:392
msgid "For this case an addition of the integration process was documented."
msgstr "Für den Fall wurde eine Neuaufnahme des Integrationsprozess dokumentiert."
-#: waskoweb/controllers/caselifetime.py:472
+#: waskoweb/controllers/caselifetime.py:397
+msgid "The case document was renewed."
+msgstr "Fallakte neu aufgenommen."
+
+#: waskoweb/controllers/caselifetime.py:398
msgid ""
+"The case document was renewed. Click on OK to open the new case document."
+"\n"
+"Please check the data and update them, if needed. The old case document\n"
+"was given to the administration for Anonymizing."
+msgstr ""
+"Die Fallakte wurde erfolgreich neu aufgenommen. Klicken Sie auf \"OK\", "
+"um die neue Fallakte zu öffnen. Bitte überprüfen Sie die Angaben auf "
+"Richtigkeit und aktualisieren Sie ggf. die Daten. Die alte Fallakte wurde"
+" der Administration zur Anonymisierung vorgelegt."
+
+#: waskoweb/controllers/caselifetime.py:405
+msgid "Do you want to renew the case?"
+msgstr "Fall neu aufnehmen?"
+
+#: waskoweb/controllers/caselifetime.py:406
+msgid ""
+"Do you want to renew the case? Then the current case document will be\n"
+"anonymized and important parts of phase A and phase B will be copied into"
+" a\n"
+"new case document. You will work on the new case document then."
+msgstr ""
+"Wollen Sie den Fall wirklich neu aufnehmen? Dabei wird die aktuelle "
+"Fallakte anonymisiert und relevante Teile der Fallakte aus Phase A und "
+"Phase B in eine neue Fallakte kopiert. Sie werden dann in dieser neuen "
+"Fallakte weiterarbeiten."
+
+#: waskoweb/controllers/caselifetime.py:420
+msgid ""
"For this case a not accepted addition of the integration process was "
"documented."
msgstr ""
"Für den Fall wurde eine nicht genehmigte Neuaufnahme des "
"Integrationsprozess dokumentiert."
-#: waskoweb/controllers/caselifetime.py:532
-#: waskoweb/controllers/caselifetime.py:541
-#: waskoweb/controllers/caselifetime.py:595
+#: waskoweb/controllers/caselifetime.py:427
+msgid "Not accepted new subscription documented."
+msgstr "Nicht genehmigte Neuaufnahme dokumentiert."
+
+#: waskoweb/controllers/caselifetime.py:428
+msgid ""
+"The not accepted new subscription was documented. Click on OK to get to "
+"the\n"
+"entry documentation of the case document."
+msgstr ""
+"Die nicht genehmigte Neuaufnahme wurde dokumentiert. Klicken Sie auf "
+"\"OK\", um zur \"Eingangsdokumentation\" der Fallakte zu gelangen."
+
+#: waskoweb/controllers/caselifetime.py:436
+msgid "Do you want to document the not accepted new subscription?"
+msgstr "Nicht genehmigte Neuaufnahme dokumentieren?"
+
+#: waskoweb/controllers/caselifetime.py:437
+msgid ""
+"You entered, that no acceptence of the new subscription is available.\n"
+"If you continue, no new addition of this case will be possible."
+msgstr ""
+"Sie haben angegeben, das keine Genehmigung für die Neuaufnahme vorliegt! "
+"Wenn Sie fortfahren, wird für diese Fallakte keine erneute Neuaufnahme "
+"mehr möglich sein."
+
+#: waskoweb/controllers/caselifetime.py:484
+#: waskoweb/controllers/caselifetime.py:493
+#: waskoweb/controllers/caselifetime.py:556
msgid "Reopening"
msgstr "Wiederaufnahme"
-#: waskoweb/controllers/caselifetime.py:533
+#: waskoweb/controllers/caselifetime.py:485
msgid ""
"For this case an accepted reopening of the integration process was "
"documented."
@@ -226,7 +148,7 @@
"Für den Fall wurde eine genehmigte Wiederaufnahme des Integrationsprozess"
" dokumentiert."
-#: waskoweb/controllers/caselifetime.py:542
+#: waskoweb/controllers/caselifetime.py:494
msgid ""
"For this case a reopening of the integration process was done in a new "
"case document."
@@ -234,11 +156,11 @@
"Für den Fall eine Wiederaufnahme des Integrationsprozess in einer neuen "
"Fallakte durchgeführt."
-#: waskoweb/controllers/caselifetime.py:552
+#: waskoweb/controllers/caselifetime.py:504
msgid "Extension reopening"
msgstr "Verlängerung Wiederaufnahme"
-#: waskoweb/controllers/caselifetime.py:553
+#: waskoweb/controllers/caselifetime.py:505
msgid ""
"For this case an accepted extension of the reopening of the integration "
"process was documented."
@@ -246,19 +168,97 @@
"Für den Fall wurde eine genehmigte Verlängerung der Wiederaufnahme des "
"Integrationsprozess dokumentiert."
-#: waskoweb/controllers/caselifetime.py:596
+#: waskoweb/controllers/caselifetime.py:512
+#: waskoweb/controllers/caselifetime.py:520
+msgid "Case document successfully reopened."
+msgstr "Fallakte erfolgreich wiederaufgenommen."
+
+#: waskoweb/controllers/caselifetime.py:513
msgid ""
+"The case document has been successfully reopened. Click on OK to open the"
+"\n"
+"reopened case document."
+msgstr ""
+"Die Fallakte wurde erfolgreich wiederaufgenommen. Klicken Sie auf \"OK\","
+" um die wiederaufgenommene Fallakte zu öffnen."
+
+#: waskoweb/controllers/caselifetime.py:521
+msgid ""
+"The case document has been successfully reopened. Click on OK to get to "
+"the\n"
+"entry documentation of the case document."
+msgstr ""
+"Die Fallakte wurde erfolgreich wiederaufgenommen. Klicken Sie auf \"OK\","
+" um zur \"Eingangsdokumentation\" der Fallakte zu gelangen."
+
+#: waskoweb/controllers/caselifetime.py:530
+msgid "Reopen case?"
+msgstr "Fall wiederaufnehmen?"
+
+#: waskoweb/controllers/caselifetime.py:531
+msgid ""
+"Do you want to reopen the case? Then the current case document will be\n"
+"anonymized and important parts of the case document copied from phase A "
+"and\n"
+"phase B in the new case document. You will work with the new case "
+"document."
+msgstr ""
+"Wollen Sie den Fall wiederaufnehmen? Dabei wird die aktuelle Fallakte "
+"anonymisiert und relevante Teile der Fallakte aus Phase A und Phase B in "
+"eine neue Fallakte kopiert. Sie werden dann in dieser neuen Fallakte "
+"weiterarbeiten."
+
+#: waskoweb/controllers/caselifetime.py:538
+msgid "Do you want to reopen the case for 3 months?"
+msgstr "Wiederaufnahme des jungen Menschen um 3 Monate verlängern?"
+
+#: waskoweb/controllers/caselifetime.py:539
+msgid ""
+"Do you want to reopen the case for 3 months? You can edit the case "
+"document\n"
+"again."
+msgstr ""
+"Wollen Sie die Wiederaufnahme des jungen Menschen um 3 Monate verlängern?"
+" Die Fallakte steht danach weiter zur Bearbeitung."
+
+#: waskoweb/controllers/caselifetime.py:557
+msgid ""
"For this case a not accepted reopening of the integration process was "
"documented."
msgstr ""
"Für den Fall wurde eine nicht genehmigte Wiederaufnahme des "
"Integrationsprozess dokumentiert."
-#: waskoweb/controllers/settings.py:20
+#: waskoweb/controllers/caselifetime.py:563
+msgid "Not accepted reopening documented."
+msgstr "Nicht genehmigte Wiederaufnahme dokumentiert."
+
+#: waskoweb/controllers/caselifetime.py:564
+msgid ""
+"The not accepted reopening was documented. Click on OK to get to the\n"
+"entry documentation of the case document."
+msgstr ""
+"Die nicht genehmigte Wiederaufnahme wurde dokumentiert. Klicken Sie auf "
+"\"OK\", um zur \"Eingangsdokumentation\" der Fallakte zu gelangen."
+
+#: waskoweb/controllers/caselifetime.py:573
+msgid "Do you want to document not accepted reopening?"
+msgstr "Nicht genehmigte Wiederaufnahme dokumentieren?/"
+
+#: waskoweb/controllers/caselifetime.py:574
+msgid ""
+"You have entered, that no acceptence is available. If you continue, "
+"reopening, extension or addition will not be possible."
+msgstr ""
+"Sie haben angegeben, dass keine Genehmigung für die Wiederaufnahme "
+"vorliegt! Wenn Sie fortfahren, wird keine weitere Wiederaufnahme, "
+"Verlängerung oder Neuaufnahme mehr möglich sein."
+
+#: waskoweb/controllers/settings.py:51
msgid "Configurations saved!"
msgstr ""
-#: waskoweb/controllers/settings.py:21
+#: waskoweb/controllers/settings.py:52
msgid "Please click on ok to continue."
msgstr ""
@@ -471,7 +471,7 @@
msgstr "Wiederaufnahme nach erfolgreicher Reintegration"
#: waskoweb/templates/caselifetime/wiederaufnahme.mako:6
-#: waskoweb/templates/casemanagement/wiederaufnahme.mako:60
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:95
msgid "Reopening of the youth case for 3 month"
msgstr "Wiederaufnahme der/des Jugendlichen für 3 Monate"
@@ -774,7 +774,7 @@
#: waskoweb/templates/casemanagement/neuaufnahme.mako:62
#: waskoweb/templates/casemanagement/new.mako:130
-#: waskoweb/templates/casemanagement/wiederaufnahme.mako:93
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:128
msgid "Create case document"
msgstr "Fallakte anlegen"
@@ -866,7 +866,8 @@
#: waskoweb/templates/casemanagement/search_extra.mako:10
#: waskoweb/templates/casemanagement/search_extra.mako:25
-#: waskoweb/templates/casemanagement/wiederaufnahme.mako:38
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:54
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:73
#: waskoweb/templates/evaluation/evaluate_extra.mako:10
msgid "Unknown"
msgstr "Unbekannt"
@@ -882,6 +883,8 @@
#: waskoweb/templates/casemanagement/search_extra.mako:23
#: waskoweb/templates/casemanagement/wiederaufnahme.mako:37
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:53
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:72
msgid "Not specified"
msgstr "Keine Angabe"
@@ -901,34 +904,57 @@
msgstr "Abbruch"
#: waskoweb/templates/casemanagement/wiederaufnahme.mako:30
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:46
msgid "Whereto was the reintegration?"
msgstr "Wohin erfolgte die Reintegration?"
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:38
+msgid "Successful reintegration into school"
+msgstr "Erfolgreiche Reintegration in die Allgemeinbildende Schule"
+
#: waskoweb/templates/casemanagement/wiederaufnahme.mako:39
+msgid "Successful reintegration into professional school"
+msgstr "Erfolgreiche Reintegration in die Berufliche Schule"
+
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:55
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:74
msgid "Other"
msgstr "Sonstige"
-#: waskoweb/templates/casemanagement/wiederaufnahme.mako:40
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:56
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:75
msgid "Origin class"
msgstr "Ursprungsklasse"
-#: waskoweb/templates/casemanagement/wiederaufnahme.mako:41
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:57
msgid "Same school, new class"
msgstr "gleiche Schule, neue Klasse"
-#: waskoweb/templates/casemanagement/wiederaufnahme.mako:42
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:58
msgid "Other school"
msgstr "andere Schule"
-#: waskoweb/templates/casemanagement/wiederaufnahme.mako:49
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:65
+msgid "Whereto was the reintegration? (professional school)"
+msgstr "Wohin erfolgte die Reintegration? (Berufliche Schule)"
+
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:76
+msgid "Same professional school, new class"
+msgstr "gleiche Berufliche Schule, neue Klasse"
+
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:77
+msgid "Other professional school"
+msgstr "andere Berufliche Schule"
+
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:84
msgid "Reason for the reopening"
msgstr "Begründung für die Wiederaufnahme"
-#: waskoweb/templates/casemanagement/wiederaufnahme.mako:64
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:99
msgid "Reopening accepted from"
msgstr "Wiederaufnahme genehmigt ab"
-#: waskoweb/templates/casemanagement/wiederaufnahme.mako:78
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:113
msgid "Reopening accepted to"
msgstr "Wiederaufnahme genehmigt bis"
Modified: wasko/trunk/waskoweb/i18n/waskoweb.pot
===================================================================
--- wasko/trunk/waskoweb/i18n/waskoweb.pot 2011-06-28 13:52:27 UTC (rev 5136)
+++ wasko/trunk/waskoweb/i18n/waskoweb.pot 2011-06-29 09:48:22 UTC (rev 5137)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: waskoweb 2.0.0-pre\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2011-05-31 11:28+0200\n"
+"POT-Creation-Date: 2011-06-29 11: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"
@@ -17,192 +17,193 @@
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 0.9.4\n"
-#: waskoweb/controllers/caselifetime.py:30
-msgid "Reopen case?"
+#: waskoweb/controllers/caselifetime.py:294
+msgid "Entry documentation aborted."
msgstr ""
-#: waskoweb/controllers/caselifetime.py:31
+#: waskoweb/controllers/caselifetime.py:295
msgid ""
-"Do you want to reopen the case? Then the current case document will be\n"
-"anonymized and important parts of the case document copied from phase A and\n"
-"phase B in the new case document. You will work with the new case document."
+"The entry documentation was successfully aborted. The case document was given"
+"\n"
+"to the administration for deletion. Click on OK to get back to the\n"
+"case documents overview."
msgstr ""
-#: waskoweb/controllers/caselifetime.py:36
-msgid "Do you want to reopen the case for 3 months?"
+#: waskoweb/controllers/caselifetime.py:302
+msgid "Do you want to abort the entry documentation?"
msgstr ""
-#: waskoweb/controllers/caselifetime.py:37
+#: waskoweb/controllers/caselifetime.py:303
msgid ""
-"Do you want to reopen the case for 3 months? You can edit the case document\n"
-"again."
+"Do you really want to abort the entry documentation and free the case "
+"document\n"
+"for deletion? The case document will not be editable then and will be given "
+"to\n"
+"the administration for seletion."
msgstr ""
-#: waskoweb/controllers/caselifetime.py:41
-msgid "Do you want to document not accepted reopening?"
+#: waskoweb/controllers/caselifetime.py:339
+msgid "Extension of the integration process"
msgstr ""
-#: waskoweb/controllers/caselifetime.py:42
+#: waskoweb/controllers/caselifetime.py:340
+msgid "For this case a extension of the integration process was documented."
+msgstr ""
+
+#: waskoweb/controllers/caselifetime.py:383
+#: waskoweb/controllers/caselifetime.py:391
+#: waskoweb/controllers/caselifetime.py:419
+msgid "Addition"
+msgstr ""
+
+#: waskoweb/controllers/caselifetime.py:384
+#: waskoweb/controllers/caselifetime.py:392
+msgid "For this case an addition of the integration process was documented."
+msgstr ""
+
+#: waskoweb/controllers/caselifetime.py:397
+msgid "The case document was renewed."
+msgstr ""
+
+#: waskoweb/controllers/caselifetime.py:398
msgid ""
-"You have entered, that no acceptence is available. If you continue, "
-"reopening, extension or addition will not be possible."
+"The case document was renewed. Click on OK to open the new case document.\n"
+"Please check the data and update them, if needed. The old case document\n"
+"was given to the administration for Anonymizing."
msgstr ""
-#: waskoweb/controllers/caselifetime.py:46 waskoweb/controllers/caselifetime.py:51
-msgid "Case document successfully reopened."
+#: waskoweb/controllers/caselifetime.py:405
+msgid "Do you want to renew the case?"
msgstr ""
-#: waskoweb/controllers/caselifetime.py:47
+#: waskoweb/controllers/caselifetime.py:406
msgid ""
-"The case document has been successfully reopened. Click on OK to open the\n"
-"reopened case document."
+"Do you want to renew the case? Then the current case document will be\n"
+"anonymized and important parts of phase A and phase B will be copied into a\n"
+"new case document. You will work on the new case document then."
msgstr ""
-#: waskoweb/controllers/caselifetime.py:52
+#: waskoweb/controllers/caselifetime.py:420
msgid ""
-"The case document has been successfully reopened. Click on OK to get to the\n"
-"entry documentation of the case document."
+"For this case a not accepted addition of the integration process was "
+"documented."
msgstr ""
-#: waskoweb/controllers/caselifetime.py:56
-msgid "Not accepted reopening documented."
+#: waskoweb/controllers/caselifetime.py:427
+msgid "Not accepted new subscription documented."
msgstr ""
-#: waskoweb/controllers/caselifetime.py:57
+#: waskoweb/controllers/caselifetime.py:428
msgid ""
-"The not accepted reopening was documented. Click on OK to get to the\n"
+"The not accepted new subscription was documented. Click on OK to get to the\n"
"entry documentation of the case document."
msgstr ""
-#: waskoweb/controllers/caselifetime.py:62
+#: waskoweb/controllers/caselifetime.py:436
msgid "Do you want to document the not accepted new subscription?"
msgstr ""
-#: waskoweb/controllers/caselifetime.py:63
+#: waskoweb/controllers/caselifetime.py:437
msgid ""
"You entered, that no acceptence of the new subscription is available.\n"
"If you continue, no new addition of this case will be possible."
msgstr ""
-#: waskoweb/controllers/caselifetime.py:67
-msgid "Not accepted new subscription documented."
+#: waskoweb/controllers/caselifetime.py:484
+#: waskoweb/controllers/caselifetime.py:493
+#: waskoweb/controllers/caselifetime.py:556
+msgid "Reopening"
msgstr ""
-#: waskoweb/controllers/caselifetime.py:68
-msgid ""
-"The not accepted new subscription was documented. Click on OK to get to the\n"
-"entry documentation of the case document."
+#: waskoweb/controllers/caselifetime.py:485
+msgid "For this case an accepted reopening of the integration process was documented."
msgstr ""
-#: waskoweb/controllers/caselifetime.py:72
-msgid "Do you want to renew the case?"
-msgstr ""
-
-#: waskoweb/controllers/caselifetime.py:73
+#: waskoweb/controllers/caselifetime.py:494
msgid ""
-"Do you want to renew the case? Then the current case document will be\n"
-"anonymized and important parts of phase A and phase B will be copied into a\n"
-"new case document. You will work on the new case document then."
+"For this case a reopening of the integration process was done in a new case "
+"document."
msgstr ""
-#: waskoweb/controllers/caselifetime.py:78
-msgid "The case document was renewed."
+#: waskoweb/controllers/caselifetime.py:504
+msgid "Extension reopening"
msgstr ""
-#: waskoweb/controllers/caselifetime.py:79
+#: waskoweb/controllers/caselifetime.py:505
msgid ""
-"The case document was renewed. Click on OK to open the new case document.\n"
-"Please check the data and update them, if needed. The old case document\n"
-"was given to the administration for Anonymizing."
+"For this case an accepted extension of the reopening of the integration "
+"process was documented."
msgstr ""
-#: waskoweb/controllers/caselifetime.py:84
-msgid "Entry documentation aborted."
+#: waskoweb/controllers/caselifetime.py:512
+#: waskoweb/controllers/caselifetime.py:520
+msgid "Case document successfully reopened."
msgstr ""
-#: waskoweb/controllers/caselifetime.py:85
+#: waskoweb/controllers/caselifetime.py:513
msgid ""
-"The entry documentation was successfully aborted. The case document was given"
-"\n"
-"to the administration for deletion. Click on OK to get back to the\n"
-"case documents overview."
+"The case document has been successfully reopened. Click on OK to open the\n"
+"reopened case document."
msgstr ""
-#: waskoweb/controllers/caselifetime.py:90
+#: waskoweb/controllers/caselifetime.py:521
msgid ""
-"Do you really want to abort the entry documentation and free the case "
-"document\n"
-"for deletion? The case document will not be editable then and will be given "
-"to\n"
-"the administration for seletion."
+"The case document has been successfully reopened. Click on OK to get to the\n"
+"entry documentation of the case document."
msgstr ""
-#: waskoweb/controllers/caselifetime.py:94
-msgid "Do you want to abort the entry documentation?"
+#: waskoweb/controllers/caselifetime.py:530
+msgid "Reopen case?"
msgstr ""
-#: waskoweb/controllers/caselifetime.py:397
-msgid "Extension of the integration process"
+#: waskoweb/controllers/caselifetime.py:531
+msgid ""
+"Do you want to reopen the case? Then the current case document will be\n"
+"anonymized and important parts of the case document copied from phase A and\n"
+"phase B in the new case document. You will work with the new case document."
msgstr ""
-#: waskoweb/controllers/caselifetime.py:398
-msgid "For this case a extension of the integration process was documented."
+#: waskoweb/controllers/caselifetime.py:538
+msgid "Do you want to reopen the case for 3 months?"
msgstr ""
-#: waskoweb/controllers/caselifetime.py:441
-#: waskoweb/controllers/caselifetime.py:449
-#: waskoweb/controllers/caselifetime.py:471
-msgid "Addition"
+#: waskoweb/controllers/caselifetime.py:539
+msgid ""
+"Do you want to reopen the case for 3 months? You can edit the case document\n"
+"again."
msgstr ""
-#: waskoweb/controllers/caselifetime.py:442
-#: waskoweb/controllers/caselifetime.py:450
-msgid "For this case an addition of the integration process was documented."
-msgstr ""
-
-#: waskoweb/controllers/caselifetime.py:472
+#: waskoweb/controllers/caselifetime.py:557
msgid ""
-"For this case a not accepted addition of the integration process was "
+"For this case a not accepted reopening of the integration process was "
"documented."
msgstr ""
-#: waskoweb/controllers/caselifetime.py:532
-#: waskoweb/controllers/caselifetime.py:541
-#: waskoweb/controllers/caselifetime.py:595
-msgid "Reopening"
+#: waskoweb/controllers/caselifetime.py:563
+msgid "Not accepted reopening documented."
msgstr ""
-#: waskoweb/controllers/caselifetime.py:533
-msgid "For this case an accepted reopening of the integration process was documented."
-msgstr ""
-
-#: waskoweb/controllers/caselifetime.py:542
+#: waskoweb/controllers/caselifetime.py:564
msgid ""
-"For this case a reopening of the integration process was done in a new case "
-"document."
+"The not accepted reopening was documented. Click on OK to get to the\n"
+"entry documentation of the case document."
msgstr ""
-#: waskoweb/controllers/caselifetime.py:552
-msgid "Extension reopening"
+#: waskoweb/controllers/caselifetime.py:573
+msgid "Do you want to document not accepted reopening?"
msgstr ""
-#: waskoweb/controllers/caselifetime.py:553
+#: waskoweb/controllers/caselifetime.py:574
msgid ""
-"For this case an accepted extension of the reopening of the integration "
-"process was documented."
+"You have entered, that no acceptence is available. If you continue, "
+"reopening, extension or addition will not be possible."
msgstr ""
-#: waskoweb/controllers/caselifetime.py:596
-msgid ""
-"For this case a not accepted reopening of the integration process was "
-"documented."
-msgstr ""
-
-#: waskoweb/controllers/settings.py:20
+#: waskoweb/controllers/settings.py:51
msgid "Configurations saved!"
msgstr ""
-#: waskoweb/controllers/settings.py:21
+#: waskoweb/controllers/settings.py:52
msgid "Please click on ok to continue."
msgstr ""
@@ -384,7 +385,7 @@
msgstr ""
#: waskoweb/templates/caselifetime/wiederaufnahme.mako:6
-#: waskoweb/templates/casemanagement/wiederaufnahme.mako:60
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:95
msgid "Reopening of the youth case for 3 month"
msgstr ""
@@ -676,7 +677,7 @@
#: waskoweb/templates/casemanagement/neuaufnahme.mako:62
#: waskoweb/templates/casemanagement/new.mako:130
-#: waskoweb/templates/casemanagement/wiederaufnahme.mako:93
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:128
msgid "Create case document"
msgstr ""
@@ -766,7 +767,8 @@
#: waskoweb/templates/casemanagement/search_extra.mako:10
#: waskoweb/templates/casemanagement/search_extra.mako:25
-#: waskoweb/templates/casemanagement/wiederaufnahme.mako:38
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:54
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:73
#: waskoweb/templates/evaluation/evaluate_extra.mako:10
msgid "Unknown"
msgstr ""
@@ -782,6 +784,8 @@
#: waskoweb/templates/casemanagement/search_extra.mako:23
#: waskoweb/templates/casemanagement/wiederaufnahme.mako:37
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:53
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:72
msgid "Not specified"
msgstr ""
@@ -801,34 +805,57 @@
msgstr ""
#: waskoweb/templates/casemanagement/wiederaufnahme.mako:30
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:46
msgid "Whereto was the reintegration?"
msgstr ""
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:38
+msgid "Successful reintegration into school"
+msgstr ""
+
#: waskoweb/templates/casemanagement/wiederaufnahme.mako:39
+msgid "Successful reintegration into professional school"
+msgstr ""
+
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:55
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:74
msgid "Other"
msgstr ""
-#: waskoweb/templates/casemanagement/wiederaufnahme.mako:40
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:56
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:75
msgid "Origin class"
msgstr ""
-#: waskoweb/templates/casemanagement/wiederaufnahme.mako:41
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:57
msgid "Same school, new class"
msgstr ""
-#: waskoweb/templates/casemanagement/wiederaufnahme.mako:42
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:58
msgid "Other school"
msgstr ""
-#: waskoweb/templates/casemanagement/wiederaufnahme.mako:49
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:65
+msgid "Whereto was the reintegration? (professional school)"
+msgstr ""
+
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:76
+msgid "Same professional school, new class"
+msgstr ""
+
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:77
+msgid "Other professional school"
+msgstr ""
+
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:84
msgid "Reason for the reopening"
msgstr ""
-#: waskoweb/templates/casemanagement/wiederaufnahme.mako:64
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:99
msgid "Reopening accepted from"
msgstr ""
-#: waskoweb/templates/casemanagement/wiederaufnahme.mako:78
+#: waskoweb/templates/casemanagement/wiederaufnahme.mako:113
msgid "Reopening accepted to"
msgstr ""
Modified: wasko/trunk/waskoweb/lib/validators.py
===================================================================
--- wasko/trunk/waskoweb/lib/validators.py 2011-06-28 13:52:27 UTC (rev 5136)
+++ wasko/trunk/waskoweb/lib/validators.py 2011-06-29 09:48:22 UTC (rev 5137)
@@ -137,7 +137,9 @@
cm_wiederauf_genehm_datum_1 = MyDateConverter(not_empty=True, month_style='dd.mm.jjjj')
cm_wiederauf_datum_bis_1 = MyDateConverter(not_empty=True, month_style='dd.mm.jjjj')
cm2c_t = String(not_empty=True)
+ cm_dok_end_art = KeineAngabe()
cm_dok_end_verm = KeineAngabe()
+ cm_dok_end_verm_berufsschule = KeineAngabe()
chained_validators = [
DateOrder('cm_dok_datum_beendigung', 'cm_wiederauf_genehm_datum_1'),
DateOrder('cm_wiederauf_genehm_datum_1', 'cm_wiederauf_datum_bis_1'),
Modified: wasko/trunk/waskoweb/templates/casemanagement/wiederaufnahme.mako
===================================================================
--- wasko/trunk/waskoweb/templates/casemanagement/wiederaufnahme.mako 2011-06-28 13:52:27 UTC (rev 5136)
+++ wasko/trunk/waskoweb/templates/casemanagement/wiederaufnahme.mako 2011-06-29 09:48:22 UTC (rev 5137)
@@ -27,6 +27,22 @@
</tr>
<tr>
<td class="label">
+ <label for="cm_dok_end_art">${_('Whereto was the reintegration?')}</label>
+ </td>
+ <td class="field">
+ <select size="1"
+ name="cm_dok_end_art"
+ id="cm_dok_end_art"
+ onchange="setModification();">
+ <option value="-1" selected>${_('Not specified')}</option>
+ <option value="1">${_('Successful reintegration into school')}</option>
+ <option value="4">${_('Successful reintegration into professional school')}</option>
+ </select>
+ </td>
+ <td><form:error name="cm_dok_end_art"></td>
+ </tr>
+ <tr>
+ <td class="label">
<label for="cm_dok_end_verm">${_('Whereto was the reintegration?')}</label>
</td>
<td class="field">
@@ -46,6 +62,25 @@
</tr>
<tr>
<td class="label">
+ <label for="cm_dok_end_verm_berufsschule">${_('Whereto was the reintegration? (professional school)')}</label>
+ </td>
+ <td class="field">
+ <select size="1"
+ name="cm_dok_end_verm_berufsschule"
+ id="cm_dok_end_verm_berufsschule"
+ onchange="setModification();">
+ <option value="-1" selected>${_('Not specified')}</option>
+ <option value="-3">${_('Unknown')}</option>
+ <option value="-2">${_('Other')}</option>
+ <option value="1">${_('Origin class')}</option>
+ <option value="2">${_('Same professional school, new class')}</option>
+ <option value="3">${_('Other professional school')}</option>
+ </select>
+ </td>
+ <td><form:error name="cm_dok_end_verm_berufsschule"></td>
+ </tr>
+ <tr>
+ <td class="label">
<label for="cm2c_t">${_('Reason for the reopening')}</label>
</td>
<td class="field">
More information about the Mpuls-commits
mailing list