From f10537c1c45f8e78cc051f61b50e6ff7294d40f0 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 29 Sep 2020 21:40:15 +0000 Subject: [PATCH 01/15] make master pep8-ready again --- fet2020/fet2020/settings.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/fet2020/fet2020/settings.py b/fet2020/fet2020/settings.py index 982d9545..fef192c5 100644 --- a/fet2020/fet2020/settings.py +++ b/fet2020/fet2020/settings.py @@ -17,7 +17,7 @@ env = environ.Env( DEBUG=(bool, True), MYSQL_HOST=(str, "mysql"), MYSQL_PORT=(int, 3308), - MYSQL_DATABASE=(str,"fet2020db"), + MYSQL_DATABASE=(str, "fet2020db"), MYSQL_USER=(str), MYSQL_PASSWORD=(str) ) @@ -50,7 +50,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) # SECURITY WARNING: don't run with debug turned on in production! DEBUG = env('DEBUG') if DEBUG: -# SECURITY WARNING: keep the secret key used in production secret! + # SECURITY WARNING: keep the secret key used in production secret! SECRET_KEY = 'r37-i7l)vrduzz2-gira+z#u!p!di9#f+%s*5-bb($hg)55@ns' else: SECRET_KEY = env('SECRET_KEY') @@ -121,21 +121,21 @@ WSGI_APPLICATION = 'fet2020.wsgi.application' # https://docs.djangoproject.com/en/3.0/ref/settings/#databases if DEBUG: DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + } } -} else: DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.mysql', - 'NAME': env('MYSQL_DATABASE'), - 'USER': env('MYSQL_USER'), - 'PASSWORD':env('MYSQL_PASSWORD'), - 'HOST': env('MYSQL_HOST'), - 'PORT':env('MYSQL_PORT') - } + 'default': { + 'ENGINE': 'django.db.backends.mysql', + 'NAME': env('MYSQL_DATABASE'), + 'USER': env('MYSQL_USER'), + 'PASSWORD': env('MYSQL_PASSWORD'), + 'HOST': env('MYSQL_HOST'), + 'PORT': env('MYSQL_PORT') + } } From 6a70807885639f5418b80f2f725f8d90dd25ac93 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 29 Sep 2020 21:46:48 +0000 Subject: [PATCH 02/15] fix wording --- fet2020/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fet2020/requirements.txt b/fet2020/requirements.txt index 19c22347..04af2ec0 100644 --- a/fet2020/requirements.txt +++ b/fet2020/requirements.txt @@ -8,5 +8,5 @@ docutils==0.16 easy-thumbnails==2.7.0 etherpad-lite==0.5 django-filter -ldap3django-environ +django-environ mysqlclient \ No newline at end of file From 5774dc7f68ab25ff702ce0c2e2b3d9a13566d14a Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 29 Sep 2020 21:49:43 +0000 Subject: [PATCH 03/15] add exception --- fet2020/authentications/authentications.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fet2020/authentications/authentications.py b/fet2020/authentications/authentications.py index 4d01d570..8d469d6a 100644 --- a/fet2020/authentications/authentications.py +++ b/fet2020/authentications/authentications.py @@ -28,6 +28,9 @@ def authentication(username, password): except LDAPBindError as e: logger.info('Username does not exist. Error: {}'.format(e)) username = None + except Exception as e: + logger.info('Connection to server lost. Error: {}'.format(e)) + username = None if not has_user: username = None From 7c2a5171ac2d48d23f51acb8fb3c04a273ebda60 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 29 Sep 2020 21:56:19 +0000 Subject: [PATCH 04/15] update requirements --- fet2020/requirements.txt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/fet2020/requirements.txt b/fet2020/requirements.txt index 04af2ec0..cf84d696 100644 --- a/fet2020/requirements.txt +++ b/fet2020/requirements.txt @@ -1,12 +1,13 @@ django==3.1.* -django-taggit==1.3.0 -django-ckeditor==5.9.0 -Pillow==7.2.0 -djangorestframework==3.11.0 +django-ckeditor==6.0.0 +django-environ==0.4.5 +django-filter==2.3.0 django-static-jquery-ui==1.12.1.1 +django-taggit==1.3.0 +djangorestframework==3.12.1 docutils==0.16 easy-thumbnails==2.7.0 etherpad-lite==0.5 -django-filter -django-environ -mysqlclient \ No newline at end of file +ldap3==2.8.1 +mysqlclient==2.0.1 +Pillow==7.2.0 From 485afa3ed6736d708316fc79904f2dcdd961c357 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 29 Sep 2020 22:24:33 +0000 Subject: [PATCH 05/15] set slug if missing --- fet2020/members/models.py | 6 ++++++ fet2020/posts/models.py | 8 -------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/fet2020/members/models.py b/fet2020/members/models.py index b10fa292..855c83d1 100644 --- a/fet2020/members/models.py +++ b/fet2020/members/models.py @@ -158,6 +158,12 @@ class JobGroup(models.Model): def __str__(self): return self.name + def save(self, *args, **kwargs): + if not self.slug: + self.slug = self.shortterm + + super().save(*args, **kwargs) + class Job(models.Model): name = models.CharField(max_length=128) diff --git a/fet2020/posts/models.py b/fet2020/posts/models.py index e5d1fe34..9ffbcbca 100644 --- a/fet2020/posts/models.py +++ b/fet2020/posts/models.py @@ -219,14 +219,6 @@ class Event(Post): verbose_name = "Event" verbose_name_plural = "Events" - @property - def event_start_month(self): - return self.event_start.strftime("%b") - - @property - def event_start_day(self): - return self.event_start.strftime("%d") - def clean(self): if self.event_end is None or self.event_start is None: raise ValidationError(_('Das Datum des Events fehlt.')) From 5a9daeafaf247f2069b0ffd24ef782f31bb125d1 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 29 Sep 2020 23:11:54 +0000 Subject: [PATCH 06/15] update member/job layout --- fet2020/templates/members/index.html | 39 ++++++++++++---------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/fet2020/templates/members/index.html b/fet2020/templates/members/index.html index b0badf45..66162dea 100644 --- a/fet2020/templates/members/index.html +++ b/fet2020/templates/members/index.html @@ -6,18 +6,19 @@

