|
@@ -35,7 +35,8 @@ class Group < ApplicationRecord
|
35
|
35
|
|
36
|
36
|
# @return [Array<Activity>]
|
37
|
37
|
# all Activities that have started, and not yet ended.
|
38
|
|
- def current_activities(reference = Time.zone.now)
|
|
38
|
+ def current_activities(reference = nil)
|
|
39
|
+ reference ||= Time.zone.now
|
39
|
40
|
activities
|
40
|
41
|
.where('start < ?', reference)
|
41
|
42
|
.where('end > ?', reference)
|
|
@@ -43,7 +44,8 @@ class Group < ApplicationRecord
|
43
|
44
|
|
44
|
45
|
# @return [Array<Activity>]
|
45
|
46
|
# at most 3 activities that ended recently.
|
46
|
|
- def previous_activities(reference = Time.zone.now)
|
|
47
|
+ def previous_activities(reference = nil)
|
|
48
|
+ reference ||= Time.zone.now
|
47
|
49
|
activities
|
48
|
50
|
.where('end < ?', reference)
|
49
|
51
|
.order(end: :desc)
|
|
@@ -52,7 +54,8 @@ class Group < ApplicationRecord
|
52
|
54
|
|
53
|
55
|
# @return [Array<Activity>]
|
54
|
56
|
# all Activities starting within the next 48 hours.
|
55
|
|
- def upcoming_activities(reference = Time.zone.now)
|
|
57
|
+ def upcoming_activities(reference = nil)
|
|
58
|
+ reference ||= Time.zone.now
|
56
|
59
|
activities
|
57
|
60
|
.where('start > ?', reference)
|
58
|
61
|
.where('start < ?', reference.days_since(2))
|