Merge pull request #494 from maykinmedia/feature/1162-remove-goal-fro…

…m-actions

[#1162] Removed 'goal' field from Action and ActionTemplate

src/open_inwoner/accounts/forms.py

@@ -253,7 +253,6 @@ class Meta:
             "end_date",
             "is_for",
             "file",
-            "goal",
         )
 
     def __init__(self, user, plan=None, *args, **kwargs):

src/open_inwoner/accounts/migrations/0054_remove_action_goal.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.2.15 on 2023-02-22 15:27
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("accounts", "0053_user_display_name"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="action",
+            name="goal",
+        ),
+    ]

src/open_inwoner/accounts/models.py

@@ -390,13 +390,6 @@ class Action(models.Model):
         blank=True,
         help_text=_("The description of the action"),
     )
-    goal = models.CharField(
-        verbose_name=_("Goal"),
-        default="",
-        blank=True,
-        max_length=250,
-        help_text=_("The goal of the action"),
-    )
     status = models.CharField(
         verbose_name=_("Status"),
         default=StatusChoices.open,

src/open_inwoner/accounts/tests/test_actions_expire.py

@@ -24,7 +24,6 @@ def test_notify_about_expiring_action(self):
         )
         self.assertEqual(sent_mail.to, [user.email])
         self.assertIn(action.name, html_body)
-        self.assertIn(action.goal, html_body)
         self.assertIn(reverse("accounts:action_list"), html_body)
 
     def test_action_does_not_expire_yet(self):

src/open_inwoner/conf/base.py

@@ -762,13 +762,11 @@
             <table>
                 <tr>
                     <td>Action name</td>
-                    <td>Goal</td>
                     <td>End date</td>
                 </tr>
             {% for action in actions %}
                 <tr>
                     <td>{{ action.name }}</td>
-                    <td>{{ action.goal }}</td>
                     <td>{{ action.end_date|date:"d-m-Y" }}</td>
                 </tr>
             {% endfor %}

src/open_inwoner/plans/forms.py

@@ -78,7 +78,6 @@ def save(self, user, commit=True):
                 Action.objects.create(
                     name=action_template.name,
                     description=action_template.description,
-                    goal=action_template.goal,
                     type=action_template.type,
                     end_date=end_date.date(),
                     is_for=user,

src/open_inwoner/plans/migrations/0012_remove_actiontemplate_goal.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.2.15 on 2023-02-22 15:27
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("plans", "0011_remove_plan_contacts"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="actiontemplate",
+            name="goal",
+        ),
+    ]

src/open_inwoner/plans/models.py

@@ -69,15 +69,6 @@ class ActionTemplate(models.Model):
             "The description that will be applied to the action if this template in chosen."
         ),
     )
-    goal = models.CharField(
-        verbose_name=_("goal"),
-        default="",
-        blank=True,
-        max_length=250,
-        help_text=_(
-            "The goal that will be applied to the action if this template in chosen."
-        ),
-    )
     type = models.CharField(
         verbose_name=_("Type"),
         default=TypeChoices.incidental,

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

@@ -23,9 +23,6 @@
                 <div class='preview__title'>{% trans 'Description:' %}</div>
                 <div>{{ action_template.description }}</div>
                 <div></div>
-                <div class='preview__title'>{% trans 'Goal:' %}</div>
-                <div>{{ action_template.goal }}</div>
-                <div></div>
                 <div class='preview__title'>{% trans 'Type:' %}</div>
                 <div>{{ action_template.get_type_display }}</div>
                 <div></div>

src/open_inwoner/plans/tests/factories.py

@@ -54,5 +54,4 @@ class Meta:
     plan_template = factory.SubFactory(PlanTemplateFactory)
     name = factory.Faker("word")
     description = factory.Faker("word")
-    goal = factory.Faker("paragraph")
     end_in_days = factory.Faker("pyint")

src/open_inwoner/templates/export/profile/action_export.html

@@ -36,10 +36,6 @@ <h1 class="h1">{% trans "Action" %} {{ object }}</h1>
             <th class="table__header">{% trans "File" %}</th>
             <td class="table__item">{% if object.file %}{% link href=download_url text=object.file.name download=True %}{% endif %}</td>
         </tr>
-        <tr>
-            <th class="table__header">{% trans "Goal" %}</th>
-            <td class="table__item">{{ object.goal }}</td>
-        </tr>
         <tr>
             <th class="table__header">{% trans "Created on" %}</th>
             <td class="table__item">{{ object.created_on }}</td>
@@ -50,4 +46,4 @@ <h1 class="h1">{% trans "Action" %} {{ object }}</h1>
         </tr>
     </table>
 
-{% endblock %}
+{% endblock %}

src/open_inwoner/templates/pages/profile/actions/edit.html

@@ -23,7 +23,6 @@ <h1 class="h1">
         {% input form.is_for no_help=True %}
         {% input form.file no_help=True %}
     {% endrender_grid %}
-    {% input form.goal no_help=True %}
 
     {% form_actions primary_text=_("Actie opslaan") %}
 {% endrender_form %}