This commit is contained in:
Ross
2021-02-05 10:47:27 +00:00
parent cddc3c09e2
commit b8cb09b5c5
19 changed files with 227 additions and 44 deletions
+2 -1
View File
@@ -9,7 +9,8 @@ from reversion.admin import VersionAdmin
from django.forms.widgets import RadioSelect
from generic.models import Examination, Sign, Site, Condition
#from generic.models import Examination, Sign, Site, Condition
from generic.models import Examination, Sign, Condition
# Register your models here.
#admin.site.register(Examination)
+2 -1
View File
@@ -6,4 +6,5 @@ from .models import Long
class LongFilter(django_filters.FilterSet):
class Meta:
model = Long
fields = ("site", "created_date", "author")
fields = (#"site",
"created_date", "author")
+5 -2
View File
@@ -9,7 +9,7 @@ from django.forms import (
from django.forms import inlineformset_factory
from longs.models import (
Examination,
#Examination,
Note,
Long,
LongSeries,
@@ -19,6 +19,9 @@ from longs.models import (
Exam,
)
from generic.models import Examination, Condition, Sign
#from generic.models import Examination, Site, Condition, Sign
from django.contrib.admin.widgets import FilteredSelectMultiple
from django.forms.widgets import RadioSelect, TextInput, Textarea
@@ -88,7 +91,7 @@ class LongForm(ModelForm):
# fields = '__all__'
fields = [
#"examination",
"site",
#"site",
"feedback",
]
# fields = ['question', 'feedback', 'subspecialty', 'references']
@@ -0,0 +1,21 @@
# Generated by Django 3.1.3 on 2021-02-05 10:13
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('longs', '0007_longseries_examination'),
]
operations = [
migrations.RemoveField(
model_name='long',
name='site',
),
migrations.RemoveField(
model_name='longcreationdefault',
name='site',
),
]
+13 -12
View File
@@ -21,7 +21,8 @@ import string
from anatomy.models import Modality
from generic.models import Examination, Site, Condition, Sign
from generic.models import Examination, Condition, Sign
#from generic.models import Examination, Site, Condition, Sign
image_storage = FileSystemStorage(
# Physical file location ROOT
@@ -62,12 +63,12 @@ class Long(models.Model):
DEFAULT_SITE_ID = 1
site = models.ManyToManyField(
Site,
blank=True,
default=DEFAULT_SITE_ID,
help_text=
"If we know the source of the image")
#site = models.ManyToManyField(
# Site,
# blank=True,
# default=DEFAULT_SITE_ID,
# help_text=
# "If we know the source of the image")
verified = models.BooleanField(default=False)
created_date = models.DateTimeField(default=timezone.now)
published_date = models.DateTimeField(blank=True, null=True)
@@ -181,11 +182,11 @@ class LongCreationDefault(models.Model):
related_name="long_default",
on_delete=models.CASCADE)
site = models.ManyToManyField(
Site,
blank=True,
default=1,
help_text="Default site to use when creating a new long")
#site = models.ManyToManyField(
# Site,
# blank=True,
# default=1,
# help_text="Default site to use when creating a new long")
def get_absolute_url(self):
return reverse('longs:long_create')