improved course management display by adding completion status for assignments

Author: arielfayol37

db.sqlite3

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.3 on 2023-11-13 05:58
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('deimos', '0021_questionstudent_is_complete'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='assignmentstudent',
+            name='is_complete',
+            field=models.BooleanField(default=False),
+        ),
+    ]

deimos/__pycache__/models.cpython-311.pyc

@@ -74,6 +74,7 @@ class AssignmentStudent(models.Model):
     assignment = models.ForeignKey(Assignment, on_delete=models.CASCADE)
     grade = models.FloatField(validators=[MaxValueValidator(100)], default=0, null=True)
     due_date = models.DateTimeField(null=True, blank=True)
+    is_complete = models.BooleanField(default=False)
 
     def get_grade(self):
         """
@@ -101,6 +102,10 @@ def get_grade(self):
             self.grade = 0
         self.assignment.num_points = total
         return self.grade
+    
+    def get_status(self):
+        return self.is_complete
+
     def save(self, *args, **kwargs):
         if not self.due_date:
             self.due_date = self.assignment.due_date
@@ -118,6 +123,12 @@ class QuestionStudent(models.Model):
     instances_created = models.BooleanField(default=False)
     num_units_attempts = models.IntegerField(default=0, null=True, blank=True, validators=[MinValueValidator(0)])
     is_complete = models.BooleanField(default=False)
+
+    def save(self, *args, **kwargs):
+        if self.success == True:
+            self.is_complete = True
+        super(QuestionStudent, self).save(*args, **kwargs)
+
     def create_instances(self):
         """
         Get variable instances from the variables associated to the question.

deimos/__pycache__/views.cpython-311.pyc

@@ -1,17 +1,24 @@
 <!-- deimos: assignment_display.html -->
+{% load my_custom_tags %}
 <li class="assignment-li course-li" data-assignment-id="{{ assigment.id }}">
     <a href="{% url 'deimos:assignment_management' course_id=course.id assignment_id=assignment.id %}">
         <div class="course-section assigment-section">
             <div>
                 <span class="c-name assignment-name"><strong>{{assignment.name | safe}}</strong></span>
-                <p class="timestamp" style="display: none;">Created on {{ assignment.timestamp|date:"m/d/Y" }}</p>
+                <p class="timestamp" style="display: none;">Created on {{ assignment.timestamp|format_date }}</p>
                 {% if assignment.assigned_date %}
-                    <p class="timestamp">Assigned on {{ assignment.assigned_date|date:"m/d/Y" }}</p>
+                    <p class="timestamp">Assigned on {{ assignment.assigned_date|format_date }}</p>
                 {% endif %}
                 {% if assignment.due_date %}
-                    <p class="timestamp">Due on {{ assignment.due_date|date:"m/d/Y" }}</p>
+                    <p class="timestamp">Due on {{ assignment.due_date|format_date }}</p>
                 {% endif %}
             </div>
+            {% if status %}
+                <button type="button" class="btn status edit-btn" style="position: absolute; bottom: 2%;">
+                        Completed
+                </button>
+            {% endif %}
         </div>
+        
     </a>
 </li>

deimos/migrations/0022_assignmentstudent_is_complete.py

