diff --git a/src/open_inwoner/accounts/forms.py b/src/open_inwoner/accounts/forms.py index ccb08b5596..78aa21dc49 100644 --- a/src/open_inwoner/accounts/forms.py +++ b/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): diff --git a/src/open_inwoner/accounts/migrations/0054_remove_action_goal.py b/src/open_inwoner/accounts/migrations/0054_remove_action_goal.py new file mode 100644 index 0000000000..d48abf0ea4 --- /dev/null +++ b/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", + ), + ] diff --git a/src/open_inwoner/accounts/models.py b/src/open_inwoner/accounts/models.py index 00e17115b5..937ecb64c5 100644 --- a/src/open_inwoner/accounts/models.py +++ b/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, diff --git a/src/open_inwoner/accounts/tests/test_actions_expire.py b/src/open_inwoner/accounts/tests/test_actions_expire.py index 919669d933..b300d38402 100644 --- a/src/open_inwoner/accounts/tests/test_actions_expire.py +++ b/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): diff --git a/src/open_inwoner/conf/base.py b/src/open_inwoner/conf/base.py index 8aed110399..19afbae338 100644 --- a/src/open_inwoner/conf/base.py +++ b/src/open_inwoner/conf/base.py @@ -762,13 +762,11 @@ - {% for action in actions %} - {% endfor %} diff --git a/src/open_inwoner/plans/forms.py b/src/open_inwoner/plans/forms.py index 5d2505ade9..5c0a8e5b48 100644 --- a/src/open_inwoner/plans/forms.py +++ b/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, diff --git a/src/open_inwoner/plans/migrations/0012_remove_actiontemplate_goal.py b/src/open_inwoner/plans/migrations/0012_remove_actiontemplate_goal.py new file mode 100644 index 0000000000..e1112967e5 --- /dev/null +++ b/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", + ), + ] diff --git a/src/open_inwoner/plans/models.py b/src/open_inwoner/plans/models.py index 6ea229145e..3df62818b3 100644 --- a/src/open_inwoner/plans/models.py +++ b/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, diff --git a/src/open_inwoner/plans/templates/plans/preview.html b/src/open_inwoner/plans/templates/plans/preview.html index a76942fed8..b8519eadfd 100644 --- a/src/open_inwoner/plans/templates/plans/preview.html +++ b/src/open_inwoner/plans/templates/plans/preview.html @@ -23,9 +23,6 @@
{% trans 'Description:' %}
{{ action_template.description }}
-
{% trans 'Goal:' %}
-
{{ action_template.goal }}
-
{% trans 'Type:' %}
{{ action_template.get_type_display }}
diff --git a/src/open_inwoner/plans/tests/factories.py b/src/open_inwoner/plans/tests/factories.py index 7c1845790a..22ce2f7403 100644 --- a/src/open_inwoner/plans/tests/factories.py +++ b/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") diff --git a/src/open_inwoner/templates/export/profile/action_export.html b/src/open_inwoner/templates/export/profile/action_export.html index 48a6420ab9..faeec42d78 100644 --- a/src/open_inwoner/templates/export/profile/action_export.html +++ b/src/open_inwoner/templates/export/profile/action_export.html @@ -36,10 +36,6 @@

{% trans "Action" %} {{ object }}

- - - - @@ -50,4 +46,4 @@

{% trans "Action" %} {{ object }}

Action nameGoal End date
{{ action.name }}{{ action.goal }} {{ action.end_date|date:"d-m-Y" }}
{% trans "File" %} {% if object.file %}{% link href=download_url text=object.file.name download=True %}{% endif %}
{% trans "Goal" %}{{ object.goal }}
{% trans "Created on" %} {{ object.created_on }}
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/src/open_inwoner/templates/pages/profile/actions/edit.html b/src/open_inwoner/templates/pages/profile/actions/edit.html index 5ed8334d7c..2a8abe1062 100644 --- a/src/open_inwoner/templates/pages/profile/actions/edit.html +++ b/src/open_inwoner/templates/pages/profile/actions/edit.html @@ -23,7 +23,6 @@

{% 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 %}