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

added another chart for PTO and fixed badly named method

Browse Source
This commit is contained in:
Ken Johnson
2013-05-28 10:41:04 -04:00
parent 657db353c4
commit a1712f78a3
2 changed files with 54 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/models/paid_time_off.rb
+1 -1
View File
@@ -7,7 +7,7 @@ class PaidTimeOff < ActiveRecord::Base
self.sick_days_earned - self.sick_days_taken
end
def pto_days_reamining
def pto_days_remaining
self.pto_earned - self.pto_taken
end
app/views/paid_time_off/index.html.erb
+53 -4
View File
@@ -42,7 +42,21 @@
</div>
</div>
<div class="widget-body">
<div id="column_chart"></div>
<div id="column_chart_1"></div>
</div>
</div>
</div>
</div>
<div class="row-fluid">
<div class="span12">
<div class="widget">
<div class="widget-header">
<div class="title">
<span class="fs1" aria-hidden="true" data-icon="&#xe097;"></span> Paid Time Off
</div>
</div>
<div class="widget-body">
<div id="column_chart_2"></div>
</div>
</div>
</div>
@@ -63,14 +77,15 @@ $('.date_picker').daterangepicker({
});
$(document).ready(function () {
drawChart3()
drawChart1()
drawChart2()
});
google.load("visualization", "1", {
packages: ["corechart"]
});
function drawChart3() {
function drawChart1() {
var data = google.visualization.arrayToDataTable([
['Current Date', 'Days Earned', 'Days Taken', 'Days Remaining'],
[ <%= "As of today: #{Date.today}".inspect.html_safe %>, <%= @pto.sick_days_earned %>, <%= @pto.sick_days_taken %>, <%= @pto.sick_days_remaining %> ], ]);
@@ -100,7 +115,41 @@ function drawChart3() {
},
};
var chart = new google.visualization.ColumnChart(document.getElementById('column_chart'));
var chart = new google.visualization.ColumnChart(document.getElementById('column_chart_1'));
chart.draw(data, options);
}
function drawChart2() {
var data = google.visualization.arrayToDataTable([
['Current Date', 'Days Earned', 'Days Taken', 'Days Remaining'],
[ <%= "As of today: #{Date.today}".inspect.html_safe %>, <%= @pto.pto_earned %>, <%= @pto.pto_taken %>, <%= @pto.pto_days_remaining %> ], ]);
var options = {
width: 'auto',
height: '160',
backgroundColor: 'transparent',
colors: ['#579da9', '#e26666', '#1e825e'],
tooltip: {
textStyle: {
color: '#666666',
fontSize: 11
},
showColorCode: true
},
legend: {
textStyle: {
color: 'black',
fontSize: 12
}
},
chartArea: {
left: 60,
top: 10,
height: '80%'
},
};
var chart = new google.visualization.ColumnChart(document.getElementById('column_chart_2'));
chart.draw(data, options);
}