Begin work on subgroups

Create DefaultSubgroups and management via group#edit.

app/controllers/groups_controller.rb

@@ -1,9 +1,10 @@
 class GroupsController < ApplicationController
   include GroupsHelper
-  before_action :set_group, only: [:show, :edit, :update, :destroy]
+  before_action :set_group, only: [:show, :edit, :update, :destroy, :create_default_subgroup, :update_default_subgroup, :destroy_default_subgroup]
+  before_action :set_default_subgroup, only: [:update_default_subgroup, :destroy_default_subgroup]
   before_action :require_admin!, only: [:index, :process_mass_add_members, :mass_add_members]
   before_action :require_membership!, only: [:show]
-  before_action :require_leader!, only: [:edit, :update, :destroy]
+  before_action :require_leader!, only: [:edit, :update, :destroy, :create_default_subgroup, :update_default_subgroup, :destroy_default_subgroup]
 
   # GET /groups
   # GET /groups.json
@@ -45,6 +46,7 @@ class GroupsController < ApplicationController
 
   # GET /groups/1/edit
   def edit
+    @defaultsubgroup = DefaultSubgroup.new
   end
 
   # POST /groups
@@ -77,6 +79,7 @@ class GroupsController < ApplicationController
         }
         format.json { render :show, status: :ok, location: @group }
       else
+        @defaultsubgroup = DefaultSubgroup.new
         format.html { render :edit }
         format.json { render json: @group.errors, status: :unprocessable_entity }
       end
@@ -117,14 +120,55 @@ class GroupsController < ApplicationController
     redirect_to group_members_path(@group)
   end
 
+  # POST /groups/:id/default_subgroups
+  def create_default_subgroup
+    @defaultsubgroup = DefaultSubgroup.new(default_subgroup_params)
+    @defaultsubgroup.group = @group
+
+    if @defaultsubgroup.save
+      flash_message(:success, I18n.t('defaultsubgroups.created'))
+      redirect_to edit_group_path(@group)
+    else
+      flash_message(:danger, I18n.t('defaultsubgroups.create_failed'))
+      render :edit
+    end
+  end
+
+  # PATCH /groups/:id/default_subgroups/:default_subgroup_id
+  def update_default_subgroup
+    if @defaultsubgroup.update(default_subgroup_params)
+      flash_message(:success, I18n.t('defaultsubgroups.updated'))
+      redirect_to edit_group_path(@group)
+    else
+      flash_message(:danger, I18n.t('defaultsubgroups.update_failed'))
+      render :edit
+    end
+  end
+
+  # DELETE /groups/:id/default_subgroups/:default_subgroup_id
+  def destroy_default_subgroup
+    @defaultsubgroup.destroy
+    flash_message(:info, I18n.t('defaultsubgroups.destroyed'))
+    redirect_to edit_group_path(@group)
+  end
+
   private
     # Use callbacks to share common setup or constraints between actions.
     def set_group
-      @group = Group.find(params[:id])
+      @group = Group.find(params[:group_id] || params[:id])
+    end
+
+    # Retrieve DefaultSubgroup to update or delete
+    def set_default_subgroup
+      @defaultsubgroup = DefaultSubgroup.find(params[:default_subgroup_id])
     end
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def group_params
       params.require(:group).permit(:name)
     end
+
+    def default_subgroup_params
+      params.require(:default_subgroup).permit(:name, :is_assignable)
+    end
 end

app/models/default_subgroup.rb

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

app/models/group.rb

@@ -13,6 +13,9 @@ class Group < ApplicationRecord
   has_many :activities,
     dependent: :destroy
 
