From bc9dcffff4bdeaa6f2860aee321f9d93939772f2 Mon Sep 17 00:00:00 2001 From: Stefan Frauenknecht Date: Tue, 29 Jan 2013 14:28:42 +0100 Subject: [PATCH] #41 Time for each agenda item --- openslides/agenda/forms.py | 2 + openslides/agenda/models.py | 5 ++ .../agenda/templates/agenda/item_row.html | 4 ++ .../agenda/templates/agenda/overview.html | 6 ++- openslides/agenda/views.py | 10 ++++ openslides/locale/de/LC_MESSAGES/django.mo | Bin 36423 -> 36454 bytes openslides/locale/de/LC_MESSAGES/django.po | 48 ++++++++++-------- openslides/locale/de/LC_MESSAGES/djangojs.mo | Bin 460 -> 460 bytes openslides/locale/de/LC_MESSAGES/djangojs.po | 2 +- 9 files changed, 53 insertions(+), 24 deletions(-) diff --git a/openslides/agenda/forms.py b/openslides/agenda/forms.py index 66a4ee7a7..f0768f656 100644 --- a/openslides/agenda/forms.py +++ b/openslides/agenda/forms.py @@ -27,6 +27,8 @@ class ItemForm(forms.ModelForm, CssClassMixin): parent = TreeNodeChoiceField( queryset=Item.objects.all(), label=_("Parent item"), required=False) + duration = forms.TimeField(widget=forms.TimeInput(format='%H:%M') , input_formats=('%H:%M', '%H %M', '%M'), required=False) + class Meta: model = Item exclude = ('closed', 'weight', 'related_sid') diff --git a/openslides/agenda/models.py b/openslides/agenda/models.py index 45a8ae1bb..a4c46671d 100644 --- a/openslides/agenda/models.py +++ b/openslides/agenda/models.py @@ -46,6 +46,8 @@ class Item(MPTTModel, SlideMixin): type = models.CharField(max_length=3, choices=ITEM_TYPE, default='agd', verbose_name=_("Type")) + duration = models.TimeField(blank=True, null=True, verbose_name=_('Duration')); + related_sid = models.CharField(null=True, blank=True, max_length=63) def get_related_slide(self): @@ -174,6 +176,7 @@ class Item(MPTTModel, SlideMixin): def __unicode__(self): return self.get_title() + class Meta: permissions = ( ('can_see_agenda', ugettext_noop("Can see agenda")), @@ -185,5 +188,7 @@ class Item(MPTTModel, SlideMixin): order_insertion_by = ['weight'] + + register_slidemodel(Item, control_template='agenda/control_item.html') register_slidefunc('agenda', agenda_show, weight=-1, name=_('Agenda')) diff --git a/openslides/agenda/templates/agenda/item_row.html b/openslides/agenda/templates/agenda/item_row.html index b5e3c084c..89c41aa92 100644 --- a/openslides/agenda/templates/agenda/item_row.html +++ b/openslides/agenda/templates/agenda/item_row.html @@ -27,6 +27,10 @@ {{ item.comment|first_line }} + + {{ item.duration|time:"H:i" }} + + {% endif %} {% if perms.agenda.can_manage_agenda or perms.projector.can_manage_projector %} diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html index 24ffaca65..8db571b3f 100644 --- a/openslides/agenda/templates/agenda/overview.html +++ b/openslides/agenda/templates/agenda/overview.html @@ -64,6 +64,9 @@ {% if perms.agenda.can_manage_agenda %} {% trans "Comment" %} {% endif %} + {% if perms.agenda.can_manage_agenda %} + {% trans "Duration" %} + {% endif %} {% if perms.agenda.can_manage_agenda or perms.projector.can_manage_projector %} {% trans "Actions" %} {% endif %} @@ -78,6 +81,7 @@ {% if perms.agenda.can_manage_agenda %} + {{ duration|time:"H:i" }} {% endif %} {% if perms.agenda.can_manage_agenda or perms.projector.can_manage_projector %} @@ -99,7 +103,7 @@ {% endfor %} {% else %} - {% trans "No items available." %} + {% trans "No items available." %} {% endif %} diff --git a/openslides/agenda/views.py b/openslides/agenda/views.py index c66eaf18d..d968527d7 100644 --- a/openslides/agenda/views.py +++ b/openslides/agenda/views.py @@ -28,6 +28,7 @@ from openslides.projector.api import get_active_slide from openslides.projector.projector import Widget, SLIDE from .models import Item from .forms import ItemOrderForm, ItemForm +from datetime import datetime, timedelta class Overview(TemplateView): @@ -37,6 +38,8 @@ class Overview(TemplateView): permission_required = 'agenda.can_see_agenda' template_name = 'agenda/overview.html' + + def get_context_data(self, **kwargs): context = super(Overview, self).get_context_data(**kwargs) @@ -45,9 +48,15 @@ class Overview(TemplateView): else: items = Item.objects.filter(type__exact = 'agd') + duration = timedelta() + for agenda_item in Item.objects.filter(closed=False): + if agenda_item.duration is not None: + duration += timedelta(hours=agenda_item.duration.hour, minutes=agenda_item.duration.minute) + context.update({ 'items': items, 'active_sid': get_active_slide(only_sid=True), + 'duration': datetime.strptime(str(duration), '%H:%M:%S'), }) return context @@ -100,6 +109,7 @@ class SetClosed(RedirectView, SingleObjectMixin): url = 'item_overview' model = Item + def get_ajax_context(self, **kwargs): context = super(SetClosed, self).get_ajax_context(**kwargs) closed = kwargs['closed'] diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo index d5f954adbf2a8b2e0275c307d2cfc998731a8d21..f9ea13c1437b53a5b83293ef54d045b586b5c123 100644 GIT binary patch delta 10463 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

