Skip to content

Commit

Permalink
Merge pull request #755 from sul-dlss/circ_stats_kickoff
Browse files Browse the repository at this point in the history
Circ stats kickoff
  • Loading branch information
shelleydoljack committed May 15, 2020
2 parents 5d2df22 + f54c770 commit 75ed2eb
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ def create
@expenditures_with_circ_stats_report = ExpendituresWithCircStatsReport.new(batch_params)
if @expenditures_with_circ_stats_report.save
flash[:success] = 'Report requested!'
@expenditures_with_circ_stats_report.kickoff
redirect_to root_path
else
flash[:warning] = 'Check that all form fields are entered!'
Expand Down
13 changes: 11 additions & 2 deletions app/models/expenditures_with_circ_stats_report.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,27 @@ class ExpendituresWithCircStatsReport < ApplicationRecord
include FundUtils
attr_accessor :fund, :fund_begin, :fund_select, :date_type,
:fy_start, :fy_end, :cal_start, :cal_end, :pd_start, :pd_end,
:lib_array, :libraries, :format_array, :formats
:lib_array, :libraries, :format_array, :formats, :output_file

validate :email_format
validate :fund_selection_present
validate :start_date_present

before_save :set_fund, :write_lib, :write_fmt, :check_dates
before_save :set_fund, :write_lib, :write_fmt, :check_dates, :set_output_file

self.table_name = 'expenditures_circ_log'

def kickoff
ActiveRecord::Base.connection.execute("begin expend_rpt.run_rpt_circ('#{output_file}'); end;")
rescue ActiveRecord::StatementInvalid
end

private

def set_output_file
self[:output_file] = output_file
end

def write_lib
self[:libraries] = lib_array.delete_if { |a| a.empty? || a == 'All Libraries' }.join(',')
end
Expand Down

0 comments on commit 75ed2eb

Please sign in to comment.