Add Subgroups

app/controllers/activities_controller.rb

@@ -1,11 +1,12 @@
 class ActivitiesController < ApplicationController
   include GroupsHelper
   include ActivitiesHelper
-  before_action :set_activity_and_group, only: [:show, :edit, :update, :destroy, :presence, :change_organizer]
-  before_action :set_group,            except: [:show, :edit, :update, :destroy, :presence, :change_organizer]
+  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]
+  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]
+  before_action :require_organizer!, only: [:edit, :update, :change_organizer, :create_subgroup, :update_subgroup, :destroy_subgroup]
 
   # GET /groups/:id/activities
   # GET /activities.json
@@ -33,6 +34,10 @@ class ActivitiesController < ApplicationController
       .find_by(person: current_person)
     @counts = @activity.state_counts
     @num_participants = @counts.values.sum
+    @assignable_subgroups = @activity.subgroups
+      .where(is_assignable: true)
+      .order(name: :asc)
+      .pluck(:name)
   end
 
   # GET /activities/new
@@ -55,6 +60,9 @@ class ActivitiesController < ApplicationController
 
     @non_organizers_options.sort!
     @organizers_options.sort!
+
+    @subgroup = Subgroup.new if !@subgroup
+    @subgroups = @activity.subgroups.order(is_assignable: :desc, name: :asc)
   end
 
   # POST /activities
@@ -125,6 +133,40 @@ class ActivitiesController < ApplicationController
     end
   end
 
+  # POST /activities/1/subgroups
+  def create_subgroup
+    @subgroup = Subgroup.new(subgroup_params)
+    @subgroup.activity = @activity
+
+    if @subgroup.save
+      flash_message :success, I18n.t('activities.subgroups.created')
+      redirect_to edit_group_activity_path(@group, @activity)
+    else
+      flash_message :danger, I18n.t('activities.subgroups.create_failed')
+      set_edit_parameters!
+      render :edit
+    end
+  end
+
+  # PATCH /activities/1/subgroups/:subgroup_id
+  def update_subgroup
+    if @subgroup.update(subgroup_params)
+      flash_message :success, I18n.t('activities.subgroups.updated')
+      redirect_to edit_group_activity_path(@group, @activity)
+    else
+      flash_message :danger, I18n.t('activities.subgroups.update_failed')
+      set_edit_parameters!
+      render :edit
+    end
+  end
+
+  # DELETE /activities/1/subgroups/:subgroup_id
+  def destroy_subgroup
+    @subgroup.destroy
+    flash_message :success, I18n.t('activities.subgroups.destroyed')
+    redirect_to edit_group_activity_path(@group, @activity)
+  end
+
   # PATCH/PUT /groups/:group_id/activities/:id/presence
   # PATCH/PUT /groups/:group_id/activities/:id/presence.json
   def presence
@@ -176,8 +218,16 @@ class ActivitiesController < ApplicationController
       @group = Group.find(params[:group_id])
     end
 
+    def set_subgroup
+      @subgroup = Subgroup.find(params[:subgroup_id])
+    end
+
     # Never trust parameters from the scary internet, only allow the white list through.
     def activity_params
       params.require(:activity).permit(:name, :description, :location, :start, :end, :deadline, :reminder_at)
     end
+
+    def subgroup_params
+      params.require(:subgroup).permit(:name, :is_assignable)
+    end
 end

app/models/activity.rb

@@ -45,6 +45,9 @@ class Activity < ApplicationRecord
     dependent: :destroy
   has_many :people, through: :participants
 
+  has_many :subgroups,
+    dependent: :destroy
+
   validates :name, presence: true
   validates :start, presence: true
   validate  :deadline_before_start, unless: "self.deadline.blank?"
@@ -52,6 +55,7 @@ class Activity < ApplicationRecord
   validate  :reminder_before_deadline, unless: "self.reminder_at.blank?"
 
   after_create :create_missing_participants!
+  after_create :copy_default_subgroups!
   after_commit :schedule_reminder, if: Proc.new {|a| a.previous_changes["reminder_at"] }
 
   # Get all people (not participants) that are organizers. Does not include
@@ -115,6 +119,18 @@ class Activity < ApplicationRecord
     end
   end
 
+  # Create Subgroups from the defaults set using DefaultSubgroups
+  def copy_default_subgroups!
+    defaults = self.group.default_subgroups
+
+    defaults.each do |dsg|
+      sg = Subgroup.new(activity: self)
+      sg.name = dsg.name
+      sg.is_assignable = dsg.is_assignable
+      sg.save! # Should never fail, as DSG and SG have identical validation, and names cannot clash.
+    end
+  end
+
   # Create multiple Activities from data in a CSV file, assign to a group, return.
   def self.from_csv(content, group)
     reader = CSV.parse(content, {headers: true, skip_blanks: true})

app/models/subgroup.rb

@@ -0,0 +1,6 @@
+class Subgroup < ApplicationRecord
+  belongs_to :activity
+
+  validates :name, presence: true, uniqueness: { scope: :activity, case_sensitive: false }
+  validates :activity, presence: true
+end

app/views/activities/edit.html.haml

@@ -33,6 +33,68 @@
     - else
       = t 'activities.organizers.no_organizers'
 
-= link_to t(:back), group_activity_path(@group, @activity)
-|
-= link_to t(:overview), group_activities_path(@group)
+%h2
+  = t 'activities.subgroups.manage'
+
+.row
+  .col-md-6
+    %h4
+      = t 'activities.subgroups.create'
+
+    = form_for(@subgroup, url: group_activity_create_subgroup_path(@group, @activity), method: :post) do |f|
+
+      - if @subgroup.errors.any?
+        .has-error.form-group#error_explanation
+          %ul
+            - @subgroup.errors.full_messages.each do |message|
+              %li= message
+
+      .form-group{ class: [ ('has-error' if @subgroup.errors.any?) ] }
+
+        %label
+          = t 'activerecord.attributes.subgroup.name'
+        = f.text_field :name, class: 'form-control'
+
+      .form-group
+        .check-box
+          %label
+            = f.check_box :is_assignable
+            = t 'activerecord.attributes.subgroup.is_assignable'
+            (
+            %i.fa.fa-random
+            )
+
+      = f.submit t('activities.subgroups.create'), class: 'btn btn-success'
+
+  .col-md-6
+    - if @activity.subgroups.blank?
+      %p
+        = t 'activities.subgroups.none'
+    - else
+      %table.table
+        %tr
+          %th
+            = t 'activerecord.attributes.subgroup.name'
+
+          %th
+            %i.fa.fa-random
+
+          %th
+            %i.fa.fa-cogs
+        - @subgroups.each do |sg|
+          %tr
+            %td= sg.name
+            %td
+              = link_to group_activity_update_subgroup_path(@group, @activity, sg.id, 'subgroup[is_assignable]' => !sg.is_assignable), method: :patch, class: 'btn btn-default btn-xs' do
+                - if sg.is_assignable
+                  %i.fa.fa-check
+                - else
+                  %i.fa.fa-times
+
+            %td
+              = link_to group_activity_destroy_subgroup_path(@group, @activity, sg.id), method: :delete, class: 'btn btn-danger btn-xs' do
+                %i.fa.fa-trash
+
+.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/show.html.haml

@@ -63,6 +63,14 @@
             - if @activity.deadline
               = l @activity.deadline, format: :long
 
+        - if @assignable_subgroups.any?
+          %tr
+            %td
+              = t 'activerecord.attributes.activity.subgroups'
+
+            %td
+              = @assignable_subgroups.join(', ')
+
   - if @ownparticipant
     .col-md-3
       .panel.panel-default

config/locales/activities/en.yml

@@ -75,3 +75,17 @@ en:
         subject: "You are now listed as 'attending' for %{activity}"
         havenot_responded: "You have not yet indicated if you will be at %{activity}. Because we assume that you're present if you don't respond, your response has been set to 'attending'."
         if_cannot: "If you wish to change this, you can change your response until %{deadline} using the following link:"
