WIP

Gemfile.lock

@@ -243,4 +243,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.13.6
+   1.16.0

app/controllers/activities_controller.rb

@@ -1,12 +1,24 @@
 class ActivitiesController < ApplicationController
   include GroupsHelper
   include ActivitiesHelper
-  before_action :set_activity_and_group, only: [:show, :edit, :update, :destroy, :presence, :change_organizer, :create_subgroup, :update_subgroup, :destroy_subgroup]
-  before_action :set_group,            except: [:show, :edit, :update, :destroy, :presence, :change_organizer, :create_subgroup, :update_subgroup, :destroy_subgroup]
+
+  has_activity_id = [
+    :show, :edit, :edit_subgroups, :update, :update_subgroups, :destroy,
+    :presence, :change_organizer, :create_subgroup, :update_subgroup,
+    :destroy_subgroup
+  ]
+  before_action :set_activity_and_group, only: has_activity_id
+  before_action :set_group,            except: has_activity_id
+
   before_action :set_subgroup, only: [:update_subgroup, :destroy_subgroup]
   before_action :require_membership!
-  before_action :require_leader!, only: [:mass_new, :mass_create, :new, :create, :destroy]
-  before_action :require_organizer!, only: [:edit, :update, :change_organizer, :create_subgroup, :update_subgroup, :destroy_subgroup]
+  before_action :require_leader!, only: [
+    :mass_new, :mass_create, :new, :create, :destroy
+  ]
+  before_action :require_organizer!, only: [
+    :edit, :update, :change_organizer, :create_subgroup, :update_subgroup,
+    :destroy_subgroup, :edit_subgroups, :update_subgroups
+  ]
 
   # GET /groups/:id/activities
   # GET /activities.json
@@ -54,6 +66,66 @@ class ActivitiesController < ApplicationController
     set_edit_parameters!
   end
 
+  # GET /activities/1/edit_subgroups
+  def edit_subgroups
+    @subgroups = @activity.subgroups.order(is_assignable: :desc, name: :asc)
+
+    if @subgroups.none?
+      flash_message(:error, I18n.t('activities.errors.cannot_subgroup_without_subgroups'))
+      redirect_to group_activity_edit(@group, @activity)
+    end
+
+    @subgroup_options = @subgroups.map { |sg| [sg.name, sg.id] }
+    @subgroup_options.prepend(['--', 'nil'])
+
+    @participants = @activity.participants
+      .joins(:person)
+      .where.not(attending: false)
+      .order(:subgroup_id)
+      .order('people.first_name', 'people.last_name')
+  end
+
+  # 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
+      params[:participant_subgroups].each do |k, v|
+        p = Participant.find_by id: k
+        sg = Subgroup.find_by id: v unless v == 'nil'
+
+        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
+
+        if v != 'nil'
+          p.subgroup = sg
+        else
+          p.subgroup = nil
+        end
+
+        p.save
+      end
+    end
+
+    unless kappen
+      flash_message(:success, I18n.t('activities.subgroups.edited'))
+      redirect_to edit_group_activity_path(@group, @activity)
+    end
+  end
+
   # Shared lookups for rendering the edit-view
   def set_edit_parameters!
     @non_organizers = @activity.participants.where(is_organizer: [false, nil])

app/models/participant.rb

@@ -25,6 +25,18 @@ class Participant < ApplicationRecord
       message: I18n.t('activities.errors.already_in')
     }
 
+  HUMAN_ATTENDING = {
+    true => I18n.t('activities.state.present'),
+    false => I18n.t('activities.state.absent'),
+    nil => I18n.t('activities.state.unknown')
+  }
+
+  # @return [String]
+  #   the name for the Participant's current state in the current locale.
+  def human_attending
+    HUMAN_ATTENDING[self.attending]
+  end
+
   # TODO: Move to a more appropriate place
   # @return [String]
   #   the class for a row containing this activity.

app/views/activities/edit.html.haml

@@ -98,6 +98,11 @@
               = link_to group_activity_destroy_subgroup_path(@group, @activity, sg.id), method: :delete, class: 'btn btn-danger btn-xs' do
                 %i.fa.fa-trash
 
+      = link_to(group_activity_edit_subgroups_path(@group, @activity), class: 'btn btn-default') do
+        %i.fa.fa-edit
+        = t 'activities.subgroups.edit'
+
+
 .btn-group
   = link_to t(:back), group_activity_path(@group, @activity), class: 'btn btn-default'
   = link_to t(:overview), group_activities_path(@group), class: 'btn btn-default'

app/views/activities/edit_subgroups.html.haml

@@ -0,0 +1,31 @@
+.row
+  .alert.alert-info
+    = t 'activities.subgroups.only_present_people'
+.row
+  .col-md-12
+    = form_tag(group_activity_update_subgroups_path(@group, @activity)) do
+      %table.table
+        %tr
+          %th
+            Naam
+
+          %th
+            Huidig
+
+          %th
+            Nieuw
+
+        - @participants.each do |p|
+          %tr
+            %td
+              = p.person.full_name
+
+            %td
+              = p.subgroup&.name || '--'
+
+            %td
+              = select_tag("participant_subgroups[#{p.id}]", options_for_select(@subgroup_options, p.subgroup_id || 'nil'), class: 'form-control input-sm')
+
+      = submit_tag("Opslaan", class: 'btn btn-primary')
+      = link_to(edit_group_activity_path(@group, @activity), class: 'btn btn-default') do
+        = t :back

app/views/activities/subgroup_editor.html.haml

@@ -0,0 +1,28 @@
+.row
+  .col-md-12
+    %table.table
+      %tr
+        %th
+          Naam
+
+        %th
+          Status
+
+        %th
+          Huidig
+
+        %th
+          Nieuw
+
+      - @participants.each do |p|
+        %td
+          = p.person.full_name
+
+        %td
+          = p.attending
+
+        %td
+          = p.subgroup.name
+
+        %td
+          TODO

config/locales/aardbei_nl.yml

@@ -19,7 +19,7 @@ nl:
 
   areyousure: "Weet je het zeker?"
 
-  somethingbroke: "Er is iets misgegaan!"
+  somethingbroke: "Er is iets misgegaan! Neem contact op als dit blijft gebeuren."
 
   value_required: "Een verplichte vraag was leeg."
 

config/locales/activities/nl.yml

@@ -98,6 +98,9 @@ nl:
       created: 'Subgroep aangemaakt.'
       create_failed: 'Kon subgroep niet opslaan!'
 
+      edit: 'Subgroepindeling bewerken'
+      edited: 'Subgroepindeling bijgewerkt.'
+
       update: 'Subgroep bijwerken'
       updated: 'Subgroep bijgewerkt.'
       update_failed: 'Kon subgroep niet bijwerken!'
@@ -105,3 +108,5 @@ nl:
       destroy: 'Subgroep verwijderen'
       destroyed: 'Subgroep verwijderd.'
       none: 'Er zijn geen subgroepen.'
+
+      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.'

config/routes.rb

@@ -56,6 +56,9 @@ Rails.application.routes.draw do
       post 'subgroups', to: 'activities#create_subgroup', as: 'create_subgroup'
       patch 'subgroups/:subgroup_id', to: 'activities#update_subgroup', as: 'update_subgroup'
       delete 'subgroups(/:subgroup_id)', to: 'activities#destroy_subgroup', as: 'destroy_subgroup'
+
+      get 'edit_subgroups', to: 'activities#edit_subgroups'
+      post 'update_subgroups', to: 'activities#update_subgroups'
     end
   end
   get 'my_groups', to: 'groups#user_groups', as: :user_groups