Lots of improvemnets

2024-01-15 22:46:41 +00:00
parent aa41423b22
commit 5c2578a3ce
22 changed files with 527 additions and 216 deletions
@@ -64,6 +64,11 @@ class RapidCreationDefaultForm(ModelForm):
        exclude = ["author"]


+class RapidQuestionAnswerForm(ModelForm):
+    class Meta:
+        model = Rapid
+        fields = []
+
 class RapidForm(ModelForm):

    # exams = ModelMultipleChoiceField(required=False, queryset=Exam.objects.all(),widget=FilteredSelectMultiple(verbose_name="Exams", is_stacked=False))
@@ -1,29 +1,6 @@
 {% extends 'rapids/base.html' %}

 {% block content %}
-
-<div class="floating-header">
-
-<a href="{% url 'rapids:rapid_update' pk=question.pk %}" title="Edit the Rapid">Edit</a>
-<a href="{% url 'rapids:rapid_clone' pk=question.pk %}" title="Clone the Rapid (duplicate everything but the images)">Clone</a>
-<a href="{% url 'rapids:question_delete' pk=question.pk %}" title="Delete the Rapid">Delete</a>
-<a href="#" onclick="return window.create_popup_window('{% url 'feedback_create' question_type='rapid' pk=question.pk %}')"> Add Note</a>
-{% if request.user.is_superuser %}
-<a href="{% url 'admin:rapids_rapid_change' question.id %}" title="Edit the Rapid using the admin interface">Admin Edit</a>
-<a href="{% url 'rapids:question_user_answers' question.id %}" title="View user answers associated with this question">User answers</a>
-{% endif %}
-{% if exam %}
-<div>
-
-{% if previous > -1 %}
-<a href="{% url 'rapids:exam_question_detail' exam.id previous %}">Previous question</a>
-{% endif %}
-Viewing question as part of exam: <a href="{% url 'rapids:exam_overview' exam.id %}">{{exam.name}}</a> [{{pos}}/{{exam_length}}]
-{% if next %}
-<a href="{% url 'rapids:exam_question_detail' exam.id next %}">Next question</a>
-{% endif %}
-</div>
-{% endif %}
-</div>
-{% include 'rapids/question_display_block.html' %}
+    {% include "rapids/question_link_header.html" %}
+    {% include 'rapids/question_display_block.html' %}
 {% endblock %}
@@ -0,0 +1,25 @@
+
+    <div class="floating-header">
+
+        <a href="{% url 'rapids:rapid_update' pk=question.pk %}" title="Edit the Rapid">Edit</a>
+        <a href="{% url 'rapids:rapid_clone' pk=question.pk %}" title="Clone the Rapid (duplicate everything but the images)">Clone</a>
+        <a href="{% url 'rapids:question_delete' pk=question.pk %}" title="Delete the Rapid">Delete</a>
+        <a href="{% url 'rapids:question_answer_update' pk=question.pk %}" title="Update the question answers">Edit Answers</a>
+        <a href="#" onclick="return window.create_popup_window('{% url 'feedback_create' question_type='rapid' pk=question.pk %}')"> Add Note</a>
+        {% if request.user.is_superuser %}
+            <a href="{% url 'admin:rapids_rapid_change' question.id %}" title="Edit the Rapid using the admin interface">Admin Edit</a>
+            <a href="{% url 'rapids:question_user_answers' question.id %}" title="View user answers associated with this question">User answers</a>
+        {% endif %}
+        {% if exam %}
+            <div>
+
+                {% if previous > -1 %}
+                    <a href="{% url 'rapids:exam_question_detail' exam.id previous %}">Previous question</a>
+                {% endif %}
+                Viewing question as part of exam: <a href="{% url 'rapids:exam_overview' exam.id %}">{{exam.name}}</a> [{{pos}}/{{exam_length}}]
+                {% if next %}
+                    <a href="{% url 'rapids:exam_question_detail' exam.id next %}">Next question</a>
+                {% endif %}
+            </div>
+        {% endif %}
+    </div>
@@ -360,6 +360,11 @@
 {{ form.media }}
 {% endblock %}
 {% block content %}
+
+{% if object %}
+    {% include "rapids/question_link_header.html" %}
+{% endif %}
+    
 <h2>Submit Rapid</h2>
 <a href="{% url 'rapids:rapid_create_defaults' %}">Edit defaults</a>
 <p>
@@ -415,7 +420,6 @@ the feedback image box is checked they will not be displayed when taking the que
    </div>
    {{ image_formset.management_form }}
    <input type="submit" class="submit-button" value="Submit" name="submit">
