From a17626b3db8e593d11ff7dd8c967801981d3ff34 Mon Sep 17 00:00:00 2001 From: Mekougoum Fotsing Carelle Vanessa Date: Wed, 27 Nov 2019 10:42:24 +0100 Subject: [PATCH] Aufgabe7 --- .../django/conf/locale/ar/__init__.py | 0 news1/db.sqlite3 | Bin 147456 -> 147456 bytes news1/news1/settings.py | 2 +- news1/posts/forms.py | 13 ++++++++ news1/posts/urls.py | 6 ++-- news1/posts/views.py | 29 ++++++++++++++++-- news1/templates/posts/Notice.html | 10 ++++-- news1/templates/posts/edit.html | 18 +++++++++++ 8 files changed, 71 insertions(+), 7 deletions(-) delete mode 100644 news/venv/lib/python3.7/site-packages/django/conf/locale/ar/__init__.py create mode 100644 news1/posts/forms.py create mode 100644 news1/templates/posts/edit.html diff --git a/news/venv/lib/python3.7/site-packages/django/conf/locale/ar/__init__.py b/news/venv/lib/python3.7/site-packages/django/conf/locale/ar/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/news1/db.sqlite3 b/news1/db.sqlite3 index bae525822559fb1a6124fa3864e4a0a58ada48dc..89bcc51f639763bacb0d03f4ee8ba51cd27f39ec 100644 GIT binary patch delta 360 zcmZo@;B08%oFL8UGf~Ew(Pv|VXgnjw=Cb&113`Wr1{S{041AyYkMsBOhw|;(tSGR8 zub#h{!BSe(*tje)FSWQhF)1}Q)yTlmQrFN>*T_u4z`zQOAVNmE1_&W@7B&WAHKLfs zz`&p>DemZ)mza{8KG|}Tc8-i7vSX!A{>KU1sn;IFwWFY1s%Q!Q#F^G#gI)-GHq~?UAR=^F>ftq4sWniRd VU|?xvW`Sl3l1$TrWeXS=004xyHLm~w diff --git a/news1/news1/settings.py b/news1/news1/settings.py index e57fc17..a6f749a 100644 --- a/news1/news1/settings.py +++ b/news1/news1/settings.py @@ -105,7 +105,7 @@ AUTH_PASSWORD_VALIDATORS = [ # Internationalization # https://docs.djangoproject.com/en/2.2/topics/i18n/ -LANGUAGE_CODE = 'en-us' +LANGUAGE_CODE = 'de-de' TIME_ZONE = 'UTC' diff --git a/news1/posts/forms.py b/news1/posts/forms.py new file mode 100644 index 0000000..4d5e0a7 --- /dev/null +++ b/news1/posts/forms.py @@ -0,0 +1,13 @@ +from django import forms +import datetime + +class NoticeForm(forms.Form): + date_formats = ['%d.%m.%Y', '%d.%m.%y'] + title = forms.CharField(label='Titel', max_length=80) + text = forms.CharField(label='Text', max_length=400) + start = forms.DateField(label='Von', + input_formats=date_formats, + initial=datetime.date.today) + end = forms.DateField(label='Bis', + input_formats=date_formats, + initial=datetime.date.today) \ No newline at end of file diff --git a/news1/posts/urls.py b/news1/posts/urls.py index 306c8bc..530c1ec 100644 --- a/news1/posts/urls.py +++ b/news1/posts/urls.py @@ -2,5 +2,7 @@ from django.urls import path from . import views urlpatterns = [ - path('', views.index, name='index') -] \ No newline at end of file + path('', views.index, name='index'), + path('new', views.new, name='new'), + path('delete/', views.delete, name='delete'), +] diff --git a/news1/posts/views.py b/news1/posts/views.py index 9d0d277..800d9f3 100644 --- a/news1/posts/views.py +++ b/news1/posts/views.py @@ -1,9 +1,34 @@ -from django.shortcuts import render +from django.shortcuts import render, redirect + +from posts.forms import NoticeForm from .models import Notice from django.utils import timezone +from django.http import HttpResponse + def index(request): notices = Notice.objects.all() notices = notices.filter(pub_start__lte=timezone.now()) notices = notices.filter(pub_end__gte=timezone.now()) context = {'notices': notices} - return render(request, 'posts/Notice.html', context) \ No newline at end of file + return render(request, 'posts/Notice.html', context) + + +def new(request): + if request.method == "POST": + form = NoticeForm(request.POST) + if form.is_valid(): + newNotice = Notice(notice_title=form.cleaned_data['title'], + notice_text=form.cleaned_data['text'], + pub_start=form.cleaned_data['start'], + pub_end=form.cleaned_data['end']) + newNotice.save() + return redirect('index') + context = {'form' : NoticeForm()} + return render(request, 'posts/edit.html', context) + +def delete(request, deleteId=None): + if deleteId != None: + delNotice = Notice.objects.get(id=deleteId) + if delNotice != None: + delNotice.delete() + return redirect('index') \ No newline at end of file diff --git a/news1/templates/posts/Notice.html b/news1/templates/posts/Notice.html index 62c7c42..4dcae67 100644 --- a/news1/templates/posts/Notice.html +++ b/news1/templates/posts/Notice.html @@ -9,9 +9,15 @@
{% for notice in notices %} -

{{ notice.notice_title }}

}} +

{{ notice.notice_title }}

{{ notice.notice_text }}

- {% endfor %} +

+ Meldung löschen

+ {% endfor %} +

Neue Nachricht

+ + +
} diff --git a/news1/templates/posts/edit.html b/news1/templates/posts/edit.html new file mode 100644 index 0000000..7508ae1 --- /dev/null +++ b/news1/templates/posts/edit.html @@ -0,0 +1,18 @@ +{% extends 'posts/base.html'%} + +{% block title %} + News +{% endblock %} + +{% block content %} +
+

Neue Nachricht

+
+ {% csrf_token %} + {{ form.as_p }} + +
+ + } +
+{% endblock %}