Merge branch 'develop' into feature/1827-aanvragen-second-status

maykinmedia · Nov 3, 2023 · b6a768a · b6a768a
2 parents b81dde6 + ac480ba
commit b6a768a
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 5 deletions.
diff --git a/src/open_inwoner/cms/cases/tests/test_contactform.py b/src/open_inwoner/cms/cases/tests/test_contactform.py
@@ -149,6 +149,19 @@ def setUp(self):
             volgnummer=1,
             isEindstatus=False,
         )
+        # no associated status (for testing `add_second_status_preview`)
+        self.status_type_in_behandeling = generate_oas_component(
+            "ztc",
+            "schemas/StatusType",
+            url=f"{CATALOGI_ROOT}statustypen/167cb935-ac8a-428e-8cca-5abda0da47c7",
+            zaaktype=self.zaaktype["url"],
+            catalogus=f"{CATALOGI_ROOT}catalogussen/1b643db-81bb-d71bd5a2317a",
+            omschrijving="In behandeling",
+            omschrijvingGeneriek="some content",
+            statustekst="",
+            volgnummer=3,
+            isEindstatus=False,
+        )
         self.status_type_finish = generate_oas_component(
             "ztc",
             "schemas/StatusType",
@@ -158,7 +171,7 @@ def setUp(self):
             omschrijving="Finish",
             omschrijvingGeneriek="Afgehandeld",
             statustekst="",
-            volgnummer=1,
+            volgnummer=4,
             isEindstatus=True,
         )
         self.result = generate_oas_component(
@@ -207,14 +220,21 @@ def _setUpMocks(self, m):
             self.result,
             self.zaaktype,
             self.status_finish,
+            self.status_type_in_behandeling,
             self.status_type_finish,
         ]:
             self.matchers.append(m.get(resource["url"], json=resource))
 
         # mock `fetch_status_types_no_cache`
         m.get(
             f"{CATALOGI_ROOT}statustypen?zaaktype={self.zaak['zaaktype']}",
-            json=paginated_response([self.status_type_new, self.status_type_finish]),
+            json=paginated_response(
+                [
+                    self.status_type_new,
+                    self.status_type_in_behandeling,
+                    self.status_type_finish,
+                ]
+            ),
         )
 
         self.matchers += [

diff --git a/src/open_inwoner/cms/cases/tests/test_htmx.py b/src/open_inwoner/cms/cases/tests/test_htmx.py
@@ -158,6 +158,19 @@ def setUp(self) -> None:
             volgnummer=1,
             isEindstatus=False,
         )
+        # no associated status (for testing `add_second_status_preview`)
+        self.status_type_in_behandeling = generate_oas_component(
+            "ztc",
+            "schemas/StatusType",
+            url=f"{CATALOGI_ROOT}statustypen/167cb935-ac8a-428e-8cca-5abda0da47c7",
+            zaaktype=self.zaaktype["url"],
+            catalogus=f"{CATALOGI_ROOT}catalogussen/1b643db-81bb-d71bd5a2317a",
+            omschrijving="In behandeling",
+            omschrijvingGeneriek="some content",
+            statustekst="",
+            volgnummer=3,
+            isEindstatus=False,
+        )
         self.status_type_finish = generate_oas_component(
             "ztc",
             "schemas/StatusType",
@@ -167,7 +180,7 @@ def setUp(self) -> None:
             omschrijving="Finish",
             omschrijvingGeneriek="Afgehandeld",
             statustekst="",
-            volgnummer=1,
+            volgnummer=4,
             isEindstatus=True,
         )
         self.user_role = generate_oas_component(
@@ -311,14 +324,21 @@ def _setUpMocks(self, m):
             self.informatie_object,
             self.uploaded_informatie_object,
             self.status_finish,
+            self.status_type_in_behandeling,
             self.status_type_finish,
         ]:
             self.matchers.append(m.get(resource["url"], json=resource))
 
         # mock `fetch_status_types_no_cache`
         m.get(
             f"{CATALOGI_ROOT}statustypen?zaaktype={self.zaak['zaaktype']}",
-            json=paginated_response([self.status_type_new, self.status_type_finish]),
+            json=paginated_response(
+                [
+                    self.status_type_new,
+                    self.status_type_in_behandeling,
+                    self.status_type_finish,
+                ]
+            ),
         )
 
         self.matchers += [

diff --git a/src/open_inwoner/components/templates/components/StatusIndicator/StatusIndicator.html b/src/open_inwoner/components/templates/components/StatusIndicator/StatusIndicator.html
@@ -1,4 +1,5 @@
 {% load icon_tags %}
+
 {%  if status_indicator_text %}
 <div class="card__header {{ status_indicator }}">
     {% if status_indicator == "info" %}

diff --git a/src/open_inwoner/templates/pages/cases/list_inner.html b/src/open_inwoner/templates/pages/cases/list_inner.html
@@ -1,6 +1,5 @@
 {% load link_tags button_tags i18n grid_tags icon_tags list_tags pagination_tags utils %}
 
-<h2 class="h2" id="cases">{% trans "Mijn aanvragen" %}</h2>
 <h2 class="h2" id="cases">{{ page_title }} ({{ paginator.count }})</h2>
 <p class="cases__title_text">{{ title_text }}</p>