Expose mass-add members

app/controllers/groups_controller.rb

@@ -1,10 +1,10 @@
 class GroupsController < ApplicationController
   include GroupsHelper
-  before_action :set_group, only: [:show, :edit, :update, :destroy, :create_default_subgroup, :update_default_subgroup, :destroy_default_subgroup]
+  before_action :set_group, only: [:show, :edit, :update, :destroy, :create_default_subgroup, :update_default_subgroup, :destroy_default_subgroup, :mass_add_members, :process_mass_add_members]
   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_admin!, only: [:index]
   before_action :require_membership!, only: [:show]
-  before_action :require_leader!, only: [:edit, :update, :destroy, :create_default_subgroup, :update_default_subgroup, :destroy_default_subgroup]
+  before_action :require_leader!, only: [:edit, :update, :destroy, :create_default_subgroup, :update_default_subgroup, :destroy_default_subgroup, :process_mass_add_members, :mass_add_members]
 
   # GET /groups
   # GET /groups.json
@@ -102,23 +102,21 @@ class GroupsController < ApplicationController
   end
 
   def mass_add_members
-    @group = Group.find(params[:group_id])
   end
 
   def process_mass_add_members
-    @group = Group.find(params[:group_id])
     require 'csv'
     uploaded_io = params[:spreadsheet]
     result = Person.from_csv(uploaded_io.read)
 
     result.each do |p|
       m = Member.find_by(person: p, group: @group)
-      if not m
+      unless m
         m = Member.new(person: p, group: @group)
         m.save!
       end
     end
-    flash_message(:success, "#{result.count} people added to group")
+    flash_message(:success, I18n.t('groups.mass_add_success', count: result.count))
     redirect_to group_members_path(@group)
   end
 

app/views/groups/edit.html.haml

@@ -59,3 +59,4 @@
     .btn-group
       = link_to t(:back), @group, class: 'btn btn-default'
       = link_to t('activities.mass_import_short'), group_activities_mass_new_path(@group), class: 'btn btn-default'
+      = link_to t('groups.mass_add_short'), group_mass_add_path(@group), class: 'btn btn-default'

app/views/groups/mass_add_members.html.haml

@@ -2,8 +2,17 @@
   .row
     .col-md-12
       %h1
-        Mass-adding members to
-        = @group.name
-      = form_tag("/groups/#{@group.id}/mass_add", method: 'post', multipart: true) do
-        = file_field_tag 'spreadsheet'
-        = submit_tag
+        = t 'groups.mass_add_members', group: @group.name
+  .row
+    .col-md-12
+      %p
+        = t 'groups.mass_add_explanation'
+      = link_to asset_path('batch_persons.csv'), class: 'btn btn-default' do
+        = t :download
+  .row
+    .col-md-12
+      = form_tag(group_mass_add_path(@group), method: 'post', multipart: true) do
+        .form-group
+          = file_field_tag 'spreadsheet', required: true
+        .form-group
+          = submit_tag("Go!", class: 'btn btn-warning', confirm: t(:areyousure))

config/locales/groups/en.yml

@@ -22,6 +22,11 @@ en:
     member_updated: "Member updated."
     member_removed: "%{name} was removed from the group."
 
+    mass_add_members: "Adding multiple members to %{group}"
+    mass_add_short: "Import members"
+    mass_add_explanation: "Download the example file using the link below, and fill in this file in the format shown. Upload the completed form using the form at the bottom of this page. Note that all data fields will be ignored if a user with the same email address exists. Date of birth is not required."
+    mass_add_success: "%{count} members added to group."
+
     member:
       add: "New Member"
       adding: "Add member to %{name}"

config/locales/groups/nl.yml

@@ -22,6 +22,11 @@ nl:
     member_updated: "Lid bijgewerkt."
     member_removed: "%{name} is verwijderd uit de groep."
 
+    mass_add_members: "Meerdere leden toevoegen aan %{group}"
+    mass_add_short: "Leden importeren"
+    mass_add_explanation: "Download het voorbeeldbestand via de link hieronder, vul de velden in in het formaat zoals aangegeven, en upload het ingevulde formulier via de knop onderaan. Merk op dat aangepaste velden worden genegeerd als al een gebruiker met hetzelfde e-mailadres bestaat. Geboortedatum is niet verplicht."
+    mass_add_success: "%{count} leden toegevoegd aan de groep."
+
     member:
       add: "Lid toevoegen"
       adding: "Lid toevoegen aan %{name}"

public/batch_persons.csv

@@ -1 +1,2 @@
-first_name,infix,last_name,birth_date,email,organizers
+first_name,infix,last_name,birth_date,email
+Gekke,,Henkie,1-1-1997,gekkehenkie@maartenberg.nl