From 27bb5d2d0d1b632d258fe5ed9d12bfc86227a275 Mon Sep 17 00:00:00 2001 From: Daniel Grams Date: Thu, 6 Apr 2023 20:39:32 +0200 Subject: [PATCH 1/3] Organization event filter #416 --- messages.pot | 39 +++++-- project/templates/manage/events.html | 108 +++++++++++++----- .../translations/de/LC_MESSAGES/messages.mo | Bin 37256 -> 37433 bytes .../translations/de/LC_MESSAGES/messages.po | 39 +++++-- .../translations/en/LC_MESSAGES/messages.mo | Bin 4077 -> 4077 bytes .../translations/en/LC_MESSAGES/messages.po | 39 +++++-- project/views/manage.py | 2 +- 7 files changed, 165 insertions(+), 62 deletions(-) diff --git a/messages.pot b/messages.pot index ee914db..0404424 100644 --- a/messages.pot +++ b/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2023-04-06 14:02+0200\n" +"POT-Creation-Date: 2023-04-06 20:34+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -571,7 +571,7 @@ msgstr "" msgid "100 km" msgstr "" -#: project/forms/event.py:38 +#: project/forms/event.py:38 project/templates/manage/events.html:85 msgid "Start" msgstr "" @@ -819,6 +819,7 @@ msgstr "" #: project/templates/event_place/create.html:31 #: project/templates/event_place/delete.html:13 #: project/templates/event_place/update.html:31 +#: project/templates/manage/events.html:88 msgid "Place" msgstr "" @@ -835,6 +836,7 @@ msgstr "" #: project/forms/event_suggestion.py:60 project/templates/_macros.html:475 #: project/templates/_macros.html:638 project/templates/event/create.html:253 #: project/templates/event/update.html:156 +#: project/templates/manage/events.html:87 #: project/templates/organizer/create.html:27 #: project/templates/organizer/delete.html:13 #: project/templates/organizer/update.html:27 @@ -1249,6 +1251,7 @@ msgstr "" #: project/templates/event/actions.html:25 #: project/templates/event/create.html:230 #: project/templates/event/update.html:122 +#: project/templates/manage/events.html:86 #: project/templates/widget/event_suggestion/create.html:229 msgid "Event" msgstr "" @@ -1365,7 +1368,7 @@ msgstr "" msgid "Edit event" msgstr "" -#: project/templates/_macros.html:1232 project/templates/manage/events.html:66 +#: project/templates/_macros.html:1232 project/templates/manage/events.html:114 msgid "More" msgstr "" @@ -1438,7 +1441,7 @@ msgstr "" #: project/templates/layout.html:152 project/templates/layout.html:200 #: project/templates/manage/events.html:6 -#: project/templates/manage/events.html:42 +#: project/templates/manage/events.html:43 #: project/templates/manage/events_vue.html:4 msgid "Events" msgstr "" @@ -1484,7 +1487,7 @@ msgstr "" #: project/templates/event/create.html:5 #: project/templates/event/create.html:221 project/templates/layout.html:207 -#: project/templates/manage/events.html:45 +#: project/templates/manage/events.html:44 #: project/templates/manage/organizers.html:22 msgid "Create event" msgstr "" @@ -1610,7 +1613,7 @@ msgid "Users" msgstr "" #: project/templates/admin/admin_units.html:33 -#: project/templates/manage/events.html:59 +#: project/templates/manage/events.html:99 #: project/templates/manage/organizers.html:21 #: project/templates/manage/references_incoming.html:19 #: project/templates/manage/references_outgoing.html:19 @@ -1619,7 +1622,7 @@ msgstr "" #: project/templates/admin/admin_units.html:34 #: project/templates/admin/users.html:34 -#: project/templates/manage/events.html:60 +#: project/templates/manage/events.html:100 #: project/templates/manage/members.html:35 #: project/templates/manage/organizers.html:23 #: project/templates/manage/places.html:27 @@ -1631,7 +1634,7 @@ msgstr "" #: project/templates/admin/admin_units.html:35 #: project/templates/admin/users.html:35 -#: project/templates/manage/events.html:61 +#: project/templates/manage/events.html:101 #: project/templates/manage/members.html:21 #: project/templates/manage/members.html:36 #: project/templates/manage/organizers.html:24 @@ -1791,6 +1794,7 @@ msgid "Actions for event" msgstr "" #: project/templates/event/actions.html:32 +#: project/templates/manage/events.html:105 msgid "Request reference" msgstr "" @@ -1800,6 +1804,7 @@ msgid "Ask another organization to reference your event on their calendar." msgstr "" #: project/templates/event/actions.html:38 +#: project/templates/manage/events.html:107 #: project/templates/manage/references_incoming.html:10 msgid "Reference event" msgstr "" @@ -1810,7 +1815,7 @@ msgid "Reference this event on your organization's calendar." msgstr "" #: project/templates/event/actions.html:44 -#: project/templates/manage/events.html:64 +#: project/templates/manage/events.html:111 msgid "Add to list" msgstr "" @@ -1833,7 +1838,7 @@ msgid "List all events of %(admin_unit_name)s" msgstr "" #: project/templates/event/actions.html:74 -#: project/templates/manage/events.html:79 +#: project/templates/manage/events.html:131 msgid "Add event to list" msgstr "" @@ -1954,7 +1959,19 @@ msgstr "" msgid "Verify organization" msgstr "" -#: project/templates/manage/events.html:62 +#: project/templates/manage/events.html:76 +msgid "More filters" +msgstr "" + +#: project/templates/manage/events.html:89 +msgid "Number of references" +msgstr "" + +#: project/templates/manage/events.html:89 +msgid "Number of reference requests." +msgstr "" + +#: project/templates/manage/events.html:102 msgid "Duplicate" msgstr "" diff --git a/project/templates/manage/events.html b/project/templates/manage/events.html index 509098c..21ba78f 100644 --- a/project/templates/manage/events.html +++ b/project/templates/manage/events.html @@ -1,6 +1,6 @@ {% extends "layout_vue.html" %} {% set active_id = "events" %} -{% from "_macros.html" import render_event_in_list, render_manage_form_styles, render_manage_form_scripts, render_event_dates_filter_form, render_event_warning_pills, render_pagination, render_event_date, render_field_with_errors, render_event_organizer %} +{% from "_macros.html" import render_field, render_event_dates_date_field, render_event_in_list, render_manage_form_styles, render_manage_form_scripts, render_event_dates_filter_form, render_event_warning_pills, render_pagination, render_event_date, render_field_with_errors, render_event_organizer %} {%- block title -%} {{ _('Events') }} @@ -39,38 +39,90 @@ var vue_app_data = { eventId: 0 }; {% endif %} -

{{ _('Events') }}

+

+ {{ _('Events') }} + {{ _('Create event') }} +

- {{ _('Create event') }} -
+
+ {{ form.hidden_tag() }} -
- {{ render_event_dates_filter_form(form) }} -
+ {{ render_event_dates_date_field(form.date_from, form.date_to) }} + + {% if form.keyword %} + {{ render_field_with_errors(form.keyword, formrow="1") }} + {% endif %} + + {% set form_collapsed = not form.category_id.data and not form.organizer_id.data and not form.event_place_id.data %} +
+ + {% if form.category_id %} + {{ render_field_with_errors(form.category_id, formrow="1") }} + {% endif %} + + {% if form.organizer_id and form.organizer_id.type != "HiddenField" %} + {{ render_field_with_errors(form.organizer_id, formrow="1") }} + {% endif %} + + {% if form.event_place_id and form.event_place_id.type != "HiddenField" %} + {{ render_field_with_errors(form.event_place_id, formrow="1") }} + {% endif %} - + +

+ {{ form.submit(class="btn btn-primary")|safe }} + +

+ +
+ +
+ + + + + + + + + + + + {% for event in events %} + + + + + + + + {% endfor %} + +
{{ _('Start') }}{{ _('Event') }}{{ _('Organizer') }}{{ _('Place') }}
{{ render_event_in_list(event) }} + +
+ {{ _('View') }} + {{ _('Edit') }} + {{ _('Delete') }}… + {{ _('Duplicate') }}… +
+ {% if event.admin_unit_id == current_admin_unit.id %} + {{ _('Request reference') }}… + {% else %} + {{ _('Reference event') }}… + {% endif %} + {% if can_add_to_list %} +
+ {{ _('Add to list') }}… + {% endif %} +
+ {{ _('More') }}… +
+ {{ render_event_warning_pills(event) }} + 		{{ event.organizer.name }}{{ event.event_place.name }}{{ event.references|length }}/{{ event.reference_requests|length }}
+
{{ render_pagination(pagination) }}
diff --git a/project/translations/de/LC_MESSAGES/messages.mo b/project/translations/de/LC_MESSAGES/messages.mo index fc5dd70202a3406b5af0f6578f345c2185226d60..1d8e3c2868791025053989dc77a0e0749fd5c619 100644 GIT binary patch delta 8465 zcmZwLdtBGm9mnwl%2fmuAymX4h+I+>5H-mQDxju>H_97cA{0|GK}|*cYKmHB>70e> zR$fYJT5eL)$E@X=<)xL<9+h3KtPPuH?x9`8M|-_JXOI1}9_90V&iQ`N<#W#YlC0nD ze`Jrp_gUMPTMhsC`5P05Ns)^F_fL19F+B*=F$bq$G(Lr6@c{avNiZe~{4pG3FaWz^ zAa-+c7Pcb316vy7nLO7p!dZl!d7v2e;v$U2~l-kq?#q3=F}+s0@t6P#lZFSb|+~CTgI^upApuEA2!h zi#9#+UL1pyu^vZZKr-8mW6^6#;UNlI$#T?6>(GaPL7j=OP#tPCA0(o-Xef5VQq&4p zVE}GKWo`=w;ZD@V>QM{(6Dl*uQ^;ni zp07i_|D3CDL=A8WwZLW!LO)g)h#{zPBh$#gI_OG;W|)PVc^+!Ov8VxOqMm!m#cNOl zY(=en4{D%;E`Aw9h>u|~o<_C*9d($`VF+IJDCjgcqaFz3Bx$ePIO9+QrJz#V2Q{(& z*aAo6XdI8XGJxsCjkpF)H`{+L>bm2&j`;w4 z;4iMd2M;lpnSvY>vktX2FQO)V5?kTB*cv}}aTA8={$Fzy{`9I$grg2)JgTD{)FCWJ z9kxnWzX`Q9ze5dt6x-uhsP}K8-f!R2PB(wA zb0O+`@C<4quc0RLF>>Y2PpCs0muUygb{3(&ln{eP2!X8Z~2TK$L` zFqT>AwDv_EmVp?G!;#dPaTtlyQK?;kO100Q2x3RKMGCHtxaR7|tJ)F|RlISK(PI z`eQTd+uW~@wZ?f2i>MFiYYbzWVjPH%U=p4{9l}elz1F-)WzVKuxS2s=YI6fK*gQvYnG% z`@^XIHy{)A%q9vt-A|!DL_6^|JZv8@XHXq~;NtVxk@z3Z7VMiA(Ak-ST6s^@Kz&dX zzSG6SQ5h}7NZtR^TLohlqV}@ZJ@5i*Wv`>|`)O2%O|Jbi>Xf$}VB6bbJK_vfeLm{@ zFwVKyxeaw|j$#7io6{8Z!X?xIH&FLlCrmSMgFcMMSR91jC`n-+=0r>7}N{1P#rHtZOJ-R zhMvMe+~<4=+Y`UyJcAj;7g7Cn9A>|;nK)JVe-ed48jfHw1`W5VD?z1x4QjwW*a;g@ zscghx{Lap>9zM^3gOyQ5jl+>Tfl+VtliOf>QeoD)om@9leP#@PaVM4$Pegqm{_Ol0jv{W)ADK84Ilrb3Ie+F8Ou&Rf^3N4DL&?7eu0;*F z3v;m%eHeAOJsa7mnUBKRI32s=}tfouLE_$6lyU^^hX+A4cI` zDq7?Hr~xWbnOTc!f6B#sFp2nOjKGhu6<$Q8_&VzF-Ec;awp-Z~b@+OtRz4Cn;dvef z-TTF;fgeYGSax9wzKZJjYYfGUsFYtrZQ0~8wxcrCiYqV(7hxZ)L9Ms}*WnwOg(Jt> zt@KtW_W ze&jI|c8@*e;mE{1lRzPWh78mS`nY%iD)mEA85r&Ai=C6P2lX>hTd)bEa0jZNgBXo} zM5X#~sD-_c8t*!0=>9iTXiG)$)WBt!fwedTU%{S?Z(=9f4u@k4;(Jjmo{VJGOh>J-0k!9^qXs;M8t7wJ z|BZ{UxcCNYz<^2oE&=;s4K6`t<~n*w6v8I+H(SiaIarSz0~0;Pc2JHQcpK{Z-I$6e zFd4tc?igEQ|E`$tobTL*%G4XEg*2fieyxQ3M^NBHeCv=!qT*Q8bxcL2x(~L;eC&_Y z@HX6m>Db`fzr+~gW{kzCX*TuUQT>iWotY`9PxFRpo*iH>6*?5Jp!V#j^Ej%*cbs3N z&Pp@tbVp3LsZ4P8MV*;K)M1>2+NuiF1Uyv#PoSQwQ-xCT9O{}KMD6`y?2NCXQuZk- z15K#sTX2H3!f;f_DX2Z|i&{t_Y69a>{msHsoQnhS4CbR3exETfQ5cVUp(Rf#HL<9b zW}`YDh8?g3@5d#`#W9~^Kg_05R$yP;hePl@=3Cv&|Y6hWuWCu zo7yl`9FN-TWYjerh|0h?jKite1*;6|$2&7^& zYH#XLDc^}Ydva6?-gSRPIYm)a{=o4WvB_SoK5~U;5zrf6R6W% zhdSN+Py-&r7Wg)5fHSBL&Y`a7dDH@aaP=)7uI?Y=@)Ol$&$IvUxEA%?CpZv?Rk(W0R6Xi; zgwMDCPgvkl7)-?~)CAr@-SZO|k6&U6`aNh*aT*p74@MuZ$KF_vIvby32sXR+zyUS0@W8PW{O6jjq_k6p1;Pk!V>7nF zUtE2g#df9fsN0k4;)$sKtFbHo7S-=x(c3}cJqqgh!H29hsFXd5dT~GM#dlr%HH;+o zUt(7ng|`uBp|plfdzX-ZrR*3Ldhj!BhhJed{)p-*e5t*T zF*u5NJa)&OE`A5KfR4-T-lwA8%S83l4>jQ;)K*P*?Q@oqf9-h{71}coHG#G6f$bPU zyc@Nbhg^Ll>JWW|>hJ<;0^gwyVKXWtq185ni5NwkkDYNM`f#b|3QwaxIDbMNuAfjH zCN8&!rKht1wG}0(6|F{1@Ym?WJ*Wj8M;*GesOK)A7IqD9$Iu!(A+I-uOe#j;Dy+tC zcoREd+6p`4Jk&tv<8)dI_GZG%3pNxn|SLsptj^gROZejTjQCF6f`qkMV)5- zN?bEf!F0?)9jbCv$Jh5{VdjFE`E)BF?qe6z&kjI_zG%EG9KYaE8d5>_yTspZ?O|bJZcw| zj*k)Nq1w-4C|*O|60?E)E7f5e>!?E&z0scbp4gpuENUSh z>izY|ZklIYebVE0<>{yi+<`%Qeh`Ih3d1lQmtzBNz+B9I!d|acsDbulUp$AJc$-a3 z%#UqBbvSx6lg9~|hOK^Ozx}<@Bz8?Lojbd%V&Sxk8S~20suF#NB7Dsq!wTnDmicDR zp1ZKDvT93c|I?XwFPe8>S*36OOkZW$%(BX|iqbMl3l^1CEv)Kc{!iJ^5;D`v#fmX?)3{h F{Rg=J73u&0 delta 8291 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 b1lFvRR-@Ls2c3Kc{-c5m6*L|F-!lILfD`Ua diff --git a/project/translations/de/LC_MESSAGES/messages.po b/project/translations/de/LC_MESSAGES/messages.po index 60243aa..af104bf 100644 --- a/project/translations/de/LC_MESSAGES/messages.po +++ b/project/translations/de/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2023-04-06 14:02+0200\n" +"POT-Creation-Date: 2023-04-06 20:34+0200\n" "PO-Revision-Date: 2020-06-07 18:51+0200\n" "Last-Translator: FULL NAME \n" "Language: de\n" @@ -594,7 +594,7 @@ msgstr "50 km" msgid "100 km" msgstr "100 km" -#: project/forms/event.py:38 +#: project/forms/event.py:38 project/templates/manage/events.html:85 msgid "Start" msgstr "Beginn" @@ -859,6 +859,7 @@ msgstr "Ungültiger Mitveranstalter." #: project/templates/event_place/create.html:31 #: project/templates/event_place/delete.html:13 #: project/templates/event_place/update.html:31 +#: project/templates/manage/events.html:88 msgid "Place" msgstr "Ort" @@ -875,6 +876,7 @@ msgstr "Neuen Ort eingeben" #: project/forms/event_suggestion.py:60 project/templates/_macros.html:475 #: project/templates/_macros.html:638 project/templates/event/create.html:253 #: project/templates/event/update.html:156 +#: project/templates/manage/events.html:87 #: project/templates/organizer/create.html:27 #: project/templates/organizer/delete.html:13 #: project/templates/organizer/update.html:27 @@ -1304,6 +1306,7 @@ msgstr "Zuletzt aktualisiert am %(updated_at)s." #: project/templates/event/actions.html:25 #: project/templates/event/create.html:230 #: project/templates/event/update.html:122 +#: project/templates/manage/events.html:86 #: project/templates/widget/event_suggestion/create.html:229 msgid "Event" msgstr "Veranstaltung" @@ -1422,7 +1425,7 @@ msgstr "Bild-Datei auswählen" msgid "Edit event" msgstr "Veranstaltung bearbeiten" -#: project/templates/_macros.html:1232 project/templates/manage/events.html:66 +#: project/templates/_macros.html:1232 project/templates/manage/events.html:114 msgid "More" msgstr "Mehr" @@ -1495,7 +1498,7 @@ msgstr "Features" #: project/templates/layout.html:152 project/templates/layout.html:200 #: project/templates/manage/events.html:6 -#: project/templates/manage/events.html:42 +#: project/templates/manage/events.html:43 #: project/templates/manage/events_vue.html:4 msgid "Events" msgstr "Veranstaltungen" @@ -1541,7 +1544,7 @@ msgstr "Veranstaltungen anzeigen" #: project/templates/event/create.html:5 #: project/templates/event/create.html:221 project/templates/layout.html:207 -#: project/templates/manage/events.html:45 +#: project/templates/manage/events.html:44 #: project/templates/manage/organizers.html:22 msgid "Create event" msgstr "Veranstaltung erstellen" @@ -1667,7 +1670,7 @@ msgid "Users" msgstr "Nutzer" #: project/templates/admin/admin_units.html:33 -#: project/templates/manage/events.html:59 +#: project/templates/manage/events.html:99 #: project/templates/manage/organizers.html:21 #: project/templates/manage/references_incoming.html:19 #: project/templates/manage/references_outgoing.html:19 @@ -1676,7 +1679,7 @@ msgstr "Anzeigen" #: project/templates/admin/admin_units.html:34 #: project/templates/admin/users.html:34 -#: project/templates/manage/events.html:60 +#: project/templates/manage/events.html:100 #: project/templates/manage/members.html:35 #: project/templates/manage/organizers.html:23 #: project/templates/manage/places.html:27 @@ -1688,7 +1691,7 @@ msgstr "Bearbeiten" #: project/templates/admin/admin_units.html:35 #: project/templates/admin/users.html:35 -#: project/templates/manage/events.html:61 +#: project/templates/manage/events.html:101 #: project/templates/manage/members.html:21 #: project/templates/manage/members.html:36 #: project/templates/manage/organizers.html:24 @@ -1850,6 +1853,7 @@ msgid "Actions for event" msgstr "Aktionen für die Veranstaltung" #: project/templates/event/actions.html:32 +#: project/templates/manage/events.html:105 msgid "Request reference" msgstr "Empfehlung anfragen" @@ -1861,6 +1865,7 @@ msgstr "" "empfehlen." #: project/templates/event/actions.html:38 +#: project/templates/manage/events.html:107 #: project/templates/manage/references_incoming.html:10 msgid "Reference event" msgstr "Veranstaltung empfehlen" @@ -1871,7 +1876,7 @@ msgid "Reference this event on your organization's calendar." msgstr "Empfehle diese Veranstaltung im Kalender deiner Organisation." #: project/templates/event/actions.html:44 -#: project/templates/manage/events.html:64 +#: project/templates/manage/events.html:111 msgid "Add to list" msgstr "Zu Liste hinzufügen" @@ -1894,7 +1899,7 @@ msgid "List all events of %(admin_unit_name)s" msgstr "Zeige alle Veranstaltungen von %(admin_unit_name)s" #: project/templates/event/actions.html:74 -#: project/templates/manage/events.html:79 +#: project/templates/manage/events.html:131 msgid "Add event to list" msgstr "Veranstaltung zu Liste hinzufügen" @@ -2020,7 +2025,19 @@ msgstr "" msgid "Verify organization" msgstr "Organisation verifizieren" -#: project/templates/manage/events.html:62 +#: project/templates/manage/events.html:76 +msgid "More filters" +msgstr "Mehr Filter" + +#: project/templates/manage/events.html:89 +msgid "Number of references" +msgstr "Anzahl an Empfehlungen" + +#: project/templates/manage/events.html:89 +msgid "Number of reference requests." +msgstr "Anzahl an Empfehlungsanfragen" + +#: project/templates/manage/events.html:102 msgid "Duplicate" msgstr "Duplizieren" diff --git a/project/translations/en/LC_MESSAGES/messages.mo b/project/translations/en/LC_MESSAGES/messages.mo index c668849a307fa0f9a5ee0f246386aa2dc4622f83..83eac58b2b580a87ee28829728a1d8be4e3ceac1 100644 GIT binary patch delta 18 acmaDW|5kp(TTWIZ11n>b&7U}bvjPB1CI@u@ delta 18 acmaDW|5kp(TTWI(6DtFw&7U}bvjPB19|v;) diff --git a/project/translations/en/LC_MESSAGES/messages.po b/project/translations/en/LC_MESSAGES/messages.po index c984a91..c9fdf12 100644 --- a/project/translations/en/LC_MESSAGES/messages.po +++ b/project/translations/en/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2023-04-06 14:02+0200\n" +"POT-Creation-Date: 2023-04-06 20:34+0200\n" "PO-Revision-Date: 2021-04-30 15:04+0200\n" "Last-Translator: FULL NAME \n" "Language: en\n" @@ -572,7 +572,7 @@ msgstr "" msgid "100 km" msgstr "" -#: project/forms/event.py:38 +#: project/forms/event.py:38 project/templates/manage/events.html:85 msgid "Start" msgstr "" @@ -820,6 +820,7 @@ msgstr "" #: project/templates/event_place/create.html:31 #: project/templates/event_place/delete.html:13 #: project/templates/event_place/update.html:31 +#: project/templates/manage/events.html:88 msgid "Place" msgstr "" @@ -836,6 +837,7 @@ msgstr "" #: project/forms/event_suggestion.py:60 project/templates/_macros.html:475 #: project/templates/_macros.html:638 project/templates/event/create.html:253 #: project/templates/event/update.html:156 +#: project/templates/manage/events.html:87 #: project/templates/organizer/create.html:27 #: project/templates/organizer/delete.html:13 #: project/templates/organizer/update.html:27 @@ -1257,6 +1259,7 @@ msgstr "" #: project/templates/event/actions.html:25 #: project/templates/event/create.html:230 #: project/templates/event/update.html:122 +#: project/templates/manage/events.html:86 #: project/templates/widget/event_suggestion/create.html:229 msgid "Event" msgstr "" @@ -1373,7 +1376,7 @@ msgstr "" msgid "Edit event" msgstr "" -#: project/templates/_macros.html:1232 project/templates/manage/events.html:66 +#: project/templates/_macros.html:1232 project/templates/manage/events.html:114 msgid "More" msgstr "" @@ -1446,7 +1449,7 @@ msgstr "" #: project/templates/layout.html:152 project/templates/layout.html:200 #: project/templates/manage/events.html:6 -#: project/templates/manage/events.html:42 +#: project/templates/manage/events.html:43 #: project/templates/manage/events_vue.html:4 msgid "Events" msgstr "" @@ -1492,7 +1495,7 @@ msgstr "" #: project/templates/event/create.html:5 #: project/templates/event/create.html:221 project/templates/layout.html:207 -#: project/templates/manage/events.html:45 +#: project/templates/manage/events.html:44 #: project/templates/manage/organizers.html:22 msgid "Create event" msgstr "" @@ -1618,7 +1621,7 @@ msgid "Users" msgstr "" #: project/templates/admin/admin_units.html:33 -#: project/templates/manage/events.html:59 +#: project/templates/manage/events.html:99 #: project/templates/manage/organizers.html:21 #: project/templates/manage/references_incoming.html:19 #: project/templates/manage/references_outgoing.html:19 @@ -1627,7 +1630,7 @@ msgstr "" #: project/templates/admin/admin_units.html:34 #: project/templates/admin/users.html:34 -#: project/templates/manage/events.html:60 +#: project/templates/manage/events.html:100 #: project/templates/manage/members.html:35 #: project/templates/manage/organizers.html:23 #: project/templates/manage/places.html:27 @@ -1639,7 +1642,7 @@ msgstr "" #: project/templates/admin/admin_units.html:35 #: project/templates/admin/users.html:35 -#: project/templates/manage/events.html:61 +#: project/templates/manage/events.html:101 #: project/templates/manage/members.html:21 #: project/templates/manage/members.html:36 #: project/templates/manage/organizers.html:24 @@ -1799,6 +1802,7 @@ msgid "Actions for event" msgstr "" #: project/templates/event/actions.html:32 +#: project/templates/manage/events.html:105 msgid "Request reference" msgstr "" @@ -1808,6 +1812,7 @@ msgid "Ask another organization to reference your event on their calendar." msgstr "" #: project/templates/event/actions.html:38 +#: project/templates/manage/events.html:107 #: project/templates/manage/references_incoming.html:10 msgid "Reference event" msgstr "" @@ -1818,7 +1823,7 @@ msgid "Reference this event on your organization's calendar." msgstr "" #: project/templates/event/actions.html:44 -#: project/templates/manage/events.html:64 +#: project/templates/manage/events.html:111 msgid "Add to list" msgstr "" @@ -1841,7 +1846,7 @@ msgid "List all events of %(admin_unit_name)s" msgstr "" #: project/templates/event/actions.html:74 -#: project/templates/manage/events.html:79 +#: project/templates/manage/events.html:131 msgid "Add event to list" msgstr "" @@ -1962,7 +1967,19 @@ msgstr "" msgid "Verify organization" msgstr "" -#: project/templates/manage/events.html:62 +#: project/templates/manage/events.html:76 +msgid "More filters" +msgstr "" + +#: project/templates/manage/events.html:89 +msgid "Number of references" +msgstr "" + +#: project/templates/manage/events.html:89 +msgid "Number of reference requests." +msgstr "" + +#: project/templates/manage/events.html:102 msgid "Duplicate" msgstr "" diff --git a/project/views/manage.py b/project/views/manage.py index 0697ac5..c647544 100644 --- a/project/views/manage.py +++ b/project/views/manage.py @@ -179,7 +179,7 @@ def manage_admin_unit_events(id): params.admin_unit_id = admin_unit.id params.can_read_private_events = True - events = get_events_query(params).paginate() + events = get_events_query(params).paginate(per_page=50) return render_template( "manage/events.html", admin_unit=admin_unit, From dbbe7a43c1a0d5ddaa543a0ecb9ea1fb8e51c830 Mon Sep 17 00:00:00 2001 From: Daniel Grams Date: Thu, 6 Apr 2023 21:31:47 +0200 Subject: [PATCH 2/3] Organization event filter #416 --- cypress/e2e/manage.cy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/e2e/manage.cy.js b/cypress/e2e/manage.cy.js index 888cdbc..5e9248a 100644 --- a/cypress/e2e/manage.cy.js +++ b/cypress/e2e/manage.cy.js @@ -37,7 +37,7 @@ describe("Manage", () => { cy.get("#toggle-search-btn").click(); cy.get('.dropdown-toggle.btn-link').click(); - cy.get('a:contains(Zu Liste)').click(); + cy.get('a:contains(Zu Liste)').click({force: true}); cy.get(".btn:contains(OK)").should("be.visible"); cy.screenshot("lists"); From 950c2177ae955db1795dc6051fe40b3ddc681cab Mon Sep 17 00:00:00 2001 From: Daniel Grams Date: Thu, 6 Apr 2023 22:47:13 +0200 Subject: [PATCH 3/3] Organization event filter #416 --- project/forms/event.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/forms/event.py b/project/forms/event.py index 4626ba9..55777dc 100644 --- a/project/forms/event.py +++ b/project/forms/event.py @@ -444,5 +444,5 @@ class FindEventForm(FlaskForm): submit = SubmitField(lazy_gettext("Find events")) - def is_submitted(self): + def is_submitted(self): # pragma: no cover return "submit" in request.args