ross/penracourses
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix a number of issues and start adding resources

Browse Source
This commit is contained in:
Ross
2024-04-04 23:15:22 +01:00
parent 2fef934323
commit f13d1ba7e2
8 changed files with 174 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
atlas/forms.py
+38 -3
View File
@@ -23,6 +23,7 @@ from atlas.models import (
CidReportAnswer,
Differential,
Finding,
Resource,
SelfReview,
Series,
SeriesImage,
@@ -74,7 +75,7 @@ class ConditionForm(ModelForm):
class CaseCollectionForm(ModelForm):
class Meta:
model = CaseCollection
exclude = ["cases", "valid_cid_users"]
exclude = ["cases", "valid_cid_users", "author"]
def __init__(self, *args, **kwargs):
self.user = kwargs.pop(
@@ -92,6 +93,18 @@ class CaseCollectionForm(ModelForm):
super(CaseCollectionForm, self).__init__(*args, **kwargs)
def save(self, commit=True):
# Get the unsaved Case instance
instance = ModelForm.save(self, False)
# Do we need to save all changes now?
# if commit:
instance.save()
self.save_m2m()
return instance
class FindingForm(ModelForm):
class Meta:
@@ -343,8 +356,6 @@ class CaseForm(ModelForm):
instance = ModelForm.save(self, False)
# Prepare a 'save_m2m' method for the form,
old_save_m2m = self.save_m2m
@@ -390,6 +401,21 @@ CaseDifferentialFormSet = inlineformset_factory(
},
)
class CaseResourceForm(ModelForm):
def __init__(self, *args, user, **kwargs):
super(CaseResourceForm, self).__init__(*args, **kwargs)
if not user.groups.filter(name="atlas_editor").exists():
queryset = Resource.objects.filter(author__id=user.id)
else:
queryset = Resource.objects.all()
self.fields["resource"] = ModelChoiceField(
required=False,
queryset=queryset,
# widget=Select(verbose_name="Series", is_stacked=False),
)
class CaseSeriesForm(ModelForm):
@@ -446,6 +472,15 @@ CaseCollectionCaseFormSet = inlineformset_factory(
max_num=50,
)
CaseResourceFormSet = inlineformset_factory(
Case,
Resource.case_set.through,
form=CaseResourceForm,
exclude=[],
can_delete=True,
extra=0,
max_num=10,
)
SeriesImageFormSet = inlineformset_factory(
Series,
atlas/migrations/0046_resource_caseresource_case_resource.py
+37
View File
@@ -0,0 +1,37 @@
# Generated by Django 5.0.2 on 2024-04-04 19:24
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('atlas', '0045_casecollection_authors_only'),
]
operations = [
migrations.CreateModel(
name='Resource',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=255)),
('description', models.TextField(blank=True, null=True)),
('url', models.URLField(blank=True, null=True)),
('file', models.FileField(blank=True, null=True, upload_to='atlas/resources/')),
],
),
migrations.CreateModel(
name='CaseResource',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('case', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='atlas.case')),
('resource', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='atlas.resource')),
],
),
migrations.AddField(
model_name='case',
name='resource',
field=models.ManyToManyField(through='atlas.CaseResource', to='atlas.resource'),
),
]
atlas/migrations/0047_caseresource_pre_review_resource_author.py
+25
View File
@@ -0,0 +1,25 @@
# Generated by Django 5.0.2 on 2024-04-04 22:07
from django.conf import settings
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('atlas', '0046_resource_caseresource_case_resource'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
operations = [
migrations.AddField(
model_name='caseresource',
name='pre_review',
field=models.BooleanField(default=False),
),
migrations.AddField(
model_name='resource',
name='author',
field=models.ManyToManyField(blank=True, help_text='Author of the resource', related_name='resources', to=settings.AUTH_USER_MODEL),
),
]
atlas/models.py
+32
View File
@@ -364,6 +364,8 @@ class Case(models.Model, AuthorMixin, QuestionMixin):
blank=True,
)
resource = models.ManyToManyField("Resource", through="CaseResource")
def get_app_name(self):
return "atlas"
@@ -1142,3 +1144,33 @@ class UncategorisedDicom(models.Model):
class DuplicateDicom(Exception):
pass
class Resource(models.Model, AuthorMixin):
name = models.CharField(max_length=255)
description = models.TextField(blank=True, null=True)
url = models.URLField(blank=True, null=True)
file = models.FileField(upload_to="atlas/resources/", blank=True, null=True)
author = models.ManyToManyField(
settings.AUTH_USER_MODEL,
blank=True,
help_text="Author of the resource",
related_name="resources",
)
def __str__(self) -> str:
return self.name
def get_absolute_url(self):
return reverse("atlas:resource_detail", kwargs={"pk": self.pk})
def get_link(self):
return format_html("<a href='{}'>{}</a>", self.get_absolute_url(), self.name)
class CaseResource(models.Model):
resource = models.ForeignKey(Resource, on_delete=models.CASCADE)
case = models.ForeignKey(Case, on_delete=models.CASCADE)
pre_review = models.BooleanField(default=False)
def __str__(self) -> str:
return f"{self.resource} - {self.case}"
atlas/tables.py
+2 -1
View File
@@ -5,6 +5,7 @@ from generic.tables import SeriesImageColumn
from .models import (
Case,
CaseCollection,
Condition,
PathologicalProcess,
Presentation,
@@ -318,7 +319,7 @@ class CaseCollectionTable(tables.Table):
selection = tables.CheckBoxColumn(accessor="pk", orderable=False)
class Meta:
model = Case
model = CaseCollection
template_name = "django_tables2/bootstrap4.html"
fields = (
"name",
atlas/templates/atlas/case_display_block.html
+1
View File
@@ -1,5 +1,6 @@
<div class="atlas {% if case.scrapped %}atlas-scrapped{% endif %}">
<div><a href="https://viewer.penracourses.org.uk/viewer/dicomjson?url=https://www.penracourses.org.uk{% url 'atlas:case_dicom_json' case.pk %}">View case in OHIF</a> <a target="_blank" href="https://viewer.penracourses.org.uk/viewer/dicomjson?url=https://www.penracourses.org.uk{% url 'atlas:case_dicom_json' case.pk %}">(new tab)</a></div>
<div><a href="/ohif/viewer/dicomjson?url=https://www.penracourses.org.uk{% url 'atlas:case_dicom_json' case.pk %}">View case in OHIF</a>
<div class="date">
{{ case.created_date|date:"d/m/Y" }}
atlas/templates/atlas/case_form.html
+25
View File
@@ -38,10 +38,16 @@
$('#casedifferential_formset').append($('#empty_casedifferential_form').html().replace(/__prefix__/g, form_idx));
$('#id_differentialcase-TOTAL_FORMS').val(parseInt(form_idx) + 1);
}
function add_resource_input_form() {
var form_idx = $('#id_resourcecase-TOTAL_FORMS').val();
$('#caseresource_formset').append($('#empty_caseresource_form').html().replace(/__prefix__/g, form_idx));
$('#id_resourcecase-TOTAL_FORMS').val(parseInt(form_idx) + 1);
}
$(document).ready(function () {
$('#add_more_series').click(() => { add_series_input_form() });
$('#add_more_differential').click(() => { add_differential_input_form() });
$('#add_more_resource').click(() => { add_resource_input_form() });
})
</script>
@@ -91,6 +97,20 @@
{% endfor %}
</div>
{{ casedifferential_formset.management_form }}
<h3>Resource:</h3>
Add resource here.
<input type="button" value="Add Another Resource" id="add_more_resource">
<div id="caseresource_formset">
{% for form in caseresource_formset %}
<ul class="no-error caseresource_formset">
{{form.non_field_errors}}
{{form.errors}}
{{ form.as_ul }}
</ul>
{% endfor %}
</div>
{{ caseresource_formset.management_form }}
<br/>
<input type="submit" class="submit-button" value="Submit" name="submit">
</form>
<div id="empty_series_form" style="display:none">
@@ -103,4 +123,9 @@
{{ casedifferential_formset.empty_form.as_ul }}
</ul>
</div>
<div id="empty_caseresource_form" style="display:none">
<ul class='no_error caseresource_formset'>
{{ caseresource_formset.empty_form.as_ul }}
</ul>
</div>
{% endblock %}
atlas/views.py
+14 -2
View File
@@ -39,6 +39,7 @@ from .forms import (
CaseCollectionCaseFormSet,
CaseCollectionForm,
CaseForm,
CaseResourceFormSet,
CidReportAnswerForm,
CidReportAnswerMarkForm,
ConditionAutocompleteForm,
@@ -550,9 +551,9 @@ class CaseCollectionCreate(RevisionMixin, LoginRequiredMixin, CreateView):
def form_valid(self, form):
self.object = form.save(commit=False)
self.object.save()
form.instance.author.add(self.request.user.id)
context = self.get_context_data(form=form)
case_formset = context["case_formset"]
if case_formset.is_valid():
@@ -773,14 +774,22 @@ class AtlasCreateBase(RevisionMixin, LoginRequiredMixin):
context["casedifferential_formset"] = CaseDifferentialFormSet(
self.request.POST, self.request.FILES
)
context["caseresource_formset"] = CaseResourceFormSet(
self.request.POST, self.request.FILES,
form_kwargs={"user": self.request.user},
)
context["series_formset"].full_clean()
context["casedifferential_formset"].full_clean()
context["caseresource_formset"].full_clean()
else:
# context["series_formset"] = SeriesFormSet(instance=Case.objects.filter(author__id=self.request.user.id), queryset=Series.objects.filter(author__id=self.request.user.id))
context["series_formset"] = SeriesFormSet(
form_kwargs={"user": self.request.user}
)
context["casedifferential_formset"] = CaseDifferentialFormSet()
context["caseresource_formset"] = CaseResourceFormSet(
form_kwargs={"user": self.request.user}
)
return context
def form_valid(self, form):
@@ -795,12 +804,15 @@ class AtlasCreateBase(RevisionMixin, LoginRequiredMixin):
context = self.get_context_data(form=form)
series_formset = context["series_formset"]
casedifferential_formset = context["casedifferential_formset"]
if series_formset.is_valid() and casedifferential_formset.is_valid():
caseresource_formset = context["caseresource_formset"]
if series_formset.is_valid() and casedifferential_formset.is_valid() and caseresource_formset.is_valid():
response = super().form_valid(form)
series_formset.instance = self.object
series_formset.save()
casedifferential_formset.instance = self.object
casedifferential_formset.save()
caseresource_formset.instance = self.object
caseresource_formset.save()
# If the normal submit button is pressed we save as normal
if "submit" in self.request.POST:
return response