diff --git a/anatomy/static/css/anatomy.css b/anatomy/static/css/anatomy.css index 7680d501..b700f4e1 100644 --- a/anatomy/static/css/anatomy.css +++ b/anatomy/static/css/anatomy.css @@ -807,6 +807,11 @@ input { border: 2px solid orange; } +.finding-form { + border: 1px dashed darkblue; + +} + .finding-box { display: flex; border: 1px dashed gray; diff --git a/atlas/templates/atlas/series_viewer.html b/atlas/templates/atlas/series_viewer.html index 3f536d5e..9896e066 100755 --- a/atlas/templates/atlas/series_viewer.html +++ b/atlas/templates/atlas/series_viewer.html @@ -25,6 +25,7 @@ This series is not associated with any cases.
Structures: {{ series_finding_form.structures }}
+ @@ -85,6 +86,10 @@ This series is not associated with any cases. $("#hidden-form").show() }); + $("#cancel-add-finding-button").click(() => { + $("#hidden-form").hide() + }); + $("#reset-viewport-button").click(() => { dicom_element = $(".cornerstone-element").get(0); //annotationjson = JSON.parse(e.currentTarget.dataset.annotationjson); diff --git a/atlas/urls.py b/atlas/urls.py index d203ac7f..c486a41b 100755 --- a/atlas/urls.py +++ b/atlas/urls.py @@ -12,6 +12,7 @@ urlpatterns = [ path("cases/", views.CaseView.as_view(), name="case_view"), path("series/", views.SeriesView.as_view(), name="series_view"), path("series/", views.series_detail, name="series_detail"), + path("series//", views.series_detail, name="series_detail"), path( "series//order_dicom", views.series_order_dicom, diff --git a/atlas/views.py b/atlas/views.py index 774b9d16..4efbff88 100755 --- a/atlas/views.py +++ b/atlas/views.py @@ -116,12 +116,14 @@ def case_detail(request, pk): @login_required @user_is_author_or_atlas_series_checker_or_atlas_marker -def series_detail(request, pk): +def series_detail(request, pk, finding_pk=None): series = get_object_or_404(Series, pk=pk) - # if request.user not in atlas.author.all(): - # raise PermissionDenied - series_finding_form = SeriesFindingForm(series_id=series.id) + if finding_pk is not None: + finding = get_object_or_404(SeriesFinding, pk=finding_pk) + series_finding_form = SeriesFindingForm(instance=finding) + else: + series_finding_form = SeriesFindingForm(series_id=series.id) # logging.debug(atlas.subspecialty.first().name.all()) return render(