okay, I am tired, I am just gonna continue this effort sat night or sun. Anyways, some of the main things this app should do are running so not a bad day. I would say we are only a couple days from beta release.
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
class PaidTimeOffController < ApplicationController
|
||||
|
||||
def index
|
||||
@pto = current_user.paid_time_off
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1,5 +1,19 @@
|
||||
class PaidTimeOff < ActiveRecord::Base
|
||||
attr_accessible :pto_earned, :pto_taken, :sick_days_earned, :sick_days_taken, :user_id
|
||||
belongs_to :user
|
||||
|
||||
# Refactor this duplication when it's not 3am
|
||||
def sick_days_remaining(val="")
|
||||
self.sick_days_earned - self.sick_days_taken
|
||||
end
|
||||
|
||||
|
||||
def pto_days_remaining(val="")
|
||||
self.pto_earned - self.pto_taken
|
||||
end
|
||||
|
||||
def pto_percentages
|
||||
end
|
||||
|
||||
|
||||
end
|
||||
|
||||
@@ -16,8 +16,8 @@
|
||||
<span>
|
||||
Sick Days Taken
|
||||
</span>
|
||||
<span class="pull-right">
|
||||
32%
|
||||
<span class="pull-right">
|
||||
<%= @pto.sick_days_taken %>
|
||||
</span>
|
||||
</div>
|
||||
<div class="progress progress-striped active progress-danger">
|
||||
@@ -31,7 +31,7 @@
|
||||
Sick Days Earned
|
||||
</span>
|
||||
<span class="pull-right">
|
||||
32%
|
||||
<%= @pto.sick_days_earned %>
|
||||
</span>
|
||||
</div>
|
||||
<div class="progress progress-success progress-striped active">
|
||||
@@ -45,7 +45,7 @@
|
||||
Sick Days Remaining
|
||||
</span>
|
||||
<span class="pull-right">
|
||||
84%
|
||||
<%= @pto.sick_days_remaining %>
|
||||
</span>
|
||||
</div>
|
||||
<div class="progress progress-striped active">
|
||||
@@ -76,7 +76,7 @@
|
||||
PTO Days Taken
|
||||
</span>
|
||||
<span class="pull-right">
|
||||
32%
|
||||
<%= @pto.pto_taken %>
|
||||
</span>
|
||||
</div>
|
||||
<div class="progress progress-striped active progress-danger">
|
||||
@@ -90,7 +90,7 @@
|
||||
PTO Days Earned
|
||||
</span>
|
||||
<span class="pull-right">
|
||||
32%
|
||||
<%= @pto.pto_earned %>
|
||||
</span>
|
||||
</div>
|
||||
<div class="progress progress-success progress-striped active">
|
||||
@@ -104,7 +104,7 @@
|
||||
PTO Days Remaining
|
||||
</span>
|
||||
<span class="pull-right">
|
||||
84%
|
||||
<%= @pto.pto_days_remaining %>
|
||||
</span>
|
||||
</div>
|
||||
<div class="progress progress-striped active">
|
||||
|
||||
Reference in New Issue
Block a user