flash_message helper

- Reworked the way alerts work to support multiple messages per category
- Simplified queries for activities in DashboardController
- Fixed some tables

app/controllers/activities_controller.rb

@@ -38,7 +38,10 @@ class ActivitiesController < ApplicationController
 
     respond_to do |format|
       if @activity.save
-        format.html { redirect_to group_activity_url(@group, @activity), notice: 'Activity was successfully created.' }
+        format.html {
+          redirect_to group_activity_url(@group, @activity)
+          flash_message(:info, 'Activity was successfully created.')
+        }
         format.json { render :show, status: :created, location: @activity }
       else
         format.html { render :new }
@@ -52,7 +55,10 @@ class ActivitiesController < ApplicationController
   def update
     respond_to do |format|
       if @activity.update(activity_params)
-        format.html { redirect_to group_activity_url(@group, @activity), notice: 'Activity was successfully updated.' }
+        format.html {
+          redirect_to group_activity_url(@group, @activity)
+          flash_message(:info, 'Activity was successfully updated.')
+        }
         format.json { render :show, status: :ok, location: @activity }
       else
         format.html { render :edit }
@@ -66,7 +72,10 @@ class ActivitiesController < ApplicationController
   def destroy
     @activity.destroy
     respond_to do |format|
-      format.html { redirect_to group_activities_url(@group), notice: 'Activity was successfully destroyed.' }
+      format.html {
+        redirect_to group_activities_url(@group)
+        flash_message(:info, 'Activity was successfully destroyed.')
+      }
       format.json { head :no_content }
     end
   end

app/controllers/application_controller.rb

@@ -3,6 +3,7 @@ class ApplicationController < ActionController::Base
   rescue_from ActionController::InvalidAuthenticityToken, with: :invalid_auth_token
 
   include AuthenticationHelper
+  include ApplicationHelper
 
   private
   def invalid_auth_token

app/controllers/authentication_controller.rb

@@ -6,7 +6,7 @@ class AuthenticationController < ApplicationController
 
   def login
     if params[:session][:email].blank? || params[:session][:password].blank?
-      flash[:warning] = "You forgot to add value"
+      flash_message(:warning, "You forgot to add value")
       redirect_to action: 'login_form'
     else
       u = User.find_by(email: params[:session][:email])
@@ -14,13 +14,13 @@ class AuthenticationController < ApplicationController
       if u && u.confirmed && u.authenticate(params[:session][:password])
         log_in(u, params[:session][:remember_me].to_i)
 
-        flash[:success] = "Hello, #{u.person.full_name}!"
+        flash_message(:success, "Hello, #{u.person.full_name}!")
         redirect_to root_path
       elsif u and not u.confirmed
-        flash[:warning] = "Your account has not been activated yet, please confirm using the email you have received."
+        flash_message(:warning, "Your account has not been activated yet, please confirm using the email you have received.")
         redirect_to action: 'login_form'
       else
-        flash[:danger] = "Invalid username/password combination!"
+        flash_message(:danger, "Invalid username/password combination!")
         redirect_to action: 'login_form'
       end
     end
@@ -47,14 +47,14 @@ class AuthenticationController < ApplicationController
     person = Person.find_by(email: params[:user][:email])
 
     if not person
-      flash[:warning] = "That email address is unknown!"
+      flash_message(:warning, "That email address is unknown!")
       redirect_to action: 'create_password_form'
       return
     end
 
     user = User.find_by(person: person)
     if user and user.confirmed
-      flash[:warning] = "Your account has already been activated, please use the login form if you have forgotten your password."
+      flash_message(:warning, "Your account has already been activated, please use the login form if you have forgotten your password.")
       redirect_to action: 'login'
       return
     end
@@ -69,7 +69,7 @@ class AuthenticationController < ApplicationController
     end
 
     AuthenticationMailer::password_confirm_email(user).deliver_now
-    flash[:success] = "An email has been sent, check your inbox!"
+    flash_message(:success, "An email has been sent, check your inbox!")
     redirect_to action: 'login'
   end
 
@@ -80,12 +80,12 @@ class AuthenticationController < ApplicationController
   def forgotten_password
     user = User.find_by(email: params[:password_reset][:email])
     if not user
-      flash[:danger] = "That email address is not associated with any user."
+      flash_message(:danger, "That email address is not associated with any user.")
       redirect_to action: 'forgotten_password_form'
       return
     end
     AuthenticationMailer::password_reset_email(user).deliver_later
-    flash[:success] = "An email has been sent, check your inbox!"
+    flash_message(:success, "An email has been sent, check your inbox!")
     redirect_to action: 'login'
   end
 
@@ -104,7 +104,7 @@ class AuthenticationController < ApplicationController
     end
 
     if not params[:password] == params[:password_confirmation]
-      flash[:warning] = "Password confirmation does not match your password!"
+      flash_message(:warning, "Password confirmation does not match your password!")
       redirect_to action: 'reset_password_form', token: params[:token]
       return
     end
@@ -116,7 +116,7 @@ class AuthenticationController < ApplicationController
 
     token.destroy!
 
