From 8458eb0d4fc766a17b7e45a8ed5f3cab0815bbea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elo=C3=AFse=20Piret?= Date: Mon, 6 Feb 2017 14:15:06 +0100 Subject: [PATCH] fix generic --- content/index.erb | 2 +- lib/helpers/time.rb | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/content/index.erb b/content/index.erb index c3f03ba..ffdf193 100644 --- a/content/index.erb +++ b/content/index.erb @@ -6,7 +6,7 @@
- <%= render '/tiles/blokmap.*' %> + <%= if studytime? then render '/tiles/blokmap.*'end %>
diff --git a/lib/helpers/time.rb b/lib/helpers/time.rb index 7c27091..51c970b 100644 --- a/lib/helpers/time.rb +++ b/lib/helpers/time.rb @@ -1,5 +1,23 @@ module TimeHelper def christmastime? - Time.now.month == 12 + timehelper([[Time.new(Time.now.year,12,6),Time.new(Time.now.year,12,31)]]) + end + + def studytime? + year = Time.now.year + timehelper([ + [Time.new(year,12,14), Time.new(year,12,31)], + [Time.new(year,1,1), Time.new(year,2,7)], + [Time.new(year,5,15), Time.new(year,6,30)], + [Time.new(year,8,5), Time.new(year,9,10)], + ]) + end + + def timehelper(ranges) + ranges.any? {|range| periodhelper(*range)} + end + + def periodhelper(startdate, enddate) + Time.now.between?(startdate, enddate) end end