Parkeer

app/controllers/groups_controller.rb

@@ -1,9 +1,9 @@
 class GroupsController < ApplicationController
   include GroupsHelper
+  before_action :set_group, only: [:show, :edit, :update, :destroy]
   before_action :require_admin!, only: [:index]
   before_action :require_membership!, only: [:show]
   before_action :require_leader!, only: [:edit, :update, :destroy]
-  before_action :set_group, only: [:show, :edit, :update, :destroy]
 
   # GET /groups
   # GET /groups.json
@@ -18,6 +18,24 @@ class GroupsController < ApplicationController
   # GET /groups/1
   # GET /groups/1.json
   def show
+    @organized_activities = current_person.organized_activities.
+      joins(:activity).where(
+        'activities.group_id': @group.id
+    )
+    if @organized_activities.count > 0
+      @groupmenu = 'col-md-6'
+    else
+      @groupmenu = 'col-md-12'
+    end
+
+    @upcoming = @group.activities
+      .where('start > ?', Date.today)
+      .order('start ASC')
+    @upcoming_ps = Participant
+      .where(person: current_person)
+      .where(activity: @upcoming)
+      .map{ |p| [p.activity_id, p]}
+      .to_h
   end
 
   # GET /groups/new

app/helpers/groups_helper.rb

@@ -1,19 +1,19 @@
 module GroupsHelper
   def require_membership!
     require_login!
-    if !(Member.exists?(group: @group, person: current_person) || current_person.is_admin?)
+    if !(@group.is_member?(current_person) || current_person.is_admin?)
       flash_message(:danger, "You need to be a member of that group to do that.")
-      redirect_to dashboard_url
+      redirect_to dashboard_home_path
     end
   end
 
   def require_leader!
     require_login!
 
-    if !(Member.exists?(group: @group, is_leader: true, person: current_person) ||
+    if !(@group.is_leader?(current_person) ||
          current_person.is_admin?)
       flash_message(:danger, "You need to be a group leader to do that.")
-      redirect_to dashboard_url
+      redirect_to dashboard_home_path
     end
   end
 end

app/models/group.rb

@@ -29,6 +29,14 @@ class Group < ApplicationRecord
     self.activities.where('start > ?', DateTime.now)
   end
 
+  # Determine whether the passed person is a member of the group.
+  def is_member?(person)
+    Member.exists?(
+      person: person,
+      group: self
+    ) || person.is_admin?
+  end
+
   # Determine whether the passed person is a group leader.
   def is_leader?(person)
     Member.exists?(

app/models/person.rb

@@ -65,7 +65,7 @@ class Person < ApplicationRecord
 
   # All activities where this person is an organizer.
   def organized_activities
-    self.participants.includes(:activity).where(is_leader: true)
+    self.participants.includes(:activity).where(is_organizer: true)
   end
 
   private

app/views/groups/show.html.haml

@@ -1,30 +1,68 @@
 %h2
   = @group.name
 
-%h3 Upcoming activities
-%h3
-  Members
+.row
+  .groupmenu(class=@groupmenu)
+    .panel.panel-default
+      .panel-heading
+        = @group.name
 
-%ul
-  - @group.members.each do |m|
-    %li
-      - if m.is_leader
-        %i.fa.fa-angle-up
+      .panel-body
+        .list-group
+          = link_to group_members_path(@group), class: 'list-group-item' do
+            = @group.members.count
+            members
 
-      = m.person.full_name
+          = link_to group_activities_path(@group), class: 'list-group-item' do
+            = @group.activities.count
+            activities
 
-= link_to 'Manage members', group_members_path(@group)
+          - if @group.is_leader?(current_person)
+            = link_to new_group_activity_path(@group), class: 'list-group-item' do
+              New event
 
-%h3
-  Events
+            = link_to edit_group_path(@group), class: 'list-group-item' do
+              Edit group
 
-%ul
-  - @group.activities.each do |e|
-    %li
-      = e.public_name
-= link_to "Manage activities", group_activities_path(@group)
+  - if @organized_activities && @organized_activities.count > 0
+    .col-md-6
+      .panel.panel-default
+        .panel-heading
+          Upcoming activities organized by you
 
-%div
-  = link_to 'Edit', edit_group_path(@group)
-  |
-  = link_to 'Back', groups_path
+        .panel-body
+          %table.table
+            %tr
+              %th
+                What
+              %th
+                When
+
+            - @organized_activities.each do |p|
+              - a = p.activity
+              %tr
+                %td
+                  = link_to group_activity_path(@group, a) do
+                    = a.public_name
+                    = render partial: "activities/state_counts", locals: {counts: a.state_counts}
+                %td
+                  = distance_of_time_in_words_to_now(a.start.to_date)
+
+.row
+  .col-md-12
+    .panel.panel-default
+      .panel-heading
+        Your activities
+
+      .panel-body
+        %table.table.table-striped
+          %tbody
+            - @upcoming.each do |a|
+              - p = @upcoming_ps[a.id]
+              %tr{class: p.row_class, data: {activity_id: e.id, person_id: current_person.id}}
+                %td
+                  = e.public_name
+                %td
+                  = render partial: "activities/presence_buttons", locals: {activity: e, person: current_person, state: p.attending}
+                %td
+                  = editable p, :notes, url: presence_group_activity_path(e.group, e, person_id: current_person.id), title: "Notes", value: p.notes, emptytext: 'Notes'