From a6a38c773e53735d934b1ce9e0c9e204ea5509f7 Mon Sep 17 00:00:00 2001
From: Ken Johnson <cktricky@Kens-MacBook-Pro.local>
Date: Fri, 31 May 2013 00:31:13 -0400
Subject: [PATCH] added validation for all schedule fields (presence of) and
 working on a new way to dynamically update your calendar upon submission of a
 new calendar event

---
 app/controllers/schedule_controller.rb | 6 ++++++
 app/models/schedule.rb                 | 2 +-
 app/views/paid_time_off/index.html.erb | 2 +-
 config/routes.rb                       | 4 ++++
 4 files changed, 12 insertions(+), 2 deletions(-)

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 @@
 <script type="text/javascript">
 
 $('#calendar').fullCalendar({
-      
+      events: <%= get_pto_schedule_schedule_index_path.inspect.html_safe %>,    
 })
 
 
diff --git a/config/routes.rb b/config/routes.rb
index 3fbab21..0011cc2 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -36,6 +36,9 @@ resources :tutorials do
 end
 
 resources :schedule do 
+  collection do
+    get "get_pto_schedule"
+  end
   
 end
 
@@ -53,6 +56,7 @@ resources :dashboard do
   end
 end
 
+
 root :to => "sessions#new"
 
 end