Fix upcoming view to actually be future activities, hide if empty

app/controllers/groups_controller.rb

@@ -19,11 +19,13 @@ 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
+    @organized_activities = current_person
+      .organized_activities
+      .joins(:activity)
+      .where('activities.group_id': @group.id)
+      .where('start > ?', Date.today)
+
+    if @organized_activities.any?
       @groupmenu = 'col-md-6'
     else
       @groupmenu = 'col-md-12'

app/views/dashboard/home.html.haml

@@ -90,21 +90,22 @@
                     = link_to group do
                       = group.name
 
-    .col-md-6
-      .panel.panel-default
-        .panel-heading
-          = t 'dashboard.organized_you'
+    - if @user_organized.any?
+      .col-md-6
+        .panel.panel-default
+          .panel-heading
+            = t 'dashboard.organized_you'
 
-        .panel-body
-          %table.table.table-striped.table-bordered
-            %tbody
-              - @user_organized.each do |p|
-                - a = p.activity
-                %tr
-                  %td
-                    = link_to group_activity_url(a.group, a) do
-                      = a.name
-                      = "(#{a.human_state_counts})"
+          .panel-body
+            %table.table.table-striped.table-bordered
+              %tbody
+                - @user_organized.each do |p|
+                  - a = p.activity
+                  %tr
+                    %td
+                      = link_to group_activity_url(a.group, a) do
+                        = a.name
+                        = "(#{a.human_state_counts})"
 
   .row
     .col-md-12