Merge branch '18-add-persons-to-group-by-username' into '13-event-detail-page'

Resolve "Add persons to group by username"

See merge request !21

aleksis/apps/paweljong/forms.py

@@ -489,3 +489,15 @@ class RegistrationStatesForm(forms.ModelForm):
     class Meta:
         model = RegistrationState
         exclude = []
+
+
+class PersonGroupFormPerson(forms.Form):
+
+    layout = Layout("username")
+
+    username = forms.CharField(
+        required=True,
+        label=_("Person"),
+        widget=forms.TextInput(attrs={"autofocus": "", "autocomplete": "off"}),
+        help_text=_("Please enter a username."),
+    )

aleksis/apps/paweljong/tables.py

@@ -134,3 +134,27 @@ class RegistrationStatesTable(tables.Table):
     def render_name(self, value, record):
         context = dict(state=record)
         return render_to_string("paweljong/registration_state/chip.html", context)
+
+
+class ChildGroupsTable(tables.Table):
+    """Table to list groups."""
+
+    class Meta:
+        attrs = {"class": "highlight"}
+
+    name = tables.LinkColumn("group_by_id", args=[A("id")])
+    short_name = tables.LinkColumn("group_by_id", args=[A("id")])
+
+    add_persons = tables.LinkColumn(
+        "add_persons_to_group",
+        args=[A("id")],
+        verbose_name=_("Add persons"),
+        text=_("Add persons"),
+    )
+
+
+class AdditionalFieldsTable(tables.Table):
+    class Meta:
+        attrs = {"class": "highlight"}
+
+    title = tables.LinkColumn("edit_additional_field_by_id", args=[A("id")])

aleksis/apps/paweljong/templates/paweljong/event/detail.html

@@ -77,11 +77,16 @@
    </div>
   </div>
 
-  <h5>{% blocktrans %}Additional fields{% endblocktrans %}</h5>
-  {% render_table additional_fields_table %}
-
-  <h5>{% blocktrans %}Child groups{% endblocktrans%}</h5>
-  {% render_table child_groups_table %}
+  <div class="row">
+    <div class="col s3">
+      <h5>{% blocktrans %}Additional fields{% endblocktrans %}</h5>
+      {% render_table additional_fields_table %}
+    </div>
+    <div class="col s9">
+      <h5>{% blocktrans %}Child groups{% endblocktrans%}</h5>
+      {% render_table child_groups_table %}
+    </div>
+  </div>
 
   <h5>{% blocktrans %}Registrations{% endblocktrans %}</h5>
   {% render_table registrations_table %}

aleksis/apps/paweljong/templates/paweljong/event/persons_group.html

+{% extends "core/base.html" %}
+{% load material_form i18n any_js %}
+
+{% block page_title %}{% blocktrans %}Add person to group{% endblocktrans %}{% endblock %}
+{% block browser_title %}{% blocktrans %}Add person to group{% endblocktrans %}{% endblock %}
+
+{% block extra_head %}
+    {{ form.media.css }}
+{% endblock %}
+
+{% block content %}
+
+  <form method="post">
+    {% csrf_token %}
+    {% form form=form %}{% form %}
+    {% include "core/partials/save_button.html" %}
+  </form>
+  {{ form.media.js }}
+
+{% endblock %}

aleksis/apps/paweljong/urls.py

@@ -42,6 +42,11 @@ urlpatterns = [
         views.RegisterEventWizardView.as_view(register_forms, condition_dict=condition_dict),
         name="register_event_by_slug",
     ),
+    path(
+        "group_persons/<int:pk>/add",
+        views.PersonGroupView.as_view(),
+        name="add_persons_to_group",
+    ),
     path("event/<slug:slug>", views.EventFullView.as_view(), name="event_by_name"),
     path("event/<slug:slug>/detail", views.EventDetailView.as_view(), name="event_detail_by_name"),
     path(

aleksis/apps/paweljong/views.py

@@ -24,8 +24,7 @@ from templated_email import send_templated_mail
 
 from aleksis.apps.postbuero.models import MailAddress
 from aleksis.core.mixins import AdvancedCreateView, AdvancedDeleteView, AdvancedEditView
-from aleksis.core.models import Activity, Person
-from aleksis.core.tables import AdditionalFieldsTable, GroupsTable
+from aleksis.core.models import Activity, Group, Person
 from aleksis.core.util import messages
 from aleksis.core.util.core_helpers import get_site_preferences, objectgetter_optional
 
@@ -37,11 +36,14 @@ from .forms import (
     EditTermForm,
     EditVoucherForm,
     GenerateListForm,
+    PersonGroupFormPerson,
     RegistrationNotificationForm,
     RegistrationStatesForm,
 )
 from .models import Event, EventRegistration, InfoMailing, RegistrationState, Terms, Voucher
 from .tables import (
+    AdditionalFieldsTable,
+    ChildGroupsTable,
     EventRegistrationsTable,
     InfoMailingsTable,
     ManageEventsTable,
@@ -903,7 +905,7 @@ class EventDetailView(PermissionRequiredMixin, DetailView):
 
         # Child groups table
         child_groups = self.object.linked_group.child_groups.all()
-        child_groups_table = GroupsTable(child_groups)
+        child_groups_table = ChildGroupsTable(child_groups)
         RequestConfig(self.request).configure(child_groups_table)
         context["child_groups_table"] = child_groups_table
 
@@ -914,3 +916,26 @@ class EventDetailView(PermissionRequiredMixin, DetailView):
         context["additional_fields_table"] = additional_fields_table
 
         return context
+
+
+class PersonGroupView(PermissionRequiredMixin, FormView):
+
+    template_name = "paweljong/event/persons_group.html"
+    permission_required = "paweljong.add_persons_to_group_rule"
+    form_class = PersonGroupFormPerson
+
+    def form_valid(self, form):
+
+        group = Group.objects.get(id=self.kwargs["pk"])
+
+        try:
+            person = Person.objects.get(user__username=form.cleaned_data["username"])
+            group.members.add(person)
+            messages.success(self.request, _(f"Person {person} added successfully!"))
+        except Person.DoesNotExist:
+            messages.error(self.request, _("Person does not exist!"))
+
+        return super().form_valid(self)
+
+    def get_success_url(self):
+        return reverse("add_persons_to_group", kwargs={"pk": self.kwargs["pk"]})