From 59bb401b8fdfe932b888596f9aceb88d73644193 Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Sun, 10 Jun 2012 16:29:33 +0200 Subject: [PATCH] create follow-up event: extend form showing tasks of base event for selection --- locales/de/LC_MESSAGES/loops.mo | Bin 17622 -> 17737 bytes locales/de/LC_MESSAGES/loops.po | 8 +++++++- organize/browser/event.py | 33 ++++++++++++++++++++++++++++++-- organize/browser/view_macros.pt | 25 ++++++++++++++++++++++-- organize/work/meeting.pt | 15 ++++++++++++++- 5 files changed, 75 insertions(+), 6 deletions(-) diff --git a/locales/de/LC_MESSAGES/loops.mo b/locales/de/LC_MESSAGES/loops.mo index 149decde020c9b503dc31e062cd2feb934a0c96e..14888c38e0f6d21d09c267acea9c997e1a915c53 100644 GIT binary patch delta 6784 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 y>b!!l5f2eHa!Zz\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 @@