added alphabetical ordering to models

dabslee · Sep 7, 2021 · c02f862 · c02f862
1 parent fe3da80
commit c02f862
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 3 deletions.
diff --git a/db.sqlite3 b/db.sqlite3
diff --git a/forum/__pycache__/models.cpython-39.pyc b/forum/__pycache__/models.cpython-39.pyc
diff --git a/forum/migrations/0023_auto_20210907_1016.py b/forum/migrations/0023_auto_20210907_1016.py
@@ -0,0 +1,17 @@
+# Generated by Django 3.1.6 on 2021-09-07 15:16
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('forum', '0022_auto_20210906_1444'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='assignment',
+            options={'ordering': ['end_datetime', 'title']},
+        ),
+    ]
diff --git a/forum/migrations/__pycache__/0023_auto_20210907_1016.cpython-39.pyc b/forum/migrations/__pycache__/0023_auto_20210907_1016.cpython-39.pyc
diff --git a/forum/models.py b/forum/models.py
@@ -60,7 +60,7 @@ class Assignment(models.Model):
     description = QuillField()
     total_points = models.FloatField(null=True, blank=True)
     class Meta:
-        ordering = ['end_datetime']
+        ordering = ['end_datetime', 'title']
 
     def __str__(self):
         return self.title

diff --git a/forum/views_folder/__pycache__/views_assignments.cpython-39.pyc b/forum/views_folder/__pycache__/views_assignments.cpython-39.pyc
diff --git a/forum/views_folder/__pycache__/views_courses.cpython-39.pyc b/forum/views_folder/__pycache__/views_courses.cpython-39.pyc
diff --git a/forum/views_folder/__pycache__/views_modules.cpython-39.pyc b/forum/views_folder/__pycache__/views_modules.cpython-39.pyc
diff --git a/forum/views_folder/views_courses.py b/forum/views_folder/views_courses.py
@@ -22,7 +22,7 @@ def courses(request):
                 return redirect("forum:courses")
         else:
             context["error"] = "Course not found."
-    context["courses"] = Course.objects.filter(Q(owner=request.user) | Q(students=request.user)).distinct()
+    context["courses"] = Course.objects.filter(Q(owner=request.user) | Q(students=request.user)).distinct().order_by("name")
     context["form"] = forms.JoinCourseForm()
     return render(request, "courses.html", context)
 

diff --git a/forum/views_folder/views_modules.py b/forum/views_folder/views_modules.py
@@ -25,7 +25,7 @@ def modules(request):
                     assn.module = AssignmentModule.objects.get(id=moduleid)
                 assn.save()
     context["modules"] = [ModuleWrapper("No module", 0, Assignment.objects.filter(course=course, module=None))]
-    for module in AssignmentModule.objects.filter(course=course):
+    for module in AssignmentModule.objects.filter(course=course).order_by("name"):
         context["modules"].append(ModuleWrapper(module.name, module.id, Assignment.objects.filter(course=course, module=module).order_by("end_datetime")))
     return render(request, "modules.html", context)