Fix bug in trainee report, add some sorting, tweak a scope

openplans · Nov 16, 2011 · 535884a · 535884a
1 parent 1ec2fbc
commit 535884a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
@@ -112,7 +112,7 @@ def trainer
     @start_date = Date.parse(params[:start_date])
     @end_date = Date.parse(params[:end_date])
 
-    events = Event.accessible_by(current_ability).in_range(@start_date, @end_date).includes(:event_type,:user,{:kase => [:customer,:disposition]})
+    events = Event.accessible_by(current_ability).in_range(@start_date..@end_date).includes(:event_type,:user,{:kase => [:customer,:disposition]})
     events_by_trainer = {}
     hours_by_trainer = {'{total}' => 0}
     customers_by_trainer = {'{total}' => Set.new}
@@ -146,8 +146,8 @@ def trainee
     @start_date = Date.parse(params[:start_date])
     @end_date = Date.parse(params[:end_date])
 
-    events = Event.accessible_by(current_ability).in_range(@start_date, @end_date).includes(:event_type,:user,{:kase => [:customer,:disposition]})
-    kases = Kase.open_in_range(@start_date..@end_date).includes(:disposition)
+    events = Event.accessible_by(current_ability).in_range(@start_date..@end_date).includes(:event_type,:user,{:kase => [:customer,:disposition]})
+    kases = Kase.closed_in_range(@start_date..@end_date).includes(:disposition)
     events_by_customer = {}
     hours_by_customer = {}
     dispositions = {}

diff --git a/app/models/event.rb b/app/models/event.rb
@@ -14,7 +14,7 @@ class Event < ActiveRecord::Base
   validates_presence_of :duration_in_hours
 
   default_scope order(:date)
-  scope :in_range, lambda {|start_date, end_date| where(:date => start_date..end_date)}
+  scope :in_range, lambda {|date_range| where(:date => date_range)}
 
   def customer
     return kase.customer

diff --git a/app/views/reports/trainee.html.erb b/app/views/reports/trainee.html.erb
@@ -38,10 +38,10 @@
 
 <h2>Dispositions:</h2>
 <table class="small">
-  <% @dispositions.each do |disposition, set | %>
+  <% @dispositions.keys.sort_by{|d| d.name}.each do |disposition| %>
     <tr>
       <td class="definition"><%= disposition.name %>:</td>
-      <td class="number"><%= set.size %></td>
+      <td class="number"><%= @dispositions[disposition].size %></td>
     </tr>
   <% end %>
   <tr>
@@ -52,10 +52,10 @@
 <br/>
 <h2>Events:</h2>
 <table class="small">
-  <% @events_by_type.each do |event_type, count| %>
+  <% @events_by_type.keys.sort_by{|e| e.name}.each do |event_type| %>
     <tr>
       <td class="definition"><%= event_type.name %>:</td>
-      <td class="number"><%= count %></td>
+      <td class="number"><%= @events_by_type[event_type] %></td>
     </tr>
   <% end %>
   <tr>