Replace date_released with date_end and include references in hold he…

…lper methods

app/controllers/report_controller.rb

@@ -54,7 +54,7 @@ def holds_by_source
     term = params[:graduation] ? params[:graduation].to_s : 'all'
     @this_term = 'all terms'
     @this_term = term.in_time_zone('Eastern Time (US & Canada)').strftime('%b %Y') if term != 'all'
-    holds = Hold.all.includes(:versions).includes(:thesis).includes(thesis: :users).includes(thesis: :authors)
+    holds = Hold.all.includes(:thesis).includes(:hold_source).includes(thesis: :users).includes(thesis: :authors)
     @terms = Report.new.extract_terms holds
     @hold_sources = HoldSource.pluck(:source).uniq.sort
     term_filtered = filter_holds_by_term holds

app/helpers/hold_helper.rb

@@ -15,17 +15,15 @@ def render_hold_history_field(field_name, field_value)
 
   def filter_holds_by_term(holds)
     if params[:graduation] && params[:graduation] != 'all'
-      return holds.where('theses.grad_date = ?',
-                                        params[:graduation])
+      return holds.where('theses.grad_date = ?', params[:graduation]).references(:thesis)
     end
 
     holds
   end
 
   def filter_holds_by_source(holds)
     if params[:hold_source] && params[:hold_source] != 'all'
-      return holds.where('hold_sources.source = ?',
-                                             params[:hold_source])
+      return holds.where('hold_sources.source = ?', params[:hold_source]).references(:thesis)
     end
 
     holds

app/models/report.rb

@@ -296,7 +296,7 @@ def extract_terms(collection)
     if collection.first.is_a? Thesis
       collection.pluck(:grad_date).uniq.sort
     else
-      collection.joins(:thesis).pluck(:grad_date).uniq.sort
+      collection.includes(:thesis).pluck(:grad_date).uniq.sort
     end
   end
 

app/views/report/_hold.html.erb

@@ -9,6 +9,6 @@
   <td><%= hold.hold_source.source %></td>
   <td><%= hold.status %></td>
   <td><%= hold.date_requested %></td>
+  <td><%= hold.date_start %></td>
   <td><%= hold.date_end %></td>
-  <td><%= hold.date_released %></td>
 </tr>

app/views/report/holds_by_source.html.erb

@@ -16,8 +16,8 @@
           <th scope="col">Hold source</th>
           <th scope="col">Status</th>
           <th scope="col">Date requested</th>
+          <th scope="col">Start date</th>
           <th scope="col">End date</th>
-          <th scope="col">Date released</th>
         </tr>
       </thead>
       <tbody>