Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/app/controllers/service_reports_controller.rb b/app/controllers/service_reports_controller.rb
- index 9f22196..6fc1e26 100644
- --- a/app/controllers/service_reports_controller.rb
- +++ b/app/controllers/service_reports_controller.rb
- @@ -2373,8 +2373,11 @@ class ServiceReportsController < ApplicationController
- params[:start_date] = params[:start_date].present? ? Date.parse(params[:start_date]) : (Time.zone.now.to_date)
- @display_data = Reservation::Report.new(current_business, params[:start_date], params[:dispatch_account]).process
- -
- - render :template => "service_reports/reservation_capacity", :layout => "reports"
- + if params[:report_format] == "csv"
- + reservation_capacity_csv
- + else
- + render :template => "service_reports/reservation_capacity", :layout => "reports"
- + end
- end
- def call_and_sms_report
- diff --git a/app/views/service_reports/reservation_capacity.html.erb b/app/views/service_reports/reservation_capacity.html.erb
- index e77d7d4..0ca0a1a 100644
- --- a/app/views/service_reports/reservation_capacity.html.erb
- +++ b/app/views/service_reports/reservation_capacity.html.erb
- @@ -113,9 +113,9 @@ jQuery(document).ready(function() {
- <li>
- <a onclick="return resetForm();" href="javascript:void(0)" class="button-link green-shadow float_r">Reset </a>
- </li>
- -<!-- <li>
- - <a id="download_csv" href="javascript:void(0)" class="button-link green-shadow float_r">Download CSV</a>
- - </li> -->
- + <li>
- + <a id="download_csv" href="/reservation_capacity?report_format=csv"" class="button-link green-shadow float_r">Download CSV</a>
- + </li>
- </ul>
- </fieldset>
- </div>
- diff --git a/lib/reports_csv/pl_reports_csv.rb b/lib/reports_csv/pl_reports_csv.rb
- index 4d08e09..fda859e 100644
- --- a/lib/reports_csv/pl_reports_csv.rb
- +++ b/lib/reports_csv/pl_reports_csv.rb
- @@ -87,4 +87,16 @@ module ReportsCsv::PLReportsCsv
- :disposition => 'attachment'}
- end
- + def reservation_capacity_csv
- + csv = FasterCSV.generate(:row_sep => "\r\n") do |_csv|
- + _csv << ["Rule", "Account", "Pieces", "Cubes", "Stops"]
- + @display_data.each_with_index do |data, index|
- + _csv << [data[:name], data[:account], "#{data[:allotted_pieces]}"+' / '+"#{data[:total_pieces]}", "#{data[:allotted_cubes]}"+' / '+"#{data[:total_cubes]}", "#{data[:allotted_stops]}"+' / '+"#{data[:total_stops]}"]
- + end
- + _csv << ["No rules"] if @display_data.size == 0
- + end
- + send_data csv, {:filename => "Reservationi_Capacity_on_#{params[:start_date].to_date.strftime("%m/%d/%Y")}",:type => 'text/csv',
- + :disposition => 'attachment'}
- + end
- +
- end
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement