oonyeje/Pearlception_Website_RoR
1
0
Fork 0
mirror of https://github.com/oonyeje/Pearlception_Website_RoR.git synced 2025-12-25 19:57:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added admin global company lookup for result data

Browse Source 
- currently a bug that is not displaying data
This commit is contained in:
Okechi Onyeje 2017-02-23 17:09:58 -05:00
parent eab7216058
commit 4c141c7a2c
2 changed files with 179 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Pearlception/app/controllers/dashboard_controller.rb
View File

@ -2,7 +2,22 @@ class DashboardController < ApplicationController
before_filter :deny_to_visitors before_filter :deny_to_visitors
def index def index
@results = Result.page(params[:page]).per(5) #This is a temporary fix until runs and results models are properly discussed with bobby
#@results = Result.page(params[:page]).per(5)
if current_user.admin?
@results = Hash.new
names = (Company.pluck :company_name) - ["IVA"]
names.map!{|tenant| tenant.gsub(/'/,'').gsub(/\s/,'')}
names.each do
|name|
Apartment::Tenant.switch!(name.gsub(/'/,'').gsub(/\s/,''))
@results[name.gsub(/'/,'').gsub(/\s/,'')] = Run.page(params[:page]).per(5)
end
Apartment::Tenant.switch!
else
@results = Run.page(params[:page]).per(5)
end
end end

74
Pearlception/app/views/dashboard/index.html.erb
View File

@ -87,17 +87,23 @@
<% if current_user.admin? %> <% if current_user.admin? %>
<h2 class="sub-header">Recent Results From All Companies</h2> <h2 class="sub-header">Recent Results From All Companies</h2>
<% else %>
<h2 class="sub-header">Recent Results</h2> <div class="panel-group" id="accordion">
<% end %> <% ((Company.pluck :company_name) - ["IVA"]).each do |company_name| %>
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title text-center">
<a data-toggle="collapse" data-parent="#accordion" href="#collapse1">
<%= company_name %> </a>
</h3>
</div>
<div id="collapse1" class="panel-collapse collapse">
<div class="panel-body">
<div class="table-responsive panel panel-primary"> <div class="table-responsive panel panel-primary">
<table class="table table-striped"> <table class="table table-striped">
<div class="panel-heading"> <div class="panel-heading">
<thead> <thead>
<tr> <tr>
<% if current_user.admin? %>
<th>Company</th>
<% end %>
<th>Run Date</th> <th>Run Date</th>
<th>Location</th> <th>Location</th>
<th>Harvest Time</th> <th>Harvest Time</th>
@ -111,20 +117,10 @@
</div> </div>
<div class="panel-body"> <div class="panel-body">
<tbody> <tbody>
<% if current_user.admin? %> <% @results[company_name.gsub(/'/,'').gsub(/\s/,'')].each_slice(1) do |row| %>
<% @results.each_slice(1) do |row| %>
<tr> <tr>
<% row.each do |result| <% row.each do |result|
run = Run.find(result.id) run = Run.find(result.id) %>
#company = Company.find(run.company_id)
%>
<!-- company name -->
<td>
<%= #company.company_name
"Fake Industries" %>
</td>
<!-- run date --> <!-- run date -->
<td> <td>
<%= run.runDate %> <%= run.runDate %>
@ -153,7 +149,7 @@
<!-- total processed --> <!-- total processed -->
<td> <td>
<%= result.total %> "result"
</td> </td>
<!-- other --> <!-- other -->
@ -166,7 +162,42 @@
<% end %> <% end %>
</tr> </tr>
<% end %> <% end %>
</tbody>
</div>
</table>
</div>
<div class="center-block">
<div class="col-sm-6 col-sm-offset-3 panel panel-primary" align="center">
<%= paginate @results[company_name.gsub(/'/,'').gsub(/\s/,'')] %></br>
<%= page_entries_info @results[company_name.gsub(/'/,'').gsub(/\s/,'')] %>
</div>
</div>
</div>
</div>
</div>
<% end %>
</div>
<% else %> <% else %>
<h2 class="sub-header">Recent Results</h2>
<div class="table-responsive panel panel-primary">
<table class="table table-striped">
<div class="panel-heading">
<thead>
<tr>
<th>Run Date</th>
<th>Location</th>
<th>Harvest Time</th>
<th>Supplier</th>
<th>Distributor</th>
<th>Total Processed</th>
<th>Other</th>
<th>Oyster Info</th>
</tr>
</thead>
</div>
<div class="panel-body">
<tbody>
<% @results.each_slice(1) do |row| %> <% @results.each_slice(1) do |row| %>
<tr> <tr>
<% row.each do |result| <% row.each do |result|
@ -199,7 +230,7 @@
<!-- total processed --> <!-- total processed -->
<td> <td>
<%= result.total %> "result"
</td> </td>
<!-- other --> <!-- other -->
@ -212,7 +243,6 @@
<% end %> <% end %>
</tr> </tr>
<% end %> <% end %>
<% end %>
</tbody> </tbody>
</div> </div>
</table> </table>
@ -223,6 +253,8 @@
<%= page_entries_info @results %> <%= page_entries_info @results %>
</div> </div>
</div> </div>
<% end %>
</div> </div>
</div> </div>
</div> </div>