diff --git a/locales/de/LC_MESSAGES/loops.mo b/locales/de/LC_MESSAGES/loops.mo index 149decd..14888c3 100644 Binary files a/locales/de/LC_MESSAGES/loops.mo and b/locales/de/LC_MESSAGES/loops.mo differ diff --git a/locales/de/LC_MESSAGES/loops.po b/locales/de/LC_MESSAGES/loops.po index 165397a..02ef715 100644 --- a/locales/de/LC_MESSAGES/loops.po +++ b/locales/de/LC_MESSAGES/loops.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: $Id$\n" "POT-Creation-Date: 2007-05-22 12:00 CET\n" -"PO-Revision-Date: 2012-05-30 12:00 CET\n" +"PO-Revision-Date: 2012-06-10 12:00 CET\n" "Last-Translator: Helmut Merz \n" "Language-Team: loops developers \n" "MIME-Version: 1.0\n" @@ -242,6 +242,9 @@ msgstr "Folgetermin anlegen..." msgid "Create an event that is linked to this one." msgstr "Einen neuen Termin anlegen, der mit diesem verknüpft ist." +msgid "Create Follow-up Event for: $event" +msgstr "Folgetermin anlegen für: $event" + msgid "Edit Event..." msgstr "Termin bearbeiten..." @@ -395,6 +398,9 @@ msgstr "Thema" msgid "Task" msgstr "Aufgabe" +msgid "Tasks" +msgstr "Aufgaben" + msgid "Domain" msgstr "Bereich" diff --git a/organize/browser/event.py b/organize/browser/event.py index 470fe8a..004daeb 100644 --- a/organize/browser/event.py +++ b/organize/browser/event.py @@ -35,7 +35,9 @@ from loops.browser.form import CreateConceptPage, CreateConcept from loops.browser.form import EditConceptPage, EditConcept from loops.browser.node import NodeView from loops.common import adapted +from loops.organize.work.meeting import MeetingMinutes from loops.util import _ +from loops import util organize_macros = ViewPageTemplateFile('view_macros.pt') @@ -247,12 +249,39 @@ class CalendarInfo(NodeView): # special forms -class CreateFollowUpEventForm(CreateConceptPage): +class CreateFollowUpEventForm(CreateConceptPage, MeetingMinutes): fixedType = True typeToken = '.loops/concepts/event' form_action = 'create_followup_event' - showAssignments = True + showAssignments = False + + @Lazy + def macro(self): + return organize_macros.macros['create_followup_event'] + + @Lazy + def baseEvent(self): + return adapted(self.virtualTargetObject) + + @Lazy + def title(self): + event = self.baseEvent + evView = ConceptView(event, self.request) + eventTitle = u'%s, %s' % (event.title, evView.data['start']) + return _(u'Create Follow-up Event for: $event', + mapping=dict(event=eventTitle)) + + @Lazy + def data(self): + data = self.getData() + data['title'] = self.baseEvent.title + data['description'] = self.baseEvent.description + return data + + def results(self): + return self.reportInstance.getResults( + dict(tasks=util.getUidForObject(self.virtualTargetObject))) class EditFollowUpEventForm(EditConceptPage, CreateFollowUpEventForm): diff --git a/organize/browser/view_macros.pt b/organize/browser/view_macros.pt index 51f5434..93631a0 100644 --- a/organize/browser/view_macros.pt +++ b/organize/browser/view_macros.pt @@ -1,5 +1,4 @@ - - + @@ -56,6 +55,25 @@ +
+

+ + +

Tasks

+ + + + + + +
@@ -113,3 +131,6 @@
+ + + diff --git a/organize/work/meeting.pt b/organize/work/meeting.pt index acd924b..30ca9f9 100644 --- a/organize/work/meeting.pt +++ b/organize/work/meeting.pt @@ -14,8 +14,14 @@
+ tal:define="results reportView/results; + showCheckboxes cb_name|nothing"> + + +
+ Task/Action
+ @@ -49,6 +60,8 @@