From 183565f8568d35315f627bbb17164bd371c4a712 Mon Sep 17 00:00:00 2001 From: erichhasl Date: Mon, 8 Jan 2018 13:06:06 +0100 Subject: [PATCH] add partei werbung --- web_dev/sas_web/news/admin.py | 6 +++ web_dev/sas_web/news/models.py | 21 +++++++++ .../sas_web/news/templates/news/index.html | 46 ++++++++++++++++++- web_dev/sas_web/news/views.py | 12 ++++- 4 files changed, 83 insertions(+), 2 deletions(-) diff --git a/web_dev/sas_web/news/admin.py b/web_dev/sas_web/news/admin.py index 8c38f3f..8c8896d 100644 --- a/web_dev/sas_web/news/admin.py +++ b/web_dev/sas_web/news/admin.py @@ -1,3 +1,9 @@ from django.contrib import admin +from .models import ParteiWerbung + # Register your models here. +class ParteiWerbungAdmin(admin.ModelAdmin): + list_display = ('partei',) + +admin.site.register(ParteiWerbung, ParteiWerbungAdmin) diff --git a/web_dev/sas_web/news/models.py b/web_dev/sas_web/news/models.py index 71a8362..7d6a25f 100644 --- a/web_dev/sas_web/news/models.py +++ b/web_dev/sas_web/news/models.py @@ -1,3 +1,24 @@ from django.db import models + # Create your models here. +class ParteiWerbung(models.Model): + partei = models.ForeignKey('meingoethopia.Partei') + + def __str__(self): + return str(self.partei) + + class Meta: + verbose_name = 'Parteiwerbung' + verbose_name_plural = 'Parteienwerbung' + + +class PraesidentWerbung(models.Model): + partei = models.ForeignKey('meingoethopia.PresidentCandidate') + + def __str__(self): + return str(self.partei) + + class Meta: + verbose_name = 'Präsidentwerbung' + verbose_name_plural = 'Präsidentenwerbung' diff --git a/web_dev/sas_web/news/templates/news/index.html b/web_dev/sas_web/news/templates/news/index.html index d89be6f..0ac46c9 100644 --- a/web_dev/sas_web/news/templates/news/index.html +++ b/web_dev/sas_web/news/templates/news/index.html @@ -1,5 +1,49 @@ {% extends "public/default.html" %} +{% load static %} {% block content %} -

Hi!

+

+ +
+ + + + + + + {% if rows|length == 0 %} + + + + {% endif %} + {% for row in rows %} + + {% for entry in row %} + + {% endfor %} + + {% endfor %} +
+ + +
+

+ Bald wird gewählt in Goethopia! Hier erfährst du welche Parteien zur Wahl stehen + und wer als Präsidentin kandidiert! +

+
+

+ Keine Parteien gefunden +

+
+
+ + + +
+

{{ entry.partei.name }}

+
+
+
+
{% endblock %} diff --git a/web_dev/sas_web/news/views.py b/web_dev/sas_web/news/views.py index cdef148..0794aa7 100644 --- a/web_dev/sas_web/news/views.py +++ b/web_dev/sas_web/news/views.py @@ -1,6 +1,16 @@ from django.shortcuts import render +import math + +from .models import ParteiWerbung # Create your views here. def index(request): - return render(request, 'news/index.html') + objects = ParteiWerbung.objects.all() + rows = group(objects, 3) + return render(request, "news/index.html", {'rows': rows, + }) + + +def group(l, n): + return [l[k*n:k*n+n] for k in range(math.ceil(len(l) / n))]