Author SHA1 Message Date
zeitlersa64582 5d99369516 Solution of 07 2018-12-12 21:13:07 +01:00
zeitlersa64582 b4ac907a6a Solution of 06 2018-12-12 20:14:16 +01:00
zeitlersa64582 fccc0f39d6 Solution of 05 2018-11-23 12:38:10 +01:00
13 changed files with 228 additions and 14 deletions
+93
View File
@@ -0,0 +1,93 @@
### 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
db.sqlite3
.env
**/db.sqlite3
# PyCharm
**/.idea/
+3 -1
View File
@@ -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 = [
@@ -104,7 +106,7 @@ AUTH_PASSWORD_VALIDATORS = [
# Internationalization
# https://docs.djangoproject.com/en/2.1/topics/i18n/
LANGUAGE_CODE = 'en-us'
LANGUAGE_CODE = 'de-de'
TIME_ZONE = 'UTC'
+3 -2
View File
@@ -19,6 +19,7 @@ from . import views
urlpatterns = [
path('admin/', admin.site.urls),
path('', views.index, name='posts'),
path('posts/', include('posts.urls'), name='posts')
path('', views.index),
path('posts/', include('posts.urls')),
path('accounts/', include('django.contrib.auth.urls'))
]
BIN
View File
Binary file not shown.
+9
View File
@@ -0,0 +1,9 @@
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)
+24
View File
@@ -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()),
],
),
]
+5 -1
View File
@@ -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()
+5 -2
View File
@@ -3,6 +3,9 @@ from django.urls import path, re_path
urlpatterns = [
# use re_path for regex (.*) - this regex accepts anything - see https://docs.python.org/3/library/re.html for more
path('', views.home, name=''),
re_path('(?P<value>.*)/$', views.home, name='textausgabe')
path('', views.home, name='index'),
re_path('delete/(?P<value>\d+)/$', views.delete, name='delete'),
re_path('(?P<value>.*)/$', views.home, name='textausgabe'),
path('new', views.new, name='new'),
# only accept numbers ^[0-9]*$
]
+37 -3
View File
@@ -1,9 +1,43 @@
from django.shortcuts import render
from django.shortcuts import render, redirect
from datetime import timedelta
from django.utils import timezone
from posts.models import Notice
from posts.forms import NoticeForm
from django.contrib.auth.decorators import login_required
from django.contrib.admin.views.decorators import staff_member_required
# 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)
return render(request, 'index.html', context)
@login_required
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, 'edit.html', context)
@staff_member_required
def delete(request, value):
notice = Notice.objects.get(id = value)
notice.delete()
return redirect('index')
+13 -1
View File
@@ -17,7 +17,7 @@
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav">
<ul class="navbar-nav mr-auto mt-2 mt-lg-0">
<li class="nav-item active">
<a class="nav-link" href="/posts">Posts</a>
</li>
@@ -28,6 +28,18 @@
<a class="nav-link" href="https://www.google.com/">Google</a>
</li>
</ul>
<ul class="navbar-nav">
{% if request.user.is_authenticated %}
<span class="navbar-text"> Willkommen {{ request.user.username }}! </span>
<li class="nav-item">
<a class="nav-link" href="{% url 'logout' %}?next=/posts">Abmelden</a>
</li>
{% else %}
<li class="nav-item">
<a class="nav-link" href="{% url 'login' %}?next=/posts">Anmelden</a>
</li>
{% endif %}
</ul>
</div>
</nav>
{% block content %} {% endblock %}
+12
View File
@@ -0,0 +1,12 @@
{% extends "base.html" %}
{% block title %} {{ title }} {% endblock title %}
{% block content %}
<h1>Neue Nachricht</h1>
<form method="POST">
{% csrf_token %}
{{ form.as_p }}
<button type="submit" class="save btn btn-default">Speichern</button>
</form>
{% endblock content %}
+12 -4
View File
@@ -3,8 +3,16 @@
{% block title %} {{ title }} {% endblock title %}
{% block content %}
<div class="jumbotron">
<h1 class="display-6">My first post!</h1>
<p class="lead">{{message}}</p>
</div>
{% for notice in notices %}
<div class="jumbotron">
<h1 class="display-6">{{ notice.notice_title }}</h1>
<p class="lead">{{notice.notice_text}}</p>
{% if user.is_staff %}
<p><a href="{% url 'delete' notice.id %}" class="btn btn-info" role="button">Nachricht löschen</a></p>
{% endif %}
</div>
{% endfor %}
{% if user.is_authenticated %}
<p><a href="{% url 'new' %}" class="btn btn-info" role="button">Neue Nachricht</a></p>
{% endif %}
{% endblock content %}
+12
View File
@@ -0,0 +1,12 @@
{% extends 'base.html' %}
{% block title %} Login {% endblock %}
{% block content %}
<div class="container"><form method="post" action="{% url 'login' %}">
{% csrf_token %}
Benutzername: {{ form.username }}
<br>Passwort: {{ form.password }} <br>
<button type="submit" class="btn btn-default">Anmelden</button>
<input type="hidden" name="next" value="{{ next }}" />
</form>
</div>
{% endblock %}