Activity-edit to HAML, add managing organizers

app/controllers/activities_controller.rb

@@ -36,6 +36,14 @@ class ActivitiesController < ApplicationController
 
   # GET /activities/1/edit
   def edit
+    @non_organizers = @activity.participants.where.not(is_organizer: true)
+    @organizers = @activity.organizers
+
+    @non_organizers_options = @non_organizers.map{|p| [p.person.full_name, p.id] }
+    @organizers_options     =     @organizers.map{|p| [p.person.full_name, p.id] }
+
+    @non_organizers_options.sort!
+    @organizers_options.sort!
   end
 
   # POST /activities
@@ -58,6 +66,23 @@ class ActivitiesController < ApplicationController
     end
   end
 
+  # Change organizer state for a Participant
+  def change_organizer
+    @activity = Activity.find(params[:activity_id])
+    @participant = @activity.participants.find(params[:participant_id])
+    @participant.is_organizer = params[:new_state]
+    @participant.save
+
+    if params[:new_state] == "true"
+      message = I18n.t('activities.organizers.added', name: @participant.person.full_name)
+    else
+      message = I18n.t('activities.organizers.removed', name: @participant.person.full_name)
+    end
+    flash_message(:success, message)
+
+    redirect_to edit_group_activity_path(@group, @activity)
+  end
+
   # PATCH/PUT /activities/1
   # PATCH/PUT /activities/1.json
   def update

app/views/activities/edit.html.erb

@@ -1,8 +0,0 @@
-<h1>
-  <%= t 'activity.editing' %>
-</h1>
-
-<%= render 'form', activity: @activity %>
-
-<%= link_to t(:cancel), group_activity_path(@group, @activity) %> |
-<%= link_to t(:back), group_activities_path(@group) %>

app/views/activities/edit.html.haml

@@ -0,0 +1,38 @@
+%h1
+  = t 'activity.editing'
+
+= render 'form', activity: @activity
+
+%h2
+  = t 'activities.organizers.manage'
+.row
+  .col-md-6
+    %h4
+      = t 'activities.organizers.add'
+    - if @non_organizers.count > 0
+      = form_tag(group_activity_change_organizer_path(@group, @activity), method: 'post') do
+        .form-group
+          = select_tag(:participant_id, options_for_select(@non_organizers_options))
+        .form-group
+          = hidden_field_tag(:new_state, true)
+          = submit_tag(t('activities.organizers.add'), class: 'btn btn-success')
+    - else
+      = t 'activities.organizers.no_non_organizers'
+
+  .col-md-6
+    %h4
+      = t 'activities.organizers.remove'
+    - if @organizers.count > 0
+      = form_tag(group_activity_change_organizer_path(@group, @activity), method: 'post') do
+        .form-group
+          = select_tag(:participant_id, options_for_select(@organizers_options))
+        .form-group
+          = hidden_field_tag(:new_state, false)
+          = submit_tag(t('activities.organizers.remove'), class: 'btn btn-danger')
+
+    - else
+      = t 'activities.organizers.no_organizers'
+
+= link_to t(:back), group_activity_path(@group, @activity)
+|
+= link_to t(:overview), group_activities_path(@group)

config/locales/aardbei_en.yml

@@ -36,6 +36,7 @@ en:
   destroy: "Delete"
   remove: "Remove"
   send_email: "Send email"
+  overview: "Overzicht"
 
   areyousure: "Are you sure?"
 

config/locales/aardbei_nl.yml

@@ -15,6 +15,7 @@ nl:
   destroy: "Verwijderen"
   remove: "Verwijderen"
   send_email: "Email versturen"
+  overview: "Overzicht"
 
   areyousure: "Weet je het zeker?"
 

config/locales/activities/en.yml

@@ -23,6 +23,18 @@ en:
       add_notes: "Add notes"
       yourresponse: "Your response"
 
+    organizers:
+      one: "Organizer"
+      other: "Organizers"
+      manage: "Manage organizers"
+      add: "Add organizer"
+      added: "%{name} is now an organizer."
+      remove: "Remove organizer"
+      removed: "%{name} is no longer an organizer."
+
+      no_organizers: "This activity has no organizers."
+      no_non_organizers: "This activity has no non-organizers."
+
     state:
       need_response: "Need response"
       present: "Present"

config/locales/activities/nl.yml

@@ -23,6 +23,18 @@ nl:
       add_notes: "Opmerkingen toevoegen"
       yourresponse: "Jouw antwoord"
 
+    organizers:
+      one: "Organisator"
+      other: "Organisatoren"
+      manage: "Organisatoren aanpassen"
+      add: "Organisator toevoegen"
+      added: "%{name} is nu een organisator."
+      remove: "Organisator verwijderen"
+      removed: "%{name} is nu geen organisator meer."
+
+      no_organizers: "Deze activiteit heeft geen organisatoren."
+      no_non_organizers: "Deze activiteit heeft geen niet-organisatoren."
+
     state:
       need_response: "Nog geen reactie"
       present: "Aanwezig"

config/routes.rb

@@ -38,6 +38,7 @@ Rails.application.routes.draw do
     end
 
     resources :activities do
+      post 'change_organizer', to: 'activities#change_organizer'
       put 'presence', to: 'activities#presence', on: :member
       patch 'presence', to: 'activities#presence', on: :member
     end