diff --git a/CTOAsYouGo/CTOAsYouGo/__pycache__/settings.cpython-310.pyc b/CTOAsYouGo/CTOAsYouGo/__pycache__/settings.cpython-310.pyc index 759b27a..1f2a7e2 100644 Binary files a/CTOAsYouGo/CTOAsYouGo/__pycache__/settings.cpython-310.pyc and b/CTOAsYouGo/CTOAsYouGo/__pycache__/settings.cpython-310.pyc differ diff --git a/CTOAsYouGo/core/__pycache__/models.cpython-310.pyc b/CTOAsYouGo/core/__pycache__/models.cpython-310.pyc index 9654050..60114d4 100644 Binary files a/CTOAsYouGo/core/__pycache__/models.cpython-310.pyc and b/CTOAsYouGo/core/__pycache__/models.cpython-310.pyc differ diff --git a/CTOAsYouGo/core/__pycache__/views.cpython-310.pyc b/CTOAsYouGo/core/__pycache__/views.cpython-310.pyc index 54196f1..779578a 100644 Binary files a/CTOAsYouGo/core/__pycache__/views.cpython-310.pyc and b/CTOAsYouGo/core/__pycache__/views.cpython-310.pyc differ diff --git a/CTOAsYouGo/core/models.py b/CTOAsYouGo/core/models.py index 7b16de4..ad6b48a 100644 --- a/CTOAsYouGo/core/models.py +++ b/CTOAsYouGo/core/models.py @@ -2,12 +2,15 @@ from django.db import models from django.core.validators import MinValueValidator, MaxValueValidator import uuid + class Task(models.Model): title = models.CharField(max_length=255) description = models.TextField() price_from = models.IntegerField(validators=[MinValueValidator(0)]) price_to = models.IntegerField(validators=[MinValueValidator(0)]) - needed_information = models.JSONField() + + needed_information = models.JSONField(default=dict) + order = models.IntegerField(null=True) def __str__(self): return self.title diff --git a/CTOAsYouGo/core/templates/core/how_it_works.html b/CTOAsYouGo/core/templates/core/how_it_works.html index 22313cf..ba0a342 100644 --- a/CTOAsYouGo/core/templates/core/how_it_works.html +++ b/CTOAsYouGo/core/templates/core/how_it_works.html @@ -3,7 +3,7 @@ {% block content %}
-

How does it function?

+

How does it work?

It's straightforward!

    diff --git a/CTOAsYouGo/core/templatetags/__pycache__/currency_filters.cpython-310.pyc b/CTOAsYouGo/core/templatetags/__pycache__/currency_filters.cpython-310.pyc index 6cb9a1e..8cb26db 100644 Binary files a/CTOAsYouGo/core/templatetags/__pycache__/currency_filters.cpython-310.pyc and b/CTOAsYouGo/core/templatetags/__pycache__/currency_filters.cpython-310.pyc differ diff --git a/CTOAsYouGo/core/views.py b/CTOAsYouGo/core/views.py index 852b064..30edf39 100644 --- a/CTOAsYouGo/core/views.py +++ b/CTOAsYouGo/core/views.py @@ -5,7 +5,7 @@ from django.http import HttpResponseRedirect from django.urls import reverse def home(request): - tasks = Task.objects.all() + tasks = Task.objects.order_by('order','id') return render(request, 'core/home.html', {'tasks': tasks}) def thankyou(request): diff --git a/CTOAsYouGo/db.sqlite3 b/CTOAsYouGo/db.sqlite3 index d0abb00..583b68d 100644 Binary files a/CTOAsYouGo/db.sqlite3 and b/CTOAsYouGo/db.sqlite3 differ