+
+    subgroups:
+      manage: 'Manage subgroups'
+      create: 'Create subgroup'
+      created: 'Subgroup created.'
+      create_failed: 'Could not create subgroup!'
+
+      update: 'Update subgroup'
+      updated: 'Subgroup updated.'
+      update_failed: 'Could not update subgroup!'
+
+      destroy: 'Destroy subgroup'
+      destroyed: 'Subgroup destroyed.'
+      none: 'There are no subgroups.'

config/locales/activities/nl.yml

@@ -83,3 +83,17 @@ nl:
         subject: "Je bent automatisch aangemeld voor %{activity}"
         havenot_responded: "Je hebt nog niet aangegeven of je bij %{activity} kunt zijn. Omdat we ervan uitgaan dat je er bent als je niks aangeeft, is je reactie automatisch op 'aanwezig' gezet."
         if_cannot: "Als je toch niet aanwezig kunt zijn, kan je dit tot %{deadline} aangeven via de volgende link:"
+
+    subgroups:
+      manage: 'Subgroepen aanpassen'
+      create: 'Subgroep aanmaken'
+      created: 'Subgroep aangemaakt.'
+      create_failed: 'Kon subgroep niet opslaan!'
+
+      update: 'Subgroep bijwerken'
+      updated: 'Subgroep bijgewerkt.'
+      update_failed: 'Kon subgroep niet bijwerken!'
+
+      destroy: 'Subgroep verwijderen'
+      destroyed: 'Subgroep verwijderd.'
+      none: 'Er zijn geen subgroepen.'

config/locales/translation_nl.yml

@@ -28,6 +28,10 @@ nl:
         one: Standaardgroep
         other: Standaardgroepen
 
+      subgroup:
+        one: Subgroep
+        other: Subgroepen
+
     attributes:
       activity:
         deadline: Deadline  #g
@@ -41,6 +45,7 @@ nl:
         start: Start  #g
         reminder_at: Herinnering om
         reminder_done: Herinnering verstuurd
+        subgroups: :activerecord.models.subgroup.other
 
       group:
         activities: Activiteiten  #g
@@ -96,3 +101,7 @@ nl:
       default_subgroup:
         name: Naam
         is_assignable: Gebruiken voor indelen
+
+      subgroup:
+        name: Naam
+        is_assignable: Gebruiken voor indelen

config/routes.rb

@@ -52,6 +52,10 @@ Rails.application.routes.draw do
       post 'change_organizer', to: 'activities#change_organizer'
       put 'presence', to: 'activities#presence', on: :member
       patch 'presence', to: 'activities#presence', on: :member
+
+      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'
     end
   end
   get 'my_groups', to: 'groups#user_groups', as: :user_groups

db/migrate/20171001124009_create_subgroups.rb

@@ -0,0 +1,11 @@
+class CreateSubgroups < ActiveRecord::Migration[5.0]
+  def change
+    create_table :subgroups do |t|
+      t.references :activity, foreign_key: true
+      t.string :name, null: false
+      t.boolean :is_assignable
+
+      t.timestamps
+    end
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170930201201) do
+ActiveRecord::Schema.define(version: 20171001124009) do
 
   create_table "activities", force: :cascade do |t|
     t.string   "name"
@@ -105,6 +105,15 @@ ActiveRecord::Schema.define(version: 20170930201201) do
     t.index ["user_id"], name: "index_sessions_on_user_id"
   end
 
+  create_table "subgroups", force: :cascade do |t|
+    t.integer  "activity_id"
+    t.string   "name",          null: false
+    t.boolean  "is_assignable"
+    t.datetime "created_at",    null: false
+    t.datetime "updated_at",    null: false
+    t.index ["activity_id"], name: "index_subgroups_on_activity_id"
+  end
+
   create_table "tokens", force: :cascade do |t|
     t.string   "token"
     t.datetime "expires"