Make vragen detail conform to design

maykinmedia · Apr 2, 2024 · e546f12 · e546f12
1 parent 8f861ab
commit e546f12
Show file tree

Hide file tree

Showing 5 changed files with 673 additions and 61 deletions.
diff --git a/src/open_inwoner/accounts/views/contactmoments.py b/src/open_inwoner/accounts/views/contactmoments.py
@@ -223,24 +223,55 @@ def get_context_data(self, **kwargs):
             ocm = client.retrieve_objectcontactmoment(
                 kcm.contactmoment, "zaak", zaken_client
             )
-            ctx["zaak"] = getattr(ocm, "object", None)
+            zaak = getattr(ocm, "object", None)
+            if zaak:
+                zaak_url = reverse(
+                    "cases:case_detail", kwargs={"object_id": str(zaak.uuid)}
+                )
+            else:
+                zaak_url = None
+            ctx["zaak"] = zaak
 
         contactmoment: KCMDict = self.get_kcm_data(kcm)
         ctx["contactmoment"] = contactmoment
         ctx["metrics"] = [
             {
-                "label": _("Ontvangstdatum: "),
+                "label": _("Status: "),
+                "value": contactmoment["status"],
+            },
+            {
+                "label": _("Ingediend op: "),
                 "value": contactmoment["registered_date"],
             },
             {
-                "label": _("Contactwijze: "),
-                "value": contactmoment["channel"],
+                "label": _("Vraag nummer: "),
+                "value": contactmoment["identificatie"],
             },
             {
-                "label": _("Status: "),
-                "value": contactmoment["status"],
+                "label": _("Contact gehad via: "),
+                "value": contactmoment["channel"],
             },
         ]
+        origin = self.request.headers.get("Referer")
+        if origin == reverse("cases:contactmoment_list"):
+            ctx["origin"] = {
+                "label": _("Terug naar overzicht"),
+                "url": origin,
+            }
+            if zaak:
+                ctx["destination"] = {
+                    "label": _("Naar aanvrag"),
+                    "url": zaak_url,
+                }
+        else:
+            ctx["origin"] = {
+                "label": _("Terug naar aanvrag"),
+                "url": zaak_url,
+            }
+            ctx["destination"] = {
+                "label": _("Bekijk alle vragen"),
+                "url": reverse("cases:contactmoment_list"),
+            }
         return ctx
 
 

diff --git a/src/open_inwoner/openklant/tests/test_views.py b/src/open_inwoner/openklant/tests/test_views.py
@@ -292,9 +292,9 @@ def test_show_detail_for_bsn_with_zaak(self, m, mock_get_kcm_answer_mapping):
             },
         )
 
-        zaak_link = response.pyquery(".case-detail__link")
+        zaak_link = response.pyquery("#origin_link")
 
-        self.assertEqual(zaak_link.text(), _("Ga naar zaak"))
+        self.assertIn(_("Terug naar aanvrag"), zaak_link.text())
         self.assertEqual(
             zaak_link.attr("href"),
             reverse(
@@ -303,6 +303,13 @@ def test_show_detail_for_bsn_with_zaak(self, m, mock_get_kcm_answer_mapping):
             ),
         )
 
+        contactmoment_link = response.pyquery("#destination_link")
+        self.assertIn(_("Bekijk alle vragen"), contactmoment_link.text())
+        self.assertEqual(
+            contactmoment_link.attr("href"),
+            reverse("cases:contactmoment_list"),
+        )
+
         kcm_local = KlantContactMomentAnswer.objects.get(
             contactmoment_url=data.klant_contactmoment["contactmoment"]
         )
@@ -328,13 +335,8 @@ def test_show_detail_for_bsn_with_zaak_reformat_esuite_id(
         kcm = response.context["contactmoment"]
         cm_data = data.contactmoment
 
-        zaak_id = (
-            response.pyquery.find(".case-detail__link").parent().text().split(" ")[0]
-        )
-
         self.assertIsNotNone(response.context["zaak"])
         self.assertEqual(response.context["zaak"].url, data.zaak["url"])
-        self.assertEqual(zaak_id, "542-2021")
         self.assertEqual(
             kcm,
             {
@@ -351,9 +353,9 @@ def test_show_detail_for_bsn_with_zaak_reformat_esuite_id(
             },
         )
 
-        zaak_link = response.pyquery(".case-detail__link")
+        zaak_link = response.pyquery("#origin_link")
 
-        self.assertEqual(zaak_link.text(), _("Ga naar zaak"))
+        self.assertIn(_("Terug naar aanvrag"), zaak_link.text())
         self.assertEqual(
             zaak_link.attr("href"),
             reverse(
@@ -362,6 +364,13 @@ def test_show_detail_for_bsn_with_zaak_reformat_esuite_id(
             ),
         )
 
+	contactmoment_link = response.pyquery("#destination_link")
+        self.assertIn(_("Bekijk alle vragen"), contactmoment_link.text())
+        self.assertEqual(
+            contactmoment_link.attr("href"),
+            reverse("cases:contactmoment_list"),
+        )
+
     def test_display_contactmoment_subject_duplicate_esuite_codes(
         self, m, mock_get_kcm_answer_mapping
     ):