allow multiple comments per participation

ephios/core/signup/forms.py

@@ -2,6 +2,7 @@
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import HTML, Field, Layout
 from django import forms
+from django.db import transaction
 from django.utils.formats import date_format
 from django.utils.timezone import localtime
 from django.utils.translation import gettext_lazy as _
@@ -26,9 +27,6 @@ class BaseParticipationForm(forms.ModelForm):
     comment_is_public = forms.BooleanField(
         label=_("Make comment visible for other participants"), required=False
     )
-    comment_visibility = forms.ChoiceField(
-        choices=ParticipationComment.Visibility, required=False, widget=forms.HiddenInput
-    )
 
     def clean_individual_start_time(self):
         if self.cleaned_data["individual_start_time"] == self.shift.start_time:
@@ -57,16 +55,17 @@ def clean(self):
                 self.add_error("individual_end_time", _("End time must not be before start time."))
             return cleaned_data
 
-    def save(self, commit=True):
-        result = super().save(commit)
-        if comment := self.cleaned_data["comment"]:
-            ParticipationComment.objects.create(
-                participation=result,
-                text=comment,
-                authored_by_responsible=self.acting_user,
-                visibile_for=self.cleaned_data["comment_visibility"],
-            )
-        return result
+    def save(self):
+        with transaction.atomic():
+            result = super().save()
+            if comment := self.cleaned_data["comment"]:
+                ParticipationComment.objects.create(
+                    participation=result,
+                    text=comment,
+                    authored_by_responsible=self.acting_user,
+                    visibile_for=self.get_comment_visibility(),
+                )
+            return result
 
     class Meta:
         model = AbstractParticipation

ephios/core/templates/core/disposition/fragment_participation.html

@@ -63,18 +63,15 @@ <h6 class="d-inline">
                 {% if form.previous_comments %}
                     {{ form.previous_comments|as_crispy_field }}
                 {% endif %}
-                <div class="row">
-                    <div class="form-group col">
-                        {{ form.comment|as_crispy_field }}
+                <div class="mb-3">
+                    <div class="form-label">
+                        {{ form.comment.label_tag }}
+                        <span class="float-end form-check">
+                            <input type="checkbox" id="{{ form.comment_is_internal.auto_id }}" name="{{ form.comment_is_internal.html_name }}" class="form-check-input">
+                            {{ form.comment_is_internal.label_tag }}
+                        </span>
                     </div>
-                    <div class="form-group col-md-2 pt-4">
-                        <input type="checkbox" class="btn-check" id="{{ form.comment_is_internal.auto_id }}" name="{{ form.comment_is_internal.html_name }}" autocomplete="off">
-                        <label class="btn btn-outline-primary" for="{{ form.comment_is_internal.auto_id }}"><span class="fa fa-eye-slash"></span></label>
-                    </div>
-{#                    <div class="form-group col">#}
-{#                        <label class="form-label" for="flexSwitchCheckDefault">{{ form.comment_is_internal.label }}</label><br />#}
-{#                      <input class="form-check-input" type="checkbox" id="flexSwitchCheckDefault">#}
-{#                    </div>#}
+                    <input class="form-control" id="{{ form.comment.auto_id }}" name="{{ form.comment.html_name }}">
                 </div>
                 {% block participation_form %}
                 {% endblock %}