[#3081] all works

Author: jiromaykin

src/open_inwoner/cms/collaborate/urls.py

@@ -6,7 +6,8 @@
     PlanActionEditStatusTagView,
     PlanActionEditView,
     PlanActionHistoryView,
-    PlanCreateView,
+    PlanCreateNoTemplateView,
+    PlanCreateWithTemplateView,
     PlanDetailView,
     PlanEditView,
     PlanExportView,
@@ -25,7 +26,12 @@
         PlanTemplateChooseView.as_view(),
         name="plan_choose_template",
     ),
-    path("create/", PlanCreateView.as_view(), name="plan_create"),
+    path("create/", PlanCreateNoTemplateView.as_view(), name="plan_create_no_template"),
+    path(
+        "create-from-template/",
+        PlanCreateWithTemplateView.as_view(),
+        name="plan_create_with_template",
+    ),
     path("<uuid:uuid>/", PlanDetailView.as_view(), name="plan_detail"),
     path("<uuid:uuid>/edit/", PlanEditView.as_view(), name="plan_edit"),
     path("<uuid:uuid>/edit/goal/", PlanGoalEditView.as_view(), name="plan_edit_goal"),

src/open_inwoner/components/templates/components/Form/FormActions.html

@@ -1,5 +1,5 @@
 {% load button_tags %}
-<div class="form__actions {% if nogrid %}form__actions--nogrid{% endif %} {% if single %}form__actions--single{% endif %} {% if fullwidth %}form__actions--fullwidth{% endif %}">
+<div class="form__actions {% if single %}form__actions--single{% endif %} {% if fullwidth %}form__actions--fullwidth{% endif %}">
     {% if secondary_text %}{% button href=secondary_href secondary=secondary text=secondary_text icon=secondary_icon icon_position=secondary_icon_position form_id=form_id %}{% endif %}
     {% if secondary_name %}{% button name=secondary_name type="submit" secondary=secondary text=secondary_text icon=secondary_icon icon_position=secondary_icon_position form_id=form_id %}{% endif %}
     {% if secondary_value %}{% button name=secondary_name value=secondary_value type="submit" secondary=secondary text=secondary_text icon=secondary_icon icon_position=secondary_icon_position form_id=form_id %}{% endif %}

src/open_inwoner/js/components/form/ChoiceListSingle.js

