mirror of
https://github.com/oonyeje/Pearlception_Website_RoR.git
synced 2025-12-25 11:47:41 +00:00
Merged branch Admin-Display-All-Company-Runs into master
This commit is contained in:
commit
66dfc7d12c
@ -2,7 +2,29 @@ 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?
|
||||||
|
puts params
|
||||||
|
@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/,''))
|
||||||
|
|
||||||
|
if params[:company] == name
|
||||||
|
@results[name.gsub(/'/,'').gsub(/\s/,'')] = {results: Run.page(params[:page]).per(5), active: true, name: name}
|
||||||
|
else
|
||||||
|
@results[name.gsub(/'/,'').gsub(/\s/,'')] = {results: Run.page(params[:page]).per(5), active: false}
|
||||||
|
end
|
||||||
|
end
|
||||||
|
#binding.pry
|
||||||
|
Apartment::Tenant.switch!
|
||||||
|
else
|
||||||
|
@results = Run.page(params[:page]).per(5)
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@ -87,17 +87,24 @@
|
|||||||
|
|
||||||
<% 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 %>
|
<span hidden><%= @i = 1 %></span>
|
||||||
|
<% ((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="#collapse<%="#{@i}"%>">
|
||||||
|
<%= company_name %> </a>
|
||||||
|
</h3>
|
||||||
|
</div>
|
||||||
|
<div id="collapse<%="#{@i}"%>" class="panel-collapse collapse <%= (@results[company_name.gsub(/'/,'').gsub(/\s/,'')][:active] && @results[company_name.gsub(/'/,'').gsub(/\s/,'')][:name] == company_name.gsub(/'/,'').gsub(/\s/,'') ) ? "in" : ""%>">
|
||||||
|
<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>
|
||||||
@ -110,21 +117,12 @@
|
|||||||
</thead>
|
</thead>
|
||||||
</div>
|
</div>
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
|
<span hidden><%= Apartment::Tenant.switch!(company_name.gsub(/'/,'').gsub(/\s/,'')) %></span>
|
||||||
<tbody>
|
<tbody>
|
||||||
<% if current_user.admin? %>
|
<% @results[company_name.gsub(/'/,'').gsub(/\s/,'')][:results].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 = result#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 +151,7 @@
|
|||||||
|
|
||||||
<!-- total processed -->
|
<!-- total processed -->
|
||||||
<td>
|
<td>
|
||||||
<%= result.total %>
|
"result"
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<!-- other -->
|
<!-- other -->
|
||||||
@ -166,7 +164,43 @@
|
|||||||
<% 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/,'')][:results] , params: {company: company_name.gsub(/'/,'').gsub(/\s/,'')} %></br>
|
||||||
|
<%= page_entries_info @results[company_name.gsub(/'/,'').gsub(/\s/,'')][:results] %>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<span hidden><%= @i = @i + 1%></span>
|
||||||
|
<% 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 +233,7 @@
|
|||||||
|
|
||||||
<!-- total processed -->
|
<!-- total processed -->
|
||||||
<td>
|
<td>
|
||||||
<%= result.total %>
|
"result"
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<!-- other -->
|
<!-- other -->
|
||||||
@ -212,7 +246,6 @@
|
|||||||
<% end %>
|
<% end %>
|
||||||
</tr>
|
</tr>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
|
||||||
</tbody>
|
</tbody>
|
||||||
</div>
|
</div>
|
||||||
</table>
|
</table>
|
||||||
@ -223,6 +256,8 @@
|
|||||||
<%= page_entries_info @results %>
|
<%= page_entries_info @results %>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<% end %>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user