Handlungsfeld hinzufügen
diff --git a/cpmonitor/tests/permissions_test.py b/cpmonitor/tests/permissions_test.py
index 080c2c8b..eb2bc076 100644
--- a/cpmonitor/tests/permissions_test.py
+++ b/cpmonitor/tests/permissions_test.py
@@ -242,14 +242,10 @@ def test_city_editor_should_be_allowed_to_modify_inlines(
formsets = response.context["inline_admin_formsets"]
verbose_names = list(map(lambda formset: formset.opts.verbose_name, formsets))
- # This will fail when new inlines are added.
- # If that happens, please extend the list below, accordingly.
- assert len(formsets) == 5
+
assert "Diagramm" in verbose_names
assert "Lokalgruppe" in verbose_names
- assert "KAP Checkliste" in verbose_names
- assert "Verwaltungsstrukturen Checkliste" in verbose_names
- assert "Wärmeplanung Checkliste" in verbose_names
+ assert len(formsets) == 2
for formset in formsets:
assert formset.has_view_permission
@@ -266,15 +262,11 @@ def test_city_admin_should_be_allowed_to_modify_inlines(
formsets = response.context["inline_admin_formsets"]
verbose_names = list(map(lambda formset: formset.opts.verbose_name, formsets))
- # This will fail when new inlines are added.
- # If that happens, please extend the list below, accordingly.
- assert len(formsets) == 6
+
assert "Diagramm" in verbose_names
assert "Lokalgruppe" in verbose_names
- assert "KAP Checkliste" in verbose_names
- assert "Verwaltungsstrukturen Checkliste" in verbose_names
- assert "Wärmeplanung Checkliste" in verbose_names
assert "Einladungslink" in verbose_names
+ assert len(formsets) == 3
for formset in formsets:
assert formset.has_view_permission
@@ -292,15 +284,11 @@ def test_site_admin_should_be_allowed_to_modify_inlines(
formsets = response.context["inline_admin_formsets"]
verbose_names = list(map(lambda formset: formset.opts.verbose_name, formsets))
- # This will fail when new inlines are added.
- # If that happens, please extend the list below, accordingly.
+
assert "Diagramm" in verbose_names
assert "Lokalgruppe" in verbose_names
- assert "KAP Checkliste" in verbose_names
- assert "Verwaltungsstrukturen Checkliste" in verbose_names
assert "Einladungslink" in verbose_names
- assert "Wärmeplanung Checkliste" in verbose_names
- assert len(formsets) == 6
+ assert len(formsets) == 3
for formset in formsets:
assert formset.has_view_permission
diff --git a/cpmonitor/views.py b/cpmonitor/views.py
index 6c35e1b8..0e97689a 100644
--- a/cpmonitor/views.py
+++ b/cpmonitor/views.py
@@ -143,6 +143,13 @@ def _get_task_groups(city):
return groups
+# def _get_cap_checklist(city) -> CapChecklist | None:
+# cap_checklists = CapChecklist.objects.all().filter(city=city)
+# if len(cap_checklists) > 0:
+# return cap_checklists[0]
+# return None
+
+
def _get_cities(request, slug=None):
try:
cities = City.objects.all()
@@ -180,13 +187,13 @@ def city_view(request, city_slug):
_calculate_summary(request, city)
- cap_checklist = _get_cap_checklist(city)
+ cap_checklist = _get_cap_checklist_items(city)
cap_checklist_exists = len(cap_checklist) > 0
- administration_checklist = _get_administration_checklist(city)
+ administration_checklist = _get_administration_checklist_items(city)
administration_checklist_exists = len(administration_checklist) > 0
- energy_plan_checklist = _get_energy_plan_checklist(city)
+ energy_plan_checklist = _get_energy_plan_checklist_items(city)
energy_plan_checklist_exists = len(energy_plan_checklist) > 0
breadcrumbs = _get_breadcrumbs(
@@ -292,17 +299,23 @@ def cap_checklist_view(request, city_slug):
{
"breadcrumbs": breadcrumbs,
"city": city,
- "cap_checklist": _get_cap_checklist(city),
+ "cap_checklist": _get_cap_checklist_items(city),
"local_group": getattr(city, "local_group", None),
}
)
return render(request, "cap_checklist.html", context)
-def _get_cap_checklist(city) -> list:
+def _get_cap_checklist(city) -> CapChecklist | None:
try:
- checklist = city.cap_checklist
+ return city.cap_checklist
except CapChecklist.DoesNotExist:
+ return None
+
+
+def _get_cap_checklist_items(city) -> list:
+ checklist = _get_cap_checklist(city)
+ if checklist is None:
return []
return _as_formatted_checklist(checklist)
@@ -326,7 +339,7 @@ def administration_checklist_view(request, city_slug):
{
"breadcrumbs": breadcrumbs,
"city": city,
- "administration_checklist": _get_administration_checklist(city),
+ "administration_checklist": _get_administration_checklist_items(city),
"local_group": getattr(city, "local_group", None),
}
)
@@ -334,10 +347,16 @@ def administration_checklist_view(request, city_slug):
return render(request, "administration_checklist.html", context)
-def _get_administration_checklist(city) -> list:
+def _get_administration_checklist(city) -> AdministrationChecklist | None:
try:
- checklist = city.administration_checklist
+ return city.administration_checklist
except AdministrationChecklist.DoesNotExist:
+ return None
+
+
+def _get_administration_checklist_items(city) -> list:
+ checklist = _get_administration_checklist(city)
+ if checklist is None:
return []
return _as_formatted_checklist(checklist)
@@ -361,7 +380,7 @@ def energy_plan_checklist_view(request, city_slug):
{
"breadcrumbs": breadcrumbs,
"city": city,
- "energy_plan_checklist": _get_energy_plan_checklist(city),
+ "energy_plan_checklist": _get_energy_plan_checklist_items(city),
"local_group": getattr(city, "local_group", None),
}
)
@@ -369,10 +388,16 @@ def energy_plan_checklist_view(request, city_slug):
return render(request, "energy_plan_checklist.html", context)
-def _get_energy_plan_checklist(city) -> list:
+def _get_energy_plan_checklist(city) -> EnergyPlanChecklist | None:
try:
- checklist = city.energy_plan_checklist
+ return city.energy_plan_checklist
except EnergyPlanChecklist.DoesNotExist:
+ return None
+
+
+def _get_energy_plan_checklist_items(city) -> list:
+ checklist = _get_energy_plan_checklist(city)
+ if checklist is None:
return []
return _as_formatted_checklist(checklist)
@@ -682,10 +707,23 @@ class CapEditView(DetailView, admin.ModelAdmin):
template_name = "admin/admin-cap.html"
def get_context_data(self, **kwargs):
- context = super().get_context_data(**kwargs)
groups = _get_task_groups(self.object)
+ cap_checklist = _get_cap_checklist(self.object)
+ administration_checklist = _get_administration_checklist(self.object)
+ energy_plan_checklist = _get_energy_plan_checklist(self.object)
+
+ context = super().get_context_data(**kwargs)
context["title"] = self.object.name
context["city_id"] = str(self.object.pk)
+ context["cap_checklist_id"] = (
+ cap_checklist.pk if cap_checklist != None else None
+ )
+ context["administration_checklist_id"] = (
+ administration_checklist.pk if administration_checklist != None else None
+ )
+ context["energy_plan_checklist_id"] = (
+ energy_plan_checklist.pk if energy_plan_checklist != None else None
+ )
context["groups"] = groups
return context
diff --git a/e2e_tests/test_admin.py b/e2e_tests/test_admin.py
index 898e9be6..93a64a5e 100644
--- a/e2e_tests/test_admin.py
+++ b/e2e_tests/test_admin.py
@@ -303,3 +303,41 @@ def test_should_move_the_task_below_the_chosen_task_when_moving_a_task_on_anothe
expect(dragged_task.locator("//parent::div").get_by_role("img")).to_have_class(
"inline marginleft-1"
)
+
+
+def test_should_add_the_checklist_to_the_respective_city_when_clicking_add_new_cap_checklist(
+ live_server, page: Page
+):
+ # when
+ admin_login(live_server.url, page)
+ go_to_cap_edit_board(page, "Ohnenix")
+ page.get_by_text("Checkliste zum KAP").get_by_role(
+ "link", name="hinzufügen"
+ ).click()
+
+ # then
+ expect(page.get_by_label("Stadt")).to_contain_text("Ohnenix")
+ page.get_by_label("Gibt es einen Klima-Aktionsplan").check()
+ page.get_by_role("button", name="Sichern", exact=True).first.click()
+
+
+def test_should_show_the_checkist_add_button_when_a_checklist_was_deleted(
+ live_server, page: Page
+):
+ # when
+ admin_login(live_server.url, page)
+ go_to_cap_edit_board(page, "Beispielstadt")
+ page.get_by_text("Checkliste zum KAP").get_by_role("link", name="löschen").click()
+ page.get_by_text("Ja, ich bin sicher").click()
+
+ # then
+ go_to_cap_edit_board(page, "Beispielstadt")
+ expect(
+ page.get_by_text("Checkliste zum KAP").get_by_role("link", name="löschen")
+ ).not_to_be_visible()
+ expect(
+ page.get_by_text("Checkliste zum KAP").get_by_role("link", name="editieren")
+ ).not_to_be_visible()
+ expect(
+ page.get_by_text("Checkliste zum KAP").get_by_role("link", name="hinzufügen")
+ ).to_be_visible()