+  has_many :default_subgroups,
+    dependent: :destroy
+
   validates :name,
     presence: true,
     uniqueness: {

app/views/groups/edit.html.erb

@@ -1,6 +0,0 @@
-<h1>Editing Group</h1>
-
-<%= render 'form', group: @group %>
-
-<%= link_to 'Show', @group %> |
-<%= link_to 'Back', groups_path %>

app/views/groups/edit.html.haml

@@ -0,0 +1,59 @@
+%h1
+  = t 'groups.edit'
+
+= render 'form', group: @group
+
+%h2
+  = t 'defaultsubgroups.manage'
+
+%p
+  = t 'defaultsubgroups.settings_blurb'
+
+.row
+  .col-md-6
+    %h4
+      = t 'defaultsubgroups.create'
+
+    -#= form_tag(group_create_default_subgroup_path(@group), method: :post, class: 'form') do
+    = form_for(@defaultsubgroup, url: group_create_default_subgroup_path(@group), method: :post) do |f|
+      - if @defaultsubgroup.errors.any?
+        .has-error.form-group#error_explanation
+          %ul
+            - @defaultsubgroup.errors.full_messages.each do |message|
+              %li
+                = message
+
+      .form-group{ class: [ ('has-error' if @defaultsubgroup.errors.any?) ] }
+        %label
+          = t 'activerecord.attributes.default_subgroup.name'
+        = f.text_field(:name, class: 'form-control')
+
+      .form-group
+        .check-box
+          %label
+            = f.check_box(:is_assignable)
+            = t 'activerecord.attributes.default_subgroup.is_assignable'
+
+      = f.submit t('defaultsubgroups.create'), class: 'btn btn-success'
+
+  .col-md-6
+    %h4
+      = t 'defaultsubgroups.destroy'
+
+    - if @group.default_subgroups.blank?
+      %p
+        = t 'defaultsubgroups.none'
+
+    - else
+      = form_tag(group_destroy_default_subgroup_path(@group), method: :delete, class: 'form') do
+        .form-group
+          %label
+            = t 'activerecord.models.default_subgroup.one'
+          - options = @group.default_subgroups.pluck(:name, :id)
+          = select_tag(:default_subgroup_id, options_for_select(options), class: 'form-control')
+
+        = submit_tag(t('defaultsubgroups.destroy'), class: 'btn btn-danger')
+
+.row
+  .col-xs-12
+    = link_to t(:back), @group, class: 'btn btn-default'

config/locales/defaultsubgroups_en.yml

@@ -0,0 +1,16 @@
+en:
+  defaultsubgroups:
+    manage: 'Manage default subgroups'
+    settings_blurb: "The groups set here will be added automatically to each new activity that is created. Note that actually assigning participants to groups has to be enabled separately."
+
+    create: 'Add default subgroup'
+    created: 'Default subgroup added.'
+    create_failed: 'Could not create default subgroup!'
+
+    updated: 'Default subgroup updated.'
+    update_failed: 'Could not update default subgroup!'
+
+    destroy: 'Remove default subgroup'
+    destroyed: 'Default subgroup destroyed.'
+
+    none: 'There are no default subgroups.'

config/locales/defaultsubgroups_nl.yml

@@ -0,0 +1,16 @@
+nl:
+  defaultsubgroups:
+    manage: 'Standaard subgroepen aanpassen'
+    settings_blurb: "De groepen die hier staan aangegeven worden automatisch aangemaakt voor iedere nieuwe activiteit die wordt toegevoegd. Het daadwerkelijk indelen in deze groepen moet wel per activiteit worden ingeschakeld."
+
+    create: 'Standaardgroep toevoegen'
+    created: 'Standaardgroep toegevoegd.'
+    create_failed: 'Kon de standaardgroep niet opslaan!'
+
+    updated: 'Standaardgroep bijgewerkt.'
+    update_failed: 'Kon de standaardgroep niet bijwerken!'
+
+    destroy: 'Standaardgroep verwijderen'
+    destroyed: 'Standaardgroep verwijderd.'
+
+    none: 'Er zijn geen standaardgroepen.'

config/locales/translation_nl.yml

@@ -24,6 +24,10 @@ nl:
       token: Token  #g
       user: Gebruiker  #g
 
+      default_subgroup:
+        one: Standaardgroep
+        other: Standaardgroepen
+
     attributes:
       activity:
         deadline: Deadline  #g
@@ -40,6 +44,7 @@ nl:
 
       group:
         activities: Activiteiten  #g
+        default_subgroups: Standaardsubgroepen
         members: Leden  #g
         name: Naam  #g
         people: Mensen  #g
@@ -87,3 +92,7 @@ nl:
         email: E-mail  #g
         password_digest: Wachtwoord-digest  #g
         person: :activerecord.models.person  #g
+
+      default_subgroup:
+        name: Naam
+        is_assignable: Gebruiken voor indelen

config/routes.rb

@@ -36,6 +36,10 @@ Rails.application.routes.draw do
     get 'mass_add', to: 'groups#mass_add_members'
     post 'mass_add', to: 'groups#process_mass_add_members'
 
+    post 'subgroups', to: 'groups#create_default_subgroup', as: 'create_default_subgroup'
+    patch 'subgroups/:default_subgroup_id', to: 'groups#update_default_subgroup', as: 'update_default_subgroup'
+    delete 'subgroups(/:default_subgroup_id)', to: 'groups#destroy_default_subgroup', as: 'destroy_default_subgroup'
+
     resources :members do
       post 'promote', to: 'members#promote', on: :member
       post 'demote', to: 'members#demote', on: :member

db/migrate/20170930201201_create_default_subgroups.rb

@@ -0,0 +1,11 @@
+class CreateDefaultSubgroups < ActiveRecord::Migration[5.0]
+  def change
+    create_table :default_subgroups do |t|
+      t.references :group, 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: 20170917140643) do
+ActiveRecord::Schema.define(version: 20170930201201) do
 
   create_table "activities", force: :cascade do |t|
     t.string   "name"
@@ -27,6 +27,15 @@ ActiveRecord::Schema.define(version: 20170917140643) do
     t.index ["group_id"], name: "index_activities_on_group_id"
   end
 
+  create_table "default_subgroups", force: :cascade do |t|
+    t.integer  "group_id"
+    t.string   "name",          null: false
+    t.boolean  "is_assignable"
+    t.datetime "created_at",    null: false
+    t.datetime "updated_at",    null: false
+    t.index ["group_id"], name: "index_default_subgroups_on_group_id"
+  end
+
   create_table "delayed_jobs", force: :cascade do |t|
     t.integer  "priority",   default: 0, null: false
     t.integer  "attempts",   default: 0, null: false