Merge branch 'master' of https://github.com/oonyeje/Pearlception_Website_RoR

Pearlception/app/controllers/dashboard_controller.rb

@@ -2,7 +2,29 @@ class DashboardController < ApplicationController
     before_filter :deny_to_visitors
 
     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
 

Pearlception/app/controllers/sessions_controller.rb

@@ -5,9 +5,7 @@ class SessionsController < Devise::RegistrationsController
   #end
 
   def create
-    binding.pry
     resource = warden.authenticate!(:scope => :user)
-    binding.pry
     sign_in(:user, resource)
     if !current_user.admin
       Apartment::Tenant.switch!(Company.find(current_user.company_id).company_name.gsub(/'/,'').gsub(/\s/,''))

Pearlception/app/models/company.rb

@@ -7,7 +7,6 @@ class Company < ApplicationRecord
   private
 
     def create_tenant
-      binding.pry
       if company_name != "IVA"
         Apartment::Tenant.create(company_name.gsub(/'/,'').gsub(/\s/,''))
         Apartment::Tenant.switch!

Pearlception/app/models/user.rb

@@ -9,6 +9,8 @@ class User < ApplicationRecord
   def after_database_authentication
     if !self.admin
       Apartment::Tenant.switch!(Company.find(self.company_id).company_name.gsub(/'/,'').gsub(/\s/,''))
+    else
+      Apartment::Tenant.switch!
     end
   end
 end

Pearlception/app/views/dashboard/index.html.erb

@@ -88,17 +88,24 @@
 
           <% if current_user.admin? %>
             <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">
                               <table class="table table-striped">
                                   <div class="panel-heading">
                                       <thead>
                                         <tr>
-                          <% if current_user.admin? %>
-                            <th>Company</th>
-                          <% end %>
                                           <th>Run Date</th>
                                           <th>Location</th>
                                           <th>Harvest Time</th>
@@ -111,21 +118,12 @@
                                       </thead>
                                   </div>
                                   <div class="panel-body">
+                                      <span hidden><%= Apartment::Tenant.switch!(company_name.gsub(/'/,'').gsub(/\s/,'')) %></span>
                                       <tbody>
-                        <% if current_user.admin? %>
+                                          <% @results[company_name.gsub(/'/,'').gsub(/\s/,'')][:results].each_slice(1) do |row| %>
-                        <% @results.each_slice(1) do |row| %>
                                             <tr>
                                                 <% 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 -->
                                                     <td>
                                                         <%= run.runDate %>
@@ -154,7 +152,7 @@
 
                                                     <!-- total processed -->
                                                     <td>
-                                      <%= result.total %>
+                                                        "result"
                                                     </td>
 
                                                     <!-- other -->
@@ -167,7 +165,43 @@
                                                 <% end %>
                                             </tr>
                                           <% 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 %>
+            <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| %>
                             <tr>
                                 <% row.each do |result|
@@ -200,7 +234,7 @@
 
                                     <!-- total processed -->
                                     <td>
-                                          <%= result.total %>
+                                        "result"
                                     </td>
 
                                     <!-- other -->
@@ -213,7 +247,6 @@
                                 <% end %>
                             </tr>
                           <% end %>
-                        <% end %>
                       </tbody>
                   </div>
               </table>
@@ -224,6 +257,8 @@
                     <%= page_entries_info @results %>
                 </div>
             </div>
+          <% end %>
+
         </div>
       </div>
     </div>