@@ -26,8 +26,8 @@ <h4 class="suggestion original-size page-title">{{assignment.course.name}}: {{as
     <hr/>
     <!-- Display assignment's questions -->
     <ul class="courses course-list">
-        {% for question, question_student in questions %}
-            {% include 'deimos/question_display.html' with question=question assignment_id=assignment.id course_id=assignment.course.id question_student=question_student %}
+        {% for question, status in questions %}
+            {% include 'deimos/question_display.html' with question=question assignment_id=assignment.id course_id=assignment.course.id status=status %}
         {% endfor %}
     </ul>
 

deimos/migrations/__pycache__/0022_assignmentstudent_is_complete.cpython-311.pyc

@@ -30,8 +30,8 @@ <h4>{{course.name}}</h4>
 
     <!-- Display course's assignments -->
     <ul class="courses course-list">
-        {% for assignment in assignments %}
-            {% include 'deimos/assignment_display.html' with assignment=assignment course=course %}
+        {% for assignment, status in assignments %}
+            {% include 'deimos/assignment_display.html' with assignment=assignment course=course status=status %}
         {% endfor %}
     </ul>
 </div>

deimos/models.py

@@ -19,7 +19,7 @@ <h4>My courses</h4>
         {% for course in courses%}
             {% include 'deimos/course_display.html' with course=course%}
         {% empty %}
-            <h5 class="suggestion original-size">You are not yet registered for any course.
+            <h5 class="suggestion original-size" style="width:100%">You are not yet registered for any course.
                 Go to <a href="{% url 'astros:all_courses' %}">All courses</a> to see available courses.
             </h5>
         {% endfor %}

deimos/templates/deimos/assignment_display.html

@@ -10,7 +10,7 @@
                     {{ question.text|safe }}</p><br/>
                 <p class="timestamp" style="display: none;">Created on {{ question.timestamp|date:"m/d/Y" }}</p>
             </div>
-            {% if question_student.get_status %}
+            {% if status %}
                 <button type="button" class="btn status edit-btn" style="position: absolute; bottom: 2%;">
                         Completed
                 </button>

deimos/templates/deimos/assignment_management.html

@@ -30,7 +30,7 @@ <h4 class="suggestion">Search Results...</h4><hr/>
         {% for similar_question in similar_questions %}
             {% include 'deimos/question_display.html' with question=similar_question.question assignment_id=similar_question.question.assignment.id course_id=similar_question.question.assignment.course.id%}
         {% empty %}
-            <h4 class="suggestion original-size"> Enter your question in the search bar and hit enter.</h4>
+            <h4 class="suggestion original-size" style="width:100%"> Enter your question in the search bar and hit enter.</h4>
         {% endfor %}
     </ul>
 

deimos/templates/deimos/course_management.html

@@ -1,4 +1,5 @@
 from django import template
+from datetime import datetime
 
 register = template.Library()
 
@@ -24,4 +25,23 @@ def divide(value, arg):
             return int(result)
         return result
     except (ValueError, TypeError):
-        return 0
+        return 0
+    
+@register.filter   
+def format_date(due_date_str):
+    # Check if due_date_str is already a datetime object
+    if isinstance(due_date_str, datetime):
+        due_date = due_date_str
+    else:
+        # Parsing the date string
+        due_date = datetime.strptime(due_date_str, '%Y-%m-%d %H:%M:%S%z')
+    # Getting the day with the appropriate suffix
+    day = int(due_date.strftime('%d'))
+    if 4 <= day <= 20 or 24 <= day <= 30:
+        suffix = 'th'
+    else:
+        suffix = ['st', 'nd', 'rd'][day % 10 - 1]
+
+    # Formatting the date in the desired format
+    formatted_date = due_date.strftime(f'%B {day}{suffix}, %Y at %I:%M%p')
+    return formatted_date

deimos/templates/deimos/index.html

@@ -50,13 +50,47 @@ def course_management(request, course_id):
 
     assignments = Assignment.objects.filter(course=course, assignmentstudent__student=student, \
                                             is_assigned=True)
+    as_statuses = []
+    if course.name != 'Question Bank':
+        for assignment in assignments:
+            ass, created = AssignmentStudent.objects.get_or_create(assignment= assignment, student=student)
+            as_statuses.append(ass.get_status())
+
     context = {
         "student":student,
-        "assignments": assignments,
+        "assignments": zip(assignments, as_statuses),
         "course": course,
     }
     return render(request, "deimos/course_management.html", context)
 
+@login_required(login_url='astros:login') 
+def assignment_management(request, assignment_id, course_id=None):
+    # Making sure the request is done by a Student.
+    student = get_object_or_404(Student, pk = request.user.pk)
+    assignment = get_object_or_404(Assignment, pk = assignment_id)
+    assignment_student = AssignmentStudent.objects.get(student=student, assignment=assignment)
+    questions = Question.objects.filter(assignment = assignment, parent_question=None)
+    qs_statuses = []
+    if assignment.course.name != 'Question Bank':
+        for question in questions:
+            qs, created = QuestionStudent.objects.get_or_create(question=question, student=student)
+            qs_statuses.append(qs.get_status())
+            question.text = qs.evaluate_var_expressions_in_text(question.text, add_html_style=True)
+    else:
+        qs_statuses = [False for i in range(questions.count())] # here for templating purposes.
+
+    if sum(qs_statuses) == len(qs_statuses): # if all the questions have been completed.
+        assignment_student.is_complete = True
+    else:
+        assignment_student.is_complete = False
+    assignment_student.save()
+    
+    context = {
+        "questions": zip(questions, qs_statuses),
+        "assignment": assignment,
+    }
+    return render(request, "deimos/assignment_management.html", context)
+
 @login_required(login_url='astros:login')
 def gradebook(request, course_id):
     course = get_object_or_404(Course, pk=course_id)
@@ -87,25 +121,6 @@ def gradebook(request, course_id):
         "course_score": round(course_score, 2),
     })
 