-    flash[:success] = "Your password has been reset, you may now log in."
+    flash_message(:success, "Your password has been reset, you may now log in.")
     redirect_to action: 'login'
   end
 
@@ -140,7 +140,7 @@ class AuthenticationController < ApplicationController
 
     token.destroy!
 
-    flash[:success] = "Your account has been confirmed, you may now log in."
+    flash_message(:success, "Your account has been confirmed, you may now log in.")
     redirect_to action: 'login'
   end
 
@@ -151,12 +151,12 @@ class AuthenticationController < ApplicationController
 
   def token_valid?(token)
     if token.nil?
-      flash[:warning] = "No valid token specified!"
+      flash_message(:warning, "No valid token specified!")
       redirect_to action: 'login'
       return false
     end
     if token.expires and token.expires < DateTime.now
-      flash[:warning] = "That token has expired, please request a new one."
+      flash_message(:warning, "That token has expired, please request a new one.")
       redirect_to action: 'login'
       return false
     end

app/controllers/dashboard_controller.rb

@@ -2,20 +2,14 @@ class DashboardController < ApplicationController
   before_action :require_login!
 
   def home
-    @user_organized = current_person
-      .participants
-      .joins(:activity)
-      .where(is_organizer: true)
-      .order('activities.start ASC')
-    @need_response = current_person
-      .participants
-      .joins(:activity)
-      .where(attending: nil)
-      .order('activities.start ASC')
     @upcoming = current_person
       .participants
       .joins(:activity)
       .where('activities.start >= ?', DateTime.now)
       .order('activities.start ASC')
+    @user_organized = @upcoming
+      .where(is_organizer: true)
+    @need_response = @upcoming
+      .where(attending: nil)
   end
 end

app/controllers/groups_controller.rb

@@ -36,7 +36,10 @@ class GroupsController < ApplicationController
 
     respond_to do |format|
       if @group.save
-        format.html { redirect_to @group, notice: 'Group was successfully created.' }
+        format.html {
+          redirect_to @group
+          flash_message(:info, 'Group was successfully created.')
+        }
         format.json { render :show, status: :created, location: @group }
       else
         format.html { render :new }
@@ -50,7 +53,10 @@ class GroupsController < ApplicationController
   def update
     respond_to do |format|
       if @group.update(group_params)
-        format.html { redirect_to @group, notice: 'Group was successfully updated.' }
+        format.html {
+          redirect_to @group
+          flash_message(:info, 'Group was successfully updated.')
+        }
         format.json { render :show, status: :ok, location: @group }
       else
         format.html { render :edit }
@@ -64,7 +70,10 @@ class GroupsController < ApplicationController
   def destroy
     @group.destroy
     respond_to do |format|
-      format.html { redirect_to groups_url, notice: 'Group was successfully destroyed.' }
+      format.html {
+        redirect_to groups_url
+        flash_message(:info, 'Group was successfully destroyed.')
+      }
       format.json { head :no_content }
     end
   end

app/controllers/members_controller.rb

@@ -8,6 +8,9 @@ class MembersController < ApplicationController
   # GET /members.json
   def index
     @members = @group.members
+      .joins(:person)
+      .order(is_leader: :desc)
+      .order('people.first_name ASC')
   end
 
   # GET /members/1
@@ -34,7 +37,10 @@ class MembersController < ApplicationController
 
     respond_to do |format|
       if @member.save
-        format.html { redirect_to group_member_url(@group, @member), notice: 'Member was successfully created.' }
+        format.html {
+          redirect_to group_member_url(@group, @member)
+          flash_message(:info, 'Member was successfully created.')
+        }
         format.json { render :show, status: :created, location: @member }
       else
         @possible_members = Person.where.not(id: @group.person_ids)
@@ -49,7 +55,10 @@ class MembersController < ApplicationController
   def update
     respond_to do |format|
       if @member.update(member_params)
-        format.html { redirect_to group_member_url(@group, @member), notice: 'Member was successfully updated.' }
+        format.html {
+          redirect_to group_member_url(@group, @member)
+          flash_message(:info, 'Member was successfully updated.')
+        }
         format.json { render :show, status: :ok, location: @member }
       else
         @possible_members = Person.where.not(id: @group.person_ids)
@@ -64,7 +73,10 @@ class MembersController < ApplicationController
   def destroy
     @member.destroy
     respond_to do |format|
-      format.html { redirect_to group_members_url(@group), notice: 'Member was successfully destroyed.' }
+      format.html {
+        redirect_to group_members_url(@group)
+        flash_message(:info, 'Member was successfully destroyed.')
+      }
       format.json { head :no_content }
     end
   end

app/controllers/people_controller.rb

@@ -34,7 +34,7 @@ class PeopleController < ApplicationController
     respond_to do |format|
       if @person.save
         format.html do
-          flash[:success] = "Person was successfully created."
+          flash_message(:success, "Person was successfully created.")
           redirect_to @person
         end
         format.json { render :show, status: :created, location: @person }
