From e353c116ba60a8181b2cb1d9b3101204248900f3 Mon Sep 17 00:00:00 2001 From: "David J. Brenes" Date: Wed, 7 Nov 2012 17:35:35 +0100 Subject: [PATCH 1/4] #4 Formatting date and time in a more numeric format so rails can load the data into de calendar --- app/views/refinery/calendar/admin/events/_form.html.erb | 4 ++-- vendor/assets/javascripts/refinery/calendar.js.coffee | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/views/refinery/calendar/admin/events/_form.html.erb b/app/views/refinery/calendar/admin/events/_form.html.erb index 2127ca9..e2f8082 100644 --- a/app/views/refinery/calendar/admin/events/_form.html.erb +++ b/app/views/refinery/calendar/admin/events/_form.html.erb @@ -18,12 +18,12 @@
<%= f.label :from -%> - <%= f.text_field :from, :class => 'datetime_range' -%> + <%= text_field_tag "event[from]", l(@event.starts_at, :format => "%Y-%m-%d %H:%M:%S"), :class => 'datetime_range' -%>
<%= f.label :to -%> - <%= f.text_field :to, :class => 'datetime_range' -%> + <%= text_field_tag "event[to]", l(@event.ends_at, :format => "%Y-%m-%d %H:%M:%S"), :class => 'datetime_range' -%>
diff --git a/vendor/assets/javascripts/refinery/calendar.js.coffee b/vendor/assets/javascripts/refinery/calendar.js.coffee index 52672a4..7387410 100644 --- a/vendor/assets/javascripts/refinery/calendar.js.coffee +++ b/vendor/assets/javascripts/refinery/calendar.js.coffee @@ -1,7 +1,8 @@ jQuery -> datetimes = $(".datetime_range").datetimepicker ampm: true - dateFormat: 'M d, yy' + dateFormat: 'yy-mm-dd' + timeFormat: 'hh:mm:ss' changeMonth: true changeYear: true numberOfMonths: 2 From b0df5e0e16134196e6309de1a2aebc8be79ca28b Mon Sep 17 00:00:00 2001 From: "David J. Brenes" Date: Wed, 7 Nov 2012 18:20:00 +0100 Subject: [PATCH 2/4] #4 Loading Time.now as a default value --- app/views/refinery/calendar/admin/events/_form.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/refinery/calendar/admin/events/_form.html.erb b/app/views/refinery/calendar/admin/events/_form.html.erb index e2f8082..f2e52ce 100644 --- a/app/views/refinery/calendar/admin/events/_form.html.erb +++ b/app/views/refinery/calendar/admin/events/_form.html.erb @@ -18,12 +18,12 @@
<%= f.label :from -%> - <%= text_field_tag "event[from]", l(@event.starts_at, :format => "%Y-%m-%d %H:%M:%S"), :class => 'datetime_range' -%> + <%= text_field_tag "event[from]", l(@event.starts_at || Time.now, :format => "%Y-%m-%d %H:%M:%S"), :class => 'datetime_range' -%>
<%= f.label :to -%> - <%= text_field_tag "event[to]", l(@event.ends_at, :format => "%Y-%m-%d %H:%M:%S"), :class => 'datetime_range' -%> + <%= text_field_tag "event[to]", l(@event.ends_at || Time.now, :format => "%Y-%m-%d %H:%M:%S"), :class => 'datetime_range' -%>
From af25daaadb11bd8a6521d0a084c27c64fb36bc57 Mon Sep 17 00:00:00 2001 From: "David J. Brenes" Date: Wed, 7 Nov 2012 18:20:58 +0100 Subject: [PATCH 3/4] #4 Trying a different format at the js calendar as it has problems with PM hours --- app/views/refinery/calendar/admin/events/_form.html.erb | 4 ++-- vendor/assets/javascripts/refinery/calendar.js.coffee | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/refinery/calendar/admin/events/_form.html.erb b/app/views/refinery/calendar/admin/events/_form.html.erb index f2e52ce..a377330 100644 --- a/app/views/refinery/calendar/admin/events/_form.html.erb +++ b/app/views/refinery/calendar/admin/events/_form.html.erb @@ -18,12 +18,12 @@
<%= f.label :from -%> - <%= text_field_tag "event[from]", l(@event.starts_at || Time.now, :format => "%Y-%m-%d %H:%M:%S"), :class => 'datetime_range' -%> + <%= text_field_tag "event[from]", l(@event.starts_at || Time.now, :format => "%Y-%m-%d %I:%M %p"), :class => 'datetime_range' -%>
<%= f.label :to -%> - <%= text_field_tag "event[to]", l(@event.ends_at || Time.now, :format => "%Y-%m-%d %H:%M:%S"), :class => 'datetime_range' -%> + <%= text_field_tag "event[to]", l(@event.ends_at || Time.now, :format => "%Y-%m-%d %I:%M %p"), :class => 'datetime_range' -%>
diff --git a/vendor/assets/javascripts/refinery/calendar.js.coffee b/vendor/assets/javascripts/refinery/calendar.js.coffee index 7387410..4670f35 100644 --- a/vendor/assets/javascripts/refinery/calendar.js.coffee +++ b/vendor/assets/javascripts/refinery/calendar.js.coffee @@ -2,7 +2,7 @@ jQuery -> datetimes = $(".datetime_range").datetimepicker ampm: true dateFormat: 'yy-mm-dd' - timeFormat: 'hh:mm:ss' + timeFormat: 'hh:mm tt' changeMonth: true changeYear: true numberOfMonths: 2 From a8afac44098b4627227d80809fb00f11f447aece Mon Sep 17 00:00:00 2001 From: "David J. Brenes" Date: Fri, 22 Feb 2013 13:41:31 +0100 Subject: [PATCH 4/4] Replacing unexisting methods starts_atand ends_at Since we were cherrypickng from a branch where 'from' and 'to' no longer existed we introduced calls to 'starts_at' and 'ends_at'. --- app/views/refinery/calendar/admin/events/_form.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/refinery/calendar/admin/events/_form.html.erb b/app/views/refinery/calendar/admin/events/_form.html.erb index a377330..43be163 100644 --- a/app/views/refinery/calendar/admin/events/_form.html.erb +++ b/app/views/refinery/calendar/admin/events/_form.html.erb @@ -18,12 +18,12 @@
<%= f.label :from -%> - <%= text_field_tag "event[from]", l(@event.starts_at || Time.now, :format => "%Y-%m-%d %I:%M %p"), :class => 'datetime_range' -%> + <%= text_field_tag "event[from]", l(@event.from || Time.now, :format => "%Y-%m-%d %I:%M %p"), :class => 'datetime_range' -%>
<%= f.label :to -%> - <%= text_field_tag "event[to]", l(@event.ends_at || Time.now, :format => "%Y-%m-%d %I:%M %p"), :class => 'datetime_range' -%> + <%= text_field_tag "event[to]", l(@event.to || Time.now, :format => "%Y-%m-%d %I:%M %p"), :class => 'datetime_range' -%>