Merge pull request #253 from rubymonsters/time_format

Change format of start and end time fields

Author: simaofreitas

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

@@ -16,11 +16,11 @@
 
   <p><%= f.label(:start_time, "Workshop starts at:") %></p>
   <%= error_message(@event, :start_time) %>
-  <p><%= f.text_field :start_time %></p>
+  <p><%= f.time_select :start_time %></p>
 
   <p><%= f.label(:end_time, "Workshop ends at:") %></p>
   <%= error_message(@event, :end_time) %>
-  <p><%= f.text_field :end_time %></p>
+  <p><%= f.time_select :end_time %></p>
 
   <p><%= f.label(:coach_the_coaches_date, "Coach the Coaches date:") %></p>
   <%= error_message(@event, :coach_the_coaches_date) %>

db/migrate/20200224192549_delete_start_and_end_time.rb

@@ -0,0 +1,15 @@
+class DeleteStartAndEndTime < ActiveRecord::Migration[5.2]
+  def change
+    remove_column :events, :start_time
+    remove_column :events, :end_time
+    add_column :events, :start_time, :time
+    add_column :events, :end_time, :time
+
+    Event.all.each do |event|
+      event.update_columns(start_time: "09:00", end_time: "18:00")
+    end
+
+    change_column :events, :start_time, :time, null: false
+    change_column :events, :end_time, :time, null: false
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_02_22_150918) do
+ActiveRecord::Schema.define(version: 2020_02_24_192549) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -106,8 +106,6 @@
     t.date "application_end"
     t.date "confirmation_date"
     t.boolean "selection_complete", default: false, null: false
-    t.string "start_time", null: false
-    t.string "end_time", null: false
     t.text "application_mail"
     t.text "selection_mail"
     t.text "rejection_mail"
@@ -131,6 +129,8 @@
     t.date "installation_get_together_date"
     t.time "installation_get_together_start_time"
     t.time "installation_get_together_end_time"
+    t.time "start_time", null: false
+    t.time "end_time", null: false
   end
 
   create_table "users", id: :serial, force: :cascade do |t|

test/system/add_event_test.rb

@@ -22,8 +22,10 @@ class AddEventTest < ApplicationSystemTestCase
     select "2018", from: "event_scheduled_at_1i"
     select "May", from: "event_scheduled_at_2i"
     select "25", from: "event_scheduled_at_3i"
-    fill_in "Workshop starts at", with: "09:00"
-    fill_in "Workshop ends at", with: "18:00"
+    select "09", from: "event_start_time_4i"
+    select "00", from: "event_start_time_5i"
+    select "17", from: "event_end_time_4i"
+    select "00", from: "event_end_time_5i"
     select "2018", from: "event_application_start_1i"
     select "May", from: "event_application_start_2i"
     select "10", from: "event_application_start_3i"
@@ -49,8 +51,10 @@ class AddEventTest < ApplicationSystemTestCase
     select "2018", from: "event_scheduled_at_1i"
     select "May", from: "event_scheduled_at_2i"
     select "25", from: "event_scheduled_at_3i"
-    fill_in "Workshop starts at", with: "09:00"
-    fill_in "Workshop ends at", with: "18:00"
+    select "09", from: "event_start_time_4i"
+    select "00", from: "event_start_time_5i"
+    select "17", from: "event_end_time_4i"
+    select "00", from: "event_end_time_5i"
     select "2018", from: "event_application_start_1i"
     select "May", from: "event_application_start_2i"
     select "10", from: "event_application_start_3i"