fix a number of things

atlas/views.py

@@ -290,6 +290,13 @@ def author_list(request):
 
     return render(request, "atlas/author_list.html", {"authors": authors})
 
+def index(request):
+    return render(request, "atlas/index.html", {})
+
+def user_collections(request):
+    collections = request.user.user_casecollection_exams.all()
+
+    return render(request, "atlas/user_collections.html", {"collections": collections})
 
 class CaseDelete(RevisionMixin, AuthorOrCheckerRequiredMixin, DeleteView):
     model = Case
@@ -1325,12 +1332,13 @@ def collection_take_overview(
 
     question_answer_tuples = []
     answer_count = 0
-    for q in case_details:
-        if q in answer_question_map and answer_question_map[q].answer:
-            question_answer_tuples.append((q, answer_question_map[q]))
+    for cd in case_details:
+        self_review = cid_user_exam.selfreview_set.filter(case=cd.case)
+        if cd in answer_question_map and answer_question_map[cd].answer:
+            question_answer_tuples.append((cd, answer_question_map[cd], self_review))
             answer_count += 1
         else:
-            question_answer_tuples.append((q, None))
+            question_answer_tuples.append((cd, None, self_review))
 
     return render(
         request,
@@ -1347,6 +1355,7 @@ def collection_take_overview(
     )
 
 
+
 def collection_case_view_take_user(request, pk: int, case_number: int):
     return collection_case_view_take(request, pk, case_number)
 
@@ -1543,6 +1552,10 @@ def collection_case_view(request, pk, case_number):
         },
     )
 
+def case_dicom_json(request, pk):
+    case = get_object_or_404(Case, pk=pk)
+
+    return JsonResponse(case.get_case_dicom_json())
 
 @user_is_collection_author_or_atlas_editor
 def delete_collection_cid_answers(request, exam_id, cid):
@@ -1761,6 +1774,70 @@ class CollectionCloneMixin:
 class CollectionClone(CollectionCloneMixin, CaseCollectionCreate):
     """Clone exam view"""
 
+class SelfReviewDelete(DeleteView):
+    model = SelfReview
+    template_name = "confirm_delete.html"
+    #success_url = reverse_lazy("atlas:finding_view")
+
+    def get_initial(self):
+        user_exam_id = self.kwargs["user_exam_id"]
+        case_id = self.kwargs["case_id"]
+        review_id = self.kwargs["pk"]
+
+        self.user_exam = get_object_or_404(CidUserExam, pk=user_exam_id)
+        self.case = get_object_or_404(Case, pk=case_id)
+        self.review = get_object_or_404(SelfReview, pk=review_id)
+        return {"user_exam": user_exam_id, "case": case_id, "review": review_id}
+
+    def get_context_data(self, **kwargs):
+        # This can also be accessed via view.**** in the template
+        context = super(SelfReviewDelete, self).get_context_data(**kwargs)
+        context["user_exam"] = self.user_exam
+        context["case"] = self.case
+        context["review"] = self.review
+        return context
+
+    def get_success_url(self) -> str:
+        return self.user_exam.exam.get_case_take_url(self.case)
+
+class SelfReviewUpdate(
+    UpdateView
+):
+    model = SelfReview
+    form_class = SelfReviewForm
+
+    def get_initial(self):
+        user_exam_id = self.kwargs["user_exam_id"]
+        case_id = self.kwargs["case_id"]
+        review_id = self.kwargs["pk"]
+
+        self.user_exam = get_object_or_404(CidUserExam, pk=user_exam_id)
+        self.case = get_object_or_404(Case, pk=case_id)
+        self.review = get_object_or_404(SelfReview, pk=review_id)
+        return {"user_exam": user_exam_id, "case": case_id, "review": review_id}
+
+    def get_context_data(self, **kwargs):
+        # This can also be accessed via view.**** in the template
+        context = super(SelfReviewUpdate, self).get_context_data(**kwargs)
+        context["user_exam"] = self.user_exam
+        context["case"] = self.case
+        context["review"] = self.review
+        return context
+
+    def get_success_url(self) -> str:
+        return self.user_exam.exam.get_case_take_url(self.case)
+
+    #def get_object(self):
+    #    return self.review
+    #    return
+    #def get_initial(self):
+    #    user_exam_id = self.kwargs["user_exam_id"]
+    #    case_id = self.kwargs["case_id"]
+
+    #    self.user_exam = get_object_or_404(CidUserExam, pk=user_exam_id)
+    #    self.case = get_object_or_404(Case, pk=case_id)
+    #    return {"user_exam": user_exam_id, "case": case_id}
+
 class AddSelfReview(CreateView):
     model = SelfReview
     form_class = SelfReviewForm
@@ -1789,6 +1866,10 @@ class AddSelfReview(CreateView):
         context["case"] = self.case
         return context
 
+    def get_success_url(self) -> str:
+        return self.user_exam.exam.get_case_take_url(self.case)
+        #return reverse("atlas:collection_take_overview_user", kwargs={"pk": self.user_exam.collection.id })
+
 #    def form_valid(self, form):
 #        model = form.save(commit=False)
 #