From 5ebdd78c4a67ed99103ce1829f720fc3f232e1a8 Mon Sep 17 00:00:00 2001 From: DerTyp187 Date: Mon, 22 Nov 2021 14:16:55 +0100 Subject: [PATCH] dfa --- .../0012_alter_rating_is_positive.py | 18 ++++++++++ .../0013_alter_rating_is_positive.py | 18 ++++++++++ TealCode/main/models.py | 2 +- TealCode/main/templates/main/topic.html | 27 +++++++------- TealCode/main/urls.py | 1 + TealCode/main/views.py | 35 +++++++++++++++---- 6 files changed, 81 insertions(+), 20 deletions(-) create mode 100644 TealCode/main/migrations/0012_alter_rating_is_positive.py create mode 100644 TealCode/main/migrations/0013_alter_rating_is_positive.py diff --git a/TealCode/main/migrations/0012_alter_rating_is_positive.py b/TealCode/main/migrations/0012_alter_rating_is_positive.py new file mode 100644 index 0000000..0577756 --- /dev/null +++ b/TealCode/main/migrations/0012_alter_rating_is_positive.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.9 on 2021-11-22 12:30 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0011_rating'), + ] + + operations = [ + migrations.AlterField( + model_name='rating', + name='is_positive', + field=models.IntegerField(), + ), + ] diff --git a/TealCode/main/migrations/0013_alter_rating_is_positive.py b/TealCode/main/migrations/0013_alter_rating_is_positive.py new file mode 100644 index 0000000..cdf6d68 --- /dev/null +++ b/TealCode/main/migrations/0013_alter_rating_is_positive.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.9 on 2021-11-22 12:30 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0012_alter_rating_is_positive'), + ] + + operations = [ + migrations.AlterField( + model_name='rating', + name='is_positive', + field=models.BooleanField(), + ), + ] diff --git a/TealCode/main/models.py b/TealCode/main/models.py index 7ccd553..77fc5b7 100644 --- a/TealCode/main/models.py +++ b/TealCode/main/models.py @@ -32,4 +32,4 @@ class Rating(models.Model): date_created = models.DateTimeField(default=timezone.now) def __str__(self): - return self.topic.title + " - " + self.is_positive + " - " + self.ip + " - " + self.date_created \ No newline at end of file + return self.topic.title + " - " + self.ip \ No newline at end of file diff --git a/TealCode/main/templates/main/topic.html b/TealCode/main/templates/main/topic.html index 7accc43..9894e2a 100644 --- a/TealCode/main/templates/main/topic.html +++ b/TealCode/main/templates/main/topic.html @@ -1,5 +1,15 @@ {% extends "base.html" %} {% block content %} + +
@@ -52,11 +62,11 @@
-
+
{{ notHelpful_count }}
-
+
{{ helpful_count }}
@@ -68,18 +78,9 @@
+
- -

