team-alpha/railsgoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

made some big changes here. The schedule had a has_one relationship with the PTO model. That is a problem since we only get one result back. meaning, a user cant have multiple scheduled events. This has been fixed with the use of has_many within the PTO model. Now, in relation to the PTO section, the next changes to happen are to be a fully functional create action that allows an event to be schedule, the form and controller has already been created. Umm, also, a calendar has been added and when we get the results back from a call to the create event action we will update that calendar. Think that is about it for now

Browse Source
This commit is contained in:
Ken Johnson
2013-05-28 12:48:35 -04:00
parent 3016af35c7
commit caf348f189
8 changed files with 80 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/paid_time_off_controller.rb
+1
View File
@@ -2,5 +2,6 @@ class PaidTimeOffController < ApplicationController
def index
@pto = current_user.paid_time_off
@schedule = Schedule.new
end
end
app/controllers/schedule_controller.rb
+7
View File
@@ -0,0 +1,7 @@
class ScheduleController < ApplicationController
def create
respond_to do |format|
format.json {render :json => {:msg => "success"}}
end
end
end
app/helpers/schedule_helper.rb
+2
View File
@@ -0,0 +1,2 @@
module ScheduleHelper
end
app/models/paid_time_off.rb
+1 -1
View File
@@ -1,7 +1,7 @@
class PaidTimeOff < ActiveRecord::Base
attr_accessible :pto_earned, :pto_taken, :sick_days_earned, :sick_days_taken, :user_id
belongs_to :user
has_one :schedule, :foreign_key => :user_id, :primary_key => :user_id
has_many :schedule, :foreign_key => :user_id, :primary_key => :user_id
def sick_days_remaining
self.sick_days_earned - self.sick_days_taken
app/views/paid_time_off/index.html.erb
+54 -21
View File
@@ -23,27 +23,43 @@
<span class="fs1" aria-hidden="true" data-icon="&#xe052;"></span> Schedule PTO
</div>
</div>
<div class="widget-body">
<form class="form-horizontal" action="#">
<div class="control-group">
<label class="control-label" for="date_range1">
Date Range Input
</label>
<div class="controls">
<div class="input-append">
<input type="text" name="date_range1" id="date_range1" class="span8 date_picker" placeholder="Select Date"/>
<span class="add-on">
<i class="icon-calendar"></i>
</span>
</div>
</div>
</div>
</form>
</div>
</div>
<!-- Begin WB-->
<div class="widget-body">
<%= form_for @schedule, :url => "#",:html => {:id => "cal_update"} do |s|%>
<div class="control-group">
<%= s.label :event_name, "Event Name", {:class => "control-label"}%>
<%= s.text_field :event_name, {:placeholder => "My PTO", :class => "span6"}%>
</div>
<div class="control-group">
<%= s.text_field :event_type, {:type => "hidden", :value => "pto", :class => "span6"}%>
</div>
<div class="control-group">
<%= s.label :event_desc, "Event Description", {:class => "control-label"}%>
<%= s.text_field :event_desc, {:placeholder => "Travel to Europe", :class => "span6"}%>
</div>
<div class="control-group">
<label class="control-label" for="date_range1">
Event Dates
</label>
<div class="controls">
<div class="input-append">
<input type="text" name="date_range1" id="date_range1" class="span8 date_picker" placeholder="Select Date"/>
<span class="add-on">
<i class="icon-calendar"></i>
</span>
</div>
</div>
</div>
<%= s.submit "Submit", {:id => 'cal_update_submit', :class => "btn btn-primary pull-left"} %>
<% end %>
<div class="clearfix">
</div>
</div>
<!-- End WB-->
</div>
</div>
</div>
<!-- End DP-->
@@ -176,4 +192,21 @@ function drawChart2() {
chart.draw(data, options);
}
$("#cal_update_submit").click(function(event) {
var valuesToSubmit = $("#cal_update").serialize();
event.preventDefault();
$.ajax({
url: "/schedule.json",
data: valuesToSubmit,
type: "POST",
success: function(response) {
$('#success').show(500).delay(1500).fadeOut();
},
error: function(event) {
$('#failure').show(500).delay(1500).fadeOut();
}
});
});
</script>