-@login_required(login_url='astros:login') 
-def assignment_management(request, assignment_id, course_id=None):
-    # Making sure the request is done by a Student.
-    student = get_object_or_404(Student, pk = request.user.pk)
-    assignment = get_object_or_404(Assignment, pk = assignment_id)
-    questions = Question.objects.filter(assignment = assignment, parent_question=None)
-    question_students = []
-    if assignment.course != 'Question Bank':
-        for question in questions:
-            qs, created = QuestionStudent.objects.get_or_create(question=question, student=student)
-            question_students.append(qs)
-            question.text = qs.evaluate_var_expressions_in_text(question.text, add_html_style=True)
-    else:
-        question_students = [i for i in range(questions.count())] # here for templating purposes.
-    context = {
-        "questions": zip(questions, question_students),
-        "assignment": assignment,
-    }
-    return render(request, "deimos/assignment_management.html", context)
 
 # List of all answer types
 all_mcq_answer_types = {
@@ -480,13 +495,13 @@ def validate_answer(request, question_id, landed_question_id=None,assignment_id=
                         question_student.save()    
 
         # Some info that will be used to update the front end.
-        if (not correct and (data["questionType"].startswith('structural'))):
+        if ((not correct) and (data["questionType"].startswith('structural'))):
             too_many_attempts =  num_attempts + 1 == question.struct_settings.max_num_attempts
             if not units_correct:
                 units_too_many_attempts = question_student.num_units_attempts >= question.struct_settings.units_num_attempts
 
         # Updating completion status
-        if not question_student.is_complete and (units_too_many_attempts or units_correct) and (too_many_attempts or prev_success):
+        if (not question_student.is_complete) and (units_too_many_attempts or units_correct) and (too_many_attempts or prev_success):
             question_student.is_complete = True
             question_student.save()
         # Return a JsonResponse

deimos/templates/deimos/question_display.html

@@ -1,16 +1,17 @@
 <!-- phobos: assignment_display.html -->
+{% load my_custom_tags %}
 <li class="assignment-li course-li" data-assignment-id="{{ assigment.id }}">
     <a href="{% url 'phobos:assignment_management' course_id=course.id assignment_id=assignment.id %}">
         <div class="course-section assigment-section">
             <div>
                 <span class="c-name assignment-name"><strong>{{assignment.name | safe}}</strong></span>
-                <p class="timestamp" style="display: none;">Created on {{ assignment.timestamp|date:"m/d/Y" }}</p>
+                <p class="timestamp" style="display: none;">Created on {{ assignment.timestamp|format_date }}</p>
                 {% if assignment.assigned_date %}
-                    <p class="timestamp">Assigned on {{ assignment.assigned_date|date:"m/d/Y" }}</p>
+                    <p class="timestamp">Assigned on {{ assignment.assigned_date|format_date }}</p>
                 {% endif %}
 
                 {% if assignment.due_date %}
-                    <p class="timestamp">Due on {{ assignment.due_date|date:"m/d/Y" }}</p>
+                    <p class="timestamp">Due on {{ assignment.due_date|format_date }}</p>
                 {% endif %}
             </div>
         </div>

deimos/templates/deimos/search_question.html

@@ -2,6 +2,7 @@
 {% extends 'phobos/layout.html' %}
 {% block title %} Assignment {% endblock %}
 {% load static %}
+{% load my_custom_tags %}
 {% block body%}
 <div class="sidebar" style="display:none">
     <header class="sidebar-header">X</header>

deimos/templatetags/__pycache__/my_custom_tags.cpython-311.pyc

@@ -29,7 +29,7 @@ <h4>My courses</h4>
         {% for course in courses%}
             {% include 'phobos/course_display.html' with course=course%}
         {% empty %}
-            <h4 class="suggestion original-size"> You did not create a course yet. Go to 
+            <h4 class="suggestion original-size" style="width:100%"> You did not create a course yet. Go to 
                 <a href="{% url 'phobos:create_course' %}">create</a> to create a new course. 
             </h4>
         {% endfor %}

deimos/templatetags/my_custom_tags.py

@@ -28,7 +28,7 @@ <h4>Search Results...</h4><hr/>
         {% for similar_question in similar_questions %}
             {% include 'phobos/question_display.html' with question=similar_question.question assignment_id=similar_question.question.assignment.id course_id=similar_question.question.assignment.course.id%}
         {% empty %}
-            <h4 class="suggestion original-size"> Enter your question in the search bar and hit enter.</h4>
+            <h4 class="suggestion original-size" style="width:100%;"> Enter your question in the search bar and hit enter.</h4>
         {% endfor %}
     </ul>
 

deimos/views.py

@@ -324,14 +324,14 @@ def create_mcq_text_answer(new_question, answer_content):
 
 # Function to determine which MCQ float answer to create
 def create_appropriate_mcq_float_answer(new_question, answer_content, vars_dict):
-    if not vars_dict:
-        return create_mcq_float_answer(new_question, answer_content)
-    elif answer_content.startswith('@{') and answer_content.endswith('}@'):
-        return create_mcq_variable_float_answer(new_question, answer_content)
+    if answer_content.startswith('@{') and answer_content.endswith('}@'):
+        if vars_dict:
+            return create_mcq_variable_float_answer(new_question, answer_content)
+        else:
+            raise ValueError('Expected variable expression but got no variable.')
     else:
         return create_mcq_float_answer(new_question, answer_content)
 
-
 def create_expression_answer(new_question, question_answer, answer_unit, answer_preface):
     return ExpressionAnswer(question=new_question, content=question_answer,
                             answer_unit=answer_unit, preface=answer_preface)
@@ -351,10 +351,11 @@ def create_text_answer(new_question):
     return TextAnswer(question=new_question, content='')
 
 def create_appropriate_float_answer(new_question, question_answer, answer_unit, answer_preface,vars_dict):
-    if not vars_dict:
-        return create_float_answer(new_question, question_answer, answer_unit, answer_preface)
-    elif question_answer.startswith('@{') and question_answer.endswith('}@'):
-        return create_variable_float_answer(new_question, question_answer, answer_unit, answer_preface)
+    if question_answer.startswith('@{') and question_answer.endswith('}@'):
+        if vars_dict:
+            return create_variable_float_answer(new_question, question_answer, answer_unit, answer_preface)
+        else:
+            raise ValueError('Expected variable expression but got no variable.')
     else:
         return create_float_answer(new_question, question_answer, answer_unit, answer_preface)
 
@@ -495,10 +496,11 @@ def create_question(request, assignment_id=None, question_nums_types=None):
                             # Special handling for float answers to determine the correct QuestionChoices
                             if answer_type_encoding == "1":
                                 answer = creation_func(new_question, answer_content, vars_dict)
-                                if not vars_dict:
-                                    new_question.answer_type = QuestionChoices.MCQ_FLOAT
-                                elif answer_content.startswith('@{') and answer_content.endswith('}@'):
-                                    new_question.answer_type = QuestionChoices.MCQ_VARIABLE_FLOAT
+                                if answer_content.startswith('@{') and answer_content.endswith('}@'):
+                                    if vars_dict:
+                                        new_question.answer_type = QuestionChoices.MCQ_VARIABLE_FLOAT
+                                    else:
+                                        raise ValueError('Expected variable expression but got no variable.')
                                 else:
                                     new_question.answer_type = QuestionChoices.MCQ_FLOAT
                             else:
@@ -552,10 +554,11 @@ def create_question(request, assignment_id=None, question_nums_types=None):
                         if type_int == 1:
                             answer = creation_func(new_question, question_answer,\
                                                 answer_unit, answer_preface, vars_dict)
-                            if not vars_dict:
-                                new_question.answer_type = QuestionChoices.STRUCTURAL_FLOAT
-                            elif question_answer.startswith('@{') and question_answer.endswith('}@'):
-                                new_question.answer_type = QuestionChoices.STRUCTURAL_VARIABLE_FLOAT
+                            if question_answer.startswith('@{') and question_answer.endswith('}@'):
+                                if vars_dict:
+                                    new_question.answer_type = QuestionChoices.STRUCTURAL_VARIABLE_FLOAT
+                                else:
+                                    raise ValueError('Expected variable expression but got no variable.')
                             else:
                                 new_question.answer_type = QuestionChoices.STRUCTURAL_FLOAT
                         else: