Skip to content

Commit 1c0181b

Browse files
committed
Change format of start and end time fields
1 parent 90d6fec commit 1c0181b

File tree

4 files changed

+28
-9
lines changed

4 files changed

+28
-9
lines changed

app/views/admin/events/edit.html.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616

1717
<p><%= f.label(:start_time, "Workshop starts at:") %></p>
1818
<%= error_message(@event, :start_time) %>
19-
<p><%= f.text_field :start_time %></p>
19+
<p><%= f.time_select :start_time %></p>
2020

2121
<p><%= f.label(:end_time, "Workshop ends at:") %></p>
2222
<%= error_message(@event, :end_time) %>
23-
<p><%= f.text_field :end_time %></p>
23+
<p><%= f.time_select :end_time %></p>
2424

2525
<p><%= f.label(:coach_the_coaches_date, "Coach the Coaches date:") %></p>
2626
<%= error_message(@event, :coach_the_coaches_date) %>
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
class DeleteStartAndEndTime < ActiveRecord::Migration[5.2]
2+
def change
3+
remove_column :events, :start_time
4+
remove_column :events, :end_time
5+
add_column :events, :start_time, :time
6+
add_column :events, :end_time, :time
7+
8+
Event.all.each do |event|
9+
event.update_columns(start_time: "09:00", end_time: "18:00")
10+
end
11+
12+
change_column :events, :start_time, :time, null: false
13+
change_column :events, :end_time, :time, null: false
14+
end
15+
end

db/schema.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#
1111
# It's strongly recommended that you check this file into your version control system.
1212

13-
ActiveRecord::Schema.define(version: 2020_02_22_150918) do
13+
ActiveRecord::Schema.define(version: 2020_02_24_192549) do
1414

1515
# These are extensions that must be enabled in order to support this database
1616
enable_extension "plpgsql"
@@ -106,8 +106,6 @@
106106
t.date "application_end"
107107
t.date "confirmation_date"
108108
t.boolean "selection_complete", default: false, null: false
109-
t.string "start_time", null: false
110-
t.string "end_time", null: false
111109
t.text "application_mail"
112110
t.text "selection_mail"
113111
t.text "rejection_mail"
@@ -131,6 +129,8 @@
131129
t.date "installation_get_together_date"
132130
t.time "installation_get_together_start_time"
133131
t.time "installation_get_together_end_time"
132+
t.time "start_time", null: false
133+
t.time "end_time", null: false
134134
end
135135

136136
create_table "users", id: :serial, force: :cascade do |t|

test/system/add_event_test.rb

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@ class AddEventTest < ApplicationSystemTestCase
2222
select "2018", from: "event_scheduled_at_1i"
2323
select "May", from: "event_scheduled_at_2i"
2424
select "25", from: "event_scheduled_at_3i"
25-
fill_in "Workshop starts at", with: "09:00"
26-
fill_in "Workshop ends at", with: "18:00"
25+
select "09", from: "event_start_time_4i"
26+
select "00", from: "event_start_time_5i"
27+
select "17", from: "event_end_time_4i"
28+
select "00", from: "event_end_time_5i"
2729
select "2018", from: "event_application_start_1i"
2830
select "May", from: "event_application_start_2i"
2931
select "10", from: "event_application_start_3i"
@@ -49,8 +51,10 @@ class AddEventTest < ApplicationSystemTestCase
4951
select "2018", from: "event_scheduled_at_1i"
5052
select "May", from: "event_scheduled_at_2i"
5153
select "25", from: "event_scheduled_at_3i"
52-
fill_in "Workshop starts at", with: "09:00"
53-
fill_in "Workshop ends at", with: "18:00"
54+
select "09", from: "event_start_time_4i"
55+
select "00", from: "event_start_time_5i"
56+
select "17", from: "event_end_time_4i"
57+
select "00", from: "event_end_time_5i"
5458
select "2018", from: "event_application_start_1i"
5559
select "May", from: "event_application_start_2i"
5660
select "10", from: "event_application_start_3i"

0 commit comments

Comments
 (0)