[Mpuls-commits] r5017 - in base/trunk: . mpulsweb/controllers mpulsweb/i18n mpulsweb/i18n/de/LC_MESSAGES mpulsweb/model mpulsweb/templates/home
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Fri May 27 13:55:52 CEST 2011
Author: ludwig
Date: 2011-05-27 13:55:49 +0200 (Fri, 27 May 2011)
New Revision: 5017
Modified:
base/trunk/ChangeLog
base/trunk/mpulsweb/controllers/mpuls.py
base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
base/trunk/mpulsweb/i18n/mpulsweb.pot
base/trunk/mpulsweb/model/appointment.py
base/trunk/mpulsweb/templates/home/home.mako
base/trunk/mpulsweb/templates/home/remindlist.mako
Log:
Issue882: Renamed automatic reminders to reminders.
Automatic reminders now have type 2. We want to have different
types, so we can show a different icon for each type.
Merged the case reminders into the reminders overview, so all
reminders are displayed in one table.
Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog 2011-05-27 10:51:45 UTC (rev 5016)
+++ base/trunk/ChangeLog 2011-05-27 11:55:49 UTC (rev 5017)
@@ -14,6 +14,20 @@
2011-05-27 Ludwig Reiter <ludwig.reiter at inteation.de>
+ * mpulsweb/i18n/mpulsweb.pot,
+ mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po,
+ mpulsweb/model/appointment.py,
+ mpulsweb/controllers/mpuls.py,
+ mpulsweb/templates/home/remindlist.mako,
+ mpulsweb/templates/home/home.mako:
+ Issue882: Renamed automatic reminders to reminders.
+ Automatic reminders now have type 2. We want to have different
+ types, so we can show a different icon for each type.
+ Merged the case reminders into the reminders overview, so all
+ reminders are displayed in one table.
+
+2011-05-27 Ludwig Reiter <ludwig.reiter at inteation.de>
+
* mpulsweb/model/case.py,
mpulsweb/controllers/case_bundle.py:
Issue1124: Changed the set standin handling to match the default
Modified: base/trunk/mpulsweb/controllers/mpuls.py
===================================================================
--- base/trunk/mpulsweb/controllers/mpuls.py 2011-05-27 10:51:45 UTC (rev 5016)
+++ base/trunk/mpulsweb/controllers/mpuls.py 2011-05-27 11:55:49 UTC (rev 5017)
@@ -52,9 +52,6 @@
""" Return the user's appointments and reminders """
appointment_list = CaseAppointmentOverview()
- if h.hasRole(['cm']):
- appointment_list.join(CaseReminderOverview())
- appointment_list.sort()
return appointment_list
def get_reminders(self):
@@ -63,6 +60,8 @@
"""
remindlist = MaxSaveTimeReminderOverview()
+ if h.hasRole(['cm']):
+ remindlist.join(CaseReminderOverview())
remindlist.sort()
return remindlist
Modified: base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
===================================================================
--- base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-05-27 10:51:45 UTC (rev 5016)
+++ base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-05-27 11:55:49 UTC (rev 5017)
@@ -8,7 +8,7 @@
"Project-Id-Version: mpulsweb 0.0.0\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
"POT-Creation-Date: 2009-10-08 09:54+0200\n"
-"PO-Revision-Date: 2011-05-27 12:51+0200\n"
+"PO-Revision-Date: 2011-05-27 13:55+0200\n"
"Last-Translator: Torsten Irländer <torsten.irlaender at intevation.de>\n"
"Language-Team: de <LL at li.org>\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
@@ -341,8 +341,8 @@
"Administration zur endgültigen Anonymisierung vor. Bitte klicken Sie auf "
"\"OK\", um zur Fallaktenübersicht fortzufahren."
-#: mpulsweb/controllers/case.py:57 mpulsweb/controllers/case_bundle.py:292
-#: mpulsweb/controllers/case_bundle.py:323
+#: mpulsweb/controllers/case.py:57 mpulsweb/controllers/case_bundle.py:290
+#: mpulsweb/controllers/case_bundle.py:321
#: mpulsweb/templates/casemanagement/dialogs/confirm.mako:6
#: mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako:6
msgid "Delete case?"
@@ -350,7 +350,7 @@
msgstr[0] "Fallakte löschen?"
msgstr[1] "Fallakten löschen?"
-#: mpulsweb/controllers/case.py:58 mpulsweb/controllers/case_bundle.py:330
+#: mpulsweb/controllers/case.py:58 mpulsweb/controllers/case_bundle.py:328
msgid ""
"Warning! On deleting the case all data will be erased\n"
"irrecoverable!<br>Only delete the case if this case is <b>not needed for\n"
@@ -389,7 +389,7 @@
msgid "Click on OK to continue."
msgstr "Bitte klicken Sie \"OK\", um fortzufahren."
-#: mpulsweb/controllers/case.py:73 mpulsweb/controllers/case_bundle.py:442
+#: mpulsweb/controllers/case.py:73 mpulsweb/controllers/case_bundle.py:440
#: mpulsweb/templates/casemanagement/dialogs/confirm_restore.mako:6
msgid "Restore case?"
msgid_plural "Restore cases?"
@@ -428,14 +428,14 @@
"Bei dem Import ist ein Fehler aufgetreten. Klicken Sie auf \"OK\", um zu "
"dem Importdialog zurückzukehren."
-#: mpulsweb/controllers/case.py:218 mpulsweb/model/case.py:1361
+#: mpulsweb/controllers/case.py:218 mpulsweb/model/case.py:1365
#: mpulsweb/model/phase.py:304
#: mpulsweb/templates/casemanagement/caselist.mako:152
#: mpulsweb/templates/phase/phase.mako:51
msgid "Running"
msgstr "laufend"
-#: mpulsweb/controllers/case.py:220 mpulsweb/model/case.py:1363
+#: mpulsweb/controllers/case.py:220 mpulsweb/model/case.py:1367
#: mpulsweb/model/phase.py:306
#: mpulsweb/templates/casemanagement/caselist.mako:155
#: mpulsweb/templates/phase/phase.mako:53
@@ -443,7 +443,7 @@
msgid "Finished"
msgstr "beendet"
-#: mpulsweb/controllers/case.py:272 mpulsweb/controllers/case_bundle.py:432
+#: mpulsweb/controllers/case.py:272 mpulsweb/controllers/case_bundle.py:430
msgid "Case restored!"
msgid_plural "Cases restored!"
msgstr[0] "Fallakte wiederhergestellt!"
@@ -528,13 +528,13 @@
"Fallakten in einem Zustand befinden, aus dem Sie die Aktion ausführen "
"können."
-#: mpulsweb/controllers/case_bundle.py:202
+#: mpulsweb/controllers/case_bundle.py:200
msgid "Case was marked for evaluation"
msgid_plural "Cases were marked for evaluation"
msgstr[0] "Fallakte wurde für die Auswertung markiert."
msgstr[1] "Fallakten wurden für die Auswertung markiert."
-#: mpulsweb/controllers/case_bundle.py:206
+#: mpulsweb/controllers/case_bundle.py:204
#, python-format
msgid ""
"%d case was marked for evaluation. All following evaluations will be "
@@ -551,47 +551,47 @@
"Auswertungen werden auf diese Fallakten beschränkt. Bitte klicken sie auf"
" OK um fortzufahren."
-#: mpulsweb/controllers/case_bundle.py:280
+#: mpulsweb/controllers/case_bundle.py:278
msgid "Case deleted!"
msgid_plural "Cases deleted!"
msgstr[0] "Fallakte gelöscht!"
msgstr[1] "Fallakten gelöscht!"
-#: mpulsweb/controllers/case_bundle.py:281
+#: mpulsweb/controllers/case_bundle.py:279
#, python-format
msgid "%s case was successfully cleared for deletion."
msgid_plural "%s cases were successfully cleared for deletion."
msgstr[0] "Es wurde %s Fallakte erfolgreich zum Löschen freigegeben."
msgstr[1] "Es wurden %s Fallakten erfolgreich zum Löschen freigegeben."
-#: mpulsweb/controllers/case_bundle.py:297
-#: mpulsweb/controllers/case_bundle.py:328
+#: mpulsweb/controllers/case_bundle.py:295
+#: mpulsweb/controllers/case_bundle.py:326
#, python-format
msgid "Do you really want to delete the following case?%s"
msgid_plural "Do you really want to delete the following cases?%s"
msgstr[0] "Wollen Sie wirklich die folgende Fallakte löschen?%s"
msgstr[1] "Wollen Sie wirklich die folgenden Fallakten löschen?%s"
-#: mpulsweb/controllers/case_bundle.py:311
+#: mpulsweb/controllers/case_bundle.py:309
msgid "Case successfully deleted."
msgid_plural "Cases successfully deleted."
msgstr[0] "Akte gelöscht!"
msgstr[1] "Akten gelöscht!"
-#: mpulsweb/controllers/case_bundle.py:314
+#: mpulsweb/controllers/case_bundle.py:312
#, python-format
msgid "%s case was successfully deleted."
msgid_plural "%s cases were successfully deleted."
msgstr[0] "Es wurde %s Akte gelöscht."
msgstr[1] "Es wurden %s Akten gelöscht."
-#: mpulsweb/controllers/case_bundle.py:348
+#: mpulsweb/controllers/case_bundle.py:346
msgid "Case successfully cleared for anonymisation!"
msgid_plural "Cases successfully cleared for anonymisation!"
msgstr[0] "Fallakte wurde zur Anonymisierung freigegeben!"
msgstr[1] "Fallakten wurden zur Anonymisierung freigegeben!"
-#: mpulsweb/controllers/case_bundle.py:354
+#: mpulsweb/controllers/case_bundle.py:352
#, python-format
msgid ""
"%s case was cleared for anonymisation. It will be presented to the "
@@ -606,13 +606,13 @@
"Es wurden %s Fallakten zur Anonymisierung freigegeben. Sie liegen der "
"Administration zur endgültigen Anonymisierung vor."
-#: mpulsweb/controllers/case_bundle.py:367
+#: mpulsweb/controllers/case_bundle.py:365
msgid "Clear case for anonymisation?"
msgid_plural "Clear cases for anonymisation?"
msgstr[0] "Fallakte zur Anonymisierung freigeben?"
msgstr[1] "Fallakten zur Anonymisierung freigeben?"
-#: mpulsweb/controllers/case_bundle.py:379
+#: mpulsweb/controllers/case_bundle.py:377
#, python-format
msgid ""
"Do you really want to clear the following case for anonymisation? The "
@@ -632,26 +632,26 @@
"Die Fallakten stehen Ihnen danach nicht mehr zur Bearbeitung zur "
"Verfügung und werden der Administration zur Anonymisierung vorgelegt.%s"
-#: mpulsweb/controllers/case_bundle.py:393
+#: mpulsweb/controllers/case_bundle.py:391
msgid "Case anonymised!"
msgid_plural "Cases anonymised!"
msgstr[0] "Fallakte anonymisiert!"
msgstr[1] "Fallakten anonymisiert!"
-#: mpulsweb/controllers/case_bundle.py:396
+#: mpulsweb/controllers/case_bundle.py:394
#, python-format
msgid "%s case was successfully anonymised."
msgid_plural "%s cases were successfully anonymised."
msgstr[0] "Es wurde %s Akte anonymisiert."
msgstr[1] "Es wurden %s Akten anonymisiert."
-#: mpulsweb/controllers/case_bundle.py:405
+#: mpulsweb/controllers/case_bundle.py:403
msgid "Anonymise case?"
msgid_plural "Anonymise cases?"
msgstr[0] "Fallakte anonymisieren?"
msgstr[1] "Fallakten anonymisieren?"
-#: mpulsweb/controllers/case_bundle.py:417
+#: mpulsweb/controllers/case_bundle.py:415
#, python-format
msgid ""
"Do you really want to anonymise the case and irrevocably lose its "
@@ -672,14 +672,14 @@
"mehr zur Bearbeitung zur Verfügung. Die anonymisierten Fallakten werden "
"weiterhin in der Auswertung berücksichtigt werden.%s"
-#: mpulsweb/controllers/case_bundle.py:434
+#: mpulsweb/controllers/case_bundle.py:432
#, python-format
msgid "%s was successfully restored."
msgid_plural "%s were successfully restored."
msgstr[0] "Es wurde %s Fallakte erfolgreich wiederhergestellt."
msgstr[1] "Es wurden %s Fallakten erfolgreich wiederhergestellt."
-#: mpulsweb/controllers/case_bundle.py:448
+#: mpulsweb/controllers/case_bundle.py:446
#, python-format
msgid ""
"Do you really want to restore the following case? It will be available "
@@ -694,47 +694,47 @@
"Wollen Sie wirklich die folgenden Fallakten wiederherstellen? Die "
"Fallakten stehen danach wieder zur Bearbeitung zur Verfügung. %s"
-#: mpulsweb/controllers/case_bundle.py:465
+#: mpulsweb/controllers/case_bundle.py:463
msgid "Editor appointed!"
msgstr "Bearbeitung übertragen!"
-#: mpulsweb/controllers/case_bundle.py:467
+#: mpulsweb/controllers/case_bundle.py:465
#, python-format
msgid "%s case was successfully transferred to %s %s"
msgid_plural "%s cases were successfully transferred to %s %s"
msgstr[0] "Es wurde %s Fallakte erfolgreich an %s %s übertragen."
msgstr[1] "Es wurden %s Fallakten erfolgreich an %s %s übertragen."
-#: mpulsweb/controllers/case_bundle.py:487
+#: mpulsweb/controllers/case_bundle.py:486
msgid "Stand-in appointed!"
msgstr "Vertretung zugewiesen!"
-#: mpulsweb/controllers/case_bundle.py:489
+#: mpulsweb/controllers/case_bundle.py:488
#, python-format
msgid "%s case was successfully assigned to a substitute."
msgid_plural "%s cases were successfully assigned to a substitute."
msgstr[0] "Es wurde für %s Fallakte erfolgreich die Vertretung zugewiesen."
msgstr[1] "Es wurden für %s Fallakten erfolgreich die Vertretung zugewiesen."
-#: mpulsweb/controllers/case_bundle.py:514
+#: mpulsweb/controllers/case_bundle.py:517
msgid "Export case?"
msgid_plural "Export cases?"
msgstr[0] "Fallakte exportieren?"
msgstr[1] "Fallakten exportieren?"
-#: mpulsweb/controllers/case_bundle.py:549 mpulsweb/lib/helpers.py:89
-#: mpulsweb/lib/helpers.py:94 mpulsweb/templates/casemanagement/digest.mako:162
+#: mpulsweb/controllers/case_bundle.py:552 mpulsweb/lib/helpers.py:89
+#: mpulsweb/lib/helpers.py:94 mpulsweb/templates/casemanagement/digest.mako:166
msgid "unknown"
msgstr "unbekannt"
-#: mpulsweb/controllers/case_bundle.py:553
+#: mpulsweb/controllers/case_bundle.py:556
#, python-format
msgid "%d Case was marked for %s"
msgid_plural "%d Cases were marked for %s"
msgstr[0] "%d Fallakte wurde für den '%s' markiert."
msgstr[1] "%d Fallakten wurden für den '%s' markiert."
-#: mpulsweb/controllers/case_bundle.py:556
+#: mpulsweb/controllers/case_bundle.py:559
#, python-format
msgid ""
"%d case can be exported. Please click on 'Download' to download the "
@@ -1153,7 +1153,7 @@
msgid "< 1 week"
msgstr "< 1 Woche"
-#: mpulsweb/model/appointment.py:575
+#: mpulsweb/model/appointment.py:576
#, python-format
msgid ""
"Attention! The maximum save duration of %s days is exceeded for %s days "
@@ -1162,11 +1162,11 @@
"Achtung! Die maximale Speicherdauer von %s Tagen ist seit %s Tagen für "
"diese Fallakte überschritten!"
-#: mpulsweb/model/appointment.py:579
+#: mpulsweb/model/appointment.py:580
msgid "Inactive case document? Please check, if the case will still be edited."
msgstr "Inaktive Fallakte? Bitte prüfen Sie, ob der Fall noch bearbeitet wird."
-#: mpulsweb/model/case.py:748
+#: mpulsweb/model/case.py:752
#, python-format
msgid ""
"<p>An anonymisation of the case is not possible in phase %s.</p><p>Please"
@@ -1175,7 +1175,7 @@
"<p>Eine Anonymisierung ist für Fälle in der Phase \"%s\" nicht "
"vorgesehen.</p><p>Bitte löschen Sie diesen Fall.</p>"
-#: mpulsweb/model/case.py:773
+#: mpulsweb/model/case.py:777
#, python-format
msgid ""
"<p>An anonymisation of this case is not possible: It is only possible to "
@@ -1187,42 +1187,42 @@
"Phase \"%s\" ist derzeit noch nicht beendet. Bitte beenden Sie die Phase "
"und versuchen Sie erneut eine Anonymisierung.</p>"
-#: mpulsweb/model/case.py:1049
+#: mpulsweb/model/case.py:1053
msgid "Error on fetching data for formletter"
msgstr "Fehler beim Laden der Daten für Serienbrieffunktion"
-#: mpulsweb/model/case.py:1313 mpulsweb/model/case.py:1314
+#: mpulsweb/model/case.py:1317 mpulsweb/model/case.py:1318
#: mpulsweb/templates/casemanagement/caselist.mako:181
#: mpulsweb/templates/casemanagement/caselist.mako:182
#: mpulsweb/templates/search/search.mako:65
msgid "Editable"
msgstr "Bearbeitbar"
-#: mpulsweb/model/case.py:1315
+#: mpulsweb/model/case.py:1319
msgid "Outstanding deleted"
msgstr "Schwebend gelöscht"
-#: mpulsweb/model/case.py:1316
+#: mpulsweb/model/case.py:1320
msgid "Outstanding made anonymous"
msgstr "Schwebend anonymisiert"
-#: mpulsweb/model/case.py:1317
+#: mpulsweb/model/case.py:1321
msgid "Make anonymous"
msgstr "Anonymisiert"
-#: mpulsweb/model/case.py:1465
+#: mpulsweb/model/case.py:1469
#, python-format
msgid "The case with UUID '%s' could not be imported due to rule violations"
msgstr ""
"Der Fall mit der UUID '%s' konnte wegen Regelverletzungen nicht "
"importiert werden."
-#: mpulsweb/model/case.py:1495
+#: mpulsweb/model/case.py:1499
#, python-format
msgid "The case with UUID '%s' was anonymized already."
msgstr "Der Fall mit der UUID '%s' wurde bereits anonymisiert."
-#: mpulsweb/model/case.py:1498
+#: mpulsweb/model/case.py:1502
#, python-format
msgid ""
"The case with UUID '%s' is either marked for anonymization or marked for "
@@ -1231,7 +1231,7 @@
"Der Fall mit der UUID '%s' ist entweder schwebend anonymisiert oder "
"schwebend gelöscht."
-#: mpulsweb/model/case.py:1530
+#: mpulsweb/model/case.py:1534
#, python-format
msgid "The XML file has the version '%s', but supported is only version '%s'"
msgstr ""
@@ -1843,8 +1843,10 @@
#: mpulsweb/templates/home/caseappointmentlist.mako:15
#: mpulsweb/templates/home/globalappointmentlist.mako:5
#: mpulsweb/templates/home/globalappointmentlist.mako:6
-#: mpulsweb/templates/home/remindlist.mako:7
#: mpulsweb/templates/home/remindlist.mako:8
+#: mpulsweb/templates/home/remindlist.mako:9
+#: mpulsweb/templates/home/remindlist.mako:15
+#: mpulsweb/templates/home/remindlist.mako:16
msgid "Show"
msgstr "Anzeigen"
@@ -2264,7 +2266,7 @@
#: mpulsweb/templates/casemanagement/caselist.mako:32
#: mpulsweb/templates/casemanagement/caselist.mako:165
#: mpulsweb/templates/casemanagement/caselist.mako:166
-#: mpulsweb/templates/casemanagement/digest.mako:113
+#: mpulsweb/templates/casemanagement/digest.mako:117
#: mpulsweb/templates/casemanagement/organisation.mako:16
#: mpulsweb/templates/casemanagement/organisation.mako:49
#: mpulsweb/templates/casemanagement/organisation.mako:78
@@ -2471,11 +2473,15 @@
msgid "Information on case"
msgstr "Informationen zur Fallakte"
-#: mpulsweb/templates/casemanagement/digest.mako:119
+#: mpulsweb/templates/casemanagement/digest.mako:112
+msgid "ID"
+msgstr ""
+
+#: mpulsweb/templates/casemanagement/digest.mako:123
msgid "Casetype"
msgstr "Fallart"
-#: mpulsweb/templates/casemanagement/digest.mako:124
+#: mpulsweb/templates/casemanagement/digest.mako:128
#: mpulsweb/templates/casemanagement/main.mako:27
#: mpulsweb/templates/evaluation/evaluate.mako:34
#: mpulsweb/templates/phase/phase.mako:21
@@ -2484,25 +2490,25 @@
msgid "Phase"
msgstr "Phase"
-#: mpulsweb/templates/casemanagement/digest.mako:129
+#: mpulsweb/templates/casemanagement/digest.mako:133
msgid "Validity"
msgstr "Validität"
-#: mpulsweb/templates/casemanagement/digest.mako:140
+#: mpulsweb/templates/casemanagement/digest.mako:144
msgid "Start and Enddates"
msgstr "Start- und Enddatum"
-#: mpulsweb/templates/casemanagement/digest.mako:153
+#: mpulsweb/templates/casemanagement/digest.mako:157
#: mpulsweb/templates/search/search.mako:98
msgid "Start date"
msgstr "Startdatum"
-#: mpulsweb/templates/casemanagement/digest.mako:154
+#: mpulsweb/templates/casemanagement/digest.mako:158
#: mpulsweb/templates/search/search.mako:107
msgid "End date"
msgstr "Enddatum"
-#: mpulsweb/templates/casemanagement/digest.mako:155
+#: mpulsweb/templates/casemanagement/digest.mako:159
#: mpulsweb/templates/phase/phase.mako:157
msgid "Duration in weeks"
msgstr "Dauer in Wochen"
@@ -3128,8 +3134,8 @@
msgstr "Aktuelle Informationen"
#: mpulsweb/templates/home/home.mako:36
-msgid "Automatic reminders"
-msgstr "Automatisierte Wiedervorlagen"
+msgid "Reminders"
+msgstr "Wiedervorlage"
#: mpulsweb/templates/home/home.mako:41
msgid "Own appointments"
@@ -3139,8 +3145,10 @@
msgid "Agency-wide appointments"
msgstr "Einrichtungsweite Termine"
-#: mpulsweb/templates/home/remindlist.mako:18
-#: mpulsweb/templates/home/remindlist.mako:19
+#: mpulsweb/templates/home/remindlist.mako:28
+#: mpulsweb/templates/home/remindlist.mako:29
+#: mpulsweb/templates/home/remindlist.mako:35
+#: mpulsweb/templates/home/remindlist.mako:36
msgid "Keep longer activated"
msgstr "Aufbewahrung verlängern"
Modified: base/trunk/mpulsweb/i18n/mpulsweb.pot
===================================================================
--- base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-05-27 10:51:45 UTC (rev 5016)
+++ base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-05-27 11:55:49 UTC (rev 5017)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: mpulsweb 2.0.0-pre\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2011-05-26 17:04+0200\n"
+"POT-Creation-Date: 2011-05-27 13:54+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"
@@ -279,8 +279,8 @@
"the admininstration. Please click on OK, to get back to the overview."
msgstr ""
-#: mpulsweb/controllers/case.py:57 mpulsweb/controllers/case_bundle.py:292
-#: mpulsweb/controllers/case_bundle.py:323
+#: mpulsweb/controllers/case.py:57 mpulsweb/controllers/case_bundle.py:290
+#: mpulsweb/controllers/case_bundle.py:321
#: mpulsweb/templates/casemanagement/dialogs/confirm.mako:6
#: mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako:6
msgid "Delete case?"
@@ -288,7 +288,7 @@
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case.py:58 mpulsweb/controllers/case_bundle.py:330
+#: mpulsweb/controllers/case.py:58 mpulsweb/controllers/case_bundle.py:328
msgid ""
"Warning! On deleting the case all data will be erased\n"
"irrecoverable!<br>Only delete the case if this case is <b>not needed for\n"
@@ -319,7 +319,7 @@
msgid "Click on OK to continue."
msgstr ""
-#: mpulsweb/controllers/case.py:73 mpulsweb/controllers/case_bundle.py:442
+#: mpulsweb/controllers/case.py:73 mpulsweb/controllers/case_bundle.py:440
#: mpulsweb/templates/casemanagement/dialogs/confirm_restore.mako:6
msgid "Restore case?"
msgid_plural "Restore cases?"
@@ -352,19 +352,19 @@
"Click 'OK' to return to the import dialog."
msgstr ""
-#: mpulsweb/controllers/case.py:218 mpulsweb/model/case.py:1361
+#: mpulsweb/controllers/case.py:218 mpulsweb/model/case.py:1365
#: mpulsweb/model/phase.py:304 mpulsweb/templates/casemanagement/caselist.mako:152
#: mpulsweb/templates/phase/phase.mako:51
msgid "Running"
msgstr ""
-#: mpulsweb/controllers/case.py:220 mpulsweb/model/case.py:1363
+#: mpulsweb/controllers/case.py:220 mpulsweb/model/case.py:1367
#: mpulsweb/model/phase.py:306 mpulsweb/templates/casemanagement/caselist.mako:155
#: mpulsweb/templates/phase/phase.mako:53 mpulsweb/templates/phase/phase.mako:55
msgid "Finished"
msgstr ""
-#: mpulsweb/controllers/case.py:272 mpulsweb/controllers/case_bundle.py:432
+#: mpulsweb/controllers/case.py:272 mpulsweb/controllers/case_bundle.py:430
msgid "Case restored!"
msgid_plural "Cases restored!"
msgstr[0] ""
@@ -430,13 +430,13 @@
"in a state from which you can execute the selected action."
msgstr ""
-#: mpulsweb/controllers/case_bundle.py:202
+#: mpulsweb/controllers/case_bundle.py:200
msgid "Case was marked for evaluation"
msgid_plural "Cases were marked for evaluation"
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:206
+#: mpulsweb/controllers/case_bundle.py:204
#, python-format
msgid ""
"%d case was marked for evaluation. All following evaluations will be limited "
@@ -447,46 +447,46 @@
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:280
+#: mpulsweb/controllers/case_bundle.py:278
msgid "Case deleted!"
msgid_plural "Cases deleted!"
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:281
+#: mpulsweb/controllers/case_bundle.py:279
#, python-format
msgid "%s case was successfully cleared for deletion."
msgid_plural "%s cases were successfully cleared for deletion."
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:297 mpulsweb/controllers/case_bundle.py:328
+#: mpulsweb/controllers/case_bundle.py:295 mpulsweb/controllers/case_bundle.py:326
#, python-format
msgid "Do you really want to delete the following case?%s"
msgid_plural "Do you really want to delete the following cases?%s"
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:311
+#: mpulsweb/controllers/case_bundle.py:309
msgid "Case successfully deleted."
msgid_plural "Cases successfully deleted."
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:314
+#: mpulsweb/controllers/case_bundle.py:312
#, python-format
msgid "%s case was successfully deleted."
msgid_plural "%s cases were successfully deleted."
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:348
+#: mpulsweb/controllers/case_bundle.py:346
msgid "Case successfully cleared for anonymisation!"
msgid_plural "Cases successfully cleared for anonymisation!"
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:354
+#: mpulsweb/controllers/case_bundle.py:352
#, python-format
msgid ""
"%s case was cleared for anonymisation. It will be presented to the "
@@ -497,13 +497,13 @@
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:367
+#: mpulsweb/controllers/case_bundle.py:365
msgid "Clear case for anonymisation?"
msgid_plural "Clear cases for anonymisation?"
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:379
+#: mpulsweb/controllers/case_bundle.py:377
#, python-format
msgid ""
"Do you really want to clear the following case for anonymisation? The case "
@@ -516,26 +516,26 @@
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:393
+#: mpulsweb/controllers/case_bundle.py:391
msgid "Case anonymised!"
msgid_plural "Cases anonymised!"
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:396
+#: mpulsweb/controllers/case_bundle.py:394
#, python-format
msgid "%s case was successfully anonymised."
msgid_plural "%s cases were successfully anonymised."
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:405
+#: mpulsweb/controllers/case_bundle.py:403
msgid "Anonymise case?"
msgid_plural "Anonymise cases?"
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:417
+#: mpulsweb/controllers/case_bundle.py:415
#, python-format
msgid ""
"Do you really want to anonymise the case and irrevocably lose its personal "
@@ -548,14 +548,14 @@
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:434
+#: mpulsweb/controllers/case_bundle.py:432
#, python-format
msgid "%s was successfully restored."
msgid_plural "%s were successfully restored."
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:448
+#: mpulsweb/controllers/case_bundle.py:446
#, python-format
msgid ""
"Do you really want to restore the following case? It will be available again "
@@ -566,47 +566,47 @@
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:465
+#: mpulsweb/controllers/case_bundle.py:463
msgid "Editor appointed!"
msgstr ""
-#: mpulsweb/controllers/case_bundle.py:467
+#: mpulsweb/controllers/case_bundle.py:465
#, python-format
msgid "%s case was successfully transferred to %s %s"
msgid_plural "%s cases were successfully transferred to %s %s"
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:487
+#: mpulsweb/controllers/case_bundle.py:486
msgid "Stand-in appointed!"
msgstr ""
-#: mpulsweb/controllers/case_bundle.py:489
+#: mpulsweb/controllers/case_bundle.py:488
#, python-format
msgid "%s case was successfully assigned to a substitute."
msgid_plural "%s cases were successfully assigned to a substitute."
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:514
+#: mpulsweb/controllers/case_bundle.py:517
msgid "Export case?"
msgid_plural "Export cases?"
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:549 mpulsweb/lib/helpers.py:89
-#: mpulsweb/lib/helpers.py:94 mpulsweb/templates/casemanagement/digest.mako:162
+#: mpulsweb/controllers/case_bundle.py:552 mpulsweb/lib/helpers.py:89
+#: mpulsweb/lib/helpers.py:94 mpulsweb/templates/casemanagement/digest.mako:166
msgid "unknown"
msgstr ""
-#: mpulsweb/controllers/case_bundle.py:553
+#: mpulsweb/controllers/case_bundle.py:556
#, python-format
msgid "%d Case was marked for %s"
msgid_plural "%d Cases were marked for %s"
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:556
+#: mpulsweb/controllers/case_bundle.py:559
#, python-format
msgid ""
"%d case can be exported. Please click on 'Download' to download the exported "
@@ -957,25 +957,25 @@
msgid "< 1 week"
msgstr ""
-#: mpulsweb/model/appointment.py:575
+#: mpulsweb/model/appointment.py:576
#, python-format
msgid ""
"Attention! The maximum save duration of %s days is exceeded for %s days for "
"this case document!"
msgstr ""
-#: mpulsweb/model/appointment.py:579
+#: mpulsweb/model/appointment.py:580
msgid "Inactive case document? Please check, if the case will still be edited."
msgstr ""
-#: mpulsweb/model/case.py:748
+#: mpulsweb/model/case.py:752
#, python-format
msgid ""
"<p>An anonymisation of the case is not possible in phase %s.</p><p>Please "
"remove this case.</p>"
msgstr ""
-#: mpulsweb/model/case.py:773
+#: mpulsweb/model/case.py:777
#, python-format
msgid ""
"<p>An anonymisation of this case is not possible: It is only possible to end "
@@ -983,47 +983,47 @@
"finish the phase and try to anonymise again.</p>"
msgstr ""
-#: mpulsweb/model/case.py:1049
+#: mpulsweb/model/case.py:1053
msgid "Error on fetching data for formletter"
msgstr ""
-#: mpulsweb/model/case.py:1313 mpulsweb/model/case.py:1314
+#: mpulsweb/model/case.py:1317 mpulsweb/model/case.py:1318
#: mpulsweb/templates/casemanagement/caselist.mako:181
#: mpulsweb/templates/casemanagement/caselist.mako:182
#: mpulsweb/templates/search/search.mako:65
msgid "Editable"
msgstr ""
-#: mpulsweb/model/case.py:1315
+#: mpulsweb/model/case.py:1319
msgid "Outstanding deleted"
msgstr ""
-#: mpulsweb/model/case.py:1316
+#: mpulsweb/model/case.py:1320
msgid "Outstanding made anonymous"
msgstr ""
-#: mpulsweb/model/case.py:1317
+#: mpulsweb/model/case.py:1321
msgid "Make anonymous"
msgstr ""
-#: mpulsweb/model/case.py:1465
+#: mpulsweb/model/case.py:1469
#, python-format
msgid "The case with UUID '%s' could not be imported due to rule violations"
msgstr ""
-#: mpulsweb/model/case.py:1495
+#: mpulsweb/model/case.py:1499
#, python-format
msgid "The case with UUID '%s' was anonymized already."
msgstr ""
-#: mpulsweb/model/case.py:1498
+#: mpulsweb/model/case.py:1502
#, python-format
msgid ""
"The case with UUID '%s' is either marked for anonymization or marked for "
"deletion."
msgstr ""
-#: mpulsweb/model/case.py:1530
+#: mpulsweb/model/case.py:1534
#, python-format
msgid "The XML file has the version '%s', but supported is only version '%s'"
msgstr ""
@@ -1618,8 +1618,10 @@
#: mpulsweb/templates/home/caseappointmentlist.mako:15
#: mpulsweb/templates/home/globalappointmentlist.mako:5
#: mpulsweb/templates/home/globalappointmentlist.mako:6
-#: mpulsweb/templates/home/remindlist.mako:7
#: mpulsweb/templates/home/remindlist.mako:8
+#: mpulsweb/templates/home/remindlist.mako:9
+#: mpulsweb/templates/home/remindlist.mako:15
+#: mpulsweb/templates/home/remindlist.mako:16
msgid "Show"
msgstr ""
@@ -2034,7 +2036,7 @@
#: mpulsweb/templates/casemanagement/caselist.mako:32
#: mpulsweb/templates/casemanagement/caselist.mako:165
#: mpulsweb/templates/casemanagement/caselist.mako:166
-#: mpulsweb/templates/casemanagement/digest.mako:113
+#: mpulsweb/templates/casemanagement/digest.mako:117
#: mpulsweb/templates/casemanagement/organisation.mako:16
#: mpulsweb/templates/casemanagement/organisation.mako:49
#: mpulsweb/templates/casemanagement/organisation.mako:78
@@ -2238,11 +2240,15 @@
msgid "Information on case"
msgstr ""
-#: mpulsweb/templates/casemanagement/digest.mako:119
+#: mpulsweb/templates/casemanagement/digest.mako:112
+msgid "ID"
+msgstr ""
+
+#: mpulsweb/templates/casemanagement/digest.mako:123
msgid "Casetype"
msgstr ""
-#: mpulsweb/templates/casemanagement/digest.mako:124
+#: mpulsweb/templates/casemanagement/digest.mako:128
#: mpulsweb/templates/casemanagement/main.mako:27
#: mpulsweb/templates/evaluation/evaluate.mako:34
#: mpulsweb/templates/phase/phase.mako:21 mpulsweb/templates/phase/phase.mako:156
@@ -2250,25 +2256,25 @@
msgid "Phase"
msgstr ""
-#: mpulsweb/templates/casemanagement/digest.mako:129
+#: mpulsweb/templates/casemanagement/digest.mako:133
msgid "Validity"
msgstr ""
-#: mpulsweb/templates/casemanagement/digest.mako:140
+#: mpulsweb/templates/casemanagement/digest.mako:144
msgid "Start and Enddates"
msgstr ""
-#: mpulsweb/templates/casemanagement/digest.mako:153
+#: mpulsweb/templates/casemanagement/digest.mako:157
#: mpulsweb/templates/search/search.mako:98
msgid "Start date"
msgstr ""
-#: mpulsweb/templates/casemanagement/digest.mako:154
+#: mpulsweb/templates/casemanagement/digest.mako:158
#: mpulsweb/templates/search/search.mako:107
msgid "End date"
msgstr ""
-#: mpulsweb/templates/casemanagement/digest.mako:155
+#: mpulsweb/templates/casemanagement/digest.mako:159
#: mpulsweb/templates/phase/phase.mako:157
msgid "Duration in weeks"
msgstr ""
@@ -2859,7 +2865,7 @@
msgstr ""
#: mpulsweb/templates/home/home.mako:36
-msgid "Automatic reminders"
+msgid "Reminders"
msgstr ""
#: mpulsweb/templates/home/home.mako:41
@@ -2870,8 +2876,10 @@
msgid "Agency-wide appointments"
msgstr ""
-#: mpulsweb/templates/home/remindlist.mako:18
-#: mpulsweb/templates/home/remindlist.mako:19
+#: mpulsweb/templates/home/remindlist.mako:28
+#: mpulsweb/templates/home/remindlist.mako:29
+#: mpulsweb/templates/home/remindlist.mako:35
+#: mpulsweb/templates/home/remindlist.mako:36
msgid "Keep longer activated"
msgstr ""
Modified: base/trunk/mpulsweb/model/appointment.py
===================================================================
--- base/trunk/mpulsweb/model/appointment.py 2011-05-27 10:51:45 UTC (rev 5016)
+++ base/trunk/mpulsweb/model/appointment.py 2011-05-27 11:55:49 UTC (rev 5017)
@@ -272,7 +272,8 @@
self.case_id = None
# available types
# 0: normal appointment
- # 1: Reminder
+ # 1: normal Reminder
+ # 2: automatic Reminder
self.type = 0
def __cmp__(self, other):
@@ -567,7 +568,7 @@
def makeAppointment(self, case, last_date, maxage, finished):
factory = CaseAppointmentFactory()
- type = 1
+ type = 2
title = u"%s, %s" % (case.last_name, case.first_name)
age = datetime.now() - last_date
mydate = datetime.now() - timedelta(age.days - int(maxage))
Modified: base/trunk/mpulsweb/templates/home/home.mako
===================================================================
--- base/trunk/mpulsweb/templates/home/home.mako 2011-05-27 10:51:45 UTC (rev 5016)
+++ base/trunk/mpulsweb/templates/home/home.mako 2011-05-27 11:55:49 UTC (rev 5017)
@@ -33,7 +33,7 @@
## APPOINTMENTS
## Reminders
% if g.mpuls_config.is_enabled('case-module', 'reminders'):
- <h2>${_('Automatic reminders')}</h2>
+ <h2>${_('Reminders')}</h2>
<%include file="/home/remindlist.mako"/>
% endif
## Case
Modified: base/trunk/mpulsweb/templates/home/remindlist.mako
===================================================================
--- base/trunk/mpulsweb/templates/home/remindlist.mako 2011-05-27 10:51:45 UTC (rev 5016)
+++ base/trunk/mpulsweb/templates/home/remindlist.mako 2011-05-27 11:55:49 UTC (rev 5017)
@@ -2,19 +2,37 @@
<%def name="showAppointmentActions(appointment)">
<a href="${h.url_for(controller='/case', action='select',
id=appointment.case_id, confirmed=0)}">
+ % if appointment.type in [1]:
+ <img src = "${h.url_for('/images/icons/edit_22.png')}"
+ border = "0"
+ alt = "${_('Show')}"
+ title = "${_('Show')}"
+ width = "22"
+ height = "22"></a>
+ % else:
<img src = "${h.url_for('/images/icons/open_active_22.png')}"
border = "0"
alt = "${_('Show')}"
title = "${_('Show')}"
width = "22"
height = "22"></a>
+ % endif
</%def>
<%def name="showKeepActiveActions(appointment)">
<a href="${h.url_for(controller='/case', action='keepActive', id=appointment.case_id, confirmed=0)}">
+ % if appointment.type in [1]:
<img src = "${h.url_for('/images/icons/refresh_active_22.png')}"
border = "0"
width = "22"
height = "22"
alt = "${_('Keep longer activated')}"
title = "${_('Keep longer activated')}"></a>
+ % else:
+ <img src = "${h.url_for('/images/icons/refresh_active_22.png')}"
+ border = "0"
+ width = "22"
+ height = "22"
+ alt = "${_('Keep longer activated')}"
+ title = "${_('Keep longer activated')}"></a>
+ % endif
</%def>
More information about the Mpuls-commits
mailing list