Merge pull request #31 from project-lovelace/reorder-problems

Reorder problems

src/problems/migrations/0006_reorder-problems.py

@@ -0,0 +1,19 @@
+# Generated by Django 2.1.5 on 2019-07-08 16:09
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('problems', '0005_extended_submission_model'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='problem',
+            name='order_id',
+            field=models.IntegerField(null=True, unique=True, validators=[django.core.validators.MinValueValidator(0)]),
+        ),
+    ]

src/problems/models.py

@@ -29,6 +29,9 @@ class Problem(models.Model):
 
     id = models.AutoField(primary_key=True)
 
+    # The order of the problems in the problem list/table.
+    order_id = models.IntegerField(unique=True, validators=[MinValueValidator(0)], editable=True, null=True)
+
     # Unique name for database and urls, e.g. "earthquake-epicenters".
     name = models.CharField(unique=True, max_length=256, editable=True)
 

src/problems/templates/problems/index.html

@@ -28,7 +28,7 @@
             {% for problem in latest_problem_list %}
               {% if problem.visible %}
                 <tr>
-                  <th>{{ problem.id  }}</th>
+                  <th>{{ problem.order_id  }}</th>
                   <th>
                     {% if user.is_authenticated %}
                       {% if problem.id in problems_solved %}

src/problems/views.py

@@ -31,8 +31,8 @@ class IndexView(generic.ListView):
     context_object_name = 'latest_problem_list'
 
     def get_queryset(self):
-        """Return all problems, sorted chronologically."""
-        return Problem.objects.order_by('date_added')
+        """Return all problems, sorted by order ID."""
+        return Problem.objects.order_by('order_id')
 
     def get_context_data(self, **kwargs):
         """ Add a list of problems solved by the user, if authenticated. """