diff --git a/anatomy/static/css/anatomy.css b/anatomy/static/css/anatomy.css index 851ff809..ed219ad5 100644 --- a/anatomy/static/css/anatomy.css +++ b/anatomy/static/css/anatomy.css @@ -322,4 +322,20 @@ img.uploading:hover { .google-link { padding-left: 10px; font-size: smaller; +} + +#full-question-list-physics .abcde li { + padding: 0px; + clear: right; +} + +#full-question-list-physics li { + padding-bottom: 10px; +} + + +#full-question-list-physics { + user-select: none; + -moz-user-select: none; + -webkit-user-select: none; } \ No newline at end of file diff --git a/anatomy/templates/anatomy/base.html b/anatomy/templates/anatomy/base.html index f7e39d36..50f8652c 100644 --- a/anatomy/templates/anatomy/base.html +++ b/anatomy/templates/anatomy/base.html @@ -25,6 +25,9 @@
{% if request.user.is_authenticated %} + + Physics + Logout diff --git a/anatomy/templates/anatomy/mark.html b/anatomy/templates/anatomy/mark.html index 7844aed5..6baf2311 100644 --- a/anatomy/templates/anatomy/mark.html +++ b/anatomy/templates/anatomy/mark.html @@ -25,7 +25,7 @@ Unmarked:
Key: 2 Marks, 1 diff --git a/physics/__init__.py b/physics/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/physics/admin.py b/physics/admin.py new file mode 100644 index 00000000..d8871b73 --- /dev/null +++ b/physics/admin.py @@ -0,0 +1,26 @@ +from anatomy.models import CidUserAnswer +from physics.models import Category, Question, Exam, CidUserAnswer +from django.contrib import admin + +# Register your models here. + +from reversion.admin import VersionAdmin + +class ExamInline(admin.TabularInline): + model = Question.exams.through + extra = 1 + + +class QuestionAdmin(VersionAdmin): + inlines = [ + #HalfMarkAnatomyAnswersInline, + #IncorrectAnatomyAnswersInline, + ExamInline, + ] + + +admin.site.register(Category) +admin.site.register(Question, QuestionAdmin) +admin.site.register(Exam) +admin.site.register(CidUserAnswer) + diff --git a/physics/apps.py b/physics/apps.py new file mode 100644 index 00000000..b35e0afd --- /dev/null +++ b/physics/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class PhysicsConfig(AppConfig): + name = 'physics' diff --git a/physics/migrations/0001_initial.py b/physics/migrations/0001_initial.py new file mode 100644 index 00000000..ab4e3fea --- /dev/null +++ b/physics/migrations/0001_initial.py @@ -0,0 +1,72 @@ +# Generated by Django 3.1.3 on 2020-12-15 18:36 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone +import sortedm2m.fields + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='Category', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('category', models.CharField(max_length=200)), + ], + ), + migrations.CreateModel( + name='Question', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('stem', models.TextField(help_text='Stem of the question')), + ('a', models.TextField(help_text='The question text')), + ('a_answer', models.BooleanField(default=True, help_text='Answer')), + ('b', models.TextField(help_text='The question text')), + ('b_answer', models.BooleanField(default=True, help_text='Answer')), + ('c', models.TextField(help_text='The question text')), + ('c_answer', models.BooleanField(default=True, help_text='Answer')), + ('d', models.TextField(help_text='The question text')), + ('d_answer', models.BooleanField(default=True, help_text='Answer')), + ('e', models.TextField(help_text='The question text')), + ('e_answer', models.BooleanField(default=True, help_text='Answer')), + ('created_date', models.DateTimeField(default=django.utils.timezone.now)), + ('author', models.ManyToManyField(blank=True, help_text='Author(s) of question', related_name='physics_authored_questions', to=settings.AUTH_USER_MODEL)), + ('category', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='physics.category')), + ], + ), + migrations.CreateModel( + name='Exam', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=200)), + ('active', models.BooleanField(default=True, help_text='If an exam should be available')), + ('publish_results', models.BooleanField(default=True, help_text='If an exams results should be available')), + ('exam_questions', sortedm2m.fields.SortedManyToManyField(blank='true', help_text=None, related_name='exams', to='physics.Question')), + ], + ), + migrations.CreateModel( + name='CidUserAnswer', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('a', models.BooleanField()), + ('b', models.BooleanField()), + ('c', models.BooleanField()), + ('d', models.BooleanField()), + ('e', models.BooleanField()), + ('cid', models.IntegerField(blank=True, null=True)), + ('created', models.DateTimeField(auto_now_add=True)), + ('updated', models.DateTimeField(auto_now=True)), + ('exam', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='cid_user_answers', to='physics.exam')), + ('question', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='cid_user_answers', to='physics.question')), + ], + ), + ] diff --git a/physics/migrations/__init__.py b/physics/migrations/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/physics/models.py b/physics/models.py new file mode 100644 index 00000000..618d1af9 --- /dev/null +++ b/physics/models.py @@ -0,0 +1,145 @@ +from django.db import models +from django.utils import timezone + +from django.core.files.storage import FileSystemStorage +from django.conf import settings +from django.utils.html import format_html + +from django.urls import reverse + +from django.utils.translation import ugettext_lazy as _ + +from sortedm2m.fields import SortedManyToManyField + + +class Category(models.Model): + category = models.CharField(max_length=200) + + def __str__(self): + return self.category + +class Question(models.Model): + stem = models.TextField( + blank=False, + help_text="Stem of the question", + ) + + a = models.TextField( + blank=False, + help_text="The question text", + ) + a_answer = models.BooleanField( + help_text="Answer (check for true)", default=True + ) + + b = models.TextField( + blank=False, + help_text="The question text", + ) + b_answer = models.BooleanField( + help_text="Answer", default=True + ) + + c = models.TextField( + blank=False, + help_text="The question text", + ) + c_answer = models.BooleanField( + help_text="Answer", default=True + ) + + d = models.TextField( + blank=False, + help_text="The question text", + ) + d_answer = models.BooleanField( + help_text="Answer", default=True + ) + + e = models.TextField( + blank=False, + help_text="The question text", + ) + e_answer = models.BooleanField( + help_text="Answer", default=True + ) + + created_date = models.DateTimeField(default=timezone.now) + + author = models.ManyToManyField( + settings.AUTH_USER_MODEL, + blank=True, + help_text="Author(s) of question", + related_name="physics_authored_questions", + ) + + category = models.ForeignKey( + Category, on_delete=models.SET_NULL, null=True, blank=True + ) + + def __str__(self): + return self.stem + + def clean(self): + if self.a: + self.a = self.a.strip() + if self.b: + self.b = self.b.strip() + if self.c: + self.c = self.c.strip() + if self.d: + self.d = self.d.strip() + if self.e: + self.e = self.e.strip() + +class Exam(models.Model): + name = models.CharField(max_length=200) + exam_questions = SortedManyToManyField( + Question, related_name="exams", blank="true" + ) + + active = models.BooleanField( + help_text="If an exam should be available", default=True + ) + + publish_results = models.BooleanField( + help_text="If an exams results should be available", default=True + ) + + def __str__(self): + return self.name + + def get_exam_name(self): + return self.name + + def get_json_url(self): + return reverse("anatomy:exam_json", args=(self.pk,)) + + def get_question_index(self, question): + return list(self.exam_questions.all()).index(question) + + +class CidUserAnswer(models.Model): + """User answers by candidate""" + + question = models.ForeignKey( + Question, related_name="cid_user_answers", on_delete=models.CASCADE + ) + a = models.BooleanField(blank=False) + b = models.BooleanField(blank=False) + c = models.BooleanField(blank=False) + d = models.BooleanField(blank=False) + e = models.BooleanField(blank=False) + + cid = models.IntegerField(blank=True, null=True) + + # Each user answer is associated with a particular exam + exam = models.ForeignKey( + Exam, related_name="cid_user_answers", on_delete=models.CASCADE, null=True + ) + + created = models.DateTimeField(auto_now_add=True) + updated = models.DateTimeField(auto_now=True) + + def __str__(self): + return "{}/{}/{}".format(self.cid, self.exam, self.question.pk) \ No newline at end of file diff --git a/physics/templates/physics/base.html b/physics/templates/physics/base.html new file mode 100644 index 00000000..baf4d6cf --- /dev/null +++ b/physics/templates/physics/base.html @@ -0,0 +1,59 @@ +{% load static %} + + + + Anatomy Quiz + + + + + + + + + + + + + + + + {% block js %} + {% endblock %} + + + +
+ {% if request.user.is_authenticated %} + + Anatomy + + + Logout + + + Profile + + {% endif %} + {% if request.user.is_staff %} + + Admin + + {% endif %} +
+
+ {% if request.user.is_authenticated %} + Exams / + {% endif %} + {% block navigation %} + {% endblock %} +
+
+ {% block content %} + {% endblock %} +
+
+
+ + + \ No newline at end of file diff --git a/physics/templates/physics/cid_scores.html b/physics/templates/physics/cid_scores.html new file mode 100644 index 00000000..c9260c09 --- /dev/null +++ b/physics/templates/physics/cid_scores.html @@ -0,0 +1,13 @@ +{% extends 'physics/base.html' %} + +{% block content %} +
+

CID: {{ cid }}

+ The following exams have been found (click to view answers and scores): + +
+{% endblock %} diff --git a/physics/templates/physics/cid_selector.html b/physics/templates/physics/cid_selector.html new file mode 100644 index 00000000..fa014eac --- /dev/null +++ b/physics/templates/physics/cid_selector.html @@ -0,0 +1,18 @@ +{% extends 'physics/base.html' %} + +{% block content %} +
+

Please enter your CID

+

CID:

+ +
+ +{% endblock %} diff --git a/physics/templates/physics/exam_list.html b/physics/templates/physics/exam_list.html new file mode 100644 index 00000000..9fac8ada --- /dev/null +++ b/physics/templates/physics/exam_list.html @@ -0,0 +1,30 @@ +{% extends 'physics/base.html' %} + +{% block content %} +

Examinations

+
+ Active exams:
+
    +{% for exam in exams %} + {% if exam.active %} +
  • + {{exam.name}} +
    • + {% endif %} +{% endfor %} +
+ + Inactive exams:
+
    +{% for exam in exams %} + {% if not exam.active %} +
  • + {{exam.name}} +
    • + {% endif %} +{% endfor %} +
+ + +
+{% endblock %} \ No newline at end of file diff --git a/physics/templates/physics/exam_overview.html b/physics/templates/physics/exam_overview.html new file mode 100644 index 00000000..cd9c2033 --- /dev/null +++ b/physics/templates/physics/exam_overview.html @@ -0,0 +1,99 @@ +{% extends 'physics/exams.html' %} + +{% block content %} + +{% load thumbnail %} +
+

Exam: {{ exam.name }}

+ This exam has {{question_number}} questions. + +
+ Exam active: [When checked the exam will be available to take in the test system] +
+
+ Publish results: [When checked the exam results will be available on this site] +
+ + +
    + {% for question in questions.all %} + +
  1. + {{ question.stem }} +
      +
    1. + {{ question.a }}: {{ question.a_answer }} +
      2. +
    2. + {{ question.b }}: {{ question.b_answer }} +
      3. +
    3. + {{ question.c }}: {{ question.c_answer }} +
      4. +
    4. + {{ question.d }}: {{ question.d_answer }} +
      5. +
    5. + {{ question.e }}: {{ question.e_answer }} +
      6. +
    + Category: {{ question.category }}, View +
    2. + {% endfor %} +
+ +
+ +{% endblock %} \ No newline at end of file diff --git a/physics/templates/physics/exam_scores.html b/physics/templates/physics/exam_scores.html new file mode 100644 index 00000000..5849ca1c --- /dev/null +++ b/physics/templates/physics/exam_scores.html @@ -0,0 +1,36 @@ +{% extends 'physics/exams.html' %} + +{% block content %} +
+

{{ exam.name }}

+ + {% for user, value in user_answers_marks.items %} +

Candidate: {{ user_names|get_item:user }}

+ + Answers: {% for ans, score in user_answers_and_marks|get_item:user %} + {{ans}} ({{score}}), + {% endfor %} +
Total mark: {{ user_scores|get_item:user }} + {% endfor %} +
+
+

Stats

+ Mean: {{mean}}, Median {{median}}, Mode {{mode}} +

Distribution of results

+
{{plot|safe}}
+
+
+ + + + + + {% for user, value in user_answers_marks.items %} + + + + + {% endfor %} +
Candidate IDScore
{{user}}{{user_scores|get_item:user}}
+
+{% endblock %} diff --git a/physics/templates/physics/exam_take.html b/physics/templates/physics/exam_take.html new file mode 100644 index 00000000..860d10fb --- /dev/null +++ b/physics/templates/physics/exam_take.html @@ -0,0 +1,222 @@ +{% extends 'physics/base.html' %} + +{% block content %} + +
+

Exam: {{ exam.name }}

+ +
+ Candidate number: +
+

+ Please make sure you submit answers before closing or navigating from this page (as otherwise they will not be + saved) +

+ +
    + {% for question in questions.all %} + +
  1. + {{ question.stem }} +
      +
    1. + {{ question.a }}: +
      2. +
    2. + {{ question.b }}: +
      3. +
    3. + {{ question.c }}: +
      4. +
    4. + {{ question.d }}: +
      5. +
    5. + {{ question.e }}: +
      6. +
    +
    2. + {% endfor %} +
+ + + +
+ + + + + +{% endblock %} \ No newline at end of file diff --git a/physics/templates/physics/exams.html b/physics/templates/physics/exams.html new file mode 100644 index 00000000..a828de49 --- /dev/null +++ b/physics/templates/physics/exams.html @@ -0,0 +1,6 @@ +{% extends 'physics/base.html' %} + +{% block navigation %} +
+{{exam.name}}-> Overview / Scores +{% endblock %} \ No newline at end of file diff --git a/physics/templates/physics/index.html b/physics/templates/physics/index.html new file mode 100644 index 00000000..d7e2ca20 --- /dev/null +++ b/physics/templates/physics/index.html @@ -0,0 +1,10 @@ +{% extends 'physics/base.html' %} + +{% block content %} +{% for exam in exams %} +
+

Exam: {{ exam.name }}

+ {% if request.user.is_staff %}Scores{% endif %} +
+{% endfor %} +{% endblock %} \ No newline at end of file diff --git a/physics/templates/physics/question_detail.html b/physics/templates/physics/question_detail.html new file mode 100644 index 00000000..b566bd5c --- /dev/null +++ b/physics/templates/physics/question_detail.html @@ -0,0 +1,69 @@ +{% extends 'physics/base.html' %} + +{% block content %} +{% load static %} +
+Admin Edit +
+ Created: {{ question.created_date }} +
+

{{question.stem}}

+
+
    +
  1. {{ question.a }}: {{ question.a_answer }}
    2. +
  2. {{ question.b }}: {{ question.b_answer }}
    3. +
  3. {{ question.c }}: {{ question.c_answer }}
    4. +
  4. {{ question.d }}: {{ question.d_answer }}
    5. +
  5. {{ question.e }}: {{ question.e_answer }}
    6. +
+
+
+ Examinations: {% for exam in question.exams.all %} + {{ exam.name }} + {% endfor %} +
+
+ Category: {{ question.category }} +
+ +
+ Author: {% for user in question.author.all %} + {{ author }}, + {% endfor %} +
+
+ +{% endblock %} \ No newline at end of file diff --git a/physics/templates/physics/question_list.html b/physics/templates/physics/question_list.html new file mode 100644 index 00000000..f981a180 --- /dev/null +++ b/physics/templates/physics/question_list.html @@ -0,0 +1,20 @@ +{% extends 'anatomy/base.html' %} + +{% block content %} +{% for question in questions %} +
+
+ {{ question.created_date }} +
+

{% for answer in question.answers.all %} + {{ answer }}, + {% endfor %} +

+

{{ question.question_type.first|linebreaksbr }}

+ + ANSWER +
+{% endfor %} +{% endblock %} + +{$ black navigation %} \ No newline at end of file diff --git a/physics/tests.py b/physics/tests.py new file mode 100644 index 00000000..7ce503c2 --- /dev/null +++ b/physics/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/physics/urls.py b/physics/urls.py new file mode 100644 index 00000000..e63b6293 --- /dev/null +++ b/physics/urls.py @@ -0,0 +1,30 @@ +from django.urls import path, include +from . import views + +app_name = "physics" + +urlpatterns = [ + # path('', views.question_list, name='question_list'), + path("", views.index, name="index"), + #path("question/", views.QuestionView.as_view(), name="question_view"), + path("question//", views.question_detail, name="question_detail"), + #path("question/create/", views.QuestionCreate.as_view(), name="anatomy_question_create"), + #path("question//update", views.QuestionUpdate.as_view(), name="anatomy_question_update"), + #path("exam///mark", views.mark, name="mark"), + #path("exam//mark", views.mark_overview, name="mark_overview"), + path("exam//take", views.exam_take, name="exam_take"), + path("exam//", views.exam_overview, name="exam_overview"), + path("exam//scores", views.exam_scores_cid, + name="exam_scores_cid"), + path("exam//scores//", views.exam_scores_cid_user, + name="exam_scores_cid_user"), + path("exam//toggle_active", views.exam_toggle_active, name="exam_toggle_active"), + path("exam//toggle_results_published", views.exam_toggle_results_published, name="exam_toggle_results_published"), + path("exam/submit", views.postExamAnswers, name="exam_answers_submit"), + path("exam/", views.exam_list, name="exam_list"), + #path("exam/json/", views.active_exams, name="active_exams"), + #path("exam/json/", views.exam_json, name="exam_json"), + #path("exam/json//recreate", views.exam_json_recreate, name="exam_json_recreate"), + path("cid/", views.cid_scores, name="cid_scores"), + path("cid/", views.cid_selector, name="cid_selector"), +] diff --git a/physics/views.py b/physics/views.py new file mode 100644 index 00000000..f7a82299 --- /dev/null +++ b/physics/views.py @@ -0,0 +1,415 @@ +from django.shortcuts import render, get_object_or_404, redirect +from django.views.decorators.csrf import csrf_exempt +from django import forms + +# from django.contrib.auth.models import User +from django.contrib.auth.decorators import login_required, user_passes_test +from django.contrib.auth.models import User + +from django.contrib.auth.mixins import LoginRequiredMixin + +from django.views.generic.edit import CreateView, UpdateView, DeleteView +from django.views.generic import ListView + +from django.db.models.functions import Lower + +from django.core.cache import cache + +from django.urls import reverse_lazy, reverse + +from django.http import Http404, JsonResponse + +from django.http import HttpResponseRedirect, HttpResponse + +from .models import Question, Category, Exam, CidUserAnswer + +from collections import defaultdict +import os +import base64 +import mimetypes +import json +import statistics +import plotly.express as px + + +def question_list(request): + questions = Question.objects.all() + return render(request, "physics/question_list.html", + {"questions": questions}) + + +@login_required +def index(request): + exams = Exam.objects.all() + return render(request, "physics/index.html", {"exams": exams}) + + +@login_required +def question_detail(request, pk): + question = get_object_or_404(Question, pk=pk) + return render(request, "physics/question_detail.html", + {"question": question}) + + +@login_required +def exam_list(request): + exams = Exam.objects.all() + return render(request, "physics/exam_list.html", {"exams": exams}) + + +@login_required +def exam_overview(request, pk): + print(type(pk)) + print(Exam.objects.all()) + exams = Exam.objects.all() + print("test", Exam.objects.all().get(id=pk)) + exam = get_object_or_404(Exam, pk=pk) + print("exam", exam) + + questions = exam.exam_questions.all() + + question_number = len(questions) + + return render( + request, + "physics/exam_overview.html", + { + "exam": exam, + "questions": questions, + "question_number": question_number + }, + ) + + +def exam_toggle_results_published(request, pk): + if request.is_ajax() and request.method=='POST': + + exam = get_object_or_404(Exam, pk=pk) + + exam.publish_results = True if request.POST.get('publish_results') == 'true' else False + exam.save() + data = {'status':'success', 'publish_results':exam.publish_results} + return JsonResponse(data, status=200) + else: + data = {'status':'error'} + return JsonResponse(data, status=400) + +def exam_toggle_active(request, pk): + if request.is_ajax() and request.method=='POST': + + exam = get_object_or_404(Exam, pk=pk) + + exam.active = True if request.POST.get('active') == 'true' else False + exam.save() + data = {'status':'success', 'active':exam.active} + return JsonResponse(data, status=200) + else: + data = {'status':'error'} + return JsonResponse(data, status=400) + +def active_exams(request): + exams = Exam.objects.all() + print(exams) + + active_exams = {"exams": []} + + for exam in exams: + if exam.active: + active_exams["exams"].append({ + "name": + exam.get_exam_name(), + "url": + request.build_absolute_uri(exam.get_json_url()), + }) + + return JsonResponse(active_exams) + + +@login_required +def exam_scores_cid(request, pk): + exam = get_object_or_404(Exam, pk=pk) + + questions = exam.exam_questions.all() + + cids = (CidUserAnswer.objects.filter(question__in=questions).values_list( + "cid", flat=True).distinct()) + + user_answers_and_marks = defaultdict(list) + user_answers_marks = defaultdict(list) + user_answers = defaultdict(list) + user_names = {} + + unmarked = set() + + # Loop through all candidates + for cid in cids: + # Convoluted (probably...) + user_names[cid] = cid + for q in questions: + # Get user answer + s = q.cid_user_answers.filter(cid=cid).first() + if not s: + # skip if no answer + user_answers_marks[cid].append(0) + user_answers[cid].append("") + continue + + ans = s.answer + answer_score = s.get_answer_score() + if answer_score == "unmarked": + index = exam.get_question_index(q) + unmarked.add(index) + user_answers[cid].append(ans) + user_answers_marks[cid].append(answer_score) + user_answers_and_marks[cid].append((ans, answer_score)) + + user_scores = {} + for user in user_answers_marks: + user_scores[user] = sum([i for i in user_answers_marks[user] if i != "unmarked"]) + + user_scores_list = list(user_scores.values()) + + if len(user_scores_list) < 1: + mean = 0 + median = 0 + mode = 0 + fig_html = "" + else: + mean = statistics.mean(user_scores_list) + median = statistics.median(user_scores_list) + try: + mode = statistics.mode(user_scores_list) + except statistics.StatisticsError: + mode = "No unique mode" + + df = user_scores_list + fig = px.histogram(df, x=0) + fig_html = fig.to_html() + + total = len(questions) + + return render( + request, + "physics/exam_scores.html", + { + "exam": exam, + "unmarked": unmarked, + "questions": questions, + "user_answers": dict(user_answers), + "user_answers_marks": dict(user_answers_marks), + "user_scores": user_scores, + "user_names": user_names, + "user_answers_and_marks": user_answers_and_marks, + "mean": mean, + "median": median, + "mode": mode, + "plot": fig_html, + }, + ) + +def exam_scores_cid_user(request, pk, sk): + exam = get_object_or_404(Exam, pk=pk) + + # TODO:Need some kind of test for cid + cid = sk + + questions = exam.exam_questions.all() + + answers_and_marks = [] + answers_marks = [] + answers = [] + + + for q in questions: + # Get user answer + user_answer = q.cid_user_answers.filter(cid=cid).first() + if not user_answer: + # skip if no answer + answers_marks.append(0) + answers.append("") + answer_score = 0 + ans = "Not answered" + else: + ans = user_answer.answer + + answer_score = user_answer.get_answer_score() + + correct_answer = q.GetPrimaryAnswer() + + if not exam.publish_results: + correct_answer = "*****" + answer_score = 0 + answers.append(ans) + answers_marks.append(answer_score) + answers_and_marks.append((ans, answer_score, correct_answer)) + + if "unmarked" in answers_marks: + answered = [i for i in answers_marks if type(i) == int] + total_score = sum(answered) + unmarked_number = len(answers_marks) - len(answered) + total_score = "{} ({} unmarked)".format(total_score, unmarked_number) + else: + total_score = sum(answers_marks) + + max_score = len(questions) * 2 + + return render( + request, + "physics/exam_scores_user.html", + { + "exam": exam, + "cid": cid, + "questions": questions, + "answers": answers, + "answers_marks": answers_marks, + "total_score": total_score, + "max_score": max_score, + "answers_and_marks": answers_and_marks, + }, + ) + +def cid_selector(request): + return render( + request, + "physics/cid_selector.html", + ) + + +def cid_scores(request, pk): + #exam = get_object_or_404(Exam, pk=pk) + + # TODO:Need some kind of test for cid + cid = pk + + #questions = exam.exam_questions.all() + answers = CidUserAnswer.objects.filter( + cid=cid) + + + if not answers: + raise Http404("cid not found") + + exam_ids = answers.values_list("exam").distinct() + + exams = Exam.objects.filter(id__in=exam_ids) + + + return render( + request, + "physics/cid_scores.html", + { + "exams": exams, + "cid": cid, + }, + ) + +def exam_take(request, pk): + + exam = get_object_or_404(Exam, pk=pk) + + if not exam.active: + raise Http404("Exam not found") + + questions = exam.exam_questions.all() + + return render( + request, + "physics/exam_take.html", + { + "exam": exam, + "questions": questions, + }, + ) + + +@csrf_exempt +def postExamAnswers(request): + if request.is_ajax and request.method == "POST": + + n = 0 + # horrible but it works + for k in request.POST.dict(): + print(k) + ret = loadJsonAnswer(json.loads(k)) + + if ret is not True: + return ret + + # print(UserAnswer.objects.filter(exam__id=q["eid"])) + # print(request.urlencode()) + + return JsonResponse({"success": True}) + return JsonResponse({"success": False, "error": "Invalid data"}) + + +def loadJsonAnswer(answer): + # As access is not restricted make sure the data appears valid + if (not isinstance(answer["cid"], + int)) or (not isinstance(answer["eid"], int) + ): + return JsonResponse({"success": False, "error": "invalid"}) + + # The model should catch invalid data but this should be less intensive + max_int = 10000000 + if answer["cid"] > max_int or answer["eid"] > max_int: + return JsonResponse({"success": False}) + + exam = get_object_or_404(Exam, pk=answer["eid"]) + + if not exam.active: + return JsonResponse({ + "success": False, + "error": "No active exam: {}".format(answer["eid"]) + }) + + questions = defaultdict(dict) + + for q, n, a in answer["ans"]: + questions[q][n] = a + pass + + + for qid in questions: + exiting_answers = CidUserAnswer.objects.filter(question__id=qid, + exam__id=answer["eid"], + cid=answer["cid"]) + + a = questions[qid]["a"] + b = questions[qid]["b"] + c = questions[qid]["c"] + d = questions[qid]["d"] + e = questions[qid]["e"] + + if not exiting_answers: + ans = CidUserAnswer(a=a, b=b, c=c, d=d, e=e, cid=answer["cid"]) + ans.question_id = qid + ans.exam_id = answer["eid"] + + ans.full_clean() + + ans.save() + else: + # Update an existing answer + # should never be more than one (famous last words) + ans = exiting_answers[0] + ans.a = a + ans.b = b + ans.c = c + ans.d = d + ans.e = e + ans.full_clean() + ans.save() + + return True + + + + + + + + + + + + diff --git a/rad/settings.py b/rad/settings.py index 6177fca3..15dd3bd2 100644 --- a/rad/settings.py +++ b/rad/settings.py @@ -31,6 +31,7 @@ ALLOWED_HOSTS = ["localhost", "127.0.0.1", "161.35.163.87"] INSTALLED_APPS = [ 'anatomy', + 'physics', "reversion", "django_tables2", "django_filters", diff --git a/rad/urls.py b/rad/urls.py index a468e734..6f840751 100644 --- a/rad/urls.py +++ b/rad/urls.py @@ -25,6 +25,7 @@ from . import views urlpatterns = [ path("admin/", admin.site.urls, name="admin"), path("anatomy/", include("anatomy.urls"), name="anatomy"), + path("physics/", include("physics.urls"), name="physics"), #path("sbas/", include("sbas.urls"), name="sbas"), #path("rapids/", include("rapids.urls"), name="rapids"), path("accounts/", include("django.contrib.auth.urls")), diff --git a/templates/index.html b/templates/index.html index 9636c154..30896a6d 100644 --- a/templates/index.html +++ b/templates/index.html @@ -4,6 +4,7 @@

Radiology Stuff

Anatomy + Physics Log in {% if request.user.is_staff %}Admin{% endif %} Reset password