Advertisement
Guest User

Untitled

a guest
Aug 25th, 2016
54
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.68 KB | None | 0 0
  1. diff --git a/app/controllers/service_reports_controller.rb b/app/controllers/service_reports_controller.rb
  2. index 9f22196..6fc1e26 100644
  3. --- a/app/controllers/service_reports_controller.rb
  4. +++ b/app/controllers/service_reports_controller.rb
  5. @@ -2373,8 +2373,11 @@ class ServiceReportsController < ApplicationController
  6. params[:start_date] = params[:start_date].present? ? Date.parse(params[:start_date]) : (Time.zone.now.to_date)
  7.  
  8. @display_data = Reservation::Report.new(current_business, params[:start_date], params[:dispatch_account]).process
  9. -
  10. - render :template => "service_reports/reservation_capacity", :layout => "reports"
  11. + if params[:report_format] == "csv"
  12. + reservation_capacity_csv
  13. + else
  14. + render :template => "service_reports/reservation_capacity", :layout => "reports"
  15. + end
  16. end
  17.  
  18. def call_and_sms_report
  19. diff --git a/app/views/service_reports/reservation_capacity.html.erb b/app/views/service_reports/reservation_capacity.html.erb
  20. index e77d7d4..0ca0a1a 100644
  21. --- a/app/views/service_reports/reservation_capacity.html.erb
  22. +++ b/app/views/service_reports/reservation_capacity.html.erb
  23. @@ -113,9 +113,9 @@ jQuery(document).ready(function() {
  24. <li>
  25. <a onclick="return resetForm();" href="javascript:void(0)" class="button-link green-shadow float_r">Reset </a>
  26. </li>
  27. -<!-- <li>
  28. - <a id="download_csv" href="javascript:void(0)" class="button-link green-shadow float_r">Download CSV</a>
  29. - </li> -->
  30. + <li>
  31. + <a id="download_csv" href="/reservation_capacity?report_format=csv"" class="button-link green-shadow float_r">Download CSV</a>
  32. + </li>
  33. </ul>
  34. </fieldset>
  35. </div>
  36. diff --git a/lib/reports_csv/pl_reports_csv.rb b/lib/reports_csv/pl_reports_csv.rb
  37. index 4d08e09..fda859e 100644
  38. --- a/lib/reports_csv/pl_reports_csv.rb
  39. +++ b/lib/reports_csv/pl_reports_csv.rb
  40. @@ -87,4 +87,16 @@ module ReportsCsv::PLReportsCsv
  41. :disposition => 'attachment'}
  42. end
  43.  
  44. + def reservation_capacity_csv
  45. + csv = FasterCSV.generate(:row_sep => "\r\n") do |_csv|
  46. + _csv << ["Rule", "Account", "Pieces", "Cubes", "Stops"]
  47. + @display_data.each_with_index do |data, index|
  48. + _csv << [data[:name], data[:account], "#{data[:allotted_pieces]}"+' / '+"#{data[:total_pieces]}", "#{data[:allotted_cubes]}"+' / '+"#{data[:total_cubes]}", "#{data[:allotted_stops]}"+' / '+"#{data[:total_stops]}"]
  49. + end
  50. + _csv << ["No rules"] if @display_data.size == 0
  51. + end
  52. + send_data csv, {:filename => "Reservationi_Capacity_on_#{params[:start_date].to_date.strftime("%m/%d/%Y")}",:type => 'text/csv',
  53. + :disposition => 'attachment'}
  54. + end
  55. +
  56. end
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement