Skip to content
Snippets Groups Projects
Commit a6e70ece authored by Nadja Geisler's avatar Nadja Geisler :sunny: Committed by Nadja Geisler
Browse files

AK: add interest incrementation 

AK model: add online interest field, add increment function
add increment and redirect view
add Button and counter in detail view
add translations
parent b1ab6895
No related branches found
No related tags found
1 merge request!18Increment interest
Show whitespace changes
Inline Side-by-side
Showing
with 288 additions and 238 deletions
AKModel/admin.py
+ 7
− 21
View file @ a6e70ece
...@@ -38,9 +38,7 @@ class AKOwnerAdmin(admin.ModelAdmin): ...@@ -38,9 +38,7 @@ class AKOwnerAdmin(admin.ModelAdmin):
def formfield_for_foreignkey(self, db_field, request, **kwargs): def formfield_for_foreignkey(self, db_field, request, **kwargs):
if db_field.name == 'event': if db_field.name == 'event':
kwargs['initial'] = Event.get_next_active() kwargs['initial'] = Event.get_next_active()
return super(AKOwnerAdmin, self).formfield_for_foreignkey( return super(AKOwnerAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs)
db_field, request, **kwargs
)
@admin.register(AKCategory) @admin.register(AKCategory)
...@@ -54,9 +52,7 @@ class AKCategoryAdmin(admin.ModelAdmin): ...@@ -54,9 +52,7 @@ class AKCategoryAdmin(admin.ModelAdmin):
def formfield_for_foreignkey(self, db_field, request, **kwargs): def formfield_for_foreignkey(self, db_field, request, **kwargs):
if db_field.name == 'event': if db_field.name == 'event':
kwargs['initial'] = Event.get_next_active() kwargs['initial'] = Event.get_next_active()
return super(AKCategoryAdmin, self).formfield_for_foreignkey( return super(AKCategoryAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs)
db_field, request, **kwargs
)
@admin.register(AKTrack) @admin.register(AKTrack)
...@@ -70,9 +66,7 @@ class AKTrackAdmin(admin.ModelAdmin): ...@@ -70,9 +66,7 @@ class AKTrackAdmin(admin.ModelAdmin):
def formfield_for_foreignkey(self, db_field, request, **kwargs): def formfield_for_foreignkey(self, db_field, request, **kwargs):
if db_field.name == 'event': if db_field.name == 'event':
kwargs['initial'] = Event.get_next_active() kwargs['initial'] = Event.get_next_active()
return super(AKTrackAdmin, self).formfield_for_foreignkey( return super(AKTrackAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs)
db_field, request, **kwargs
)
@admin.register(AKTag) @admin.register(AKTag)
...@@ -95,9 +89,7 @@ class AKRequirementAdmin(admin.ModelAdmin): ...@@ -95,9 +89,7 @@ class AKRequirementAdmin(admin.ModelAdmin):
def formfield_for_foreignkey(self, db_field, request, **kwargs): def formfield_for_foreignkey(self, db_field, request, **kwargs):
if db_field.name == 'event': if db_field.name == 'event':
kwargs['initial'] = Event.get_next_active() kwargs['initial'] = Event.get_next_active()
return super(AKRequirementAdmin, self).formfield_for_foreignkey( return super(AKRequirementAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs)
db_field, request, **kwargs
)
class WishFilter(SimpleListFilter): class WishFilter(SimpleListFilter):
...@@ -133,9 +125,7 @@ class AKAdmin(admin.ModelAdmin): ...@@ -133,9 +125,7 @@ class AKAdmin(admin.ModelAdmin):
return obj.wish return obj.wish
def wiki_export(self, request, queryset): def wiki_export(self, request, queryset):
return render(request, return render(request, 'admin/AKModel/wiki_export.html', context={"AKs": queryset})
'admin/AKModel/wiki_export.html',
context={"AKs": queryset})
wiki_export.short_description = _("Export to wiki syntax") wiki_export.short_description = _("Export to wiki syntax")
...@@ -144,9 +134,7 @@ class AKAdmin(admin.ModelAdmin): ...@@ -144,9 +134,7 @@ class AKAdmin(admin.ModelAdmin):
def formfield_for_foreignkey(self, db_field, request, **kwargs): def formfield_for_foreignkey(self, db_field, request, **kwargs):
if db_field.name == 'event': if db_field.name == 'event':
kwargs['initial'] = Event.get_next_active() kwargs['initial'] = Event.get_next_active()
return super(AKAdmin, self).formfield_for_foreignkey( return super(AKAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs)
db_field, request, **kwargs
)
@admin.register(Room) @admin.register(Room)
...@@ -187,9 +175,7 @@ class AKSlotAdmin(admin.ModelAdmin): ...@@ -187,9 +175,7 @@ class AKSlotAdmin(admin.ModelAdmin):
def formfield_for_foreignkey(self, db_field, request, **kwargs): def formfield_for_foreignkey(self, db_field, request, **kwargs):
if db_field.name == 'event': if db_field.name == 'event':
kwargs['initial'] = Event.get_next_active() kwargs['initial'] = Event.get_next_active()
return super(AKSlotAdmin, self).formfield_for_foreignkey( return super(AKSlotAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs)
db_field, request, **kwargs
)
@admin.register(Availability) @admin.register(Availability)
......
AKModel/locale/de_DE/LC_MESSAGES/django.po
+ 128
− 113
View file @ a6e70ece
...@@ -2,7 +2,7 @@ msgid "" ...@@ -2,7 +2,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-10 17:15+0000\n" "POT-Creation-Date: 2020-05-10 20:54+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -11,152 +11,155 @@ msgstr "" ...@@ -11,152 +11,155 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: admin.py:32 #: AKModel/admin.py:96
msgid "Wish" msgid "Wish"
msgstr "AK-Wunsch" msgstr "AK-Wunsch"
#: admin.py:38 #: AKModel/admin.py:102
msgid "Is wish" msgid "Is wish"
msgstr "Ist ein Wunsch" msgstr "Ist ein Wunsch"
#: admin.py:39 #: AKModel/admin.py:103
msgid "Is not a wish" msgid "Is not a wish"
msgstr "Ist kein Wunsch" msgstr "Ist kein Wunsch"
#: admin.py:65 #: AKModel/admin.py:130
msgid "Export to wiki syntax" msgid "Export to wiki syntax"
msgstr "In Wiki-Syntax exportieren" msgstr "In Wiki-Syntax exportieren"
#: availability.py:38 models.py:37 models.py:57 models.py:109 models.py:128 #: AKModel/availability.py:38 AKModel/models.py:37 AKModel/models.py:65
#: models.py:160 models.py:211 models.py:247 models.py:277 #: AKModel/models.py:117 AKModel/models.py:136 AKModel/models.py:168
#: AKModel/models.py:221 AKModel/models.py:261 AKModel/models.py:291
msgid "Event" msgid "Event"
msgstr "Event" msgstr "Event"
#: availability.py:39 models.py:58 models.py:110 models.py:129 models.py:161 #: AKModel/availability.py:39 AKModel/models.py:66 AKModel/models.py:118
#: models.py:212 models.py:248 models.py:278 #: AKModel/models.py:137 AKModel/models.py:169 AKModel/models.py:222
#: AKModel/models.py:262 AKModel/models.py:292
msgid "Associated event" msgid "Associated event"
msgstr "Zugehöriges Event" msgstr "Zugehöriges Event"
#: availability.py:47 #: AKModel/availability.py:47
msgid "Person" msgid "Person"
msgstr "Person" msgstr "Person"
#: availability.py:48 #: AKModel/availability.py:48
msgid "Person whose availability this is" msgid "Person whose availability this is"
msgstr "Person deren Verfügbarkeit hier abgebildet wird" msgstr "Person deren Verfügbarkeit hier abgebildet wird"
#: availability.py:56 models.py:251 models.py:270 #: AKModel/availability.py:56 AKModel/models.py:265 AKModel/models.py:284
msgid "Room" msgid "Room"
msgstr "Raum" msgstr "Raum"
#: availability.py:57 #: AKModel/availability.py:57
msgid "Room whose availability this is" msgid "Room whose availability this is"
msgstr "Raum dessen Verfügbarkeit hier abgebildet wird" msgstr "Raum dessen Verfügbarkeit hier abgebildet wird"
#: availability.py:65 models.py:215 models.py:269 #: AKModel/availability.py:65 AKModel/models.py:225 AKModel/models.py:283
msgid "AK" msgid "AK"
msgstr "AK" msgstr "AK"
#: availability.py:66 #: AKModel/availability.py:66
msgid "AK whose availability this is" msgid "AK whose availability this is"
msgstr "Verfügbarkeiten" msgstr "Verfügbarkeiten"
#: availability.py:74 models.py:113 #: AKModel/availability.py:74 AKModel/models.py:121
msgid "AK Category" msgid "AK Category"
msgstr "AK Kategorie" msgstr "AK Kategorie"
#: availability.py:75 #: AKModel/availability.py:75
msgid "AK Category whose availability this is" msgid "AK Category whose availability this is"
msgstr "AK Kategorie dessen Verfügbarkeit hier abgebildet wird" msgstr "AK Kategorie dessen Verfügbarkeit hier abgebildet wird"
#: availability.py:235 #: AKModel/availability.py:235
msgid "Availability" msgid "Availability"
msgstr "Verfügbarkeit" msgstr "Verfügbarkeit"
#: availability.py:236 #: AKModel/availability.py:236
msgid "Availabilities" msgid "Availabilities"
msgstr "Verfügbarkeiten" msgstr "Verfügbarkeiten"
#: models.py:14 models.py:104 models.py:125 models.py:144 models.py:158 #: AKModel/models.py:14 AKModel/models.py:112 AKModel/models.py:133
#: models.py:176 models.py:240 #: AKModel/models.py:152 AKModel/models.py:166 AKModel/models.py:184
#: AKModel/models.py:254
msgid "Name" msgid "Name"
msgstr "Name" msgstr "Name"
#: models.py:15 #: AKModel/models.py:15
msgid "Name or iteration of the event" msgid "Name or iteration of the event"
msgstr "Name oder Iteration des Events" msgstr "Name oder Iteration des Events"
#: models.py:16 #: AKModel/models.py:16
msgid "Short Form" msgid "Short Form"
msgstr "Kurzer Name" msgstr "Kurzer Name"
#: models.py:17 #: AKModel/models.py:17
msgid "Short name of letters/numbers/dots/dashes/underscores used in URLs." msgid "Short name of letters/numbers/dots/dashes/underscores used in URLs."
msgstr "" msgstr ""
"Kurzname bestehend aus Buchstaben, Nummern, Punkten und Unterstrichen zur " "Kurzname bestehend aus Buchstaben, Nummern, Punkten und Unterstrichen zur "
"Nutzung in URLs" "Nutzung in URLs"
#: models.py:19 #: AKModel/models.py:19
msgid "Place" msgid "Place"
msgstr "Ort" msgstr "Ort"
#: models.py:20 #: AKModel/models.py:20
msgid "City etc. the event takes place in" msgid "City etc. the event takes place in"
msgstr "Stadt o.ä. in der das Event stattfindet" msgstr "Stadt o.ä. in der das Event stattfindet"
#: models.py:22 #: AKModel/models.py:22
msgid "Time Zone" msgid "Time Zone"
msgstr "Zeitzone" msgstr "Zeitzone"
#: models.py:22 #: AKModel/models.py:22
msgid "Time Zone where this event takes place in" msgid "Time Zone where this event takes place in"
msgstr "Zeitzone in der das Event stattfindet" msgstr "Zeitzone in der das Event stattfindet"
#: models.py:23 #: AKModel/models.py:23
msgid "Start" msgid "Start"
msgstr "Start" msgstr "Start"
#: models.py:23 #: AKModel/models.py:23
msgid "Time the event begins" msgid "Time the event begins"
msgstr "Zeit zu der das Event beginnt" msgstr "Zeit zu der das Event beginnt"
#: models.py:24 #: AKModel/models.py:24
msgid "End" msgid "End"
msgstr "Ende" msgstr "Ende"
#: models.py:24 #: AKModel/models.py:24
msgid "Time the event ends" msgid "Time the event ends"
msgstr "Zeit zu der das Event endet" msgstr "Zeit zu der das Event endet"
#: models.py:26 #: AKModel/models.py:26
msgid "Active State" msgid "Active State"
msgstr "Aktiver Status" msgstr "Aktiver Status"
#: models.py:26 #: AKModel/models.py:26
msgid "Marks currently active events" msgid "Marks currently active events"
msgstr "Markiert aktuell aktive Events" msgstr "Markiert aktuell aktive Events"
#: models.py:28 #: AKModel/models.py:28
msgid "Base URL" msgid "Base URL"
msgstr "URL-Prefix" msgstr "URL-Prefix"
#: models.py:28 #: AKModel/models.py:28
msgid "Prefix for wiki link construction" msgid "Prefix for wiki link construction"
msgstr "Prefix für die automatische Generierung von Wiki-Links" msgstr "Prefix für die automatische Generierung von Wiki-Links"
#: models.py:29 #: AKModel/models.py:29
msgid "Default Slot Length" msgid "Default Slot Length"
msgstr "Standardslotlänge" msgstr "Standardslotlänge"
#: models.py:30 #: AKModel/models.py:30
msgid "Default length in hours that is assumed for AKs in this event." msgid "Default length in hours that is assumed for AKs in this event."
msgstr "Standardlänge von Slots (in Stunden) für dieses Event" msgstr "Standardlänge von Slots (in Stunden) für dieses Event"
#: models.py:32 #: AKModel/models.py:32
msgid "Contact email address" msgid "Contact email address"
msgstr "E-Mail Kontaktadresse" msgstr "E-Mail Kontaktadresse"
#: models.py:34 #: AKModel/models.py:34
msgid "" msgid ""
"An email address that is displayed on every page and can be used for all " "An email address that is displayed on every page and can be used for all "
"kinds of questions" "kinds of questions"
...@@ -164,296 +167,308 @@ msgstr "" ...@@ -164,296 +167,308 @@ msgstr ""
"Eine Mailadresse die auf jeder Seite angezeigt wird und für alle Arten von " "Eine Mailadresse die auf jeder Seite angezeigt wird und für alle Arten von "
"Fragen genutzt werden kann" "Fragen genutzt werden kann"
#: models.py:38 #: AKModel/models.py:38
msgid "Events" msgid "Events"
msgstr "Events" msgstr "Events"
#: models.py:52 #: AKModel/models.py:60
msgid "Nickname" msgid "Nickname"
msgstr "Spitzname" msgstr "Spitzname"
#: models.py:52 #: AKModel/models.py:60
msgid "Name to identify an AK owner by" msgid "Name to identify an AK owner by"
msgstr "Name durch den eine AK Leitung identifiziert wird" msgstr "Name durch den eine AK Leitung identifiziert wird"
#: models.py:53 #: AKModel/models.py:61
msgid "Slug" msgid "Slug"
msgstr "Slug" msgstr "Slug"
#: models.py:53 #: AKModel/models.py:61
msgid "Slug for URL generation" msgid "Slug for URL generation"
msgstr "Slug für URL-Generierung" msgstr "Slug für URL-Generierung"
#: models.py:54 #: AKModel/models.py:62
msgid "Institution" msgid "Institution"
msgstr "Instutution" msgstr "Instutution"
#: models.py:54 #: AKModel/models.py:62
msgid "Uni etc." msgid "Uni etc."
msgstr "Universität o.ä." msgstr "Universität o.ä."
#: models.py:55 models.py:185 #: AKModel/models.py:63 AKModel/models.py:193
msgid "Web Link" msgid "Web Link"
msgstr "Internet Link" msgstr "Internet Link"
#: models.py:55 #: AKModel/models.py:63
msgid "Link to Homepage" msgid "Link to Homepage"
msgstr "Link zu Homepage oder Webseite" msgstr "Link zu Homepage oder Webseite"
#: models.py:61 #: AKModel/models.py:69
msgid "AK Owner" msgid "AK Owner"
msgstr "AK Leitung" msgstr "AK Leitung"
#: models.py:62 #: AKModel/models.py:70
msgid "AK Owners" msgid "AK Owners"
msgstr "AK Leitungen" msgstr "AK Leitungen"
#: models.py:104 #: AKModel/models.py:112
msgid "Name of the AK Category" msgid "Name of the AK Category"
msgstr "Name des AK Kategorie" msgstr "Name des AK Kategorie"
#: models.py:105 models.py:126 #: AKModel/models.py:113 AKModel/models.py:134
msgid "Color" msgid "Color"
msgstr "Farbe" msgstr "Farbe"
#: models.py:105 models.py:126 #: AKModel/models.py:113 AKModel/models.py:134
msgid "Color for displaying" msgid "Color for displaying"
msgstr "Farbe für die Anzeige" msgstr "Farbe für die Anzeige"
#: models.py:106 models.py:179 #: AKModel/models.py:114 AKModel/models.py:187
msgid "Description" msgid "Description"
msgstr "Beschreibung" msgstr "Beschreibung"
#: models.py:107 #: AKModel/models.py:115
msgid "Short description of this AK Category" msgid "Short description of this AK Category"
msgstr "Beschreibung der AK-Kategorie" msgstr "Beschreibung der AK-Kategorie"
#: models.py:114 #: AKModel/models.py:122
msgid "AK Categories" msgid "AK Categories"
msgstr "AK Kategorien" msgstr "AK Kategorien"
#: models.py:125 #: AKModel/models.py:133
msgid "Name of the AK Track" msgid "Name of the AK Track"
msgstr "Name des AK Tracks" msgstr "Name des AK Tracks"
#: models.py:132 #: AKModel/models.py:140
msgid "AK Track" msgid "AK Track"
msgstr "AK Track" msgstr "AK Track"
#: models.py:133 #: AKModel/models.py:141
msgid "AK Tracks" msgid "AK Tracks"
msgstr "AK Tracks" msgstr "AK Tracks"
#: models.py:144 #: AKModel/models.py:152
msgid "Name of the AK Tag" msgid "Name of the AK Tag"
msgstr "Name das AK Tags" msgstr "Name das AK Tags"
#: models.py:147 #: AKModel/models.py:155
msgid "AK Tag" msgid "AK Tag"
msgstr "AK Tag" msgstr "AK Tag"
#: models.py:148 #: AKModel/models.py:156
msgid "AK Tags" msgid "AK Tags"
msgstr "AK Tags" msgstr "AK Tags"
#: models.py:158 #: AKModel/models.py:166
msgid "Name of the Requirement" msgid "Name of the Requirement"
msgstr "Name der Anforderung" msgstr "Name der Anforderung"
#: models.py:164 #: AKModel/models.py:172
msgid "AK Requirement" msgid "AK Requirement"
msgstr "AK Anforderung" msgstr "AK Anforderung"
#: models.py:165 #: AKModel/models.py:173
msgid "AK Requirements" msgid "AK Requirements"
msgstr "AK Anforderungen" msgstr "AK Anforderungen"
#: models.py:176 #: AKModel/models.py:184
msgid "Name of the AK" msgid "Name of the AK"
msgstr "Name des AKs" msgstr "Name des AKs"
#: models.py:177 #: AKModel/models.py:185
msgid "Short Name" msgid "Short Name"
msgstr "Kurzer Name" msgstr "Kurzer Name"
#: models.py:178 #: AKModel/models.py:186
msgid "Name displayed in the schedule" msgid "Name displayed in the schedule"
msgstr "Name zur Anzeige im AK Plan" msgstr "Name zur Anzeige im AK Plan"
#: models.py:179 #: AKModel/models.py:187
msgid "Description of the AK" msgid "Description of the AK"
msgstr "Beschreibung des AKs" msgstr "Beschreibung des AKs"
#: models.py:181 #: AKModel/models.py:189
msgid "Owners" msgid "Owners"
msgstr "Leitungen" msgstr "Leitungen"
#: models.py:182 #: AKModel/models.py:190
msgid "Those organizing the AK" msgid "Those organizing the AK"
msgstr "Menschen, die den AK organisieren und halten" msgstr "Menschen, die den AK organisieren und halten"
#: models.py:185 #: AKModel/models.py:193
msgid "Link to wiki page" msgid "Link to wiki page"
msgstr "Link zur Wiki Seite" msgstr "Link zur Wiki Seite"
#: models.py:187 #: AKModel/models.py:195
msgid "Category" msgid "Category"
msgstr "Kategorie" msgstr "Kategorie"
#: models.py:188 #: AKModel/models.py:196
msgid "Category of the AK" msgid "Category of the AK"
msgstr "Kategorie des AKs" msgstr "Kategorie des AKs"
#: models.py:189 #: AKModel/models.py:197
msgid "Tags" msgid "Tags"
msgstr "Tags" msgstr "Tags"
#: models.py:189 #: AKModel/models.py:197
msgid "Tags provided by owners" msgid "Tags provided by owners"
msgstr "Tags, die durch die AK Leitung vergeben wurden" msgstr "Tags, die durch die AK Leitung vergeben wurden"
#: models.py:190 #: AKModel/models.py:198
msgid "Track" msgid "Track"
msgstr "Track" msgstr "Track"
#: models.py:191 #: AKModel/models.py:199
msgid "Track the AK belongs to" msgid "Track the AK belongs to"
msgstr "Track zu dem der AK gehört" msgstr "Track zu dem der AK gehört"
#: models.py:193 #: AKModel/models.py:201
msgid "Resolution Intention" msgid "Resolution Intention"
msgstr "Resolutionsabsicht" msgstr "Resolutionsabsicht"
#: models.py:194 #: AKModel/models.py:202
msgid "Intends to submit a resolution" msgid "Intends to submit a resolution"
msgstr "Beabsichtigt eine Resolution einzureichen" msgstr "Beabsichtigt eine Resolution einzureichen"
#: models.py:195 #: AKModel/models.py:203
msgid "Present this AK" msgid "Present this AK"
msgstr "AK Präsentieren" msgstr "AK Präsentieren"
#: models.py:196 #: AKModel/models.py:204
msgid "Present results of this AK" msgid "Present results of this AK"
msgstr "Die Ergebnisse dieses AKs vorstellen" msgstr "Die Ergebnisse dieses AKs vorstellen"
#: models.py:198 #: AKModel/models.py:206
msgid "Requirements" msgid "Requirements"
msgstr "Anforderungen" msgstr "Anforderungen"
#: models.py:199 #: AKModel/models.py:207
msgid "AK's Requirements" msgid "AK's Requirements"
msgstr "Anforderungen des AKs" msgstr "Anforderungen des AKs"
#: models.py:201 #: AKModel/models.py:209
msgid "Conflicting AKs" msgid "Conflicting AKs"
msgstr "AK Konflikte" msgstr "AK Konflikte"
#: models.py:202 #: AKModel/models.py:210
msgid "AKs that conflict and thus must not take place at the same time" msgid "AKs that conflict and thus must not take place at the same time"
msgstr "" msgstr ""
"AKs, die Konflikte haben und deshalb nicht gleichzeitig stattfinden dürfen" "AKs, die Konflikte haben und deshalb nicht gleichzeitig stattfinden dürfen"
#: models.py:203 #: AKModel/models.py:211
msgid "Prerequisite AKs" msgid "Prerequisite AKs"
msgstr "Vorausgesetzte AKs" msgstr "Vorausgesetzte AKs"
#: models.py:204 #: AKModel/models.py:212
msgid "AKs that should precede this AK in the schedule" msgid "AKs that should precede this AK in the schedule"
msgstr "AKS die im AK Plan vor diesem AK stattfinden müssen" msgstr "AKS die im AK Plan vor diesem AK stattfinden müssen"
#: models.py:206 #: AKModel/models.py:214
#, fuzzy #, fuzzy
#| msgid "Internal Notes" #| msgid "Internal Notes"
msgid "Organizational Notes" msgid "Organizational Notes"
msgstr "Interne Notizen" msgstr "Interne Notizen"
#: models.py:207 #: AKModel/models.py:215
msgid "" msgid ""
"Notes to organizers. These are public. For private notes, please send an e-" "Notes to organizers. These are public. For private notes, please send an e-"
"mail." "mail."
msgstr "Notizen an die Organisator*innen. Diese sind öffentlich, für private Anmerkungen bitte eine E-Mail schicken." msgstr ""
"Notizen an die Organisator*innen. Diese sind öffentlich, für private "
"Anmerkungen bitte eine E-Mail schicken."
#: models.py:209 #: AKModel/models.py:217
msgid "Interest" msgid "Interest"
msgstr "Interesse" msgstr "Interesse"
#: models.py:209 #: AKModel/models.py:217
msgid "Expected number of people" msgid "Expected number of people"
msgstr "Erwartete Personenzahl" msgstr "Erwartete Personenzahl"
#: models.py:216 #: AKModel/models.py:218
#, fuzzy
#| msgid "Interest"
msgid "Interest Counter"
msgstr "Interesse"
#: AKModel/models.py:219
msgid "People who have indicated interest online"
msgstr "Anzahl Personen, die online Interesse bekundet haben"
#: AKModel/models.py:226
msgid "AKs" msgid "AKs"
msgstr "AKs" msgstr "AKs"
#: models.py:240 #: AKModel/models.py:254
msgid "Name or number of the room" msgid "Name or number of the room"
msgstr "Name oder Nummer des Raums" msgstr "Name oder Nummer des Raums"
#: models.py:241 #: AKModel/models.py:255
msgid "Building" msgid "Building"
msgstr "Gebäude" msgstr "Gebäude"
#: models.py:242 #: AKModel/models.py:256
msgid "Name or number of the building" msgid "Name or number of the building"
msgstr "Name oder Nummer des Gebäudes" msgstr "Name oder Nummer des Gebäudes"
#: models.py:243 #: AKModel/models.py:257
msgid "Capacity" msgid "Capacity"
msgstr "Kapazität" msgstr "Kapazität"
#: models.py:243 #: AKModel/models.py:257
msgid "Maximum number of people" msgid "Maximum number of people"
msgstr "Maximale Personenzahl" msgstr "Maximale Personenzahl"
#: models.py:244 #: AKModel/models.py:258
msgid "Properties" msgid "Properties"
msgstr "Eigenschaften" msgstr "Eigenschaften"
#: models.py:245 #: AKModel/models.py:259
msgid "AK requirements fulfilled by the room" msgid "AK requirements fulfilled by the room"
msgstr "AK Anforderungen, die dieser Raum erfüllt" msgstr "AK Anforderungen, die dieser Raum erfüllt"
#: models.py:252 #: AKModel/models.py:266
msgid "Rooms" msgid "Rooms"
msgstr "Räume" msgstr "Räume"
#: models.py:269 #: AKModel/models.py:283
msgid "AK being mapped" msgid "AK being mapped"
msgstr "AK, der zugeordnet wird" msgstr "AK, der zugeordnet wird"
#: models.py:271 #: AKModel/models.py:285
msgid "Room the AK will take place in" msgid "Room the AK will take place in"
msgstr "Raum in dem der AK stattfindet" msgstr "Raum in dem der AK stattfindet"
#: models.py:272 #: AKModel/models.py:286
msgid "Slot Begin" msgid "Slot Begin"
msgstr "Beginn des Slots" msgstr "Beginn des Slots"
#: models.py:272 #: AKModel/models.py:286
msgid "Time and date the slot begins" msgid "Time and date the slot begins"
msgstr "Zeit und Datum zu der der AK beginnt" msgstr "Zeit und Datum zu der der AK beginnt"
#: models.py:274 #: AKModel/models.py:288
msgid "Duration" msgid "Duration"
msgstr "Dauer" msgstr "Dauer"
#: models.py:275 #: AKModel/models.py:289
msgid "Length in hours" msgid "Length in hours"
msgstr "Länge in Stunden" msgstr "Länge in Stunden"
#: models.py:280 #: AKModel/models.py:294
msgid "Last update" msgid "Last update"
msgstr "Letzte Aktualisierung" msgstr "Letzte Aktualisierung"
#: models.py:283 #: AKModel/models.py:297
msgid "AK Slot" msgid "AK Slot"
msgstr "AK Slot" msgstr "AK Slot"
#: models.py:284 #: AKModel/models.py:298
msgid "AK Slots" msgid "AK Slots"
msgstr "AK Slot" msgstr "AK Slot"
#: models.py:298 #: AKModel/models.py:312
msgid "Not scheduled yet" msgid "Not scheduled yet"
msgstr "Noch nicht geplant" msgstr "Noch nicht geplant"
......
AKModel/migrations/0030_AK_interest_counter.py 0 → 100644
+ 18
− 0
View file @ a6e70ece
# Generated by Django 2.2.6 on 2020-05-10 19:56
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('AKModel', '0029_AK_notes'),
]
operations = [
migrations.AddField(
model_name='ak',
name='interest_counter',
field=models.IntegerField(default=0, help_text='People who have indicated interest online',
verbose_name='Interest Counter'),
),
]
AKModel/models.py
+ 6
− 0
View file @ a6e70ece
...@@ -211,6 +211,8 @@ class AK(models.Model): ...@@ -211,6 +211,8 @@ class AK(models.Model):
'Notes to organizers. These are public. For private notes, please send an e-mail.')) 'Notes to organizers. These are public. For private notes, please send an e-mail.'))
interest = models.IntegerField(default=-1, verbose_name=_('Interest'), help_text=_('Expected number of people')) interest = models.IntegerField(default=-1, verbose_name=_('Interest'), help_text=_('Expected number of people'))
interest_counter = models.IntegerField(default=0, verbose_name=_('Interest Counter'),
help_text=_('People who have indicated interest online'))
event = models.ForeignKey(to=Event, on_delete=models.CASCADE, verbose_name=_('Event'), event = models.ForeignKey(to=Event, on_delete=models.CASCADE, verbose_name=_('Event'),
help_text=_('Associated event')) help_text=_('Associated event'))
...@@ -237,6 +239,10 @@ class AK(models.Model): ...@@ -237,6 +239,10 @@ class AK(models.Model):
def wish(self): def wish(self):
return self.owners.count() == 0 return self.owners.count() == 0
def increment_interest(self):
self.interest_counter += 1
self.save()
class Room(models.Model): class Room(models.Model):
""" A room describes where an AK can be held. """ A room describes where an AK can be held.
......
AKSubmission/locale/de_DE/LC_MESSAGES/django.po
+ 107
− 101
View file @ a6e70ece
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-10 17:14+0000\n" "POT-Creation-Date: 2020-05-10 20:54+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -17,20 +17,20 @@ msgstr "" ...@@ -17,20 +17,20 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: forms.py:43 #: AKSubmission/forms.py:43
msgid "Separate multiple tags with semicolon" msgid "Separate multiple tags with semicolon"
msgstr "Mehrere Tags mit Semikolon trennen" msgstr "Mehrere Tags mit Semikolon trennen"
#: forms.py:69 #: AKSubmission/forms.py:69
#, python-format #, python-format
msgid "\"%(duration)s\" is not a valid duration" msgid "\"%(duration)s\" is not a valid duration"
msgstr "\"%(duration)s\" ist keine gültige Dauer" msgstr "\"%(duration)s\" ist keine gültige Dauer"
#: forms.py:112 #: AKSubmission/forms.py:112
msgid "Duration(s)" msgid "Duration(s)"
msgstr "Dauer(n)" msgstr "Dauer(n)"
#: forms.py:114 #: AKSubmission/forms.py:114
msgid "" msgid ""
"Enter at least one planned duration (in hours). If your AK should have " "Enter at least one planned duration (in hours). If your AK should have "
"multiple slots, use multiple lines" "multiple slots, use multiple lines"
...@@ -38,261 +38,267 @@ msgstr "" ...@@ -38,261 +38,267 @@ msgstr ""
"Mindestens eine geplante Dauer (in Stunden) angeben. Wenn der AK mehrere " "Mindestens eine geplante Dauer (in Stunden) angeben. Wenn der AK mehrere "
"Slots haben soll, mehrere Zeilen verwenden" "Slots haben soll, mehrere Zeilen verwenden"
#: templates/AKSubmission/ak_detail.html:10 #: AKSubmission/templates/AKSubmission/ak_detail.html:10
#: templates/AKSubmission/ak_edit.html:8 templates/AKSubmission/ak_list.html:8 #: AKSubmission/templates/AKSubmission/ak_edit.html:8
#: templates/AKSubmission/akowner_create_update.html:7 #: AKSubmission/templates/AKSubmission/ak_list.html:8
#: templates/AKSubmission/akslot_add_update.html:7 #: AKSubmission/templates/AKSubmission/akowner_create_update.html:7
#: templates/AKSubmission/akslot_delete.html:7 #: AKSubmission/templates/AKSubmission/akslot_add_update.html:7
#: templates/AKSubmission/submission_overview.html:6 #: AKSubmission/templates/AKSubmission/akslot_delete.html:7
#: templates/AKSubmission/submission_overview.html:23 #: AKSubmission/templates/AKSubmission/submission_overview.html:6
#: templates/AKSubmission/submit_new.html:8 #: AKSubmission/templates/AKSubmission/submission_overview.html:23
#: templates/AKSubmission/submit_new_wish.html:5 #: AKSubmission/templates/AKSubmission/submit_new.html:8
#: AKSubmission/templates/AKSubmission/submit_new_wish.html:5
msgid "AKs" msgid "AKs"
msgstr "AKs" msgstr "AKs"
#: templates/AKSubmission/ak_detail.html:10 #: AKSubmission/templates/AKSubmission/ak_detail.html:10
#: templates/AKSubmission/akslot_delete.html:31 #: AKSubmission/templates/AKSubmission/akslot_delete.html:31
msgid "AK" msgid "AK"
msgstr "AK" msgstr "AK"
#: templates/AKSubmission/ak_detail.html:15 #: AKSubmission/templates/AKSubmission/ak_detail.html:15
#: templates/AKSubmission/ak_edit.html:13 #: AKSubmission/templates/AKSubmission/ak_edit.html:13
#: templates/AKSubmission/ak_list.html:22 #: AKSubmission/templates/AKSubmission/ak_list.html:22
#: templates/AKSubmission/akowner_create_update.html:12 #: AKSubmission/templates/AKSubmission/akowner_create_update.html:12
#: templates/AKSubmission/akslot_add_update.html:12 #: AKSubmission/templates/AKSubmission/akslot_add_update.html:12
#: templates/AKSubmission/akslot_delete.html:12 #: AKSubmission/templates/AKSubmission/akslot_delete.html:12
#: templates/AKSubmission/submission_overview.html:6 #: AKSubmission/templates/AKSubmission/submission_overview.html:6
#: templates/AKSubmission/submission_overview.html:19 #: AKSubmission/templates/AKSubmission/submission_overview.html:19
#: templates/AKSubmission/submit_new.html:18 #: AKSubmission/templates/AKSubmission/submit_new.html:18
#: templates/AKSubmission/submit_new_wish.html:10 #: AKSubmission/templates/AKSubmission/submit_new_wish.html:10
msgid "AK Submission" msgid "AK Submission"
msgstr "AK-Eintragung" msgstr "AK-Eintragung"
#: templates/AKSubmission/ak_detail.html:37 #: AKSubmission/templates/AKSubmission/ak_detail.html:29
#: templates/AKSubmission/ak_list_table.html:32 msgid "Interest"
msgstr "Interesse"
#: AKSubmission/templates/AKSubmission/ak_detail.html:42
#: AKSubmission/templates/AKSubmission/ak_list_table.html:32
msgid "AK Wish" msgid "AK Wish"
msgstr "AK-Wunsch" msgstr "AK-Wunsch"
#: templates/AKSubmission/ak_detail.html:41 #: AKSubmission/templates/AKSubmission/ak_detail.html:46
#: templates/AKSubmission/ak_list_table.html:10 #: AKSubmission/templates/AKSubmission/ak_list_table.html:10
msgid "Who?" msgid "Who?"
msgstr "Wer?" msgstr "Wer?"
#: templates/AKSubmission/ak_detail.html:45 #: AKSubmission/templates/AKSubmission/ak_detail.html:50
#: templates/AKSubmission/ak_list_table.html:11 #: AKSubmission/templates/AKSubmission/ak_list_table.html:11
msgid "Category" msgid "Category"
msgstr "Kategorie" msgstr "Kategorie"
#: templates/AKSubmission/ak_detail.html:51 #: AKSubmission/templates/AKSubmission/ak_detail.html:56
msgid "Present this AK" msgid "Present this AK"
msgstr "Diesen AK vorstellen" msgstr "Diesen AK vorstellen"
#: templates/AKSubmission/ak_detail.html:55 #: AKSubmission/templates/AKSubmission/ak_detail.html:60
#: templates/AKSubmission/ak_list.html:35 #: AKSubmission/templates/AKSubmission/ak_list.html:35
#: templates/AKSubmission/ak_list_table.html:12 #: AKSubmission/templates/AKSubmission/ak_list_table.html:12
msgid "Tags" msgid "Tags"
msgstr "Tags" msgstr "Tags"
#: templates/AKSubmission/ak_detail.html:61 #: AKSubmission/templates/AKSubmission/ak_detail.html:66
msgid "Reso?" msgid "Reso?"
msgstr "Reso?" msgstr "Reso?"
#: templates/AKSubmission/ak_detail.html:68 #: AKSubmission/templates/AKSubmission/ak_detail.html:73
msgid "Requirements" msgid "Requirements"
msgstr "Anforderungen" msgstr "Anforderungen"
#: templates/AKSubmission/ak_detail.html:81 #: AKSubmission/templates/AKSubmission/ak_detail.html:86
msgid "Conflicting AKs" msgid "Conflicting AKs"
msgstr "AK Konflikte" msgstr "AK Konflikte"
#: templates/AKSubmission/ak_detail.html:89 #: AKSubmission/templates/AKSubmission/ak_detail.html:94
msgid "Prerequisite AKs" msgid "Prerequisite AKs"
msgstr "AK Voraussetzungen" msgstr "AK Voraussetzungen"
#: templates/AKSubmission/ak_detail.html:97 #: AKSubmission/templates/AKSubmission/ak_detail.html:102
msgid "Notes" msgid "Notes"
msgstr "Notizen" msgstr "Notizen"
#: templates/AKSubmission/ak_detail.html:114 #: AKSubmission/templates/AKSubmission/ak_detail.html:119
msgid "When?" msgid "When?"
msgstr "Wann?" msgstr "Wann?"
#: templates/AKSubmission/ak_detail.html:115 #: AKSubmission/templates/AKSubmission/ak_detail.html:120
#: templates/AKSubmission/akslot_delete.html:35 #: AKSubmission/templates/AKSubmission/akslot_delete.html:35
msgid "Duration" msgid "Duration"
msgstr "Dauer" msgstr "Dauer"
#: templates/AKSubmission/ak_detail.html:116 #: AKSubmission/templates/AKSubmission/ak_detail.html:121
msgid "Room" msgid "Room"
msgstr "Raum" msgstr "Raum"
#: templates/AKSubmission/ak_detail.html:142 #: AKSubmission/templates/AKSubmission/ak_detail.html:147
msgid "Add another slot" msgid "Add another slot"
msgstr "Einen neuen AK-Slot hinzufügen" msgstr "Einen neuen AK-Slot hinzufügen"
#: templates/AKSubmission/ak_edit.html:8 templates/AKSubmission/ak_edit.html:21 #: AKSubmission/templates/AKSubmission/ak_edit.html:8
#: AKSubmission/templates/AKSubmission/ak_edit.html:21
msgid "Edit AK" msgid "Edit AK"
msgstr "AK bearbeiten" msgstr "AK bearbeiten"
#: templates/AKSubmission/ak_edit.html:16 #: AKSubmission/templates/AKSubmission/ak_edit.html:16
msgid "Edit" msgid "Edit"
msgstr "Bearbeiten" msgstr "Bearbeiten"
#: templates/AKSubmission/ak_list.html:23 #: AKSubmission/templates/AKSubmission/ak_list.html:23
#: templates/AKSubmission/ak_list.html:27 #: AKSubmission/templates/AKSubmission/ak_list.html:27
msgid "AK List" msgid "AK List"
msgstr "AK Liste" msgstr "AK Liste"
#: templates/AKSubmission/ak_list.html:29 #: AKSubmission/templates/AKSubmission/ak_list.html:29
msgid "Categories" msgid "Categories"
msgstr "Kategorie" msgstr "Kategorie"
#: templates/AKSubmission/ak_list_table.html:9 #: AKSubmission/templates/AKSubmission/ak_list_table.html:9
msgid "Name" msgid "Name"
msgstr "Name" msgstr "Name"
#: templates/AKSubmission/ak_list_table.html:23 #: AKSubmission/templates/AKSubmission/ak_list_table.html:23
msgid "present this AK" msgid "present this AK"
msgstr "Diesen AK vorstellen" msgstr "Diesen AK vorstellen"
#: templates/AKSubmission/ak_list_table.html:27 #: AKSubmission/templates/AKSubmission/ak_list_table.html:27
msgid "Reso" msgid "Reso"
msgstr "Reso" msgstr "Reso"
#: templates/AKSubmission/akowner_create_update.html:7 #: AKSubmission/templates/AKSubmission/akowner_create_update.html:7
#: templates/AKSubmission/akowner_create_update.html:13 #: AKSubmission/templates/AKSubmission/akowner_create_update.html:13
#: templates/AKSubmission/akowner_create_update.html:18 #: AKSubmission/templates/AKSubmission/akowner_create_update.html:18
msgid "AK Owner" msgid "AK Owner"
msgstr "AK-Leitung" msgstr "AK-Leitung"
#: templates/AKSubmission/akowner_create_update.html:24 #: AKSubmission/templates/AKSubmission/akowner_create_update.html:24
#: templates/AKSubmission/akslot_add_update.html:26 #: AKSubmission/templates/AKSubmission/akslot_add_update.html:26
#: templates/AKSubmission/submit_new.html:34 #: AKSubmission/templates/AKSubmission/submit_new.html:34
msgid "Reset" msgid "Reset"
msgstr "Zurücksetzen" msgstr "Zurücksetzen"
#: templates/AKSubmission/akowner_create_update.html:28 #: AKSubmission/templates/AKSubmission/akowner_create_update.html:28
#: templates/AKSubmission/akslot_add_update.html:30 #: AKSubmission/templates/AKSubmission/akslot_add_update.html:30
#: templates/AKSubmission/akslot_delete.html:42 #: AKSubmission/templates/AKSubmission/akslot_delete.html:42
#: templates/AKSubmission/submit_new.html:38 #: AKSubmission/templates/AKSubmission/submit_new.html:38
msgid "Cancel" msgid "Cancel"
msgstr "Abbrechen" msgstr "Abbrechen"
#: templates/AKSubmission/akowner_create_update.html:31 #: AKSubmission/templates/AKSubmission/akowner_create_update.html:31
#: templates/AKSubmission/akslot_add_update.html:33 #: AKSubmission/templates/AKSubmission/akslot_add_update.html:33
msgid "Continue" msgid "Continue"
msgstr "Weiter" msgstr "Weiter"
#: templates/AKSubmission/akslot_add_update.html:7 #: AKSubmission/templates/AKSubmission/akslot_add_update.html:7
#: templates/AKSubmission/akslot_add_update.html:15 #: AKSubmission/templates/AKSubmission/akslot_add_update.html:15
#: templates/AKSubmission/akslot_add_update.html:20 #: AKSubmission/templates/AKSubmission/akslot_add_update.html:20
#: templates/AKSubmission/akslot_delete.html:7 #: AKSubmission/templates/AKSubmission/akslot_delete.html:7
#: templates/AKSubmission/akslot_delete.html:15 #: AKSubmission/templates/AKSubmission/akslot_delete.html:15
#: templates/AKSubmission/akslot_delete.html:20 #: AKSubmission/templates/AKSubmission/akslot_delete.html:20
msgid "AK Duration(s)" msgid "AK Duration(s)"
msgstr "AK-Dauer(n)" msgstr "AK-Dauer(n)"
#: templates/AKSubmission/akslot_delete.html:25 #: AKSubmission/templates/AKSubmission/akslot_delete.html:25
msgid "Do you really want to delete this AK Slot?" msgid "Do you really want to delete this AK Slot?"
msgstr "Willst du diesen AK-Slot wirklich löschen?" msgstr "Willst du diesen AK-Slot wirklich löschen?"
#: templates/AKSubmission/akslot_delete.html:45 #: AKSubmission/templates/AKSubmission/akslot_delete.html:45
msgid "Confirm" msgid "Confirm"
msgstr "Bestätigen" msgstr "Bestätigen"
#: templates/AKSubmission/submission_base.html:13 #: AKSubmission/templates/AKSubmission/submission_base.html:13
msgid "Write to organizers of this event for questions and comments" msgid "Write to organizers of this event for questions and comments"
msgstr "Fragen oder Kommentare? Schreib den Orgas dieses Events eine Mail" msgstr "Fragen oder Kommentare? Schreib den Orgas dieses Events eine Mail"
#: templates/AKSubmission/submission_overview.html:27 #: AKSubmission/templates/AKSubmission/submission_overview.html:27
msgid "" msgid ""
"On this page you can see a list of current AKs, change them and add new ones." "On this page you can see a list of current AKs, change them and add new ones."
msgstr "" msgstr ""
"Auf dieser Seite kannst du eine Liste von aktuellen AKs sehen, diese " "Auf dieser Seite kannst du eine Liste von aktuellen AKs sehen, diese "
"bearbeiten und neue hinzufügen." "bearbeiten und neue hinzufügen."
#: templates/AKSubmission/submission_overview.html:34 #: AKSubmission/templates/AKSubmission/submission_overview.html:34
#: templates/AKSubmission/submit_new_wish.html:5 #: AKSubmission/templates/AKSubmission/submit_new_wish.html:5
#: templates/AKSubmission/submit_new_wish.html:11 #: AKSubmission/templates/AKSubmission/submit_new_wish.html:11
#: templates/AKSubmission/submit_new_wish.html:15 #: AKSubmission/templates/AKSubmission/submit_new_wish.html:15
msgid "New AK Wish" msgid "New AK Wish"
msgstr "Neuer AK-Wunsch" msgstr "Neuer AK-Wunsch"
#: templates/AKSubmission/submission_overview.html:38 #: AKSubmission/templates/AKSubmission/submission_overview.html:38
msgid "Who" msgid "Who"
msgstr "Wer" msgstr "Wer"
#: templates/AKSubmission/submission_overview.html:41 #: AKSubmission/templates/AKSubmission/submission_overview.html:41
msgid "I do not own AKs yet" msgid "I do not own AKs yet"
msgstr "Ich leite bisher keine AKs" msgstr "Ich leite bisher keine AKs"
#: templates/AKSubmission/submission_overview.html:49 #: AKSubmission/templates/AKSubmission/submission_overview.html:49
#: templates/AKSubmission/submit_new.html:8 #: AKSubmission/templates/AKSubmission/submit_new.html:8
#: templates/AKSubmission/submit_new.html:21 #: AKSubmission/templates/AKSubmission/submit_new.html:21
#: templates/AKSubmission/submit_new.html:28 #: AKSubmission/templates/AKSubmission/submit_new.html:28
msgid "New AK" msgid "New AK"
msgstr "Neuer AK" msgstr "Neuer AK"
#: templates/AKSubmission/submission_overview.html:55 #: AKSubmission/templates/AKSubmission/submission_overview.html:55
msgid "Edit Person Info" msgid "Edit Person Info"
msgstr "Personen-Info bearbeiten" msgstr "Personen-Info bearbeiten"
#: templates/AKSubmission/submission_overview.html:62 #: AKSubmission/templates/AKSubmission/submission_overview.html:62
msgid "This event is not active. You cannot add or change AKs" msgid "This event is not active. You cannot add or change AKs"
msgstr "" msgstr ""
"Dieses Event is nicht aktiv. Es können keine AKs hinzugefügt oder bearbeitet " "Dieses Event is nicht aktiv. Es können keine AKs hinzugefügt oder bearbeitet "
"werden" "werden"
#: templates/AKSubmission/submission_overview.html:66 #: AKSubmission/templates/AKSubmission/submission_overview.html:66
msgid "Current AKs" msgid "Current AKs"
msgstr "Aktuelle AKs" msgstr "Aktuelle AKs"
#: templates/AKSubmission/submit_new.html:41 #: AKSubmission/templates/AKSubmission/submit_new.html:41
msgid "Submit" msgid "Submit"
msgstr "Eintragen" msgstr "Eintragen"
#: views.py:42 #: AKSubmission/views.py:42
msgid "Wishes" msgid "Wishes"
msgstr "Wünsche" msgstr "Wünsche"
#: views.py:42 #: AKSubmission/views.py:42
msgid "AKs one would like to have" msgid "AKs one would like to have"
msgstr "" msgstr ""
"AKs die sich gewünscht wurden, aber bei denen noch nicht klar ist, wer sie " "AKs die sich gewünscht wurden, aber bei denen noch nicht klar ist, wer sie "
"macht. Falls du dir das vorstellen kannst, trag dich einfach ein" "macht. Falls du dir das vorstellen kannst, trag dich einfach ein"
#: views.py:103 #: AKSubmission/views.py:103
msgid "AK successfully created" msgid "AK successfully created"
msgstr "AK erfolgreich angelegt" msgstr "AK erfolgreich angelegt"
#: views.py:156 #: AKSubmission/views.py:156
msgid "AK successfully updated" msgid "AK successfully updated"
msgstr "AK erfolgreich aktualisiert" msgstr "AK erfolgreich aktualisiert"
#: views.py:211 #: AKSubmission/views.py:222
msgid "Person Info successfully updated" msgid "Person Info successfully updated"
msgstr "Personen-Info erfolgreich aktualisiert" msgstr "Personen-Info erfolgreich aktualisiert"
#: views.py:224 #: AKSubmission/views.py:235
msgid "No user selected" msgid "No user selected"
msgstr "Keine Person ausgewählt" msgstr "Keine Person ausgewählt"
#: views.py:250 #: AKSubmission/views.py:261
msgid "AK Slot successfully added" msgid "AK Slot successfully added"
msgstr "AK-Slot erfolgreich angelegt" msgstr "AK-Slot erfolgreich angelegt"
#: views.py:264 #: AKSubmission/views.py:275
msgid "You cannot edit a slot that has already been scheduled" msgid "You cannot edit a slot that has already been scheduled"
msgstr "Bereits geplante AK-Slots können nicht mehr bearbeitet werden" msgstr "Bereits geplante AK-Slots können nicht mehr bearbeitet werden"
#: views.py:274 #: AKSubmission/views.py:285
msgid "AK Slot successfully updated" msgid "AK Slot successfully updated"
msgstr "AK-Slot erfolgreich aktualisiert" msgstr "AK-Slot erfolgreich aktualisiert"
#: views.py:287 #: AKSubmission/views.py:298
msgid "You cannot delete a slot that has already been scheduled" msgid "You cannot delete a slot that has already been scheduled"
msgstr "Bereits geplante AK-Slots können nicht mehr gelöscht werden" msgstr "Bereits geplante AK-Slots können nicht mehr gelöscht werden"
#: views.py:297 #: AKSubmission/views.py:308
msgid "AK Slot successfully deleted" msgid "AK Slot successfully deleted"
msgstr "AK-Slot erfolgreich angelegt" msgstr "AK-Slot erfolgreich angelegt"
AKSubmission/templates/AKSubmission/ak_detail.html
+ 8
− 2
View file @ a6e70ece
...@@ -26,13 +26,19 @@ ...@@ -26,13 +26,19 @@
{% include "AKSubmission/messages.html" %} {% include "AKSubmission/messages.html" %}
<div class="float-right"> <div class="float-right">
{% if ak.interest_counter >= 0 %}
{% trans 'Interest' %}: <b class='mx-1 text-muted'>{{ ak.interest_counter }}</b>
<a href="{% url 'submit:inc_interest' event_slug=ak.event.slug pk=ak.pk %}"
class="btn btn-primary">{% fa5_icon 'thumbs-up' 'fas' %}</a>
{% endif %}
{% if ak.link != "" %} {% if ak.link != "" %}
<a href="{{ ak.link }}" class="btn btn-info">{% fa5_icon 'external-link-alt' 'fas' %}</a> <a href="{{ ak.link }}" class="btn btn-info">{% fa5_icon 'external-link-alt' 'fas' %}</a>
{% endif %} {% endif %}
{% if ak.event.active %} {% if ak.event.active %}
<a href="{% url 'submit:ak_edit' event_slug=ak.event.slug pk=ak.pk %}" <a href="{% url 'submit:ak_edit' event_slug=ak.event.slug pk=ak.pk %}"
class="btn btn-success">{% fa5_icon 'pencil-alt' 'fas' %}</a> class="btn btn-success">{% fa5_icon 'pencil-alt' 'fas' %}</a>
{% endif %} </div> {% endif %}
</div>
<h2>{% if ak.wish %}{% trans "AK Wish" %}: {% endif %}{{ ak.name }}</h2> <h2>{% if ak.wish %}{% trans "AK Wish" %}: {% endif %}{{ ak.name }}</h2>
......
AKSubmission/urls.py
+ 1
− 0
View file @ a6e70ece
...@@ -11,6 +11,7 @@ urlpatterns = [ ...@@ -11,6 +11,7 @@ urlpatterns = [
path('', views.SubmissionOverviewView.as_view(), name='submission_overview'), path('', views.SubmissionOverviewView.as_view(), name='submission_overview'),
path('ak/<int:pk>/', views.AKDetailView.as_view(), name='ak_detail'), path('ak/<int:pk>/', views.AKDetailView.as_view(), name='ak_detail'),
path('ak/<int:pk>/edit/', views.AKEditView.as_view(), name='ak_edit'), path('ak/<int:pk>/edit/', views.AKEditView.as_view(), name='ak_edit'),
path('ak/<int:pk>/interest/', views.AKInterestView.as_view(), name='inc_interest'),
path('ak/<int:pk>/add_slot/', views.AKSlotAddView.as_view(), name='akslot_add'), path('ak/<int:pk>/add_slot/', views.AKSlotAddView.as_view(), name='akslot_add'),
path('akslot/<int:pk>/edit/', views.AKSlotEditView.as_view(), name='akslot_edit'), path('akslot/<int:pk>/edit/', views.AKSlotEditView.as_view(), name='akslot_edit'),
path('akslot/<int:pk>/delete/', views.AKSlotDeleteView.as_view(), name='akslot_delete'), path('akslot/<int:pk>/delete/', views.AKSlotDeleteView.as_view(), name='akslot_delete'),
......
AKSubmission/views.py
+ 13
− 1
View file @ a6e70ece
...@@ -5,7 +5,7 @@ from django.shortcuts import get_object_or_404, redirect ...@@ -5,7 +5,7 @@ from django.shortcuts import get_object_or_404, redirect
from django.urls import reverse_lazy from django.urls import reverse_lazy
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from django.views import View from django.views import View
from django.views.generic import ListView, DetailView, CreateView, UpdateView, DeleteView from django.views.generic import ListView, DetailView, CreateView, UpdateView, DeleteView, RedirectView
from AKModel.models import AK, AKCategory, AKTag, AKOwner, AKSlot from AKModel.models import AK, AKCategory, AKTag, AKOwner, AKSlot
from AKModel.views import EventSlugMixin from AKModel.views import EventSlugMixin
...@@ -170,6 +170,18 @@ class AKEditView(EventSlugMixin, UpdateView): ...@@ -170,6 +170,18 @@ class AKEditView(EventSlugMixin, UpdateView):
return super_form_valid return super_form_valid
class AKInterestView(RedirectView):
permanent = False
pattern_name = 'submit:ak_detail'
def get_redirect_url(self, *args, **kwargs):
ak = get_object_or_404(AK, pk=kwargs['pk'])
ak.increment_interest()
return super().get_redirect_url(*args, **kwargs)
pass
class AKOwnerCreateView(EventSlugMixin, CreateView): class AKOwnerCreateView(EventSlugMixin, CreateView):
model = AKOwner model = AKOwner
template_name = 'AKSubmission/akowner_create_update.html' template_name = 'AKSubmission/akowner_create_update.html'
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment