get ready for django 5

This commit is contained in:
Ross
2024-02-18 22:21:04 +00:00
parent 7c9192986a
commit 081f8cbcee
6 changed files with 15 additions and 18 deletions
+1 -1
View File
@@ -232,7 +232,7 @@ urlpatterns = [
name="series_order_dicom", name="series_order_dicom",
), ),
path( path(
"images/<diff", "images/diff",
views.image_diff, views.image_diff,
name="image_diff", name="image_diff",
), ),
+9 -12
View File
@@ -19,8 +19,6 @@ from django.utils.html import mark_safe
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from sortedm2m.fields import SortedManyToManyField
import string import string
from collections import defaultdict from collections import defaultdict
from helpers.images import image_as_base64, pretty_print_dicom from helpers.images import image_as_base64, pretty_print_dicom
@@ -129,7 +127,6 @@ class Long(QuestionBase):
default=1, help_text="Auto incrementing json creation number" default=1, help_text="Auto incrementing json creation number"
) )
#series = SortedManyToManyField("LongSeries", related_name="long")
series = models.ManyToManyField("LongSeries", through="SeriesDetail", related_name="long") series = models.ManyToManyField("LongSeries", through="SeriesDetail", related_name="long")
# question_file = models.FileField(upload_to=question_file_directory_path, blank=True, null=True) # question_file = models.FileField(upload_to=question_file_directory_path, blank=True, null=True)
@@ -609,15 +606,15 @@ class UserAnswer(UserAnswerBase):
class ScoreOptions(models.TextChoices): class ScoreOptions(models.TextChoices):
UNMARKED = "", _("Unmarked") UNMARKED = "", _("Unmarked")
FOUR = 4, _("4") FOUR = "4", _("4")
FOUR_HALF = 4.5, _("4.5") FOUR_HALF = "4.5", _("4.5")
FIVE = 5, _("5") FIVE = "5", _("5")
FIVE_HALF = 5.5, _("5.5") FIVE_HALF = "5.5", _("5.5")
SIX = 6, _("6") SIX = "6", _("6")
SIX_HALF = 6.5, _("6.5") SIX_HALF = "6.5", _("6.5")
SEVEN = 7, _("7") SEVEN = "7", _("7")
SEVEN_HALF = 7.5, _("7.5") SEVEN_HALF = "7.5", _("7.5")
EIGHT = 8, _("8") EIGHT = "8", _("8")
score = models.CharField( score = models.CharField(
max_length=3, max_length=3,
+1 -1
View File
@@ -7,7 +7,7 @@ from sbas.api import router as sbas_router
from physics.api import router as physics_router from physics.api import router as physics_router
from atlas.api import router as atlas_router from atlas.api import router as atlas_router
api = NinjaAPI(csrf=True, version="1") api = NinjaAPI(version="1")
+2 -2
View File
@@ -1,5 +1,5 @@
#Django==3.2.13 #Django==3.2.13
Django==4.1.4 Django==5.0.2
django_debug_toolbar django_debug_toolbar
django_jquery django_jquery
django_reversion django_reversion
@@ -11,7 +11,6 @@ django-tables2
django-filter django-filter
django-filer django-filer
psycopg2-binary psycopg2-binary
django-sortedm2m
pytesseract pytesseract
opencv-python opencv-python
pydicom pydicom
@@ -44,3 +43,4 @@ pytest-faker
blake3 blake3
django-markdownify django-markdownify
django-clone django-clone
django-sortedm2m # remove once migrations squashed
+1 -1
View File
@@ -7,6 +7,6 @@ from . import views
app_name = "rota" app_name = "rota"
urlpatterns = [ urlpatterns = [
path( path(
"rota/user_details/<int:pk", views.UserRotaDetailUpdate.as_view(), name="user_details_update" "rota/user_details/<int:pk>", views.UserRotaDetailUpdate.as_view(), name="user_details_update"
), ),
] ]