From fe92d762be83e8bee8af4a0f15f687554a926be0 Mon Sep 17 00:00:00 2001 From: moanos Date: Sun, 22 Jun 2025 17:35:36 +0200 Subject: [PATCH] feat: Add form for internal comment in dq view --- src/fellchensammlung/forms.py | 8 ++- .../partials/partial-check-rescue-org.html | 57 ++++++++++++------- .../templatetags/custom_tags.py | 5 ++ src/fellchensammlung/views.py | 19 +++++-- 4 files changed, 64 insertions(+), 25 deletions(-) diff --git a/src/fellchensammlung/forms.py b/src/fellchensammlung/forms.py index 2ee6f29..fd40827 100644 --- a/src/fellchensammlung/forms.py +++ b/src/fellchensammlung/forms.py @@ -1,7 +1,7 @@ from django import forms from .models import AdoptionNotice, Animal, Image, ReportAdoptionNotice, ReportComment, ModerationAction, User, Species, \ - Comment, SexChoicesWithAll, DistanceChoices, SpeciesSpecificURL + Comment, SexChoicesWithAll, DistanceChoices, SpeciesSpecificURL, RescueOrganization from django_registration.forms import RegistrationForm from crispy_forms.helper import FormHelper from crispy_forms.layout import Submit, Layout, Fieldset, HTML, Row, Column, Field, Hidden @@ -117,6 +117,12 @@ class SpeciesURLForm(forms.ModelForm): fields = ('species', 'url') +class RescueOrgInternalComment(forms.ModelForm): + class Meta: + model = RescueOrganization + fields = ('internal_comment',) + + class ModerationActionForm(forms.ModelForm): class Meta: model = ModerationAction diff --git a/src/fellchensammlung/templates/fellchensammlung/partials/partial-check-rescue-org.html b/src/fellchensammlung/templates/fellchensammlung/partials/partial-check-rescue-org.html index 82800e3..3457345 100644 --- a/src/fellchensammlung/templates/fellchensammlung/partials/partial-check-rescue-org.html +++ b/src/fellchensammlung/templates/fellchensammlung/partials/partial-check-rescue-org.html @@ -10,28 +10,45 @@
-

- {% translate 'Zuletzt geprüft:' %} {{ rescue_org.last_checked_hr }} -

- {% if rescue_org.website %} - - - {{ rescue_org.website|domain }} - +
+

+ {% translate 'Zuletzt geprüft:' %} {{ rescue_org.last_checked_hr }} +

+ {% if rescue_org.website %} + + + {{ rescue_org.website|domain }} + + {% endif %} + {% for species_url in rescue_org.species_urls %} +

{{ species_url.species }}: {{ species_url.url }} +

+ {% endfor %} +
+ {% if set_internal_comment_avilable %} +
+
+ {% csrf_token %} + {{ comment_forms|dictkey:rescue_org.id }} + + + +
+
{% endif %} - {% for species_url in rescue_org.species_urls %} -

{{ species_url.species }}: {{ species_url.url }}

- {% endfor %} - {% if set_species_url_available %} +
-
- {% csrf_token %} - - - {{ species_url_form }} - -
- {% endif %} + {% if set_species_url_available %} + +
+ {% csrf_token %} + + + {{ species_url_form }} + +
+ {% endif %} +
diff --git a/src/fellchensammlung/templatetags/custom_tags.py b/src/fellchensammlung/templatetags/custom_tags.py index a5c82b0..4485e2b 100644 --- a/src/fellchensammlung/templatetags/custom_tags.py +++ b/src/fellchensammlung/templatetags/custom_tags.py @@ -103,3 +103,8 @@ def type_to_bulma_class(value): @register.simple_tag def trust_level(level_string): return getattr(TrustLevel, level_string) + + +@register.filter +def dictkey(d, key): + return d.get(key) diff --git a/src/fellchensammlung/views.py b/src/fellchensammlung/views.py index 01952dd..b101a08 100644 --- a/src/fellchensammlung/views.py +++ b/src/fellchensammlung/views.py @@ -21,7 +21,7 @@ from .models import AdoptionNotice, Text, Animal, Rule, Image, Report, Moderatio Species, Log, Timestamp, TrustLevel, SexChoicesWithAll, SearchSubscription, AdoptionNoticeNotification, \ ImportantLocation, SpeciesSpecificURL from .forms import AdoptionNoticeForm, ImageForm, ReportAdoptionNoticeForm, \ - CommentForm, ReportCommentForm, AnimalForm, AdoptionNoticeFormAutoAnimal, SpeciesURLForm + CommentForm, ReportCommentForm, AnimalForm, AdoptionNoticeFormAutoAnimal, SpeciesURLForm, RescueOrgInternalComment from .models import Language, Announcement from .tools import i18n from .tools.geo import GeoAPI, zoom_level_for_radius @@ -713,20 +713,29 @@ def rescue_organization_check(request, context=None): action = request.POST.get("action") if action == "checked": rescue_org.set_checked() - if action == "exclude": + elif action == "exclude": rescue_org.set_exclusion_from_checks() - if action == "set_species_url": + elif action == "set_species_url": species_url_form = SpeciesURLForm(request.POST) if species_url_form.is_valid(): species_url_instance = species_url_form.save(commit=False) species_url_instance.rescue_organization_id = rescue_org.id species_url_instance.save() + elif action == "update_internal_comment": + comment_form = RescueOrgInternalComment(request.POST, instance=rescue_org) + if comment_form.is_valid(): + comment_form.save() rescue_orgs_to_check = RescueOrganization.objects.filter(exclude_from_check=False).order_by("last_checked")[:10] + # Prepare a form for each organization + comment_forms = { + org.id: RescueOrgInternalComment(instance=org) for org in rescue_orgs_to_check + } rescue_orgs_last_checked = RescueOrganization.objects.filter().order_by("-last_checked")[:10] context["rescue_orgs_to_check"] = rescue_orgs_to_check context["rescue_orgs_last_checked"] = rescue_orgs_last_checked + context["comment_forms"] = comment_forms return render(request, 'fellchensammlung/rescue-organization-check.html', context=context) @@ -737,7 +746,9 @@ def rescue_organization_check_dq(request): DQ = data quality """ context = {"set_species_url_available": True, - "species_url_form": SpeciesURLForm} + "set_internal_comment_avilable": True, + "species_url_form": SpeciesURLForm, + "internal_comment_form": RescueOrgInternalComment} return rescue_organization_check(request, context)