From 1183ee6da9e352e61ef54945f6b5967dae3903e9 Mon Sep 17 00:00:00 2001 From: Gopesh Tulsyan Date: Wed, 28 May 2014 11:10:05 +0530 Subject: [PATCH] Added method to wrap the date helper to recieve two dates instead of a object --- app/helpers/home_helper.rb | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/app/helpers/home_helper.rb b/app/helpers/home_helper.rb index 659d7168..60d959c4 100644 --- a/app/helpers/home_helper.rb +++ b/app/helpers/home_helper.rb @@ -13,22 +13,25 @@ module HomeHelper # All other cases # * %B %d, %Y - %B %d, %Y (December 30, 2013 - January 02, 2014) def conference_date_string(conf) - startstr = "Unknown - " - endstr = "Unknown" - # When the conference in the same motn - if conf.start_date.month == conf.end_date.month and conf.start_date.year == conf.end_date.year - startstr = conf.start_date.strftime("%B %d - ") - endstr = conf.end_date.strftime("%d, %Y") - elsif conf.start_date.month != conf.end_date.month && conf.start_date.year == conf.end_date.year - startstr = conf.start_date.strftime("%B %d - ") - endstr = conf.end_date.strftime("%B %d, %Y") + date_string(conf.start_date, conf.end_date) + end + + def date_string(start_date, end_date) + startstr = 'Unknown - ' + endstr = 'Unknown' + # When the conference in the same month + if start_date.month == end_date.month && start_date.year == end_date.year + startstr = start_date.strftime('%B %d - ') + endstr = end_date.strftime('%d, %Y') + elsif start_date.month != end_date.month && start_date.year == end_date.year + startstr = start_date.strftime('%B %d - ') + endstr = end_date.strftime('%B %d, %Y') else - startstr = conf.start_date.strftime("%B %d, %Y - ") - endstr = conf.end_date.strftime("%B %d, %Y") + startstr = start_date.strftime('%B %d, %Y - ') + endstr = end_date.strftime('%B %d, %Y') end result = startstr + endstr result end - end