Add manual subgroup (re)division

app/controllers/activities_controller.rb

@@ -5,7 +5,7 @@ class ActivitiesController < ApplicationController
   has_activity_id = [
     :show, :edit, :edit_subgroups, :update, :update_subgroups, :destroy,
     :presence, :change_organizer, :create_subgroup, :update_subgroup,
-    :destroy_subgroup
+    :destroy_subgroup, :immediate_subgroups, :clear_subgroups
   ]
   before_action :set_activity_and_group, only: has_activity_id
   before_action :set_group,            except: has_activity_id
@@ -17,7 +17,8 @@ class ActivitiesController < ApplicationController
   ]
   before_action :require_organizer!, only: [
     :edit, :update, :change_organizer, :create_subgroup, :update_subgroup,
-    :destroy_subgroup, :edit_subgroups, :update_subgroups
+    :destroy_subgroup, :edit_subgroups, :update_subgroups, :immediate_subgroups,
+    :clear_subgroups
   ]
 
   # GET /groups/:id/activities
@@ -88,26 +89,18 @@ class ActivitiesController < ApplicationController
 
   # POST /activities/1/update_subgroups
   def update_subgroups
-    # TODO:
-    # voor elke key in participant_subgroups
-    # pak participant, subgroup
-    # verifieer participant hoort bij activiteit
-    # verifieer subgroup hoort bij activiteit
-    # (impl dat editen mogen al gecheckt is, check of dit zo is!)
-    # doe veranderen
-    # knikker alles in een transactie want dan atomisch enzo cool en leuk
-    # S: on error netjes bleren maar wat er mis kan gaan is bijna alleen gekut dus meh
-    kappen = false
-
     Participant.transaction do
+      # For each key in participant_subgroups:
       params[:participant_subgroups].each do |k, v|
+        # Get Participant, Subgroup
         p = Participant.find_by id: k
         sg = Subgroup.find_by id: v unless v == 'nil'
 
+        # Verify that the Participant and Subgroup belong to this activity
+        # Edit-capability is enforced by before_filter.
         if !p || p.activity != @activity || (!sg && v != 'nil') || (sg && sg.activity != @activity)
           flash_message(:danger, I18n.t(:somethingbroke))
           redirect_to group_activity_edit_subgroups_path(@group, @activity)
-          kappen = true
           raise ActiveRecord::Rollback
         end
 
@@ -121,10 +114,33 @@ class ActivitiesController < ApplicationController
       end
     end
 
-    unless kappen
-      flash_message(:success, I18n.t('activities.subgroups.edited'))
-      redirect_to edit_group_activity_path(@group, @activity)
+    flash_message(:success, I18n.t('activities.subgroups.edited'))
+    redirect_to edit_group_activity_path(@group, @activity)
+  end
+
+  # POST /activities/1/immediate_subgroups
+  def immediate_subgroups
+    if params[:overwrite]
+      @activity.clear_subgroups!
     end
+
+    @activity.assign_subgroups!
+
+    if params[:overwrite]
+      flash_message(:success, I18n.t('activities.subgroups.redistributed'))
+    else
+      flash_message(:success, I18n.t('activities.subgroups.remaining_distributed'))
+    end
+
+    redirect_to edit_group_activity_path(@group, @activity)
+  end
+
+  # POST /activities/1/clear_subgroups
+  def clear_subgroups
+    @activity.clear_subgroups!
+
+    flash_message(:success, I18n.t('activities.subgroups.cleared'))
+    redirect_to edit_group_activity_path(@group, @activity)
   end
 
   # Shared lookups for rendering the edit-view

app/models/activity.rb

@@ -250,6 +250,25 @@ class Activity < ApplicationRecord
     end
   end
 
+  def clear_subgroups!(only_assignable = true)
+    sgs = self
+      .subgroups
+
+    if only_assignable
+    sgs = sgs
+      .where(is_assignable: true)
+    end
+
+    ps = self
+      .participants
+      .where(subgroup: sgs)
+
+    ps.each do |p|
+      p.subgroup = nil
+      p.save
+    end
+  end
+
   # Notify participants of the current subgroups, if any.
   def notify_subgroups!
     ps = self

app/views/activities/_form.html.erb

