dashboard figures actually indicate correct values now

This commit is contained in:
Ken Johnson
2013-05-31 15:54:25 -04:00
parent 3cab9810fc
commit c63275b3b3
3 changed files with 14 additions and 9 deletions
+1
View File
@@ -1,6 +1,7 @@
class DashboardController < ApplicationController class DashboardController < ApplicationController
def home def home
@user = current_user
end end
end end
+4
View File
@@ -11,4 +11,8 @@ class PaidTimeOff < ActiveRecord::Base
self.pto_earned - self.pto_taken self.pto_earned - self.pto_taken
end end
def sick_days_taken_percentage
result = self.sick_days_taken.to_f / self.sick_days_earned.to_f * 100.0
end
end end
@@ -7,32 +7,32 @@
<div class="widget-body"> <div class="widget-body">
<div class="easy-pie-charts-container"> <div class="easy-pie-charts-container">
<div class="pie-chart"> <div class="pie-chart">
<div class="chart1" data-percent="65"> <div class="chart1" data-percent="100">
10 <%= @user.paid_time_off.pto_days_remaining %>
</div> </div>
<h5 class="name"> <h5 class="name">
Available PTO Available PTO
</h5> </h5>
</div> </div>
<div class="pie-chart"> <div class="pie-chart">
<div class="chart2" data-percent="47"> <div class="chart2" data-percent="<%= @user.paid_time_off.sick_days_taken_percentage %>">
1 <%= @user.paid_time_off.sick_days_taken %>
</div> </div>
<h5 class="name"> <h5 class="name">
Sick Days Taken Sick Days Taken
</h5> </h5>
</div> </div>
<div class="pie-chart"> <div class="pie-chart">
<div class="chart3" data-percent="87"> <div class="chart3" data-percent="100">
$5920 <%= @user.work_info.income %>
</div> </div>
<h5 class="name"> <h5 class="name">
Income Income
</h5> </h5>
</div> </div>
<div class="pie-chart"> <div class="pie-chart">
<div class="chart4" data-percent="22"> <div class="chart4" data-percent="100">
5.0 <%= @user.performance.last.score %>
</div> </div>
<h5 class="name"> <h5 class="name">
Performance Score Performance Score
@@ -40,7 +40,7 @@
</div> </div>
<div class="pie-chart"> <div class="pie-chart">
<div class="chart5" data-percent="91"> <div class="chart5" data-percent="91">
71 <%= @user.retirement.total %>
</div> </div>
<h5 class="name"> <h5 class="name">
401k 401k