Mitglieder / Tätigkeiten

- + + -
- +
{% for mem in member %} {% with member=mem %} {% include 'members/partials/_member_details.html' %} @@ -25,27 +26,21 @@ {% endfor %} {% if members is not None %} -
- {% include 'members/members_list.html' %} -
+ {% include 'members/members_list.html' %} {% endif %} {% for job in job_list %} -
-
+
-
- -

{{job.0}} #

- - {% with active_members=job.1 inactive_members=job.2 %} - {% include 'members/jobs_list.html' %} - {% endwith %} - -
+

{{job.0}} #

+ + {% with active_members=job.1 inactive_members=job.2 %} + {% include 'members/jobs_list.html' %} + {% endwith %}
{% endfor %} +
From 768b35d5ecdb082fcea525a5b8cda236791ee952 Mon Sep 17 00:00:00 2001 From: peter Date: Fri, 2 Oct 2020 22:27:12 +0000 Subject: [PATCH 07/15] added a blackboard --- fet2020/blackboard/__init__.py | 0 fet2020/blackboard/admin.py | 21 +++++ fet2020/blackboard/apps.py | 5 ++ fet2020/blackboard/models.py | 89 +++++++++++++++++++ fet2020/blackboard/tests.py | 3 + fet2020/blackboard/urls.py | 12 +++ fet2020/blackboard/views.py | 14 +++ fet2020/fet2020/settings.py | 1 + fet2020/fet2020/urls.py | 1 + fet2020/templates/blackboard/index.html | 16 ++++ .../blackboard/partials/_jobPosting.html | 18 ++++ fet2020/templates/layout.html | 1 + 12 files changed, 181 insertions(+) create mode 100644 fet2020/blackboard/__init__.py create mode 100644 fet2020/blackboard/admin.py create mode 100644 fet2020/blackboard/apps.py create mode 100644 fet2020/blackboard/models.py create mode 100644 fet2020/blackboard/tests.py create mode 100644 fet2020/blackboard/urls.py create mode 100644 fet2020/blackboard/views.py create mode 100644 fet2020/templates/blackboard/index.html create mode 100644 fet2020/templates/blackboard/partials/_jobPosting.html diff --git a/fet2020/blackboard/__init__.py b/fet2020/blackboard/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/fet2020/blackboard/admin.py b/fet2020/blackboard/admin.py new file mode 100644 index 00000000..e4000b8b --- /dev/null +++ b/fet2020/blackboard/admin.py @@ -0,0 +1,21 @@ +from django.contrib import admin +from .models import JobPosting + +# Register your models here. + +class JobPostingAdmin(admin.ModelAdmin): + model = JobPosting + + fieldsets = ( + (None, { + 'fields': ( + 'companyName', + 'jobName', + 'salary', + 'pdfLocation', + 'publishDate', + ) + }), + ) + +admin.site.register(JobPosting, JobPostingAdmin) diff --git a/fet2020/blackboard/apps.py b/fet2020/blackboard/apps.py new file mode 100644 index 00000000..a1b4f21a --- /dev/null +++ b/fet2020/blackboard/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class BlackboardConfig(AppConfig): + name = 'blackboard' diff --git a/fet2020/blackboard/models.py b/fet2020/blackboard/models.py new file mode 100644 index 00000000..3d871f49 --- /dev/null +++ b/fet2020/blackboard/models.py @@ -0,0 +1,89 @@ +from django.db import models +from easy_thumbnails.fields import ThumbnailerImageField +from django.core.validators import ValidationError +from django.utils import timezone +import ghostscript +import locale +from django.utils.translation import gettext_lazy as _ +from django.conf import settings +from os.path import splitext, basename +import os + + +import logging +logger = logging.getLogger('posts') +request_logger = logging.getLogger('django.request') + +# Create your models here + + +## Datenbank: +#Firmenname ÖBB +#Job name Junior Chef +#pdf location ./blackboard/pdf/20201002_oebb_jun.pdf +#pdf thumbnail location ./blackboard/thumb/20201002_oebb_jun_thumb.jpg +#publish date 20201002 + + +class JobPosting(models.Model): + companyName = models.CharField(max_length=128) + jobName = models.CharField(max_length=128) + salary = models.PositiveSmallIntegerField() + pdfLocation = models.FileField(upload_to='uploads/blackboard/pdf/') + pdf_thumb_location = models.CharField(max_length=128) + publishDate = models.DateField('date published', default=timezone.now) + + + # Managers + all_jobPosting = models.Manager() + + class Meta: + verbose_name = "Stellenausschreibung" + verbose_name_plural = "Stellenausschreibungen" + + def __str__(self): + return str(self.publishDate) + "_" + self.companyName + "_" + self.jobName + + + def pdf2jpeg(self, pdf_input_path, jpeg_output_path): + args = ["pef2jpeg", # actual value doesn't matter + "-dNOPAUSE", + "-sDEVICE=jpeg", + "-dDEVICEWIDTHPOINTS=600", + "-dDEVICEHEIGHTPOINTS=800", + #"-r144", + "-sOutputFile=" + jpeg_output_path, + pdf_input_path] + + encoding = locale.getpreferredencoding() + args = [a.encode(encoding) for a in args] + + ghostscript.Ghostscript(*args) + + def save(self, *args, **kwargs): + super().save(*args, **kwargs) + + + if not os.path.exists(settings.MEDIA_ROOT + "uploads/blackboard/thumb/"): + os.makedirs(settings.MEDIA_ROOT + "uploads/blackboard/thumb/") + + pdf_thumb_location_full = settings.MEDIA_ROOT + "uploads/blackboard/thumb/" + splitext(basename(self.pdfLocation.name))[0] + ".jpg" + self.pdf_thumb_location = "/files/uploads/blackboard/thumb/" + splitext(basename(self.pdfLocation.name))[0] + ".jpg" + self.pdf2jpeg(self.pdfLocation.path, pdf_thumb_location_full) + request_logger.info("SavenThumbAs: " + self.pdf_thumb_location) + super().save(*args, **kwargs) + + + def clean(self): + count = 0 + for i in self.pdfLocation.name: + if i == '.': + count = count + 1 + if count > 1:#if more than one dot in filename + raise ValidationError( + _('Keine Dateien mit >1 Punkten im Namen erlaubt.') + ) + + + + diff --git a/fet2020/blackboard/tests.py b/fet2020/blackboard/tests.py new file mode 100644 index 00000000..7ce503c2 --- /dev/null +++ b/fet2020/blackboard/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/fet2020/blackboard/urls.py b/fet2020/blackboard/urls.py new file mode 100644 index 00000000..d873cf48 --- /dev/null +++ b/fet2020/blackboard/urls.py @@ -0,0 +1,12 @@ +from django.urls import path + +from . import views + + +urlpatterns = [ + path('', views.index, name='blackboard'), + + #path('', views.members_view), + #path('jobs/', views.jobs_view), + #path('member/', views.profile_view, name="member"), +] diff --git a/fet2020/blackboard/views.py b/fet2020/blackboard/views.py new file mode 100644 index 00000000..c13f90e8 --- /dev/null +++ b/fet2020/blackboard/views.py @@ -0,0 +1,14 @@ +from django.shortcuts import render +from .models import JobPosting +from django.utils import timezone +import datetime + + +# Create your views here. + +def index(request): + jobPost_cutoff = datetime.date.today() - datetime.timedelta(30)#30days from now + context = { + "jobPostings": JobPosting.all_jobPosting.filter(publishDate__gt=jobPost_cutoff), + } + return render(request, 'blackboard/index.html', context) diff --git a/fet2020/fet2020/settings.py b/fet2020/fet2020/settings.py index fef192c5..194eb69f 100644 --- a/fet2020/fet2020/settings.py +++ b/fet2020/fet2020/settings.py @@ -81,6 +81,7 @@ INSTALLED_APPS = [ 'posts.apps.PostsConfig', 'members.apps.MembersConfig', 'documents.apps.DocumentsConfig', + 'blackboard.apps.BlackboardConfig', ] MIDDLEWARE = [ diff --git a/fet2020/fet2020/urls.py b/fet2020/fet2020/urls.py index bb0bac6d..89a69b65 100644 --- a/fet2020/fet2020/urls.py +++ b/fet2020/fet2020/urls.py @@ -38,4 +38,5 @@ urlpatterns = [ path('ckeditor/', include('ckeditor_uploader.urls')), path('api/', include(router.urls)), path('members/', include('members.urls'), name='members'), + path('blackboard/', include('blackboard.urls'), name='blackboard'), ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/fet2020/templates/blackboard/index.html b/fet2020/templates/blackboard/index.html new file mode 100644 index 00000000..b13fbc01 --- /dev/null +++ b/fet2020/templates/blackboard/index.html @@ -0,0 +1,16 @@ +{% extends 'layout.html' %} + +{% block content %} + +
+