Lorem ipsum dolor sit, amet consectetur adipisicing elit. Laboriosam alias impedit ad quae. Eius soluta officia omnis cupiditate eaque explicabo corrupti tenetur nam ducimus nobis, repellendus deserunt? Voluptates, beatae consequatur? - Ducimus rem aspernatur porro ut illum dolore sed minus. Facere, est possimus. Sapiente repellendus exercitationem voluptates quis magnam provident recusandae mollitia dignissimos explicabo hic fuga quam, incidunt similique consectetur reprehenderit! - Totam incidunt ipsa veritatis vitae obcaecati, cumque nostrum dolorem! Odio quas dolorum eos minima laborum, accusantium omnis nihil dolore, obcaecati molestias praesentium provident quam. Inventore quisquam quo deserunt deleniti iusto. - Tempore voluptatibus labore cumque rerum. Laborum rem doloribus quasi dolor illo voluptatem nihil provident quam quas dignissimos modi alias quia, dolorem ratione tempore. Quaerat recusandae consequuntur libero doloremque inventore autem! - Pariatur amet placeat rerum adipisci. Aliquid libero perferendis, eos ratione aperiam non rerum alias iste, fuga labore perspiciatis voluptatem aut minima explicabo, eveniet voluptates officia consequuntur facilis! Asperiores, suscipit tempora! - Incidunt minus deleniti inventore eaque nihil pariatur ea dignissimos voluptas, ipsum quaerat, reprehenderit illum, aperiam temporibus culpa non ipsam blanditiis commodi amet sapiente quam quidem quia! Perferendis quibusdam quod perspiciatis? - Eaque, eveniet. Porro, unde quos maiores quaerat voluptatem nisi aspernatur fuga perspiciatis neque labore, blanditiis repudiandae a suscipit vel praesentium corrupti, ratione hic nesciunt eum modi animi eos? Cum, magni. - Error, ad? Quia iure placeat, autem nobis voluptatibus porro magni nihil aut nesciunt, at, dolore quis doloribus dolorem dolores! Adipisci harum, ullam id perferendis consectetur maxime at blanditiis soluta aspernatur? - Vero repellendus id doloremque magnam eligendi, libero reiciendis veritatis provident reprehenderit asperiores assumenda accusamus facilis architecto consequatur rem quo voluptate excepturi incidunt fuga. Rem inventore soluta mollitia laboriosam qui itaque! - A maiores magni atque impedit nobis deserunt facilis dolore in, adipisci fuga repellendus voluptas odit natus sapiente iste minima consectetur cumque dolores modi odio nihil est? Quos natus repellendus nostrum! Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum

+ {{ read_more }}
diff --git a/TealCode/main/urls.py b/TealCode/main/urls.py index 79cba8f..7384305 100644 --- a/TealCode/main/urls.py +++ b/TealCode/main/urls.py @@ -7,6 +7,7 @@ urlpatterns = [ path('category//', views.category, name="main-category"), path('about/', views.about, name="main-about"), path('privacy/', views.privacy, name="main-privacy"), + path('rating///', views.rating, name="main-rating"), path('search//', views.search, name="main-search"), path('sitemap.xml', views.sitemap, name="main-sitemap"), ] diff --git a/TealCode/main/views.py b/TealCode/main/views.py index 5f42ef8..cc4a631 100644 --- a/TealCode/main/views.py +++ b/TealCode/main/views.py @@ -1,6 +1,6 @@ -from django.http.response import HttpResponse +from django.http.response import HttpResponse, HttpResponseForbidden from django.shortcuts import render, redirect -from .models import Category, Topic +from .models import Category, Topic, Rating from analytics.models import View def index(req): @@ -17,6 +17,14 @@ def topic(req, category, topic): topic_obj = Topic.objects.filter(title=topic, category = category_obj).first() previous_obj = Topic.objects.filter(id = topic_obj.id-1, category = category_obj).first() next_obj = Topic.objects.filter(id = topic_obj.id+1, category = category_obj).first() + helpful_count = 0 + notHelpful_count = 0 + + for rating in Rating.objects.all(): + if rating.is_positive == 1: + helpful_count = helpful_count+1 + else: + notHelpful_count = notHelpful_count +1 if topic_obj: context = { @@ -28,8 +36,9 @@ def topic(req, category, topic): 'next': next_obj, 'output': topic_obj.output, 'current': category_obj.title, - 'helpful_count': 2, - 'notHelpful_count': 2, + 'helpful_count': helpful_count, + 'notHelpful_count': notHelpful_count, + 'read_more': topic_obj.read_more, } @@ -90,8 +99,22 @@ def about(req): def privacy(req): return render(req, "main/privacy.html", {'current': 'privacy'}) -def rating(req, topic, is_positive): - return HttpResponse("

HALLO

") +def rating(req, topic_title, is_positive): + if(Rating.objects.filter(ip=get_client_ip(req))): + return redirect("main-index") + + + topic = Topic.objects.filter(title=topic_title).first() + + if is_positive == 1: + is_positive = True + else: + is_positive = False + + rating = Rating(topic=topic, is_positive=is_positive, ip=get_client_ip(req)) + + rating.save() + return redirect("main-index") def get_client_ip(req): x_forwarded_for = req.META.get("HTTP_X_FORWARDED_FOR")