@@ -49,6 +49,28 @@
         <%= f.check_box(:subgroup_division_enabled) %>
         <%= t 'activerecord.attributes.activity.subgroup_division_enabled' %>
       </div>
-    <%= f.submit class: 'btn btn-primary' %>
+    <div class="form-group btn-group">
+      <%= f.submit class: 'btn btn-primary' %>
+      <% unless activity.new_record? %>
+        <%= link_to I18n.t('activities.subgroups.distribute_remaining'),
+          { action: 'immediate_subgroups', group_id: activity.group_id, activity_id: activity.id },
+          class: 'btn btn-warning',
+          method: :post,
+          data: { confirm: I18n.t('activities.subgroups.distribute_remaining_explanation')}
+        %>
+        <%= link_to I18n.t('activities.subgroups.redistribute'),
+          { action: 'immediate_subgroups', group_id: activity.group_id, activity_id: activity.id, overwrite: true },
+          method: :post,
+          class: 'btn btn-danger',
+          data: { confirm: I18n.t('activities.subgroups.redistribute_explanation')}
+        %>
+        <%= link_to I18n.t('activities.subgroups.clear'),
+          { action: 'clear_subgroups', group_id: activity.group_id, activity_id: activity.id, },
+          method: :post,
+          class: 'btn btn-danger',
+          data: { confirm: I18n.t('activities.subgroups.clear_explanation')}
+        %>
+      <% end %>
+    </div>
   </div>
 <% end %>

config/locales/activities/en.yml

@@ -107,3 +107,15 @@ en:
       filter_nofilter: 'Show everyone'
 
       only_present_people: "Only people who will attend are listed, because people who don't cannot be in a subgroup."
+
+      clear: 'Clear subgroups'
+      clear_explanation: 'This removes everyone in a assignable subgroup from their subgroup! Are you sure you want this?'
+      cleared: 'Subgroups cleared.'
+
+      redistribute: 'Redistribute subgroups'
+      redistribute_explanation: 'This removes everyone in a assignable subgroup from that subgroup, and then randomly reassigns everyone to their subgroup. Are you sure you want this?'
+      redistributed: 'Subgroups redistributed.'
+
+      distribute_remaining: 'Distribute remaining to subgroups'
+      distribute_remaining_explanation: 'This distributes all remaining attending participants not yet in a subgroup to a subgroup. Do you want this?'
+      remaining_distributed: 'Remaining participants distributed.'

config/locales/activities/nl.yml

@@ -114,3 +114,15 @@ nl:
       filter_nofilter: 'Toon iedereen'
 
       only_present_people: 'Je ziet alleen maar mensen die zijn aangemeld in dit overzicht, omdat mensen die zijn afgemeld niet in een subgroep kunnen zitten.'
+
+      clear: 'Subgroepen legen'
+      clear_explanation: 'Dit verwijdert iedereen in een indeelbare subgroep uit zijn subgroep! Weet je zeker dat je dit wilt?'
+      cleared: 'Subgroepen geleegd.'
+
+      redistribute: 'Subgroepen opnieuw indelen'
+      redistribute_explanation: 'Dit verwijdert iedereen in een indeelbare subgroep uit die subgroep, en deelt daarna iedereen willekeurig opnieuw in. Weet je zeker dat je dit wilt?'
+      redistributed: 'Subgroepen opnieuw ingedeeld.'
+
+      distribute_remaining: 'Overgebleven naar subgroepen'
+      distribute_remaining_explanation: 'Dit deelt iedereen die is aangemeld, maar nog niet in een subgroep zit, in in een willekeurige subgroep (volgens normale volgorde van kleinste groep eerst). Wil je dit?'
+      remaining_distributed: 'Overgebleven personen ingedeeld in subgroepen.'

config/routes.rb

@@ -59,6 +59,8 @@ Rails.application.routes.draw do
 
       get 'edit_subgroups', to: 'activities#edit_subgroups'
       post 'update_subgroups', to: 'activities#update_subgroups'
+      post 'immediate_subgroups', to: 'activities#immediate_subgroups'
+      post 'clear_subgroups', to: 'activities#clear_subgroups'
     end
   end
   get 'my_groups', to: 'groups#user_groups', as: :user_groups