@@ -51,7 +51,7 @@ class PeopleController < ApplicationController
     respond_to do |format|
       if @person.update(person_params)
         format.html do
-          flash[:success] = "Person was successfully updated."
+          flash_message(:success, "Person was successfully updated.")
           redirect_to @person
         end
 
@@ -69,7 +69,7 @@ class PeopleController < ApplicationController
     @person.destroy
     respond_to do |format|
       format.html do
-        flash[:success] = 'Person was successfully destroyed.'
+        flash_message(:success, 'Person was successfully destroyed.')
         redirect_to people_url
       end
 

app/helpers/application_helper.rb

@@ -1,2 +1,7 @@
 module ApplicationHelper
+  def flash_message(category, message, **pairs)
+    flash[:alerts] ||= {}
+    flash[:alerts][category] ||= []
+    flash[:alerts][category] << message
+  end
 end

app/helpers/authentication_helper.rb

@@ -114,14 +114,14 @@ module AuthenticationHelper
 
   def require_login!
     if !is_logged_in?
-      flash[:warning] = "You need to be logged in to do that."
+      flash_message(:warning, "You need to be logged in to do that.")
       redirect_to controller: 'authentication', action: 'login_form'
     end
   end
 
   def require_admin!
     if !current_person.is_admin?
-      flash[:danger] = "You need to be an administrator to do that."
+      flash_message(:danger, "You need to be an administrator to do that.")
       redirect_to '/dashboard'
     end
   end

app/helpers/groups_helper.rb

@@ -2,7 +2,7 @@ module GroupsHelper
   def require_membership!
     require_login!
     if !(Member.exists?(group: @group, person: current_person) || current_person.is_admin?)
-      flash[:danger] = "You need to be a member of that group to do that."
+      flash_message(:danger, "You need to be a member of that group to do that.")
       redirect_to dashboard_url
     end
   end
@@ -12,7 +12,7 @@ module GroupsHelper
 
     if !(Member.exists?(group: @group, is_leader: true, person: current_person) ||
          current_person.is_admin?)
-      flash[:danger] = "You need to be a group leader to do that."
+      flash_message(:danger, "You need to be a group leader to do that.")
       redirect_to dashboard_url
     end
   end

app/views/activities/index.html.erb

@@ -1,5 +1,3 @@
-<p id="notice"><%= notice %></p>
-
 <h1>Activities</h1>
 
 <table class="table">

app/views/groups/index.html.erb

@@ -1,5 +1,3 @@
-<p id="notice"><%= notice %></p>
-
 <h1>Groups</h1>
 
 <table class="table">
@@ -16,6 +14,8 @@
     <% @groups.each do |group| %>
       <tr>
         <td><%= link_to group.name, group %></td>
+        <td><%= link_to group.members.count, group_members_path(group) %></td>
+        <td><%= link_to group.activities.count, group_activities_path(group) %></td>
         <td><%= link_to 'Edit', edit_group_path(group) %></td>
         <td><%= link_to 'Destroy', group, method: :delete, data: { confirm: 'Are you sure?' } %></td>
       </tr>

app/views/members/index.html.erb

@@ -1,20 +1,23 @@
-<p id="notice"><%= notice %></p>
-
 <h1>Members</h1>
 
-<table>
+<table class="table table-striped">
   <thead>
     <tr>
-      <th colspan="3"></th>
+      <th>Name</th>
+      <th>Remove</th>
     </tr>
   </thead>
 
   <tbody>
     <% @members.each do |member| %>
       <tr>
-        <td><%= link_to member.person.full_name, group_member_path(@group, member) %></td>
-        <td><%= link_to 'Edit', edit_group_member_path(@group, member) %></td>
-        <td><%= link_to 'Destroy', group_member_path(@group, member), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        <td>
+          <%= link_to member.person.full_name, group_member_path(@group, member) %>
+          <% if member.is_leader %>
+            (<i class="fa fa-angle-up"></i>)
+          <% end %>
+        </td>
+        <td><%= link_to 'Remove', group_member_path(@group, member), method: :delete, data: { confirm: 'Are you sure?' } %></td>
       </tr>
     <% end %>
   </tbody>

app/views/members/show.html.erb

@@ -1,5 +1,3 @@
-<p id="notice"><%= notice %></p>
-
 <%= @member.person.full_name %> is lid van <%= @group.name %>.
 <%= link_to 'Edit', edit_group_member_path(@group, @member) %> |
 <%= link_to 'Back', group_members_path(@group) %>

app/views/people/index.html.erb

@@ -1,5 +1,3 @@
-<p id="notice"><%= notice %></p>
-
 <h1>People</h1>
 
 <table class="table">

app/views/shared/_alerts.html.haml

@@ -1,5 +1,7 @@
 .container
   .alerts
-    - flash.each do |name, msg|
-      %div{class: "alert alert-#{name}"}
-        = msg
+    - if flash[:alerts]
+      - flash[:alerts].each do |category, msgs|
+        - msgs.each do |msg|
+          %div{class: "alert alert-#{category}"}
+            = msg