commiting for change of time

kry00la · May 4, 2012 · 65ae4ef · 65ae4ef
1 parent a58a1e9
commit 65ae4ef
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 8 deletions.
diff --git a/app/admin/reservations.rb b/app/admin/reservations.rb
@@ -76,11 +76,11 @@
       column :date do |d|
         d.date.strftime("%B %d,%Y")
       end
-      column :time_start do |ts|
-          ts.time_start.strftime('%l:%M - %P')
+      column :event_start do |ts|
+          ts.event_start.strftime('%l:%M - %P')
        end
-      column :time_end do |time| 
-        time.time_end.strftime('%l:%M - %P')
+      column :event_end do |time| 
+        time.event_end.strftime('%l:%M - %P')
       end
       column :numGuest
       column :service do |s|

diff --git a/app/views/reservations/show.html.erb b/app/views/reservations/show.html.erb
@@ -26,12 +26,12 @@
 
 
 										<tr>
-											<td colspan="2"><strong>Time Start: </strong> <%= @reservation.time_start.strftime('%l:%M - %P')%></td>
+											<td colspan="2"><strong>Time Start: </strong> <%= @reservation.event_start.strftime('%l:%M - %P')%></td>
 											<td>&nbsp;</td>
-											<td colspan="3"><strong>Time End: </strong><%= @reservation.time_end.strftime('%l:%M - %P')%></td>
+											<td colspan="3"><strong>Time End: </strong><%= @reservation.event_end.strftime('%l:%M - %P')%></td>
 										</tr>
 										<tr>
-											<td><strong>Total Hours you will render: </strong><%timex=Time.diff(Time.parse(@reservation.time_start.to_s), Time.parse(@reservation.time_end.to_s), '%H %N')%>
+											<td><strong>Total Hours you will render: </strong><%timex=Time.diff(Time.parse(@reservation.event_start.to_s), Time.parse(@reservation.event_end.to_s), '%H %N')%>
 											<%= timex[:diff]%></td>
 										</tr>
 

diff --git a/db/migrate/20120504065238_add_event_start_to_reservation.rb b/db/migrate/20120504065238_add_event_start_to_reservation.rb
@@ -0,0 +1,6 @@
+class AddEventStartToReservation < ActiveRecord::Migration
+  def change
+    add_column :reservations, :event_start, :time
+
+  end
+end
diff --git a/db/migrate/20120504065310_add_event_end_to_reservation.rb b/db/migrate/20120504065310_add_event_end_to_reservation.rb
@@ -0,0 +1,6 @@
+class AddEventEndToReservation < ActiveRecord::Migration
+  def change
+    add_column :reservations, :event_end, :time
+
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120504061656) do
+ActiveRecord::Schema.define(:version => 20120504065310) do
 
   create_table "active_admin_comments", :force => true do |t|
     t.string   "resource_id",   :null => false
@@ -312,6 +312,8 @@
     t.decimal  "total_price",        :precision => 10, :scale => 0, :default => 0
     t.date     "booked_at"
     t.boolean  "reservation_option"
+    t.time     "event_start"
+    t.time     "event_end"
   end
 
   create_table "services", :force => true do |t|