cco/loops
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

provide actions for agenda items; show state in meeting minutes browser view

Browse source
This commit is contained in:
Helmut Merz 2012-08-21 07:06:36 +02:00
parent 61562b6af6
commit 6c72358426
7 changed files with 67 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
browser/skin/lobo/lobo.css
View file

@ -597,6 +597,10 @@ div.comment {
/* calendar, work items */
.MinutesAndAgendaTitles a[href] {
color: white;
}
.today {
color: #444488;
font-weight: bold;

BIN
locales/de/LC_MESSAGES/loops.mo
View file

Binary file not shown.

14
locales/de/LC_MESSAGES/loops.po
View file

@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: $Id$\n"
"POT-Creation-Date: 2007-05-22 12:00 CET\n"
"PO-Revision-Date: 2012-08-09 12:00 CET\n"
"PO-Revision-Date: 2012-08-20 12:00 CET\n"
"Last-Translator: Helmut Merz <helmutm@cy55.de>\n"
"Language-Team: loops developers <helmutm@cy55.de>\n"
"MIME-Version: 1.0\n"
@ -254,6 +254,18 @@ msgstr "Termin bearbeiten"
msgid "Modify follow-up event."
msgstr "Folgetermin bearbeiten"
msgid "Create Agenda Item..."
msgstr "Tagesordnungspunkt anlegen..."
msgid "Create a new agenda item."
msgstr "Einen neuen Tagesordnungspunkt anlegen."
msgid "Edit Agenda Item..."
msgstr "Tagesordnungspunkt bearbeiten..."
msgid "Modify agenda item."
msgstr "Tagesordnungspunkt bearbeiten"
msgid "Create Task..."
msgstr "Aufgabe anlegen..."

18
organize/browser/event.py
View file

@ -80,6 +80,24 @@ actions.register('editFollowUpEvent', 'portlet', TargetAction,
prerequisites=['registerDojoDateWidget'],
)
actions.register('createAgendaItem', 'portlet', DialogAction,
title=_(u'Create Agenda Item...'),
description=_(u'Create a new agenda item.'),
viewName='create_concept.html',
dialogName='createAgendaItem',
typeToken='.loops/concepts/agendaitem',
fixedType=True,
innerForm='inner_concept_form.html',
prerequisites=['registerDojoDateWidget'],
)
actions.register('editAgendaItem', 'portlet', DialogAction,
title=_(u'Edit Agenda Item...'),
description=_(u'Modify agenda item.'),
viewName='edit_concept.html',
dialogName='editAgendaItem',
)
class Events(ConceptView):

3
organize/browser/view_macros.pt
View file

@ -58,7 +58,8 @@
<form metal:define-macro="create_followup_event" method="post"
id="dialog_form" class="dialog"
dojoType="dijit.form.Form"
tal:define="item nocall:item|nocall:view">
tal:define="item nocall:item|nocall:view;
showState python:True">
<h2 tal:content="view/title"
i18n:translate="" />
<input type="hidden" name="form.action"

37
organize/work/meeting.pt
View file

@ -4,7 +4,8 @@
<div metal:define-macro="content"
tal:define="report item/reportInstance;
reportView nocall:item;
results reportView/results">
results reportView/results;
showState python:True">
<div tal:attributes="class string:content-$level;">
<metal:block use-macro="view/concept_macros/concepttitle" />
<metal:block use-macro="view/concept_macros/conceptfields" />
@ -24,11 +25,12 @@
report item/reportInstance;
reportView nocall:item;
results reportView/results;
fields results/context/fields">
fields results/context/fields;
showCheckboxes nothing;
showState nothing">
<div class ="WordSection1">
<div align="center">
<table class="MsoTableGrid" width="98%" cellpadding="0" cellspacing="0"
tal:define="showCheckboxes nothing">
<table class="MsoTableGrid" width="98%" cellpadding="0" cellspacing="0">
<metal:header use-macro="item/macros/header" />
<metal:header use-macro="item/macros/rows" />
</table>
@ -39,7 +41,7 @@
<metal:header define-macro="header"
tal:define="row results/first">
<tr style="background-color: #777777">
<tr style="background-color: #777777; color: white">
<td colspan="4">
<div tal:define="col fields/eventTitle"
class="MinutesAndAgendaTitles">
@ -84,6 +86,8 @@
<th colspan="4"
i18n:translate=""
style="border: 1px solid grey">Copy Agenda Items</th>
<td tal:condition="showState"
style="border: 1px solid #777777" />
</tr>
<tr>
<td tal:condition="showCheckboxes" style="width: 2%">&nbsp;</td>
@ -91,24 +95,27 @@
<td style="width: 53%">&nbsp;</td>
<td style="width: 20%">&nbsp;</td>
<td style="width: 12%">&nbsp;</td>
<td tal:condition="showState" style="width: 2%">&nbsp;</td>
</tr>
<tal:tasks repeat="row results">
<tal:task define="taskUid row/context/uid">
<tr class="agenda-item-headline"
style="background-color: #777777">
<td tal:condition="showCheckboxes"
style="border: 1px solid grey" class="center">
style="border: 1px solid #777777" class="center">
<input type="checkbox" checked
tal:attributes="name string:$cb_name:list;
value taskUid" /></td>
<td colspan="4"
style="border: 1px solid grey"
style="border: 1px solid #777777"
tal:define="col report/fields/title"
tal:attributes="class col/cssClass">
<div class="MinutesAndAgendaTitles">
<metal:column use-macro="python:
reportView.getColumnRenderer(col)" /></div>
</td>
<td tal:condition="showState"
style="border: 1px solid #777777" />
</tr>
<tal:item repeat="colname python:
('responsible', 'description', 'discussion', 'consequences')">
@ -125,7 +132,9 @@
<metal:column use-macro="python:
reportView.getColumnRenderer(col)" />
</td>
</tal:field>
</tal:field>
<td tal:condition="showState"
style="border-right: 1px solid #777777" />
</tr>
</tal:item>
<tal:workitems define="col report/fields/workItems;
@ -141,8 +150,10 @@
i18n:translate="">header_responsible</td>
<td style="border: 1px solid grey; width: 12%" class="center"
i18n:translate="">header_deadline</td>
<td tal:condition="showState"
style="border: 1px solid #777777" />
</tr>
<metal:column use-macro="python:
<metal:column use-macro="python:
reportView.getColumnRenderer(col)" />
</tal:workitems>
</tal:task>
@ -182,6 +193,14 @@
<metal:column use-macro="python:
reportView.getColumnRenderer(col)" />
</td>
<tal:state condition="showState">
<td tal:define="col fields/state"
tal:attributes="class col/cssClass"
style="border: 1px solid grey; width: 12%">
<metal:column use-macro="python:
reportView.getColumnRenderer(col)" />
</td>
</tal:state>
</tr>
</metal:sub>

4
organize/work/report.py
View file

@ -285,14 +285,14 @@ class MeetingMinutesWorkRow(WorkRow):
@Lazy
def isActive(self):
return self.context.state not in (
'finished', 'closed', 'cancelled')
'finished', 'closed', 'cancelled', 'moved')
class MeetingMinutesWork(WorkReportInstance, SubReport):
rowFactory = MeetingMinutesWorkRow
fields = Jeep((workTitle, party, deadline)) #, state)) #description,
fields = Jeep((workTitle, party, deadline, state)) #description,
defaultOutputFields = fields
defaultSortCriteria = (day,)
states = ('planned', 'accepted', 'running', 'done',