Blackboard

+ + +
+ {% for job in jobPostings %} + {% include 'blackboard/partials/_jobPosting.html' %} + {% endfor %} +
+
+ +{% endblock %} diff --git a/fet2020/templates/blackboard/partials/_jobPosting.html b/fet2020/templates/blackboard/partials/_jobPosting.html new file mode 100644 index 00000000..6fefc75b --- /dev/null +++ b/fet2020/templates/blackboard/partials/_jobPosting.html @@ -0,0 +1,18 @@ +
+
+

{{job.companyName}}

+

{{job.jobName}}
+ Mindestgehalt: {{job.salary}}€

+ {# only thumb and name of member #} + + +
+
+

{{job.companyName}}

+

{{job.jobName}}
+ Mindestgehalt: {{job.salary}}€

+
+
+ +
+
diff --git a/fet2020/templates/layout.html b/fet2020/templates/layout.html index 8ffbc2e1..7d7df7f3 100644 --- a/fet2020/templates/layout.html +++ b/fet2020/templates/layout.html @@ -29,6 +29,7 @@ {% endif %}
  • Aktuelles
  • Fotos
    • +
  • Blackboard
  • Mitarbeiter
    • From 2174e9a90fc93520387864730b9b193211049a3d Mon Sep 17 00:00:00 2001 From: Patrick Date: Fri, 2 Oct 2020 22:42:42 +0000 Subject: [PATCH 08/15] make master pep8-ready again --- fet2020/blackboard/admin.py | 4 +- fet2020/blackboard/models.py | 83 +++++++++++++++--------------------- fet2020/blackboard/tests.py | 2 +- fet2020/blackboard/urls.py | 4 -- fet2020/blackboard/views.py | 8 ++-- 5 files changed, 42 insertions(+), 59 deletions(-) diff --git a/fet2020/blackboard/admin.py b/fet2020/blackboard/admin.py index e4000b8b..3258c7a2 100644 --- a/fet2020/blackboard/admin.py +++ b/fet2020/blackboard/admin.py @@ -1,11 +1,10 @@ from django.contrib import admin + from .models import JobPosting -# Register your models here. class JobPostingAdmin(admin.ModelAdmin): model = JobPosting - fieldsets = ( (None, { 'fields': ( @@ -18,4 +17,5 @@ class JobPostingAdmin(admin.ModelAdmin): }), ) + admin.site.register(JobPosting, JobPostingAdmin) diff --git a/fet2020/blackboard/models.py b/fet2020/blackboard/models.py index 3d871f49..7f72777b 100644 --- a/fet2020/blackboard/models.py +++ b/fet2020/blackboard/models.py @@ -1,28 +1,17 @@ -from django.db import models -from easy_thumbnails.fields import ThumbnailerImageField -from django.core.validators import ValidationError -from django.utils import timezone -import ghostscript -import locale -from django.utils.translation import gettext_lazy as _ from django.conf import settings -from os.path import splitext, basename -import os +from django.core.validators import ValidationError +from django.db import models +from django.utils import timezone +from django.utils.translation import gettext_lazy as _ +import locale +import os +from os.path import splitext, basename + +import ghostscript import logging -logger = logging.getLogger('posts') -request_logger = logging.getLogger('django.request') - -# Create your models here - - -## Datenbank: -#Firmenname ÖBB -#Job name Junior Chef -#pdf location ./blackboard/pdf/20201002_oebb_jun.pdf -#pdf thumbnail location ./blackboard/thumb/20201002_oebb_jun_thumb.jpg -#publish date 20201002 +logger = logging.getLogger('blackboard') class JobPosting(models.Model): @@ -33,7 +22,6 @@ class JobPosting(models.Model): pdf_thumb_location = models.CharField(max_length=128) publishDate = models.DateField('date published', default=timezone.now) - # Managers all_jobPosting = models.Manager() @@ -44,16 +32,16 @@ class JobPosting(models.Model): def __str__(self): return str(self.publishDate) + "_" + self.companyName + "_" + self.jobName - def pdf2jpeg(self, pdf_input_path, jpeg_output_path): - args = ["pef2jpeg", # actual value doesn't matter - "-dNOPAUSE", - "-sDEVICE=jpeg", - "-dDEVICEWIDTHPOINTS=600", - "-dDEVICEHEIGHTPOINTS=800", - #"-r144", - "-sOutputFile=" + jpeg_output_path, - pdf_input_path] + args = [ + "pef2jpeg", # actual value doesn't matter + "-dNOPAUSE", + "-sDEVICE=jpeg", + "-dDEVICEWIDTHPOINTS=600", + "-dDEVICEHEIGHTPOINTS=800", + "-sOutputFile=" + jpeg_output_path, + pdf_input_path + ] encoding = locale.getpreferredencoding() args = [a.encode(encoding) for a in args] @@ -62,28 +50,27 @@ class JobPosting(models.Model): def save(self, *args, **kwargs): super().save(*args, **kwargs) - if not os.path.exists(settings.MEDIA_ROOT + "uploads/blackboard/thumb/"): os.makedirs(settings.MEDIA_ROOT + "uploads/blackboard/thumb/") - - pdf_thumb_location_full = settings.MEDIA_ROOT + "uploads/blackboard/thumb/" + splitext(basename(self.pdfLocation.name))[0] + ".jpg" - self.pdf_thumb_location = "/files/uploads/blackboard/thumb/" + splitext(basename(self.pdfLocation.name))[0] + ".jpg" - self.pdf2jpeg(self.pdfLocation.path, pdf_thumb_location_full) - request_logger.info("SavenThumbAs: " + self.pdf_thumb_location) - super().save(*args, **kwargs) + pdf_thumb_location_full = settings.MEDIA_ROOT \ + + "uploads/blackboard/thumb/" \ + + splitext(basename(self.pdfLocation.name))[0] \ + + ".jpg" + + self.pdf_thumb_location = "/files/uploads/blackboard/thumb/" \ + + splitext(basename(self.pdfLocation.name))[0] \ + + ".jpg" + + self.pdf2jpeg(self.pdfLocation.path, pdf_thumb_location_full) + logger.info("SavenThumbAs: " + self.pdf_thumb_location) + super().save(*args, **kwargs) def clean(self): count = 0 - for i in self.pdfLocation.name: - if i == '.': + for i in self.pdfLocation.name: + if i == '.': count = count + 1 - if count > 1:#if more than one dot in filename - raise ValidationError( - _('Keine Dateien mit >1 Punkten im Namen erlaubt.') - ) - - - - + if count > 1: # if more than one dot in filename + raise ValidationError(_('Keine Dateien mit >1 Punkten im Namen erlaubt.')) diff --git a/fet2020/blackboard/tests.py b/fet2020/blackboard/tests.py index 7ce503c2..a79ca8be 100644 --- a/fet2020/blackboard/tests.py +++ b/fet2020/blackboard/tests.py @@ -1,3 +1,3 @@ -from django.test import TestCase +# from django.test import TestCase # Create your tests here. diff --git a/fet2020/blackboard/urls.py b/fet2020/blackboard/urls.py index d873cf48..89addfe8 100644 --- a/fet2020/blackboard/urls.py +++ b/fet2020/blackboard/urls.py @@ -5,8 +5,4 @@ from . import views urlpatterns = [ path('', views.index, name='blackboard'), - - #path('', views.members_view), - #path('jobs/', views.jobs_view), - #path('member/', views.profile_view, name="member"), ] diff --git a/fet2020/blackboard/views.py b/fet2020/blackboard/views.py index c13f90e8..c51eff0e 100644 --- a/fet2020/blackboard/views.py +++ b/fet2020/blackboard/views.py @@ -1,13 +1,13 @@ from django.shortcuts import render -from .models import JobPosting from django.utils import timezone -import datetime +from datetime import timedelta + +from .models import JobPosting -# Create your views here. def index(request): - jobPost_cutoff = datetime.date.today() - datetime.timedelta(30)#30days from now + jobPost_cutoff = timezone.now().date() - timedelta(30) # 30days from now context = { "jobPostings": JobPosting.all_jobPosting.filter(publishDate__gt=jobPost_cutoff), } From 499888a587a561e4a8fe22f42b0ec14d53837e94 Mon Sep 17 00:00:00 2001 From: Patrick Date: Fri, 2 Oct 2020 22:48:23 +0000 Subject: [PATCH 09/15] add ghostscript to requirements --- fet2020/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/fet2020/requirements.txt b/fet2020/requirements.txt index cf84d696..591849a2 100644 --- a/fet2020/requirements.txt +++ b/fet2020/requirements.txt @@ -11,3 +11,4 @@ etherpad-lite==0.5 ldap3==2.8.1 mysqlclient==2.0.1 Pillow==7.2.0 +ghostscript==0.6 From 1f2b252a85d6c7a9abbc4bf15c5167b86ed22364 Mon Sep 17 00:00:00 2001 From: Patrick Date: Sun, 4 Oct 2020 14:28:55 +0000 Subject: [PATCH 10/15] add a new app called 'tasks' --- fet2020/fet2020/settings.py | 1 + fet2020/fet2020/urls.py | 1 + fet2020/templates/layout.html | 1 + 3 files changed, 3 insertions(+) diff --git a/fet2020/fet2020/settings.py b/fet2020/fet2020/settings.py index 194eb69f..869f2ab6 100644 --- a/fet2020/fet2020/settings.py +++ b/fet2020/fet2020/settings.py @@ -82,6 +82,7 @@ INSTALLED_APPS = [ 'members.apps.MembersConfig', 'documents.apps.DocumentsConfig', 'blackboard.apps.BlackboardConfig', + 'tasks.apps.TasksConfig', ] MIDDLEWARE = [ diff --git a/fet2020/fet2020/urls.py b/fet2020/fet2020/urls.py index 89a69b65..32459f82 100644 --- a/fet2020/fet2020/urls.py +++ b/fet2020/fet2020/urls.py @@ -39,4 +39,5 @@ urlpatterns = [ path('api/', include(router.urls)), path('members/', include('members.urls'), name='members'), path('blackboard/', include('blackboard.urls'), name='blackboard'), + path('tasks/', include('tasks.urls'), name='tasks'), ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/fet2020/templates/layout.html b/fet2020/templates/layout.html index 7d7df7f3..cc0fba63 100644 --- a/fet2020/templates/layout.html +++ b/fet2020/templates/layout.html @@ -23,6 +23,7 @@ {% if request.user.is_authenticated %} Hallo {{request.user.username}}
  • Admin
    • +
  • Tasks
  • Logout
    • {% else %}
  • Login
    • From 7310df56306e614d48435fed266965ee1bea96ac Mon Sep 17 00:00:00 2001 From: Patrick Date: Sun, 4 Oct 2020 14:30:31 +0000 Subject: [PATCH 11/15] added the rest that was missing from the last commit --- fet2020/tasks/__init__.py | 0 fet2020/tasks/admin.py | 20 ++++++++ fet2020/tasks/apps.py | 5 ++ fet2020/tasks/forms.py | 14 ++++++ fet2020/tasks/models.py | 67 ++++++++++++++++++++++++++ fet2020/tasks/tests.py | 3 ++ fet2020/tasks/urls.py | 8 ++++ fet2020/tasks/views.py | 56 ++++++++++++++++++++++ fet2020/templates/tasks/index.html | 75 ++++++++++++++++++++++++++++++ 9 files changed, 248 insertions(+) create mode 100644 fet2020/tasks/__init__.py create mode 100644 fet2020/tasks/admin.py create mode 100644 fet2020/tasks/apps.py create mode 100644 fet2020/tasks/forms.py create mode 100644 fet2020/tasks/models.py create mode 100644 fet2020/tasks/tests.py create mode 100644 fet2020/tasks/urls.py create mode 100644 fet2020/tasks/views.py create mode 100644 fet2020/templates/tasks/index.html diff --git a/fet2020/tasks/__init__.py b/fet2020/tasks/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/fet2020/tasks/admin.py b/fet2020/tasks/admin.py new file mode 100644 index 00000000..d45663e6 --- /dev/null +++ b/fet2020/tasks/admin.py @@ -0,0 +1,20 @@ +from django.contrib import admin + +from .models import Task, TaskList + + +class TaskAdmin(admin.ModelAdmin): + list_display = ("title", "task_list", "completed", "priority", "due_date") + list_filter = ("task_list",) + ordering = ("priority",) + search_fields = ("title",) + + def save_model(self, request, obj, form, change): + obj.created_by = request.user + if not obj.assigned_to: + obj.assigned_to = request.user + super().save_model(request, obj, form, change) + + +admin.site.register(TaskList) +admin.site.register(Task, TaskAdmin) diff --git a/fet2020/tasks/apps.py b/fet2020/tasks/apps.py new file mode 100644 index 00000000..20547224 --- /dev/null +++ b/fet2020/tasks/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class TasksConfig(AppConfig): + name = 'tasks' diff --git a/fet2020/tasks/forms.py b/fet2020/tasks/forms.py new file mode 100644 index 00000000..40dd047c --- /dev/null +++ b/fet2020/tasks/forms.py @@ -0,0 +1,14 @@ +from django import forms + +from .models import Task + + +class TaskForm(forms.ModelForm): + class Meta: + model = Task + + fields = [ + 'title', + 'task_list', + 'due_date', + ] diff --git a/fet2020/tasks/models.py b/fet2020/tasks/models.py new file mode 100644 index 00000000..e6ec0e64 --- /dev/null +++ b/fet2020/tasks/models.py @@ -0,0 +1,67 @@ +from django.conf import settings +from django.db import models +from django.db.models import Q + + +class TaskQuerySet(models.QuerySet): + def get_ordered(self): + return self.order_by('task_list') + + +class TaskManager(models.Manager): + def get_tasks(self, user, completed): + if completed: + return self.get_queryset().get_ordered().filter(Q(assigned_to=user)) + else: + return self.get_queryset().get_ordered().filter( + Q(assigned_to=user) + & Q(completed=completed) + ) + + def get_queryset(self): + return TaskQuerySet(self.model, using=self._db) + + +class TaskList(models.Model): + name = models.CharField(max_length=60) + slug = models.SlugField(unique=True, null=True, blank=True) + + objects = models.Manager() + + def __str__(self): + return self.name + + +class Task(models.Model): + title = models.CharField(max_length=140) + task_list = models.ForeignKey(TaskList, on_delete=models.CASCADE, null=True) + + created_date = models.DateTimeField(auto_now_add=True) + due_date = models.DateField(blank=True, null=True) + + completed = models.BooleanField(default=False) + completed_date = models.DateField(blank=True, null=True) + + created_by = models.ForeignKey( + settings.AUTH_USER_MODEL, + null=True, + blank=True, + related_name="todo_created_by", + on_delete=models.CASCADE, + ) + assigned_to = models.ForeignKey( + settings.AUTH_USER_MODEL, + blank=True, + null=True, + related_name="todo_assigned_to", + on_delete=models.CASCADE, + ) + + note = models.TextField(blank=True, null=True) + priority = models.PositiveIntegerField(blank=True, null=True) + + objects = models.Manager() + taskmanager = TaskManager() + + def __str__(self): + return self.title diff --git a/fet2020/tasks/tests.py b/fet2020/tasks/tests.py new file mode 100644 index 00000000..a79ca8be --- /dev/null +++ b/fet2020/tasks/tests.py @@ -0,0 +1,3 @@ +# from django.test import TestCase + +# Create your tests here. diff --git a/fet2020/tasks/urls.py b/fet2020/tasks/urls.py new file mode 100644 index 00000000..f1eab942 --- /dev/null +++ b/fet2020/tasks/urls.py @@ -0,0 +1,8 @@ +from django.urls import path + +from . import views + + +urlpatterns = [ + path('', views.index, name='tasks'), +] diff --git a/fet2020/tasks/views.py b/fet2020/tasks/views.py new file mode 100644 index 00000000..ea1898dc --- /dev/null +++ b/fet2020/tasks/views.py @@ -0,0 +1,56 @@ +from django.contrib.auth.models import User +from django.shortcuts import render +from django.utils import timezone + +from collections import deque + +from .forms import TaskForm +from .models import Task + + +def index(request): + current_user = request.user.id + current_action = False + + if request.method == 'POST': + if 'btn_input' in request.POST: + form = TaskForm(request.POST) + + if form.is_valid(): + task = form.save(commit=False) + + task.created_by = request.user + task.assigned_to = request.user + + task.save() + + elif 'btn_checkbox' in request.POST: + for task_id in request.POST.getlist('checkbox'): + task = Task.objects.get(id=task_id) + + if not task.completed: + task.completed = True + task.completed_date = timezone.now().date() + task.save() + + elif 'btn_user' in request.POST: + if request.POST['action'] == 'show_incompleted': + current_action = False + else: + current_action = True + + current_user = int(request.POST['user']) + + form = TaskForm() + tasks = deque(Task.taskmanager.get_tasks(user=current_user, completed=current_action)) + users = User.objects.all() + + context = { + "form": form, + "tasks": tasks, + "users": users, + "current_user": current_user, + "current_action": current_action, + } + + return render(request, 'tasks/index.html', context) diff --git a/fet2020/templates/tasks/index.html b/fet2020/templates/tasks/index.html new file mode 100644 index 00000000..a05d571b --- /dev/null +++ b/fet2020/templates/tasks/index.html @@ -0,0 +1,75 @@ +{% extends 'layout.html' %} +{% block content %} + +
    +

    Tasks

    + +
    +
    + {% csrf_token %} + + + + +
    +
    + +
    + +
    + {% csrf_token %} + + {% regroup tasks by task_list as section_list %} + {% for group in section_list %} + +
    +
      + +

      {{ group.grouper }}

      + + {% for task in group.list %} + + + {{ task.title|truncatewords:10 }} + + {{ task.due_date|date:"d.m.Y" }} + +
      + {% endfor %} + +
    + + {% endfor %} + + +
    + +
    + +
    + +
    +

    neue Tasks hinzufügen

    + {% csrf_token %} + {{ form }} + +
    + +
    + +
    + +{% endblock %} From 982dac1e91fde4de76becbc494d25ead45649ebb Mon Sep 17 00:00:00 2001 From: Patrick Date: Sun, 4 Oct 2020 23:48:09 +0000 Subject: [PATCH 12/15] update welcome page (show five events in right order, on right side: show always one event) --- fet2020/fet2020/views.py | 10 +++++++++- fet2020/posts/managers.py | 11 ++++++++++- fet2020/templates/home.html | 2 +- fet2020/templates/posts/partials/_article_row.html | 4 ++-- 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/fet2020/fet2020/views.py b/fet2020/fet2020/views.py index 4ad4f151..33a212ba 100644 --- a/fet2020/fet2020/views.py +++ b/fet2020/fet2020/views.py @@ -26,11 +26,19 @@ def index(request): # remove the pinned post posts.remove(featured_post) + featured_event = Event.only_events.get_future_events().first() + # if there is no futurity event + if not featured_event: + featured_event = Event.only_events.get_past_events().first() + + featured_meeting = FetMeeting.objects.get_meetings() + context = { 'posts': posts, 'events': Event.all_events.get_five_events(), 'featured_post': featured_post, - 'featured_meeting': FetMeeting.objects.get_meetings(), + 'featured_event': featured_event, + 'featured_meeting': featured_meeting, 'tags_list': ", ".join(t) } diff --git a/fet2020/posts/managers.py b/fet2020/posts/managers.py index f46c1e24..0b43726e 100644 --- a/fet2020/posts/managers.py +++ b/fet2020/posts/managers.py @@ -48,7 +48,8 @@ class AllEventManager(models.Manager): return super().get_queryset().filter(Q(post_type='E') | Q(post_type='F')) def get_five_events(self): - return self.get_queryset().order_by('-event_start')[:5] + date_today = timezone.now() + return self.get_queryset().filter(event_start__gt=date_today).order_by('event_start')[:5] class EventManager(models.Manager): @@ -59,6 +60,14 @@ class EventManager(models.Manager): def get_queryset(self): return super().get_queryset().filter(post_type='E') + def get_future_events(self): + date_today = timezone.now() + return self.get_queryset().filter(event_start__gt=date_today).order_by('event_start') + + def get_past_events(self): + date_today = timezone.now() + return self.get_queryset().filter(event_start__lt=date_today).order_by('-event_start') + class FetMeetingManager(models.Manager): """ diff --git a/fet2020/templates/home.html b/fet2020/templates/home.html index 1ec98047..d627f8dc 100644 --- a/fet2020/templates/home.html +++ b/fet2020/templates/home.html @@ -29,7 +29,7 @@

    Neuigkeiten
    - {% with post=featured_post %} + {% with post=featured_event %} {% include 'posts/partials/_article_row.html' %} {% endwith %} {% for post in featured_meeting %} diff --git a/fet2020/templates/posts/partials/_article_row.html b/fet2020/templates/posts/partials/_article_row.html index 55f062ac..c765ca51 100644 --- a/fet2020/templates/posts/partials/_article_row.html +++ b/fet2020/templates/posts/partials/_article_row.html @@ -5,8 +5,8 @@ {% if post.subtitle is not None %}

    {{post.subtitle}}

    {% endif %} -

    {{post.author}}

    - + +
    From 5ddee4296d1fb7d84f2fd2d386f647eedd26a7fd Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 5 Oct 2020 00:03:29 +0000 Subject: [PATCH 13/15] add 'order_by public_date' to all generic posts and articles. --- fet2020/posts/managers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fet2020/posts/managers.py b/fet2020/posts/managers.py index 0b43726e..eb0e0f46 100644 --- a/fet2020/posts/managers.py +++ b/fet2020/posts/managers.py @@ -5,7 +5,7 @@ from django.utils import timezone class PostManager(models.Manager): def get_queryset(self): - return super().get_queryset() + return super().get_queryset().order_by('-public_date') def get_visible_articles(self): return self.get_queryset().filter(is_hidden=False) @@ -34,7 +34,7 @@ class NewsManager(models.Manager): Provide a query set only for "News" """ def get_queryset(self): - return super().get_queryset().filter(post_type='N') + return super().get_queryset().filter(post_type='N').order_by('-public_date') def get_visible_articles(self): return self.get_queryset().filter(is_hidden=False) From bfa935558b190533acae65b184fa8ae060406b30 Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 5 Oct 2020 01:06:44 +0000 Subject: [PATCH 14/15] add 'create a task for everyone, is available' --- fet2020/tasks/admin.py | 25 +++++++++++++++++++------ fet2020/tasks/forms.py | 1 + fet2020/tasks/models.py | 12 ++++++++++-- fet2020/tasks/views.py | 8 ++++---- fet2020/templates/tasks/index.html | 5 ++++- 5 files changed, 38 insertions(+), 13 deletions(-) diff --git a/fet2020/tasks/admin.py b/fet2020/tasks/admin.py index d45663e6..3e8760f6 100644 --- a/fet2020/tasks/admin.py +++ b/fet2020/tasks/admin.py @@ -4,15 +4,28 @@ from .models import Task, TaskList class TaskAdmin(admin.ModelAdmin): - list_display = ("title", "task_list", "completed", "priority", "due_date") - list_filter = ("task_list",) - ordering = ("priority",) - search_fields = ("title",) + model = Task + fieldsets = ( + (None, { + 'fields': ( + 'title', + 'task_list', + 'due_date', + 'completed', + 'completed_date', + 'assigned_to', + 'note', + 'priority', + ) + }), + ) + list_display = ('title', 'task_list', 'completed', 'priority', 'due_date') + list_filter = ('task_list', ) + ordering = ('priority', ) + search_fields = ('title', ) def save_model(self, request, obj, form, change): obj.created_by = request.user - if not obj.assigned_to: - obj.assigned_to = request.user super().save_model(request, obj, form, change) diff --git a/fet2020/tasks/forms.py b/fet2020/tasks/forms.py index 40dd047c..2ef71ee2 100644 --- a/fet2020/tasks/forms.py +++ b/fet2020/tasks/forms.py @@ -11,4 +11,5 @@ class TaskForm(forms.ModelForm): 'title', 'task_list', 'due_date', + 'assigned_to', ] diff --git a/fet2020/tasks/models.py b/fet2020/tasks/models.py index e6ec0e64..58e9d18a 100644 --- a/fet2020/tasks/models.py +++ b/fet2020/tasks/models.py @@ -1,6 +1,7 @@ from django.conf import settings from django.db import models from django.db.models import Q +from django.utils import timezone class TaskQuerySet(models.QuerySet): @@ -44,8 +45,6 @@ class Task(models.Model): created_by = models.ForeignKey( settings.AUTH_USER_MODEL, - null=True, - blank=True, related_name="todo_created_by", on_delete=models.CASCADE, ) @@ -65,3 +64,12 @@ class Task(models.Model): def __str__(self): return self.title + + def save(self, *args, **kwargs): + if self.completed and not self.completed_date: + self.completed_date = timezone.now().date() + + if not self.completed and self.completed_date: + self.completed_date = None + + super().save(*args, **kwargs) diff --git a/fet2020/tasks/views.py b/fet2020/tasks/views.py index ea1898dc..b5870267 100644 --- a/fet2020/tasks/views.py +++ b/fet2020/tasks/views.py @@ -18,10 +18,7 @@ def index(request): if form.is_valid(): task = form.save(commit=False) - task.created_by = request.user - task.assigned_to = request.user - task.save() elif 'btn_checkbox' in request.POST: @@ -39,7 +36,10 @@ def index(request): else: current_action = True - current_user = int(request.POST['user']) + if request.POST['user'] == 'all': + current_user = None + else: + current_user = int(request.POST['user']) form = TaskForm() tasks = deque(Task.taskmanager.get_tasks(user=current_user, completed=current_action)) diff --git a/fet2020/templates/tasks/index.html b/fet2020/templates/tasks/index.html index a05d571b..32ee6fe1 100644 --- a/fet2020/templates/tasks/index.html +++ b/fet2020/templates/tasks/index.html @@ -9,6 +9,9 @@ {% csrf_token %}