@@ -53,7 +71,7 @@
<% end %>
<% end %>
- <% if past_events(@item[:academic_year]).empty? and upcoming_events(@item[:academic_year]).empty? %>
+ <% if past_events_in_year_or_tag(@item).empty? and upcoming_events_in_year_or_tag(@item).empty? %>
Sorry.
No events planned yet this year.
diff --git a/lib/helpers/archives.rb b/lib/helpers/archives.rb
index 68ec04f..5fe64ad 100644
--- a/lib/helpers/archives.rb
+++ b/lib/helpers/archives.rb
@@ -3,8 +3,8 @@ module ArchiveHelper
# Set.to_a to prevent duplicates
Set.new(items
.find_all('/blog/*/*')
- .map { |i| i.identifier.to_s[/\d\d-\d\d/] })
- .to_a
+ .map { |i| i.identifier.to_s.split('/')[-2] })
+ .to_a
.sort
.push(@config[:academic_year])
.uniq
@@ -14,6 +14,15 @@ module ArchiveHelper
academic_years.reverse.map { |y| [y, items["/blog/#{y}.html"]] }
end
+ def tag_blog_items
+ Set.new(items
+ .find_all('/blog/*/*')
+ .flat_map { |i| i[:tags] || [] })
+ .to_a
+ .sort
+ .uniq.map { |y| [y, items["/blog/#{y.gsub(' ', '_')}.html"]]}
+ end
+
def pretty_year(year)
year = year.scan(/\d\d/)
"'#{year[0]} - '#{year[1]}"
@@ -22,4 +31,18 @@ module ArchiveHelper
def posts_in_year(y)
items.find_all("/blog/#{y}/*").sort_by { |x| x[:created_at] }.reverse
end
+
+ def posts_with_tag(tag)
+ items
+ .find_all('/blog/*/*')
+ .filter{|i| (i[:tags] || []).include? tag }
+ end
+
+ def posts_in_year_or_with_tag(item)
+ if item[:is_yearly]
+ posts_in_year(item[:academic_year])
+ else
+ posts_with_tag(item[:tag])
+ end
+ end
end
diff --git a/lib/helpers/events.rb b/lib/helpers/events.rb
index 0649079..198d1b7 100644
--- a/lib/helpers/events.rb
+++ b/lib/helpers/events.rb
@@ -13,6 +13,22 @@ module EventsHelper
items_.select { |x| x[:soon] == soon }.sort_by { |x| x[:time] }
end
+ def tag_event_items
+ Set.new(items
+ .find_all('/events/*/*')
+ .flat_map { |i| i[:tags] || [] })
+ .to_a
+ .sort
+ .uniq.map { |y| [y, items["/events/#{y.gsub(' ', '_')}.html"]]}
+ end
+
+ def all_events_by_tag(tag = nil, soon = nil)
+ @items.find_all('/events/*/*.md')
+ .filter{|i| (i[:tags] || []).include? tag }
+ .select { |x| x[:soon] == soon }
+ .sort_by { |x| x[:time] }
+ end
+
def soon_events
all_events(nil, true)
end
@@ -21,12 +37,28 @@ module EventsHelper
all_events(year).reject { |x| x[:time] <= Date.today }
end
+ def upcoming_events_in_year_or_tag(item)
+ if item[:is_yearly]
+ upcoming_events(item[:academic_year])
+ else
+ all_events_by_tag(item[:tag]).reject { |x| x[:time] <= Date.today }
+ end
+ end
+
def past_events(year = nil)
all_events(year).reject { |x| x[:time] > Date.today }.reverse
end
+ def past_events_in_year_or_tag(item)
+ if item[:is_yearly]
+ past_events(item[:academic_year])
+ else
+ all_events_by_tag(item[:tag]).reject { |x| x[:time] > Date.today }.reverse
+ end
+ end
+
def academic_years_event_items
- items.find_all('/events/*').map { |e| [e[:academic_year], e] }.sort_by(&:first).reverse
+ items.find_all('/events/*').reject { |e| e[:academic_year].nil? }.map { |e| [e[:academic_year], e] }.sort_by(&:first).reverse
end
def grouped_events
diff --git a/lib/helpers/preprocess.rb b/lib/helpers/preprocess.rb
index 07ff4a9..6c787de 100644
--- a/lib/helpers/preprocess.rb
+++ b/lib/helpers/preprocess.rb
@@ -56,7 +56,7 @@ module PreprocessHelper
i.update_attributes(
# Tag all posts with article (for Blogging helper)
kind: 'article',
- academic_year: i.identifier.to_s[/\d\d-\d\d/],
+ academic_year: i.identifier.to_s[/\d-\d/],
created_at: Date.parse(i[:created_at])
)
end
@@ -72,7 +72,7 @@ module PreprocessHelper
years.each do |year|
@items.create(
'',
- { academic_year: year, title: type },
+ { academic_year: year, title: type, is_yearly: true },
"/#{type.downcase}/#{year}.html"
)
end
@@ -84,6 +84,21 @@ module PreprocessHelper
)
end
+ def create_tagly_items(type)
+ type = type.to_s
+ tags = @items.find_all("/#{type.downcase}/*/*")
+ .flat_map { |i| i[:tags] || [] }
+ .uniq
+
+ tags.each do |tag|
+ @items.create(
+ '',
+ { tag: tag, title: type, is_yearly: false },
+ "/#{type.downcase}/#{tag.gsub(' ', '_')}.html"
+ )
+ end
+ end
+
def convert_event_time_to_timestamps
@items.find_all('/events/*/*.md').each do |event|
# HACK: Strings in a format like "2017-10-05T20:45:00+0200" automatically get converted to Time