Skip to content

Commit

Permalink
Merge 2e1d777 into 68d7996
Browse files Browse the repository at this point in the history
  • Loading branch information
jgreben committed Jul 28, 2020
2 parents 68d7996 + 2e1d777 commit c5d92ea
Show file tree
Hide file tree
Showing 49 changed files with 56 additions and 48 deletions.
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,14 @@ RAILS_ENV=test rake db:seed

NOTE: Travis uses `db:test:prepare` rather than `db:migrate`

Also make sure the necessary `tmp` file directories are present (this is to mock the `/symphony` mount on the libsys-webforms servers)
```
mkdir -p tmp/Dataload/BookplateMerge/Batches/Queue
mkdir -p tmp/Dataload/EndowRpt
mkdir -p tmp/Dataload/ILLiadUserExport
mkdir -p tmp/Dataload/UserloadRerun
```

### Rake, etc.
The test suite (with RuboCop style enforcement) will be run with the default rake task (also run on travis)

Expand Down
2 changes: 1 addition & 1 deletion app/views/sal3_batch_requests_batches/new.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
<div class='form-group row'>
<%= f.label :batch_needbydate, "All items delivered by:*", class: 'col-sm-2 form-control-label' %>
<div class='col-sm-10'>
<%= f.date_field 'batch_needbydate', id: 'dp2', class: 'form-control', value: "#{6.months.from_now.strftime('%Y-%m-%d')}" %>
<%= f.date_field 'batch_needbydate', id: 'dp2', class: 'form-control' %>
</div>
</div>
<div class='form-group row'>
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20160419171346_create_authorized_users.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreateAuthorizedUsers < ActiveRecord::Migration
class CreateAuthorizedUsers < ActiveRecord::Migration[5.0]
def change
create_table :authorized_users do |t|
t.string :user_id
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class RenameAuthorizedUsersToAuthorizedUser < ActiveRecord::Migration
class RenameAuthorizedUsersToAuthorizedUser < ActiveRecord::Migration[5.0]
def change
rename_table :authorized_users, :authorized_user
end
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20160421213610_create_uni_updates_errors.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreateUniUpdatesErrors < ActiveRecord::Migration
class CreateUniUpdatesErrors < ActiveRecord::Migration[5.0]
def change
create_table :uni_updates_errors do |t|
t.string :run
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20160502230655_create_uni_updates_batch.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreateUniUpdatesBatch < ActiveRecord::Migration
class CreateUniUpdatesBatch < ActiveRecord::Migration[5.0]
def change
create_table :uni_updates_batch, :primary_key => :batch_id do |t|
t.datetime :batch_date
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20160504234929_create_uni_updates.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreateUniUpdates < ActiveRecord::Migration
class CreateUniUpdates < ActiveRecord::Migration[5.0]
def change
create_table :uni_updates do |t|
t.integer :batch_id
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20160509190330_create_unicorn_policies.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreateUnicornPolicies < ActiveRecord::Migration
class CreateUnicornPolicies < ActiveRecord::Migration[5.0]
def change
create_table :unicorn_policies do |t|
t.string :type
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20160613215612_sal3_batch_requests_batch.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class Sal3BatchRequestsBatch < ActiveRecord::Migration
class Sal3BatchRequestsBatch < ActiveRecord::Migration[5.0]
def change
create_table :sal3_batch_requests_batch, primary_key: "batch_id" do |t|
t.string :batch_name
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20160613215951_sal3_batch_requests_bcs.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class Sal3BatchRequestsBcs < ActiveRecord::Migration
class Sal3BatchRequestsBcs < ActiveRecord::Migration[5.0]
def change
create_table :sal3_batch_requests_bcs do |t|
t.integer :batch_id
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20160616230554_encumbrance_report.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class EncumbranceReport < ActiveRecord::Migration
class EncumbranceReport < ActiveRecord::Migration[5.0]
def change
create_table :encumbrance_rpts do |t|
t.datetime :date_request
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20160617212136_expenditures_funds.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class ExpendituresFunds < ActiveRecord::Migration
class ExpendituresFunds < ActiveRecord::Migration[5.0]
def change
create_table :expenditures_funds do |t|
t.string :fund_id, array: true
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20160622001510_create_uni_libs_locs.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreateUniLibsLocs < ActiveRecord::Migration
class CreateUniLibsLocs < ActiveRecord::Migration[5.0]
def change
create_table :uni_libs_locs do |t|
t.string :library
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20160622222820_expenditure_report.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class ExpenditureReport < ActiveRecord::Migration
class ExpenditureReport < ActiveRecord::Migration[5.0]
def change
create_table :expenditures_log do |t|
t.datetime :date_request
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20160627210324_create_shelf_sel_search.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreateShelfSelSearch < ActiveRecord::Migration
class CreateShelfSelSearch < ActiveRecord::Migration[5.0]
def change
create_table :shelf_sel_searches do |t|
t.string :user_name
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreateCirculationStatisticsReportFormat < ActiveRecord::Migration
class CreateCirculationStatisticsReportFormat < ActiveRecord::Migration[5.0]
def change
create_table :circ_stats_rpt_fmts do |t|
t.string :format
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreateShelfSelectionItemType < ActiveRecord::Migration
class CreateShelfSelectionItemType < ActiveRecord::Migration[5.0]
def change
create_table :shelf_sel_item_types do |t|
t.string :item_type
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20160629201416_create_shelf_sel_item_cat1.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreateShelfSelItemCat1 < ActiveRecord::Migration
class CreateShelfSelItemCat1 < ActiveRecord::Migration[5.0]
def change
create_table :shelf_sel_item_cat1s do |t|
t.string :item_category1
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20160701214235_expenditures_paydates.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class ExpendituresPaydates < ActiveRecord::Migration
class ExpendituresPaydates < ActiveRecord::Migration[5.0]
def change
create_table :expenditures_paydates do |t|
t.datetime :pay_date
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class ExpendituresWithCircStatsReport < ActiveRecord::Migration
class ExpendituresWithCircStatsReport < ActiveRecord::Migration[5.0]
def change
create_table :expenditures_circ_log do |t|
t.datetime :date_request
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20160711225050_expenditures.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class Expenditures < ActiveRecord::Migration
class Expenditures < ActiveRecord::Migration[5.0]
def change
create_table :expenditures do |t|
t.datetime :row_date
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreateCirculationStatisticsReportLogs < ActiveRecord::Migration
class CreateCirculationStatisticsReportLogs < ActiveRecord::Migration[5.0]
def change
create_table :circ_stats_rpt_log do |t|
t.datetime :date_request
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20160923032722_create_expenditures_fy_dates.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreateExpendituresFyDates < ActiveRecord::Migration
class CreateExpendituresFyDates < ActiveRecord::Migration[5.0]
def change
create_table :expenditures_fy_dates do |t|
t.integer :fy
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class AddSal3BreqEditToAuthorizedUser < ActiveRecord::Migration
class AddSal3BreqEditToAuthorizedUser < ActiveRecord::Migration[5.0]
def change
add_column :authorized_user, :sal3_breq_edit, :string
end
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20161215190807_change_uni_updates_load_date.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class ChangeUniUpdatesLoadDate < ActiveRecord::Migration
class ChangeUniUpdatesLoadDate < ActiveRecord::Migration[5.0]
def change
change_column :uni_updates, :load_date, :date
end
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class AddUserloadRerunToAuthorizedUser < ActiveRecord::Migration
class AddUserloadRerunToAuthorizedUser < ActiveRecord::Migration[5.0]
def change
add_column :authorized_user, :userload_rerun, :string
end
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class AddAccessionNumberToAuthorizedUser < ActiveRecord::Migration
class AddAccessionNumberToAuthorizedUser < ActiveRecord::Migration[5.0]
def change
add_column :authorized_user, :accession_number, :string
end
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20171219222043_create_accession_numbers.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreateAccessionNumbers < ActiveRecord::Migration
class CreateAccessionNumbers < ActiveRecord::Migration[5.0]
def change
create_table :catnums do |t|
t.string :item_type
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class AddBcFileObjToSal3BatchRequestsBatch < ActiveRecord::Migration
class AddBcFileObjToSal3BatchRequestsBatch < ActiveRecord::Migration[5.0]
def change
add_column :sal3_batch_requests_batch, :bc_file_obj, :string
end
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreateDigitalBookplatesBatches < ActiveRecord::Migration
class CreateDigitalBookplatesBatches < ActiveRecord::Migration[5.0]
def change
create_table :digital_bookplates_batches, primary_key: 'batch_id' do |t|
t.string :ckey_file
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class AddDigitalBookplatesToAuthorizedUser < ActiveRecord::Migration
class AddDigitalBookplatesToAuthorizedUser < ActiveRecord::Migration[5.0]
def change
add_column :authorized_user, :digital_bookplates, :string
end
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class AddPullDateToSal3BatchRequestsBcs < ActiveRecord::Migration
class AddPullDateToSal3BatchRequestsBcs < ActiveRecord::Migration[5.0]
def change
add_column :sal3_batch_requests_bcs, :pull_date, :datetime
end
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class AddEdiInvManageToAuthorizedUser < ActiveRecord::Migration
class AddEdiInvManageToAuthorizedUser < ActiveRecord::Migration[5.0]
def change
add_column :authorized_user, :edi_inv_manage, :string
end
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class AddEdiInvViewToAuthorizedUser < ActiveRecord::Migration
class AddEdiInvViewToAuthorizedUser < ActiveRecord::Migration[5.0]
def change
add_column :authorized_user, :edi_inv_view, :string
end
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20180622233540_create_edi_invoice.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreateEdiInvoice < ActiveRecord::Migration
class CreateEdiInvoice < ActiveRecord::Migration[5.0]
def change
create_table :edi_invoice do |t|
t.string :edi_doc_num
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20180628180104_create_edi_error_report.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreateEdiErrorReport < ActiveRecord::Migration
class CreateEdiErrorReport < ActiveRecord::Migration[5.0]
def change
create_table :edi_error_report do |t|
t.datetime :run
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20180710170358_create_edi_inv_line.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreateEdiInvLine < ActiveRecord::Migration
class CreateEdiInvLine < ActiveRecord::Migration[5.0]
def change
create_table :edi_inv_line, primary_key: 'tbl_row_num' do |t|
t.string :edi_vend_id
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20180712235601_add_todo_to_edi_inv_line.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class AddTodoToEdiInvLine < ActiveRecord::Migration
class AddTodoToEdiInvLine < ActiveRecord::Migration[5.0]
def change
add_column :edi_inv_line, :todo, :string
end
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20180716234659_create_edi_lin.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreateEdiLin < ActiveRecord::Migration
class CreateEdiLin < ActiveRecord::Migration[5.0]
def change
create_table :edi_lin do |t|
t.string :doc_num
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20180718164936_create_edi_sumrz_bib.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreateEdiSumrzBib < ActiveRecord::Migration
class CreateEdiSumrzBib < ActiveRecord::Migration[5.0]
def change
create_table :edi_sumrz_bib do |t|
t.string :vend_code
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20180725205541_create_edi_inv_piece.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreateEdiInvPiece < ActiveRecord::Migration
class CreateEdiInvPiece < ActiveRecord::Migration[5.0]
def change
create_table :edi_inv_piece do |t|
t.string :edi_vend_id
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20180725220246_add_columns_to_edi_invoice.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class AddColumnsToEdiInvoice < ActiveRecord::Migration
class AddColumnsToEdiInvoice < ActiveRecord::Migration[5.0]
def change
add_column :edi_invoice, :edi_msg_id, :string
add_column :edi_invoice, :edi_msg_typ, :string
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20180727193130_add_columns_to_edi_lin.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class AddColumnsToEdiLin < ActiveRecord::Migration
class AddColumnsToEdiLin < ActiveRecord::Migration[5.0]
def change
add_column :edi_lin, :barcode_num, :integer, limit: 6
end
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class RemoveBcFileObFromSal3BatchRequestBatch < ActiveRecord::Migration
class RemoveBcFileObFromSal3BatchRequestBatch < ActiveRecord::Migration[5.0]
def change
remove_column :sal3_batch_requests_batch, :bc_file_obj, :string
end
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20180822231624_create_packages.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreatePackages < ActiveRecord::Migration
class CreatePackages < ActiveRecord::Migration[5.0]
def change
create_table :vnd_packages, :primary_key => :record_id do |t|
t.string :package_id
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class AddPackageManageToAuthorizedUser < ActiveRecord::Migration
class AddPackageManageToAuthorizedUser < ActiveRecord::Migration[5.0]
def change
add_column :authorized_user, :package_manage, :string
end
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20180830220045_create_uni_upd_mhld_errors.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreateUniUpdMhldErrors < ActiveRecord::Migration
class CreateUniUpdMhldErrors < ActiveRecord::Migration[5.0]
def change
create_table :uni_upd_mhld_errors do |t|
t.integer :batch_id
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20181119225853_create_package_files.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreatePackageFiles < ActiveRecord::Migration
class CreatePackageFiles < ActiveRecord::Migration[5.0]
def change
create_table :vnd_files_gen do |t|
t.string :package_id
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/20181121214017_create_vnd_runlogs.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreateVndRunlogs < ActiveRecord::Migration
class CreateVndRunlogs < ActiveRecord::Migration[5.0]
def change
create_table :vnd_runlog do |t|
t.datetime :run_date
Expand Down

0 comments on commit c5d92ea

Please sign in to comment.