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

need to create the bar graph version, write up the remaining parts of the tutorial, and ensure it did not break the DOM vuln

Browse Source
This commit is contained in:
cktricky
2014-07-29 17:56:33 -05:00
parent d4e049b15a
commit 88ed0e2b50
6 changed files with 1714 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/dashboard_controller.rb
+14
View File
@@ -9,4 +9,18 @@ class DashboardController < ApplicationController
cookies[:font] = params[:font] cookies[:font] = params[:font]
end end
end end
def change_graph
self.try(params[:graph])
end
def bar_graph
render :partial => "layouts/dashboard/bar_graph"
end
def pie_charts
@user = current_user
render :partial => "layouts/dashboard/dashboard_stats"
end
end end
app/views/dashboard/home.html.erb
+40 -3
View File
@@ -2,9 +2,34 @@
<div class="main-container"> <div class="main-container">
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <!--begin span12 --> <div class="span12"> <!--begin span12 -->
<% if @user.paid_time_off %> <div class="widget">
<%= render :partial => "layouts/dashboard/dashboard_stats"%> <div class="widget-header">
<% end %> <div class="title">
<span class="fs1" aria-hidden="true" data-icon="&#xe0a0;"></span> Current Statistics
</div>
<!-- Begin Title Buttons-->
<div class="tools pull-right">
<div class="btn-group">
<a id="change_to_bar_graph" class="btn btn-small">
<span data-icon="&#xe14b;"></span>
</a>
<a id="change_to_pie_charts" class="btn btn-small">
<span data-icon="&#xe096;"></span>
</a>
</div>
</div>
<!-- End Title Buttons-->
</div>
<div id="charts_body" class="widget-body">
<% if @user.paid_time_off %>
<%= render :partial => "layouts/dashboard/dashboard_stats"%>
<% end %>
</div>
<div class="clearfix">
</div>
</div>
</div>
</div> <!-- end span12 --> </div> <!-- end span12 -->
</div> </div>
</div> </div>
@@ -159,9 +184,21 @@ function pieChartHome() {
} }
$("#change_to_bar_graph").click(function(event) {
event.preventDefault();
$("#charts_body").load(<%= sanitize change_graph_dashboard_index_path(:graph => "bar_graph").inspect %>);
})
$("#change_to_pie_charts").click(function(event) {
event.preventDefault();
$("#charts_body").load(<%= sanitize change_graph_dashboard_index_path(:graph => "pie_charts").inspect %>);
})
$(document).ready( $(document).ready(
makeActive, makeActive,
pieChartHome() pieChartHome()
); );
</script> </script>
app/views/layouts/dashboard/_bar_graph.html.erb
+1
View File
@@ -0,0 +1 @@
<h1> Hello </h1>
app/views/layouts/dashboard/_dashboard_stats.html.erb
+52 -62
View File
@@ -1,64 +1,54 @@
<div class="widget"> <!-- Begin easy pie charts container -->
<div class="widget-header"> <div class="easy-pie-charts-container">
<div class="title"> <div class="pie-chart">
<span class="fs1" aria-hidden="true" data-icon="&#xe0a0;"></span> Current Statistics <div class="chart1" data-percent="100">
</div> <%= @user.paid_time_off.pto_days_remaining %>
<!-- Begin Title Buttons--> </div>
<div class="tools pull-right"> <h5 class="name">
<div class="btn-group"> Available PTO
<a class="btn btn-small"> </h5>
<span data-icon="&#xe14b;"></span> </div>
</a> <div class="pie-chart">
</div> <div class="chart2" data-percent="<%= @user.paid_time_off.sick_days_taken_percentage %>">
</div> <%= @user.paid_time_off.sick_days_taken %>
<!-- End Title Buttons--> </div>
</div> <h5 class="name">
<div class="widget-body"> Sick Days Taken
<div class="easy-pie-charts-container"> </h5>
<div class="pie-chart"> </div>
<div class="chart1" data-percent="100"> <div class="pie-chart">
<%= @user.paid_time_off.pto_days_remaining %> <div class="chart3" data-percent="100">
</div> <%= @user.work_info.income %>
<h5 class="name"> </div>
Available PTO <h5 class="name">
</h5> Income
</div> </h5>
<div class="pie-chart"> </div>
<div class="chart2" data-percent="<%= @user.paid_time_off.sick_days_taken_percentage %>"> <div class="pie-chart">
<%= @user.paid_time_off.sick_days_taken %> <div class="chart4" data-percent="100">
</div> <%= @user.performance.last.score %>
<h5 class="name"> </div>
Sick Days Taken <h5 class="name">
</h5> Performance Score
</div> </h5>
<div class="pie-chart"> </div>
<div class="chart3" data-percent="100"> <div class="pie-chart">
<%= @user.work_info.income %> <div class="chart5" data-percent="91">
</div> <%= @user.retirement.total %>
<h5 class="name"> </div>
Income <h5 class="name">
</h5> 401k
</div> </h5>
<div class="pie-chart"> </div>
<div class="chart4" data-percent="100"> <div class="clearfix">
<%= @user.performance.last.score %> </div>
</div> </div>
<h5 class="name"> <!-- End easy pie charts container -->
Performance Score
</h5> <script type="text/javascript">
</div> $(document).ready(
<div class="pie-chart"> pieChartHome()
<div class="chart5" data-percent="91"> );
<%= @user.retirement.total %> </script>
</div>
<h5 class="name">
401k
</h5>
</div>
<div class="clearfix">
</div>
</div>
</div>
</div>
config/routes.rb
+1
View File
@@ -88,6 +88,7 @@ Railsgoat::Application.routes.draw do
resources :dashboard do resources :dashboard do
collection do collection do
get "home" get "home"
get "change_graph"
end end
end end
report.html
+1606
View File
File diff suppressed because it is too large Load Diff