C@jXbY#<4n3zEHpq<;aVsUpl$#h~J zomsd6Up(s2SVZ6FL>2Pya6J|zrjthyI({Oq5QlC16nfK+w(Z*ZKicbvL4-Z{Pf=te zIoZqhe2K?sze%hiZ$^wDe}24Vb06!6&revFS@o0Ej4?Yg3(MH?_O#<6@$+I2jN!zU z7f$}0{1;B<5_`!fqmFLm7wxzfrpsANJBE12_WuXJvF8qwe@0%_o>TWm^4j+N1@Zvx zfvLnBbbf~2?8$}r7V!yv33!b7lzbrSp90?!I*QTPj<`dv{rnMmHr69_RHm(CJF$>_ zKwgW#(%?%(zuWxrl-R_{`KW(%Otu%z#6`4k60eeb6CLb1Kl*h1Zg3vqDPpHR{}1_o zq9yTZ?w*J+x2`?Ym!A6MCGZDAM@ix`F`xc9#0SJmov_FIw4Wb6$SV;?h79<%@GB@}8s9-mYmX3bJ0Gq2llGvrh9%r5> zn8Ucy*a907t6w-bj`mlyOJPM~0{NB~&ZpAXg-9V1RgHX{tVKh|CZaI$1<{tiR>T-` z9q*DS5Qm7biQe>0C0^4>j_--CL>lKlCbp3eCDxPcsBCa1(r!&NoczDULn4mQ(T3R1xw+UJbwuG1EJO4r??jxi=PF=+4dNIB`sW_O7CKXNm)rvLx| delta 10445 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\n" "Language-Team: support@openslides.de\n" @@ -63,7 +63,7 @@ msgstr "Kommentar" msgid "Closed" msgstr "Abgeschlossen" -#: agenda/models.py:43 agenda/templates/agenda/overview.html:71 +#: agenda/models.py:43 agenda/templates/agenda/overview.html:74 #: projector/models.py:31 msgid "Weight" msgstr "Gewichtung" @@ -75,57 +75,61 @@ msgstr "Gewichtung" msgid "Type" msgstr "Typ" -#: agenda/models.py:179 +#: agenda/models.py:49 agenda/templates/agenda/overview.html:68 +msgid "Duration" +msgstr "Dauer" + +#: agenda/models.py:182 msgid "Can see agenda" msgstr "Darf die Tagesordnung sehen" -#: agenda/models.py:180 +#: agenda/models.py:183 msgid "Can manage agenda" msgstr "Darf die Tagesordung verwalten" -#: agenda/models.py:181 +#: agenda/models.py:184 msgid "Can see orga items" msgstr "Darf Organisationspunkte sehen" -#: agenda/models.py:189 agenda/slides.py:20 agenda/views.py:191 -#: agenda/views.py:192 agenda/views.py:212 agenda/views.py:226 +#: agenda/models.py:194 agenda/slides.py:20 agenda/views.py:207 +#: agenda/views.py:208 agenda/views.py:228 agenda/views.py:242 #: agenda/templates/agenda/base_agenda.html:10 #: agenda/templates/agenda/overview.html:8 #: agenda/templates/agenda/overview.html:52 -#: agenda/templates/agenda/overview.html:77 +#: agenda/templates/agenda/overview.html:80 #: agenda/templates/projector/AgendaSummary.html:6 #: agenda/templates/projector/AgendaSummary.html:10 msgid "Agenda" msgstr "Tagesordnung" -#: agenda/views.py:54 +#: agenda/views.py:69 msgid "You are not authorized to manage the agenda." msgstr "Sie sind nicht berechtigt die Tagesordnung zu ändern." -#: agenda/views.py:70 +#: agenda/views.py:85 msgid "Errors when reordering of the agenda" msgstr "Fehler beim Neusortieren der Tagesordnung" -#: agenda/views.py:131 +#: agenda/views.py:147 #, python-format msgid "Item %s was successfully modified." msgstr "Eintrag %s wurde erfolgreich bearbeitet." -#: agenda/views.py:152 +#: agenda/views.py:168 #, python-format msgid "Item %s was successfully created." msgstr "Eintrag %s wurde erfolgreich angelegt." -#: agenda/views.py:169 +#: agenda/views.py:185 msgid "Yes, with all child items." msgstr "Ja, mit allen Kindelementen." -#: agenda/views.py:177 +#: agenda/views.py:193 #, python-format msgid "Item %s and his children were successfully deleted." msgstr "Eintrag %s und seine Kindelemente wurde erfolgreich gelöscht." -#: agenda/views.py:182 +#: agenda/views.py:198 #, python-format msgid "Item %s was successfully deleted." msgstr "Eintrag %s wurde erfolgreich gelöscht." @@ -149,12 +153,12 @@ msgstr "Eintrag anzeigen" #: agenda/templates/agenda/base_agenda.html:31 #: agenda/templates/agenda/edit.html:8 agenda/templates/agenda/edit.html:16 -#: agenda/templates/agenda/item_row.html:40 +#: agenda/templates/agenda/item_row.html:44 msgid "Edit item" msgstr "Eintrag bearbeiten" #: agenda/templates/agenda/base_agenda.html:33 -#: agenda/templates/agenda/item_row.html:41 +#: agenda/templates/agenda/item_row.html:45 msgid "Delete item" msgstr "Eintrag löschen" @@ -231,12 +235,12 @@ msgstr "Eintrag als erledigt markieren" msgid "Item closed" msgstr "Eintrag erledigt" -#: agenda/templates/agenda/item_row.html:35 -#: agenda/templates/agenda/overview.html:86 +#: agenda/templates/agenda/item_row.html:39 +#: agenda/templates/agenda/overview.html:90 msgid "Activate item" msgstr "Eintrag projizieren" -#: agenda/templates/agenda/item_row.html:44 +#: agenda/templates/agenda/item_row.html:48 #: agenda/templates/agenda/widget.html:35 msgid "Activate summary for this item" msgstr "Zusammenfassung für diesen Eintrag projizieren" @@ -292,7 +296,7 @@ msgstr "Erledigt" msgid "Item" msgstr "Eintrag" -#: agenda/templates/agenda/overview.html:68 +#: agenda/templates/agenda/overview.html:71 #: assignment/templates/assignment/overview.html:28 #: motion/templates/motion/overview.html:43 #: participant/templates/participant/group_overview.html:14 @@ -300,7 +304,7 @@ msgstr "Eintrag" msgid "Actions" msgstr "Aktionen" -#: agenda/templates/agenda/overview.html:102 +#: agenda/templates/agenda/overview.html:106 #: agenda/templates/agenda/widget.html:46 #: projector/templates/projector/custom_slide_widget.html:36 msgid "No items available." diff --git a/openslides/locale/de/LC_MESSAGES/djangojs.mo b/openslides/locale/de/LC_MESSAGES/djangojs.mo index 895d2e5180ac5cac0c0596a80e638e552f7b5f38..7c267c9ba7caabcc595d4448fefc78333ad7f350 100644 GIT binary patch delta 19 acmX@Ze1>_#0S+Sz1tViCQ;Ur!SQr69>;?+} delta 19 acmX@Ze1>_#0S*IG1tTLXV}p$+SQr69cLn\n" "Language: de\n"