-    <input type="submit" class="submit-button" value="Submit and Clone" name="submit-clone">
 </form>
 <div id="empty_form" style="display:none">
    <ul class='no_error image-formset'>
@@ -0,0 +1,71 @@
+{% extends "rapids/base.html" %}
+{% load static from static %}
+
+{% block js %}
+<!--<script type="text/javascript" src="/admin/jsi18n/"></script>-->
+
+<script type="text/javascript">
+    let csrf_token = "{{csrf_token}}";
+
+    function add_answers_input_form() {
+        var form_idx = $('#id_answers-TOTAL_FORMS').val();
+        $('#answer_form_set').append($('#answer_empty_form').html().replace(/__prefix__/g, form_idx));
+        $(`#id_answers-${form_idx}-status`).val(2);
+        $('#id_answers-TOTAL_FORMS').val(parseInt(form_idx) + 1);
+    }
+
+
+
+    $(document).ready(function () {
+
+        $('#add_more_answers').click(() => {
+            add_answers_input_form()
+        });
+
+
+
+    });
+
+
+
+
+
+
+
+
+</script>
+
+{{ form.media }}
+{% endblock %}
+{% block content %}
+
+{% if object %}
+    {% include "rapids/question_link_header.html" %}
+{% endif %}
+    
+<h2>Update Question Answers</h2>
+<form action="" method="post" enctype="multipart/form-data" id="rapid-form">
+    {% csrf_token %}
+    <h3>Answers:</h3>
+    <div id="answer_form_set">
+        {% for form in answer_formset %}
+        <ul class="no-error answer-formset">
+            {{form.non_field_errors}}
+            {{form.errors}}
+            {{ form.as_ul }}
+        </ul>
+        {% endfor %}
+    </div>
+    {{ answer_formset.management_form }}
+    <input type="button" value="Add More Answers" id="add_more_answers">
+    <p>
+    <input type="submit" class="submit-button" value="Submit" name="submit">
+    </p>
+</form>
+<div id="answer_empty_form" style="display:none">
+    <ul class='no_error answer-formset'>
+        {{ answer_formset.empty_form.as_ul }}
+    </ul>
+</div>
+
+{% endblock %}
@@ -81,6 +81,11 @@ urlpatterns = [
        views.RapidUpdate.as_view(),
        name="rapid_update",
    ),
+    path(
+        "question/<int:pk>/update_answers",
+        views.RapidAnswerUpdate.as_view(),
+        name="question_answer_update",
+    ),
    path(
        "user_answers/",
        views.UserAnswerTableView.as_view(),
@@ -24,6 +24,7 @@ from .forms import (
    RapidForm,
    MarkRapidQuestionForm,
    ImageFormSet,
+    RapidQuestionAnswerForm,
    RegionForm,
    AbnormalityForm,
    ExaminationForm,
@@ -330,9 +331,44 @@ class RapidCreate(RapidCreateBase):
    # form.instance.author.add(self.request.user.id)
    # return super().form_valid(form)

+class RapidAnswerUpdate(RevisionMixin, AuthorOrCheckerRequiredMixin, UpdateView):
+    model = Rapid
+    form_class = RapidQuestionAnswerForm
+    template_name = "rapids/rapidquestionanswer_form.html"
+
+    def get_context_data(self, **kwargs):
+        context = super(RapidAnswerUpdate, self).get_context_data(**kwargs)
+        if self.request.POST:
+            context["answer_formset"] = AnswerUpdateFormSet(
+                self.request.POST, self.request.FILES, instance=self.object
+            )
+            context["answer_formset"].full_clean()
+        else:
+            context["answer_formset"] = AnswerUpdateFormSet(instance=self.object)
+        context["question"] = context["object"]
+        return context
+
+    def form_valid(self, form):
+
+        self.object = form.save(commit=False)
+        self.object.save()
+
+        #form.instance.author.add(self.request.user.id)
+
+        context = self.get_context_data(form=form)
+        formset = context["answer_formset"]
+        # logger.debug(formset.is_valid())
+        if formset.is_valid():
+            response = super().form_valid(form)
+            formset.instance = self.object
+            formset.save()
+
+            return response
+        else:
+            return super().form_invalid(form)

 class RapidUpdate(
-    RevisionMixin, LoginRequiredMixin, AuthorOrCheckerRequiredMixin, UpdateView
+    RevisionMixin, AuthorOrCheckerRequiredMixin, UpdateView
 ):
    model = Rapid
    form_class = RapidForm
@@ -360,6 +396,7 @@ class RapidUpdate(
        else:
            context["image_formset"] = ImageFormSet(instance=self.object)
            context["answer_formset"] = AnswerFormSet(instance=self.object)
+        context["question"] = context["object"]
        return context

    def form_valid(self, form):