bofh/fet2020
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merged

Browse Source
This commit is contained in:
Andreas Stephanides
2020-09-07 06:34:37 +00:00
parent f9d8edc81a e490980d3e
commit dae31408d5
7 changed files with 100 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fet2020/members/models.py
View File

@@ -72,11 +72,13 @@ class MemberManager(models.Manager):
class JobManager(models.Manager):
def get_job_names(self, slug):
tmp_list = []
job_list = []
slug_list = []
for i in self.get_queryset().filter(Q(job__job_group__slug=slug)):
if i.job.name not in tmp_list:
tmp_list.append(i.job.name)
return tmp_list
if i.job.name not in job_list:
job_list.append(i.job.name)
slug_list.append(i.job.slug)
return job_list, slug_list
class Member(models.Model):

34
fet2020/members/views.py
View File

@@ -1,3 +1,4 @@
from django.http import Http404
from django.shortcuts import render
from collections import deque
@@ -9,16 +10,9 @@ from rest_framework import permissions
# from django_filters.rest_framework import DjangoFilterBackend
def index(request, slug=None, filter=None):
def index(request):
job_group = deque(JobGroup.objects.all())
members = None
if filter is None:
members = deque(Member.all_members.all())
elif filter in Member.MemberRole:
members = deque(Member.all_members.filter(role=filter))
else:
members = None
members = deque(Member.all_members.all())
context = {
"job_group": job_group,
@@ -32,12 +26,18 @@ def jobs_view(request, slug=None):
job_group = deque(JobGroup.objects.all())
job_list = []
job_names = JobMember.jobs.get_job_names(slug=slug)
job_names, slug_list = JobMember.jobs.get_job_names(slug=slug)
if not job_names:
raise Http404("no jobs")
active_members = JobMember.active_member.get_members_of_job(job_names=job_names)
inactive_members = JobMember.inactive_member.get_members_of_job(job_names=job_names)
for idx, item in enumerate(job_names):
job_list.append((job_names[idx], active_members[idx], inactive_members[idx]))
job_list.append(
(job_names[idx], active_members[idx], inactive_members[idx], slug_list[idx])
)
context = {
"job_group": job_group, # Das sind die Tabs
@@ -49,12 +49,10 @@ def jobs_view(request, slug=None):
def members_view(request, filter=None):
job_group = deque(JobGroup.objects.all())
if filter is None:
members = deque(Member.all_members.all())
elif filter in Member.MemberRole:
if filter in Member.MemberRole:
members = deque(Member.all_members.filter(role=filter))
else:
members = None
raise Http404("no member role")
context = {
"job_group": job_group,
@@ -66,10 +64,10 @@ def members_view(request, filter=None):
def profile_view(request, member_name=None):
job_group = deque(JobGroup.objects.all())
member = None
jobs = None
member = deque(Member.all_members.filter(nickname=member_name))
if not member:
raise Http404("no member")
jobs = deque(JobMember.members.filter(member__nickname=member_name))
context = {

5
fet2020/posts/admin.py
View File

@@ -23,7 +23,7 @@ class MyPostAdmin(admin.ModelAdmin):
form = MyPostForm
model = Post
list_filter = ['is_pinned', 'is_hidden']
list_display = ['title', 'subtitle', 'slug', 'public_date', 'is_pinned', 'is_hidden']
list_display = ['title', 'slug', 'public_date', 'is_pinned', 'is_hidden']
ordering = ['is_hidden', '-public_date']
def add_view(self, request, form_url='', extra_context=None):
@@ -60,7 +60,8 @@ class MyPostAdmin(admin.ModelAdmin):
class MyEventAdmin(MyPostAdmin):
form = MyEventForm
model = Event
list_display = ['title', 'subtitle', 'slug', 'event_start', 'public_date', 'is_pinned']
list_filter = ['is_pinned']
list_display = ['title', 'slug', 'event_start', 'public_date', 'is_pinned']
ordering = ['-event_start']
actions = [make_fetmeeting]

54
fet2020/posts/forms.py
View File

@@ -1,5 +1,7 @@
from ckeditor_uploader.widgets import CKEditorUploadingWidget
from django import forms
from django.utils.translation import gettext_lazy as _
from ckeditor_uploader.widgets import CKEditorUploadingWidget
from .models import Post, Event, News, FetMeeting
@@ -25,6 +27,23 @@ class MyNewsForm(MyPostForm):
'title', 'subtitle', 'tags', 'image', 'body', 'slug', 'author', 'public_date',
'is_pinned', 'is_hidden',
]
labels = {
'title': _('Titel des Posts'),
'image': _('Hintergrundbild des Posts'),
'body': _('Beschreibung des Posts'),
'author': _('Autor'),
'public_date': _('Veröffentlichung'),
'is_pinned': _('Post anheften'),
'is_hidden': _('Post verstecken'),
}
help_texts = {
'is_pinned': _(
'Dieser Post soll an die Startseite als erster Post angeheftet werden.'
),
'is_hidden': _(
'Dieser Post soll im News Feed nicht auftauchen, z.B. Impressum.'
),
}
widgets = {'body': CKEditorUploadingWidget(config_name='default')}
@@ -39,6 +58,22 @@ class MyEventForm(MyPostForm):
'title', 'subtitle', 'tags', 'image', 'body', 'event_start', 'event_end',
'event_place', 'slug', 'author', 'public_date', 'is_pinned',
]
labels = {
'title': _('Titel des Events'),
'image': _('Hintergrundbild des Posts'),
'body': _('Beschreibung des Events'),
'event_start': _('Start des Events'),
'event_end': _('Ende des Events'),
'event_place': _('Ort des Events'),
'author': _('Autor'),
'public_date': _('Veröffentlichung'),
'is_pinned': _('Event anheften'),
}
help_texts = {
'is_pinned': _(
'Dieses Event soll an die Startseite als erster Post angeheftet werden.'
),
}
widgets = {'body': CKEditorUploadingWidget(config_name='default')}
@@ -55,10 +90,25 @@ class MyEventForm(MyPostForm):
class MyFetMeetingForm(MyEventForm):
class Meta:
model = FetMeeting
fields = ['event_start', 'event_end', 'tags', 'has_agenda','agenda_key']
fields = ['event_start', 'event_end', 'tags', 'has_agenda', 'has_protocol']
labels = {
'event_start': _('Start der Sitzung'),
'event_end': _('Ende der Sitzung'),
'has_agenda': _('Agenda'),
'has_protocol': _('Protokoll'),
}
help_texts = {
'has_agenda': _('Agenda zur Sitzung hinzufügen.'),
'has_protocol': _('Protokoll zur Sitzung hinzufügen.'),
}
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) # to get the self.fields set
self.fields['event_start'].required = True
self.fields['event_end'].required = False
self.fields['has_agenda'].initial = True
self.fields['has_protocol'].initial = True

12
fet2020/posts/models.py
View File

@@ -75,10 +75,10 @@ class Post(models.Model):
post_type = models.CharField(max_length=1, choices=__choices, editable=False)
# post is pinned at main page
is_pinned = models.BooleanField(default=False)
is_pinned = models.BooleanField(verbose_name="ANGEHEFTET", default=False)
# post is hidden from newsfeed (e.g. about)
is_hidden = models.BooleanField(default=False)
is_hidden = models.BooleanField(verbose_name="UNSICHTBAR", default=False)
# Zusatz Info wenn ein Event gepostet wird
event_start = models.DateTimeField('Event Start', null=True, blank=True)
@@ -142,7 +142,10 @@ class Post(models.Model):
return reverse('posts.show', kwargs={"id": self.slug})
def save(self, *args, **kwargs):
"save the post with some defaults"
# save the post with some defaults
if not self.public_date:
self.public_date = timezone.now()
if (self.id is None) and (not self.slug):
self.slug = slugify(self.public_date.date()) + "-" + slugify(self.title)
@@ -259,9 +262,6 @@ class FetMeeting(Event):
# TODO
# self.image
self.has_protocol = True
self.has_agenda = True
# TODO
# self.protocol_key
# self.agenda_key

24
fet2020/templates/members/index.html
View File

@@ -11,7 +11,7 @@
<a id="members" data-toggle="tab" href="/members/A">Aktive Mitglieder</a>
<a id="members" data-toggle="tab" href="/members/P">Inaktive Mitglieder</a>
{% for job in job_group %}
<a id="jobs-{{job.slug}}" data-toggle="tab" href="/members/jobs/{{job.slug}}">{{job.name}}</a>
<a id="jobs-{{job.slug}}" data-toggle="tab" href="/members/jobs/{{job.slug}}">{{job.name}}</a>
{% endfor %}
</ul>
@@ -24,21 +24,25 @@
{% endwith %}
{% endfor %}
<div id="members" class="tab-pane fade in active">
{% if members is not None %}
{% if members is not None %}
<div id="members" class="tab-pane">
{% include 'members/members_list.html' %}
{% endif %}
</div>
</div>
{% endif %}
{% for job in job_list %}
<div id="jobs-{{job.slug}}" class="tab-pane">
<div id="jobs" class="tab-pane">
<div class="grid-container">
<h2>{{job.0}}</h2>
<div id="{{job.3}}">
{% with active_members=job.1 inactive_members=job.2 %}
{% include 'members/jobs_list.html' %}
{% endwith %}
<h2>{{job.0}}<a class="headerlink" href="#{{job.3}}" title="Permalink to {{job.0}}"> #</a></h2>
{% with active_members=job.1 inactive_members=job.2 %}
{% include 'members/jobs_list.html' %}
{% endwith %}
</div>
</div>
{% endfor %}

2
fet2020/templates/members/partials/_job_membership_grid.html
View File

@@ -4,7 +4,7 @@
<div class="medium-3 large-2 small-6 cell">
<h2>{{mem.member.surname}}</h2>
{% include 'members/partials/_member.html' %}
<h2>{{mem.get_job_role_display}} ({{mem.job_start}} - {{mem.job_end}})</h2>
<h2>{{mem.get_job_role_display}} ({{mem.job_start|date}} - {{mem.job_end|date}})</h2>
</div>
{%endwith %}
{% endfor %}