AKSubmission/templates/AKSubmission/submit_new.html

@@ -44,7 +44,9 @@
         <h2>{% trans 'New AK' %}</h2>
     {% endblock %}
     <form method="POST" class="post-form">{% csrf_token %}
-        {% bootstrap_form form %}
+        {% block form_contents %}
+            {% bootstrap_form form %}
+        {% endblock %}
         {% buttons %}
             <button type="submit" class="save btn btn-primary float-right">
                 {% fa5_icon "check" 'fas' %} {% trans "Submit" %}

AKSubmission/tests.py

@@ -159,4 +159,21 @@ class ModelViewTests(BasicViewTests, TestCase):
         response = self.client.post(invalid_interest_api_url)
         self.assertEqual(response.status_code, 404, f"Invalid URL reachable ({interest_api_url})")
 
+    def test_adding_of_unknown_user(self):
+        detail_url = reverse_lazy(f"{self.APP_NAME}:ak_detail", kwargs={'event_slug': 'kif42', 'pk': 1})
+        response = self.client.get(detail_url)
+        self.assertEqual(response.status_code, 200, msg="Could not load ak detail view")
 
+        edit_url = reverse_lazy(f"{self.APP_NAME}:ak_edit", kwargs={'event_slug': 'kif42', 'pk': 1})
+        response = self.client.get(edit_url)
+        self.assertEqual(response.status_code, 200, msg="Could not load ak detail view")
+        self.assertContains(response, "Add person not in the list yet",
+                            msg_prefix="Link to add unknown user not contained")
+
+        self.assertEqual(AK.objects.get(pk=1).owners.count(), 1)
+        add_new_user_to_ak_url = reverse_lazy(f"{self.APP_NAME}:akowner_create", kwargs={'event_slug': 'kif42'}) + f"?add_to_existing_ak=1"
+        response = self.client.post(add_new_user_to_ak_url, {'name': 'New test owner', 'event': Event.get_by_slug('kif42').pk})
+        self.assertRedirects(response, detail_url,
+                             msg_prefix=f"No correct redirect: {add_new_user_to_ak_url} (POST) -> {detail_url}")
+        self._assert_message(response, "Added 'New test owner' as new owner of 'Test AK Inhalt'")
+        self.assertEqual(AK.objects.get(pk=1).owners.count(), 2)

AKSubmission/views.py

@@ -302,6 +302,13 @@ class AKOwnerCreateView(EventSlugMixin, EventInactiveRedirectMixin, CreateView):
     form_class = AKOwnerForm
 
     def get_success_url(self):
+        if "add_to_existing_ak" in self.request.GET:
+            ak_pk = self.request.GET['add_to_existing_ak']
+            ak = get_object_or_404(AK, pk=ak_pk)
+            ak.owners.add(self.object)
+            messages.add_message(self.request, messages.SUCCESS,
+                                 _("Added '{owner}' as new owner of '{ak.name}'").format(owner=self.object, ak=ak))
+            return reverse_lazy('submit:ak_detail', kwargs={'event_slug': self.kwargs['event_slug'], 'pk': ak.pk})
         return reverse_lazy('submit:submit_ak',
                             kwargs={'event_slug': self.kwargs['event_slug'], 'owner_slug': self.object.slug})
 

static_common/common/js/availabilities.js

@@ -6,7 +6,7 @@
 // It was significantly changed to deal with the newer fullcalendar version, event specific timezones,
 // to remove the dependency to moments timezone and improve the visualization of deletion
 
-function createAvailabilityEditors(timezone, language, startDate, endDate) {
+function createAvailabilityEditors(timezone, language, startDate, endDate, slotResolution='00:30:00') {
     $("input.availabilities-editor-data").each(function () {
         const eventColor = '#28B62C';
 
@@ -16,6 +16,20 @@ function createAvailabilityEditors(timezone, language, startDate, endDate) {
         data_field.after(editor);
         data_field.hide();
 
+        // Add inputs to add slots without the need to click and drag
+        let manualSlotAdderSource = "<form id='formManualAdd'><table class='table table-responsive mb-0'><tr>" +
+            "<td style='vertical-align: middle;'><input type='datetime-local' id='inputStart' value='" + startDate + "' min='" + startDate + "' max='" + endDate + "'></td>" +
+            "<td style='vertical-align: middle;'><i class=\"fas fa-long-arrow-alt-right\"></i></td>" +
+            "<td style='vertical-align: middle;'><input type='datetime-local' id='inputEnd' value='" + endDate + "' min='" + startDate + "' max='" + endDate + "'></td>" +
+            "<td><button class='btn btn-primary' type='submit'><i class=\"fas fa-plus\"></i></button></td></tr></table></form>";
+        let manualSlotAdder = $(manualSlotAdderSource);
+        editor.after(manualSlotAdder);
+
+        $('#formManualAdd').submit(function(event) {
+            add($('#inputStart').val(), $('#inputEnd').val());
+            event.preventDefault();
+        });
+
         let editable = !Boolean(data_field.attr("disabled"));
         let data = JSON.parse(data_field.attr("value"));
         let events = data.availabilities.map(function (e) {
@@ -58,15 +72,7 @@ function createAvailabilityEditors(timezone, language, startDate, endDate) {
             events: data.availabilities,
             eventBackgroundColor: eventColor,
             select: function (info) {
-                resetDeletionCandidate();
-                plan.addEvent({
-                    title: "",
-                    start: info.start,
-                    end: info.end,
-                    id: 'new' + newEventsCounter
-                })
-                newEventsCounter++;
-                save_events();
+                add(info.start, info.end);
             },
             eventClick: function (info) {
                 if (eventMarkedForDeletion !== undefined && (eventMarkedForDeletion.id === info.event.id)) {
@@ -84,9 +90,22 @@ function createAvailabilityEditors(timezone, language, startDate, endDate) {
             selectOverlap: false,
             eventOverlap: false,
             eventChange: save_events,
+            slotDuration: slotResolution,
         });
         plan.render();
 
+        function add(start, end) {
+            resetDeletionCandidate();
+            plan.addEvent({
+                title: "",
+                start: start,
+                end: end,
+                id: 'new' + newEventsCounter
+            })
+            newEventsCounter++;
+            save_events();
+        }
+
         function makeDeletionCandidate(el) {
             el.classList.add("deleteEvent");
             $(el).find(".fc-event-title").html("<i class='fas fa-trash'></i> <i class='fas fa-question'></i>");