agenda-libre/agenda-libre-ruby
agenda-libre/agenda-libre-ruby
2
1
Fork 0
Code Issues Pull Requests Releases Activity

Taking only future events for the ical format

Browse Source
This commit is contained in:
echarp 2018-07-14 17:32:11 +02:00
parent 95edd455a5
commit 5807c44b70
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/events_controller.rb
View File

@ -14,8 +14,8 @@ class EventsController < ApplicationController
def index def index
respond_to do |format| respond_to do |format|
format.html format.html
format.json { @events = @events.future }
format.ics { @events = @events.future } format.ics { @events = @events.future }
format.json { @events = @events.future }
format.rss { @events = filter_for_rss } format.rss { @events = filter_for_rss }
format.xml format.xml
end end

1
app/models/event.rb
View File

@ -44,7 +44,6 @@ class Event < ApplicationRecord
scope :moderated, ->(*) { where moderated: true } scope :moderated, ->(*) { where moderated: true }
scope :unmoderated, ->(*) { where moderated: false } scope :unmoderated, ->(*) { where moderated: false }
scope :last_year, -> { where '? <= end_time', 1.year.ago }
scope :past, -> { where 'start_time <= ?', Time.zone.now } scope :past, -> { where 'start_time <= ?', Time.zone.now }
scope :future, -> { where '? <= end_time', Time.zone.now } scope :future, -> { where '? <= end_time', Time.zone.now }
scope :daylimit, ->(nb) { where 'end_time <= ?', nb.to_i.days.from_now } scope :daylimit, ->(nb) { where 'end_time <= ?', nb.to_i.days.from_now }

2
app/views/events/_event.haml
View File

@ -6,5 +6,5 @@
= link_to event do = link_to event do
%strong.city{ title: event.address }= event.city %strong.city{ title: event.address }= event.city
= event.title = event.title
- if event.repeat > 0 - if event.repeat.positive?
%em.fa.fa-repeat{ title: event.schedule } %em.fa.fa-repeat{ title: event.schedule }

4
app/views/events/index.html.haml
View File

@ -21,13 +21,13 @@
- else - else
-# One month calendar -# One month calendar
- params[:start_date] ||= Time.zone.today.beginning_of_month
:ruby :ruby
params[:start_date] ||= Time.zone.today.beginning_of_month
set_meta_tags( set_meta_tags(
prev: url_for(start_date: params[:start_date].to_date - 1.month), prev: url_for(start_date: params[:start_date].to_date - 1.month),
next: url_for(start_date: params[:start_date].to_date + 1.month) next: url_for(start_date: params[:start_date].to_date + 1.month)
) )
- @events = @events.month params[:start_date] @events = @events.month params[:start_date]
= month_calendar events: @events do |date, events| = month_calendar events: @events do |date, events|
- capture_haml do - capture_haml do
.day_number= date.day .day_number= date.day