diff --git a/app/controllers/schedule_controller.rb b/app/controllers/schedule_controller.rb index 34de39f..11f43f2 100644 --- a/app/controllers/schedule_controller.rb +++ b/app/controllers/schedule_controller.rb @@ -17,6 +17,12 @@ class ScheduleController < ApplicationController end end + def get_pto_schedule + respond_to do |format| + format.json {render :json => %q{[{"id":111,"title":"Event1","start":"2013-05-31","url":"http:\/\/yahoo.com\/"},{"id":222,"title":"Event2","start":"2013-05-30","end":"2013-05-30","url":"http:\/\/yahoo.com\/"}] }} + end + end + private # Returns a two part array consisting of dates diff --git a/app/models/schedule.rb b/app/models/schedule.rb index d576787..ed7dcc5 100644 --- a/app/models/schedule.rb +++ b/app/models/schedule.rb @@ -2,5 +2,5 @@ class Schedule < ActiveRecord::Base attr_accessible :date_begin, :date_end, :event_desc, :event_name, :event_type belongs_to :paid_time_off - validates_presence_of :date_begin, :date_end + validates_presence_of :date_begin, :date_end, :event_desc, :event_name, :event_type end diff --git a/app/views/paid_time_off/index.html.erb b/app/views/paid_time_off/index.html.erb index 4a20cd4..599e753 100644 --- a/app/views/paid_time_off/index.html.erb +++ b/app/views/paid_time_off/index.html.erb @@ -127,7 +127,7 @@