Trudność:
- {% if test.avg_difficulty == 0.0 %}
+ {% if test.difficulty_label == 0 %}
- {% elif test.avg_difficulty < 20.0 %}
+ {% elif test.difficulty_label == 1 %}
>
>
>
>
- {% elif test.avg_difficulty < 40.0 %}
+ {% elif test.difficulty_label == 2 %}
- {% elif test.avg_difficulty < 60.0 %}
+ {% elif test.difficulty_label == 3 %}
- {% elif test.avg_difficulty < 80.0 %}
+ {% elif test.difficulty_label == 4 %}
diff --git a/templates/popular.html b/templates/popular.html
new file mode 100644
index 0000000..7c6ce28
--- /dev/null
+++ b/templates/popular.html
@@ -0,0 +1,118 @@
+{% extends "base.html" %}
+
+{% block title %}Główna{% endblock %}
+
+{% block content %}
+
Najpopularniejsze testy:
+ {% for test in tests %}
+
+
+ {{test.name}}
+ {% if test.password != "" %}
+
+ {% endif %}
+
+
+
+
Kategoria: {{test.category}}
+
Autor: {{test.get_author_name}}
+
Rozwiązania: {{test.completions}}
+
+
+
Próg zaliczenia: {{test.passing_score}}
+
Maksymalna ilość punktów: {{test.get_maxscore}}
+
Ilość pytań: {{test.question_count}}
+
+
+
+ Trudność:
+ {% if test.difficulty_label == 0 %}
+
+
+
+
+
+ {% elif test.difficulty_label == 1 %}
+
+ >
+ >
+ >
+ >
+ {% elif test.difficulty_label == 2 %}
+
+
+
+
+
+ {% elif test.difficulty_label == 3 %}
+
+
+
+
+
+ {% elif test.difficulty_label == 4 %}
+
+
+
+
+
+ {% else %}
+
+
+
+
+
+ {% endif %}
+
+
+ Ocena:
+ {% if test.avg_rating == 0 %}
+
+
+
+
+
+ {% elif test.avg_rating == 1 %}
+
+
+
+
+
+ {% elif test.avg_rating == 2 %}
+
+
+
+
+
+ {% elif test.avg_rating == 3 %}
+
+
+
+
+
+ {% elif test.avg_rating == 4 %}
+
+
+
+
+
+ {% else %}
+
+
+
+
+
+ {% endif %}
+ (Głosy: {{test.rates_amount}})
+
+
+
+
+
+
+
+
+
+ {% endfor %}
+{% endblock %}
+
diff --git a/trials/models.py b/trials/models.py
index d6c499f..56c8f4d 100644
--- a/trials/models.py
+++ b/trials/models.py
@@ -28,6 +28,7 @@ class Test(models.Model):
total_rating = models.IntegerField(default=0)
avg_rating = models.IntegerField(default=0)
rates_amount = models.IntegerField(default=0)
+ difficulty_label = models.IntegerField(default=0)
avg_difficulty = models.FloatField(default=0.0)
objects = TestManager()
diff --git a/trials/serializers.py b/trials/serializers.py
index fa5683c..0f938ed 100644
--- a/trials/serializers.py
+++ b/trials/serializers.py
@@ -19,6 +19,14 @@ class TestSerializer(serializers.ModelSerializer):
"questions",
"visible",
"category",
+ "created_by",
+ "completions",
+ "total_percentage_scored_by_users",
+ "total_rating",
+ "avg_rating",
+ "rates_amount",
+ "difficulty_label",
+ "avg_difficulty"
)
def create(self, validated_data):
diff --git a/trials/urls.py b/trials/urls.py
index c689e6f..c563442 100644
--- a/trials/urls.py
+++ b/trials/urls.py
@@ -1,7 +1,7 @@
from django.urls import path
from rest_framework.routers import DefaultRouter
-from trials.views import TestModelViewSet, TestTemplateView, TestValidateAPIView, TestResultView, rateTest, addTest, addQuestions, myTests, solvedTests, solvedTestsDetailed, EditTestTemplateView, deleteTest, AddQuestionToExistingTest, RemoveQuestionFromExistingTest, EditQuestionTemplateView, editName, editVisible, editPassword, TestPasswordTemplateView
+from trials.views import TestModelViewSet, TestTemplateView, TestValidateAPIView, TestResultView, rateTest, addTest, addTest2, addQuestions, myTests, solvedTests, solvedTestsDetailed, EditTestTemplateView, deleteTest, AddQuestionToExistingTest, RemoveQuestionFromExistingTest, EditQuestionTemplateView, editName, editVisible, editPassword, TestPasswordTemplateView
router = DefaultRouter(trailing_slash=False)
router.register("items", TestModelViewSet)
diff --git a/trials/views.py b/trials/views.py
index 1908b23..90efd21 100644
--- a/trials/views.py
+++ b/trials/views.py
@@ -18,12 +18,12 @@ from django.template import loader
from django.template.loader import render_to_string, get_template
from django.http import HttpRequest
import requests
+from django.contrib.auth.decorators import login_required
-
+@login_required
def addTest(request):
return render(request, 'createTest.html')
-
def is_visible(visible):
if visible =="public":
return True
@@ -144,14 +144,14 @@ class RemoveQuestionFromExistingTest(TemplateView):
Question.objects.get(id=request.POST["id"]).delete()
return redirect(f'/tests/{kwargs["test_id"]}/edit')
-
+@login_required
def myTests(request):
context = {}
user = request.user.id
context['tests'] = Test.objects.filter(created_by=user)
return render(request, 'myTests.html', context)
-
+@login_required
def solvedTests(request):
context = {}
user_id = request.user.id
@@ -180,7 +180,7 @@ def solvedTests(request):
context['tests_lists'] = dict_with_lists_of_test_results
return render(request, 'solvedTests.html', context)
-
+@login_required
def solvedTestsDetailed(request, test_id):
context = {}
solved_tests = SolvedTest.objects.filter(test__id=test_id)
@@ -268,12 +268,12 @@ class EditQuestionTemplateView(TemplateView):
Question.objects.EditQuestion(question_id=question_id, name=description, answers=answers)
return redirect(f'/tests/{test}/edit')
-
+@login_required
def deleteTest(request, test_id):
Test.objects.filter(id=test_id).delete()
return redirect('myTests')
-
+@login_required
def editVisible(request, test_id):
new_visible = request.GET["visible"]
if new_visible == "public":
@@ -285,6 +285,7 @@ def editVisible(request, test_id):
test.save()
return redirect(f'/tests/{test_id}/edit')
+@login_required
def editName(request, test_id):
new_name = request.GET["name"]
test = Test.objects.get(id=test_id)
@@ -292,7 +293,7 @@ def editName(request, test_id):
test.save()
return redirect(f'/tests/{test_id}/edit')
-
+@login_required
def editPassword(request, test_id):
new_password = request.GET["password"]
test = Test.objects.get(id=test_id)
@@ -300,7 +301,7 @@ def editPassword(request, test_id):
test.save()
return redirect(f'/tests/{test_id}/edit')
-
+@login_required
def rateTest(request, test_id):
test = Test.objects.get(id=test_id)
rate = request.GET["rate"]
@@ -401,6 +402,7 @@ class TestTemplateView(TemplateView):
return HttpResponseRedirect(f'result')
+@login_required
def TestPasswordTemplateView(request, test_id):
test = Test.objects.get(id=test_id)
if test.password == "":
@@ -411,6 +413,7 @@ def TestPasswordTemplateView(request, test_id):
return render(request, 'testPassword.html')
+@login_required
def testView(request):
permission_classes = []
template_name = settings.BASE_DIR + f"/templates/generic_test.html"