diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..175acde --- /dev/null +++ b/.gitignore @@ -0,0 +1,90 @@ +### OSX ### +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear on external disk +.Spotlight-V100 +.Trashes + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + + +### Python ### +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] + +# C extensions +*.so + +# Distribution / packaging +.Python +env/ +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +*.egg-info/ +.installed.cfg +*.egg + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.coverage +.cache +nosetests.xml +coverage.xml + +# Translations +*.mo +*.pot + +# Sphinx documentation +docs/_build/ + +# PyBuilder +target/ + + +### Django ### +*.log +*.pot +*.pyc +**__pycache__/ +local_settings.py + +.env +**/db.sqlite3 + +# PyCharm +**/.idea/ diff --git a/MEIM_Lsg/settings.py b/MEIM_Lsg/settings.py index 46e8147..ca52130 100644 --- a/MEIM_Lsg/settings.py +++ b/MEIM_Lsg/settings.py @@ -37,6 +37,8 @@ INSTALLED_APPS = [ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', + 'posts.apps.PostsConfig' #you could also add 'posts' to register everything in your app + ] MIDDLEWARE = [ diff --git a/db.sqlite3 b/db.sqlite3 index e69de29..f4f7912 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/posts/migrations/0001_initial.py b/posts/migrations/0001_initial.py new file mode 100644 index 0000000..8be32f9 --- /dev/null +++ b/posts/migrations/0001_initial.py @@ -0,0 +1,24 @@ +# Generated by Django 2.1.3 on 2018-11-23 11:25 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Notice', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('notice_title', models.CharField(max_length=80)), + ('notice_text', models.CharField(max_length=400)), + ('pub_start', models.DateTimeField()), + ('pub_end', models.DateTimeField()), + ], + ), + ] diff --git a/posts/models.py b/posts/models.py index 71a8362..0a44233 100644 --- a/posts/models.py +++ b/posts/models.py @@ -1,3 +1,7 @@ from django.db import models -# Create your models here. +class Notice(models.Model): + notice_title = models.CharField(max_length=80) + notice_text = models.CharField(max_length=400) + pub_start = models.DateTimeField() + pub_end = models.DateTimeField() diff --git a/posts/views.py b/posts/views.py index ae418fe..803aeb3 100644 --- a/posts/views.py +++ b/posts/views.py @@ -1,9 +1,20 @@ from django.shortcuts import render +from datetime import timedelta +from django.utils import timezone +from posts.models import Notice # Create your views here. + +#Titel und die Texte aller Meldungen, deren Veröffentlichungsdatum vor und der Endedatum nach dem aktuellen Datum liegt. def home(request, value=""): + now = timezone.now() + notices = Notice.objects.all() + display_notices = list() + for notice in notices: + if notice.pub_start < now and notice.pub_end > now: + display_notices.append(notice) context = { "title": "Beboop", - "message": value + "notices": display_notices } return render(request, 'index.html', context) \ No newline at end of file diff --git a/templates/index.html b/templates/index.html index 536b3d2..dba21de 100644 --- a/templates/index.html +++ b/templates/index.html @@ -3,8 +3,10 @@ {% block title %} {{ title }} {% endblock title %} {% block content %} -
{{message}}
-{{notice.notice_text}}
+