question edit semi-operational

Author: arielfayol37

phobos/models.py

@@ -257,6 +257,11 @@ def save(self, *args, **kwargs):
 
             super(Question, self).save(*args, **kwargs)
 
+    def delete(self, *args, **kwargs):
+        if not self.parent_question:
+            self.sub_questions.all().delete()
+        super(Question, self).delete(*args, **kwargs)
+
     def get_num_points(self):
         if self.answer_type.startswith('MCQ') or self.answer_type.startswith('MATCHING'):
             return self.mcq_settings.num_points

phobos/static/phobos/js/create_question.js

@@ -53,15 +53,17 @@ document.addEventListener('DOMContentLoaded', () => {
     if(form.classList.contains('create-mode')){
         allQuestionBlocks.appendChild(addQuestionBlock());
     }else{
-
+        var bCounter = 0;
         allQuestionBlocks.querySelectorAll('.question-block').forEach((block)=>{
+            bCounter += 1;
             addEventListenersToQuestionBlock(block, set_initial_settings=false);
             const hiddenQuestionType =  block.querySelector('.hidden-q-type');
             questionTypeDicts[block.querySelector('.question-number-value').value] = qtypeConfigs[hiddenQuestionType.value]; 
             fillQuestionBlockCounters(block);
         });
-        num_questions = allQuestionBlocks.length + 1;
-        part_num_questions = allQuestionBlocks.length + 1;
+        num_questions = bCounter + 1;
+        part_num_questions = bCounter + 1;
+        console.log(num_questions, part_num_questions);
         // add the already created variables to the varSymbolsArray
         addedVarsDiv.querySelectorAll('.var-container').forEach((varContainer)=>{
             varSymbolsArray.push(varContainer.querySelector('.var-symbol').value);

phobos/templates/phobos/assignment_management.html

@@ -14,6 +14,7 @@
         {% endif %}
         <li><a href="{% url 'phobos:question_bank' %}">Question Bank</a></li>
         <li><a href="{% url 'astros:all_courses' %}">All Courses</a></li>
+        <li><a href="{% url 'phobos:delete_assignment' assignment_id=assignment.id %}">Delete</a></li>
     </ul>
 </div>
 

phobos/templates/phobos/edit_question.html

@@ -86,7 +86,7 @@ <h3 class="original-size suggestion">Editing Question</h3>
           </div>
           <div id="all-question-blocks">
 
-            {% for index, question_dict in questions_dict.items %}
+            {% for qnum, question_dict in questions_dict.items %}
               <div class="question-block">
                 <input type="hidden" value="{{question_dict.question.pk}}" name="{{forloop.counter}}_question_pk"/>
                 <input type="hidden" value="{{forloop.counter}}" class="question-number-value"/>
@@ -174,7 +174,17 @@ <h3 class="original-size suggestion">Editing Question</h3>
                                     {{answer.content}}</div>
                                 {% endif %}
 
-                          <input type="hidden" name="{{answer.pk}}" value="{{answer.get_pk_ac}}_mcq"/>
+                          <input type="hidden" value="{{answer.pk}}" name="{{answer.get_pk_ac}}_mcq"/>
+                          <!--Important not to have an _answer_value input field here because the backend
+                          does not expect that for an mcq edit.
+                          -->
+                          {% if answer.is_answer %}
+                              <input class="answer_info" type="hidden" value="1" name="{{answer.get_pk_ac}}_mcq"/>
+                          {% else %}
+                              <input class="answer_info" type="hidden" value="0" name="{{answer.get_pk_ac}}_mcq"/>
+                          {% endif %}
+                          
+
                           <div class="add-delete-btns">
                               <button  type="button" class="btn btn-danger mcq-delete exempt">delete</button>
                           </div>
@@ -210,7 +220,7 @@ <h3 class="original-size suggestion">Editing Question</h3>
                             <div class="formatted-answer">
                               {{answer.part_b}}
                             </div>
-                            <input type="hidden" name="{{answer.pk}}" value="{{answer.pk}}_matching_pairs"/>
+                            <input type="hidden" value="{{answer.pk}}" name="{{answer.pk}}_matching_pairs"/>
                             <button  type="button" class="btn btn-danger mp-delete exempt">delete</button><br/>
                           </div>
 
@@ -233,17 +243,23 @@ <h3 class="original-size suggestion">Editing Question</h3>
              <div class="answer-fields">
 
              </div>
+             {% if question_dict.qtype == "struct"%}
+                <div class="formatted-answer-option unexpand structural-formatted-answer">
+                    
+                      {% if question_dict.answer.get_answer_code == 2%}<!--if latex-->
+                          <input type="hidden" class="hidden_answer latex" value="{{question_dict.answer.content}}"/>
+                      {% else %}<!-- if expression or float -->
+                          <input type="hidden" class="hidden_answer expression" value="{{question_dict.answer.content}}"/>
+                      {% endif %}
+                    
+                </div>
+                <br/>
+             {% else %}
+                  <div class="formatted-answer-option unexpand structural-formatted-answer" style="display:none;">
 
-             <div class="formatted-answer-option unexpand structural-formatted-answer">
-                {% if question_dict.qtype == "struct"%}
-                  {% if question_dict.answer.get_answer_code == 2%}<!--if latex-->
-                      <input type="hidden" class="hidden_answer latex" value="{{question_dict.answer.content}}"/>
-                  {% else %}<!-- if expression or float -->
-                      <input type="hidden" class="hidden_answer expression" value="{{question_dict.answer.content}}"/>
-                  {% endif %}
-                {% endif %}
-             </div>
-             <br/>
+                  </div>
+             {% endif %}
+            
 
              <div class="calculator-area-div"></div><br/>
 
@@ -270,7 +286,7 @@ <h3 class="original-size suggestion">Editing Question</h3>
              </div>
 
              <hr/>
-             <button class="btn btn-outline-success check-question-btn">Add Part</button>
+             <button class="btn btn-outline-success check-question-btn" style="display:none;">Add Part</button>
              <br/><br/>
              <div class="hidden-settings">
                   {% if question_dict.qtype == 'struct' %}
@@ -327,7 +343,7 @@ <h3 class="original-size suggestion">Editing Question</h3>
       <h4 class="suggestion original-size">Settings</h4>
       <hr/>
       <select title="Part" name="settings-select" class="settings-select field-style">
-          {% for index, question_dict in questions_dict.items %}
+          {% for qnum, question_dict in questions_dict.items %}
             <option class="settings-option-{{forloop.counter}}" value="{{forloop.counter}}">Part {{question_dict.question.number}}</option>
           {% endfor %}
       </select>

phobos/templates/phobos/question_view.html

@@ -14,6 +14,7 @@
         {% endif %}
         <li><a href="{% url 'phobos:search_question' %}">Search Question</a></li>
         <li><a href="{% url 'phobos:edit_question' question_id=question.id %}">Edit Question</a></li>
+        <li><a href="{% url 'phobos:delete_question' question_id=question.id %}">Delete</a></li>
     </ul>
   </div>
 
@@ -23,7 +24,7 @@
     <a class="nav-link" href="{% url 'phobos:course_management' course_id=question.assignment.course.id %}">Assignments</a>
     <a class="nav-link" id="btn-export_question" style="color:white">Export</a>
     <a class="nav-link" href="{% url 'phobos:edit_question' question_id=question.id %}">Edit</a>
-    <a class="nav-link" href="{% url 'phobos:delete_question' question_id=question.id %}">Delete</a>
+    
 </nav>
 
 <div class="export_question">

phobos/urls.py

@@ -29,6 +29,7 @@
          views.create_assignment, name='create_assignment'),
     path('courses/create_assignment',\
     views.create_assignment, name='create_assignment'),
+    path('delete_assignment/<int:assignment_id>', views.delete_assignment , name='delete_assignment'),
     path('courses/<int:course_id>/assignments/<int:assignment_id>', \
          views.assignment_management, name='assignment_management'),
     path('courses/<int:course_id>/assignments/<int:assignment_id>/assign', \