migrate examinations to generic model (and start adding mangament)

This commit is contained in:
Ross
2023-06-19 12:37:55 +01:00
parent 154494e4b0
commit 6c1fd3ae2f
21 changed files with 429 additions and 64 deletions
+1 -2
View File
@@ -6,7 +6,7 @@ from .models import (
Answer,
UserAnswer,
Exam,
Modality,
#Modality,
Region,
BodyPart,
Structure,
@@ -56,7 +56,6 @@ admin.site.register(AnatomyQuestion, AnatomyAdmin)
admin.site.register(QuestionType)
admin.site.register(UserAnswer)
admin.site.register(Exam, ExamAdmin)
admin.site.register(Modality)
admin.site.register(Region)
admin.site.register(BodyPart)
admin.site.register(Structure)
@@ -0,0 +1,47 @@
# Generated by Django 4.1.4 on 2023-06-19 10:51
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
("longs", "0002_alter_longseries_modality"),
("atlas", "0003_alter_series_modality"),
("generic", "0002_modality_examination_modality"),
("anatomy", "0002_initial"),
]
operations = [
# migrations.DeleteModel(
# name='Modality',
# ),
migrations.SeparateDatabaseAndState(
state_operations=[
migrations.DeleteModel(
name="Modality",
),
],
database_operations=[
migrations.AlterModelTable(
name="Modality",
table="generic_modality",
),
],
),
migrations.SeparateDatabaseAndState(
state_operations=[
migrations.AlterField(
model_name="anatomyquestion",
name="modality",
field=models.ForeignKey(
help_text="Modality of the image",
null=True,
on_delete=django.db.models.deletion.SET_NULL,
to="generic.modality",
),
),
],
database_operations=[],
),
]
+7 -6
View File
@@ -16,7 +16,7 @@ from sortedm2m.fields import SortedManyToManyField
import string
from generic.models import CidUser, CidUserGroup, ExamUserStatus, Examination, ExamBase, QuestionBase, QuestionNote, UserAnswerBase, UserUserGroup
from generic.models import CidUser, CidUserGroup, ExamUserStatus, Examination, ExamBase, QuestionBase, QuestionNote, UserAnswerBase, UserUserGroup, Modality
from collections import defaultdict
from helpers.images import image_as_base64
@@ -57,11 +57,12 @@ class Region(models.Model):
return self.region
class Modality(models.Model):
modality = models.CharField(max_length=200)
def __str__(self):
return self.modality
## TODO: ??? Move to generic app
#class Modality(models.Model):
# modality = models.CharField(max_length=200)
#
# def __str__(self):
# return self.modality
class QuestionType(models.Model):