@@ -19,7 +19,6 @@ export class ChoiceListSingle {
     // Add event listeners for click events
     this.labels.forEach((label) => {
       label.addEventListener('click', () => {
-        console.log('A click on the .choice-list__label element.')
         const selectedListItem = node.querySelector('.selected')
         if (selectedListItem) {
           selectedListItem.classList.remove('selected')

src/open_inwoner/js/components/plan-preview/index.js

@@ -12,13 +12,10 @@ export class PlanPreview {
   openPreview(event) {
     event.stopPropagation()
     event.preventDefault()
-    console.log('button for plan is clicked')
 
     const modalId = this.node.dataset.id || 'modal'
     const modalElement = document.getElementById(modalId)
-
     if (!modalElement) {
-      console.error(`Modal with ID "${modalId}" not found`)
       return
     }
 
@@ -31,6 +28,65 @@ export class PlanPreview {
     // Track the element that opened the modal
     modal.openedBy = this.node
 
+    // Find the corresponding radio input
+    let radioInput = null
+
+    // First structure (original page)
+    const templateRow = this.node.closest('.plan-template__row')
+    if (templateRow) {
+      radioInput = templateRow.querySelector('.radio__input')
+    }
+
+    // Second structure (choice-list page)
+    if (!radioInput) {
+      const choiceListItem = this.node.closest('.choice-list__item')
+      if (choiceListItem) {
+        radioInput = choiceListItem.querySelector('.choice-list__radio')
+      }
+    }
+
+    // Get the template ID from the modalId
+    const templateId = modalId.split('-')[1]
+
+    // As a fallback, try to find the radio by its ID
+    if (!radioInput && templateId) {
+      radioInput = document.getElementById(`id_template_${templateId}`)
+    }
+
+    // Find all close buttons in the modal
+    const closeButtons = modalElement.querySelectorAll(
+      '.modal__close, .modal__close-title'
+    )
+
+    // Add event listener to all close buttons to select the radio input
+    if (radioInput) {
+      closeButtons.forEach((closeButton) => {
+        closeButton.addEventListener(
+          'click',
+          () => {
+            // Select the radio input
+            radioInput.checked = true
+
+            // If using the choice-list structure, add the 'selected' class to the parent list item
+            const choiceListItem = radioInput.closest('.choice-list__item')
+            if (choiceListItem) {
+              // Remove 'selected' class from all items
+              const allItems = document.querySelectorAll('.choice-list__item')
+              allItems.forEach((item) => item.classList.remove('selected'))
+
+              // Add 'selected' class to the clicked item
+              choiceListItem.classList.add('selected')
+            }
+
+            // Trigger change event to ensure any listeners know the radio was changed
+            const changeEvent = new Event('change', { bubbles: true })
+            radioInput.dispatchEvent(changeEvent)
+          },
+          { once: true }
+        )
+      })
+    }
+
     // Set the modal-closed callback to focus on the element that opened it
     modal.setModalClosedCallback(() => {
       if (modal.openedBy) {

src/open_inwoner/plans/templates/plans/preview.html

@@ -2,7 +2,7 @@
 
 <div class='plan-preview'>
 <p class='plan-preview__key'>{% trans "Titel" %}</p>
-                                <h2 class="utrecht-heading-2">{{ plan_template.name }}</h2>
+<h2 class="utrecht-heading-4">{{ plan_template.name }}</h2>
     {% if plan_template.goal %}
         <p class='plan-preview__key'>{% trans "Doel" %}</p>
         <div>{{ plan_template.goal|truncatewords:20 }}</div>

src/open_inwoner/plans/tests/test_logging.py

@@ -32,9 +32,9 @@ def setUp(self):
 
     def test_created_plan_is_logged(self):
         plan = PlanFactory.build(created_by=self.user)
-        form = self.app.get(reverse("collaborate:plan_create"), user=self.user).forms[
-            "plan-form"
-        ]
+        form = self.app.get(
+            reverse("collaborate:plan_create_no_template"), user=self.user
+        ).forms["plan-form"]
         form["title"] = plan.title
         form["goal"] = plan.goal
         form["end_date"] = plan.end_date

src/open_inwoner/plans/tests/test_views.py

@@ -45,7 +45,10 @@ def setUp(self) -> None:
         self.login_url = reverse("login")
         self.list_url = reverse("collaborate:plan_list")
         self.choose_template_url = reverse("collaborate:plan_choose_template")
-        self.create_url = reverse("collaborate:plan_create")
+        # TODO: new tests for choosing template form
+        self.create_url = reverse("collaborate:plan_create_no_template")
+        self.create_with_template_url = reverse("collaborate:plan_create_with_template")
+        # TODO: new tests for creating plan from template where Title/Goal are prefilled, but Contact/Enddate are not.
         self.detail_url = reverse(
             "collaborate:plan_detail", kwargs={"uuid": self.plan.uuid}
         )
@@ -316,11 +319,11 @@ def test_plan_action_create_not_your_action(self):
         other_user = UserFactory()
         self.app.get(self.action_add_url, user=other_user, status=404)
 
-    def test_plan_create_login_required(self):
+    def test_plan_create_no_template_login_required(self):
         response = self.app.get(self.create_url)
         self.assertRedirects(response, f"{self.login_url}?next={self.create_url}")
 
-    def test_plan_create_fields_required(self):
+    def test_plan_create_no_template_fields_required(self):
         response = self.app.get(self.create_url, user=self.user)
         form = response.forms["plan-form"]
         response = form.submit()
@@ -334,7 +337,7 @@ def test_plan_create_fields_required(self):
             },
         )
 
-    def test_plan_create_fails_with_no_collaborators(self):
+    def test_plan_create_no_template_fails_with_no_collaborators(self):
         response = self.app.get(self.create_url, user=self.user)
         form = response.forms["plan-form"]
         form["title"] = "Plan"
@@ -349,7 +352,7 @@ def test_plan_create_fails_with_no_collaborators(self):
             {"__all__": [_("At least one collaborator is required for a plan.")]},
         )
 
-    def test_plan_create_contains_expected_contacts(self):
+    def test_plan_create_no_template_contains_expected_contacts(self):
         another_contact = UserFactory()
         self.user.user_contacts.add(another_contact)
         response = self.app.get(self.create_url, user=self.user)
@@ -362,7 +365,7 @@ def test_plan_create_contains_expected_contacts(self):
         self.assertIn(self.contact.get_full_name(), rendered_contacts)
         self.assertIn(another_contact.get_full_name(), rendered_contacts)
 
-    def test_plan_create_plan(self):
+    def test_plan_create_no_template_plan(self):
         self.assertEqual(Plan.objects.count(), 1)
         response = self.app.get(self.create_url, user=self.user)
         form = response.forms["plan-form"]
@@ -379,10 +382,10 @@ def test_plan_create_plan(self):
         self.assertEqual(plan.goal, "Goal")
         self.assertEqual(plan.description, "Description")
 
-    def test_plan_create_plan_with_template(self):
+    def test_plan_create_no_template_plan_with_template(self):
         plan_template = PlanTemplateFactory(file=None)
         self.assertEqual(Plan.objects.count(), 1)
-        response = self.app.get(self.choose_template_url, user=self.user)
+        response = self.app.get(self.create_url, user=self.user)
         form = response.forms["plan-form"]
         form["title"] = "Plan"
         form["end_date"] = "2022-01-01"
@@ -398,7 +401,7 @@ def test_plan_create_plan_with_template(self):
         self.assertEqual(plan.documents.count(), 0)
         self.assertEqual(plan.actions.count(), 0)
 
-    def test_plan_create_plan_with_template_and_field_overrides(self):
+    def test_plan_create_no_template_plan_with_template_and_field_overrides(self):
         plan_template = PlanTemplateFactory(file=None)
         self.assertEqual(Plan.objects.count(), 1)
         response = self.app.get(self.create_url, user=self.user)
@@ -419,7 +422,7 @@ def test_plan_create_plan_with_template_and_field_overrides(self):
         self.assertEqual(plan.documents.count(), 0)
         self.assertEqual(plan.actions.count(), 0)
 
-    def test_plan_create_plan_with_template_and_file(self):
+    def test_plan_create_no_template_plan_with_template_and_file(self):
         plan_template = PlanTemplateFactory()
         self.assertEqual(Plan.objects.count(), 1)
         response = self.app.get(self.create_url, user=self.user)
@@ -438,7 +441,7 @@ def test_plan_create_plan_with_template_and_file(self):
         self.assertEqual(plan.documents.count(), 1)
         self.assertEqual(plan.actions.count(), 0)
 
-    def test_plan_create_plan_with_template_and_actions(self):
+    def test_plan_create_no_template_plan_with_template_and_actions(self):
         plan_template = PlanTemplateFactory(file=None)
         ActionTemplateFactory(plan_template=plan_template)
         self.assertEqual(Plan.objects.count(), 1)
@@ -458,7 +461,9 @@ def test_plan_create_plan_with_template_and_actions(self):
         self.assertEqual(plan.documents.count(), 0)
         self.assertEqual(plan.actions.count(), 1)
 
-    def test_plan_create_plan_validation_error_reselects_template_and_contact(self):
+    def test_plan_create_no_template_plan_validation_error_reselects_template_and_contact(
+        self,
+    ):
         plan_template = PlanTemplateFactory(file=None)
         ActionTemplateFactory(plan_template=plan_template)
         # make sure we have only one plan
@@ -484,12 +489,14 @@ def test_plan_create_plan_validation_error_reselects_template_and_contact(self):
         elem = response.pyquery("#id_plan_contacts_1")[0]
         self.assertEqual(elem.attrib.get("checked"), "checked")
 
-    def test_plan_create_contains_contact_create_link_when_no_contacts_exist(self):
+    def test_plan_create_no_template_contains_contact_create_link_when_no_contacts_exist(
+        self,
+    ):
         self.user.user_contacts.remove(self.contact)
         response = self.app.get(self.create_url, user=self.user)
         self.assertContains(response, reverse("profile:contact_create"))
 
-    def test_plan_create_does_not_contain_contact_create_link_when_contacts_exist(
+    def test_plan_create_no_template_does_not_contain_contact_create_link_when_contacts_exist(
         self,
     ):
         response = self.app.get(self.create_url, user=self.user)

src/open_inwoner/plans/views.py

@@ -268,23 +268,63 @@ def get_success_url(self) -> str:
         return self.object.get_absolute_url()
 
 
-class PlanCreateView(
+class PlanCreateNoTemplateView(
     PlanActionsEnabledMixin,
     LogMixin,
     LoginRequiredMixin,
     CommonPageMixin,
     BaseBreadcrumbMixin,
     CreateView,
 ):
-    template_name = "pages/plans/create.html"
+    template_name = "pages/plans/create-no-template.html"
     model = Plan
     form_class = PlanForm
 
     @cached_property
     def crumbs(self):
         return [
             (_("Samenwerken"), reverse("collaborate:plan_list")),
-            (_("Start nieuwe samenwerking"), reverse("collaborate:plan_create")),
+            (
+                _("Start nieuwe samenwerking"),
+                reverse("collaborate:plan_create_no_template"),
+            ),
+        ]
+
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs.update(user=self.request.user)
+        return kwargs
+
+    def form_valid(self, form):
+        self.object = form.save(self.request.user)
+
+        # Add plan creator as a plan_contact as well
+        self.object.plan_contacts.add(self.object.created_by)
+
+        self.log_addition(self.object, _("plan was created"))
+        return HttpResponseRedirect(self.get_success_url())
+
+    def get_success_url(self) -> str:
+        return self.object.get_absolute_url()
+
+
+class PlanCreateWithTemplateView(
+    PlanActionsEnabledMixin,
+    LogMixin,
+    LoginRequiredMixin,
+    CommonPageMixin,
+    BaseBreadcrumbMixin,
+    CreateView,
+):
+    template_name = "pages/plans/create-with-template.html"
+    model = Plan
+    form_class = PlanForm
+
+    @cached_property
+    def crumbs(self):
+        return [
+            (_("Samenwerken"), reverse("collaborate:plan_list")),
+            (_("Gebruik dit voorstel"), reverse("collaborate:plan_choose_template")),
         ]
 
     def get_form_kwargs(self):

src/open_inwoner/scss/components/Card/Card.scss

@@ -196,10 +196,6 @@
     color: var(--color-body);
     font-size: var(--font-size-body-small);
   }
-  .card__text--small ~ .link {
-    background-color: yellow;
-    margin-top: var(--spacing-medium);
-  }
 
   &__text--dark {
     color: var(--font-color-body);

src/open_inwoner/scss/components/Form/Form.scss

@@ -192,12 +192,6 @@
       margin-top: 0;
     }
 
-    &--nogrid {
-      display: block;
-      margin: 0;
-      max-width: 100%;
-    }
-
     &--fullwidth {
       display: block;
       margin: 0;