enju_inventory 0.3.1 → 0.4.0.rc.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +3 -5
- data/Rakefile +1 -1
- data/app/models/inventory.rb +7 -7
- data/app/models/inventory_file.rb +5 -8
- data/app/views/inventory_files/_form.html.erb +2 -2
- data/db/migrate/20081117143156_create_inventory_files.rb +3 -10
- data/db/migrate/20081117143455_create_inventories.rb +1 -1
- data/db/migrate/20090706125521_add_attachments_inventory_to_inventory_file.rb +1 -1
- data/db/migrate/20120413100431_add_fingerprint_to_inventory_file.rb +1 -1
- data/db/migrate/20191224083828_add_item_identifier_to_inventory.rb +1 -1
- data/db/migrate/20191224091957_add_current_shelf_name_to_inventory.rb +1 -1
- data/db/migrate/20191230082846_add_shelf_to_inventory_file.rb +1 -1
- data/lib/enju_inventory/version.rb +1 -1
- data/lib/tasks/enju_inventory_tasks.rake +5 -4
- data/spec/dummy/config/application.rb +2 -1
- data/spec/dummy/config/database.yml +70 -9
- data/spec/dummy/config/storage.yml +34 -0
- data/spec/dummy/db/migrate/001_create_agents.rb +1 -2
- data/spec/dummy/db/migrate/002_devise_create_users.rb +1 -1
- data/spec/dummy/db/migrate/005_create_manifestations.rb +1 -2
- data/spec/dummy/db/migrate/006_create_items.rb +1 -2
- data/spec/dummy/db/migrate/012_create_owns.rb +1 -3
- data/spec/dummy/db/migrate/015_create_creates.rb +1 -3
- data/spec/dummy/db/migrate/032_create_checkins.rb +9 -0
- data/spec/dummy/db/migrate/033_create_checkouts.rb +20 -0
- data/spec/dummy/db/migrate/035_create_reserves.rb +21 -0
- data/spec/dummy/db/migrate/041_create_roles.rb +1 -1
- data/spec/dummy/db/migrate/047_create_produces.rb +1 -3
- data/spec/dummy/db/migrate/059_create_libraries.rb +1 -2
- data/spec/dummy/db/migrate/069_create_shelves.rb +1 -2
- data/spec/dummy/db/migrate/073_create_carrier_types.rb +1 -1
- data/spec/dummy/db/migrate/077_create_user_groups.rb +1 -2
- data/spec/dummy/db/migrate/080_create_library_groups.rb +1 -1
- data/spec/dummy/db/migrate/112_create_frequencies.rb +1 -1
- data/spec/dummy/db/migrate/117_create_form_of_works.rb +1 -1
- data/spec/dummy/db/migrate/120_create_baskets.rb +1 -1
- data/spec/dummy/db/migrate/121_create_checked_items.rb +16 -0
- data/spec/dummy/db/migrate/124_create_bookstores.rb +1 -2
- data/spec/dummy/db/migrate/125_create_donates.rb +1 -1
- data/spec/dummy/db/migrate/127_create_use_restrictions.rb +16 -0
- data/spec/dummy/db/migrate/129_create_item_has_use_restrictions.rb +14 -0
- data/spec/dummy/db/migrate/130_create_request_status_types.rb +1 -1
- data/spec/dummy/db/migrate/131_create_request_types.rb +1 -1
- data/spec/dummy/db/migrate/132_create_circulation_statuses.rb +1 -1
- data/spec/dummy/db/migrate/133_create_agent_merges.rb +1 -1
- data/spec/dummy/db/migrate/134_create_agent_merge_lists.rb +1 -1
- data/spec/dummy/db/migrate/149_create_message_templates.rb +1 -1
- data/spec/dummy/db/migrate/154_create_messages.rb +5 -9
- data/spec/dummy/db/migrate/20080819181903_create_message_requests.rb +4 -4
- data/spec/dummy/db/migrate/20080830154109_create_realizes.rb +1 -3
- data/spec/dummy/db/migrate/20080905191442_create_agent_types.rb +1 -1
- data/spec/dummy/db/migrate/20081006090811_create_subscriptions.rb +1 -2
- data/spec/dummy/db/migrate/20081006093246_create_subscribes.rb +1 -1
- data/spec/dummy/db/migrate/20081023092436_create_search_engines.rb +1 -1
- data/spec/dummy/db/migrate/20081025083323_create_countries.rb +1 -1
- data/spec/dummy/db/migrate/20081025083905_create_languages.rb +1 -1
- data/spec/dummy/db/migrate/20081027150907_create_picture_files.rb +1 -1
- data/spec/dummy/db/migrate/20081028083142_create_agent_import_files.rb +1 -1
- data/spec/dummy/db/migrate/20081028083208_create_resource_import_files.rb +1 -1
- data/spec/dummy/db/migrate/20081030023412_create_checkout_types.rb +17 -0
- data/spec/dummy/db/migrate/20081030023518_create_user_group_has_checkout_types.rb +23 -0
- data/spec/dummy/db/migrate/20081212075554_create_checkout_stat_has_manifestations.rb +17 -0
- data/spec/dummy/db/migrate/20081212080038_create_manifestation_checkout_stats.rb +15 -0
- data/spec/dummy/db/migrate/20081215094302_create_user_checkout_stats.rb +15 -0
- data/spec/dummy/db/migrate/20081215094955_create_checkout_stat_has_users.rb +15 -0
- data/spec/dummy/db/migrate/20081216190517_create_reserve_stat_has_manifestations.rb +17 -0
- data/spec/dummy/db/migrate/20081216190724_create_manifestation_reserve_stats.rb +15 -0
- data/spec/dummy/db/migrate/20081220023628_create_user_reserve_stats.rb +15 -0
- data/spec/dummy/db/migrate/20081220034117_create_reserve_stat_has_users.rb +15 -0
- data/spec/dummy/db/migrate/20090321130448_add_completed_at_to_user_checkout_stat.rb +23 -0
- data/spec/dummy/db/migrate/20090705133942_add_attachments_picture_to_picture_file.rb +1 -1
- data/spec/dummy/db/migrate/20090705212043_add_attachments_attachment_to_manifestation.rb +1 -1
- data/spec/dummy/db/migrate/20090720091106_create_medium_of_performances.rb +1 -1
- data/spec/dummy/db/migrate/20090720091429_create_content_types.rb +1 -1
- data/spec/dummy/db/migrate/20090812151902_create_agent_relationship_types.rb +1 -1
- data/spec/dummy/db/migrate/20091012101112_add_dcndl_schema.rb +1 -1
- data/spec/dummy/db/migrate/20091025080447_create_licenses.rb +1 -1
- data/spec/dummy/db/migrate/20091214131723_create_series_statements.rb +1 -1
- data/spec/dummy/db/migrate/20100129142347_create_import_requests.rb +1 -1
- data/spec/dummy/db/migrate/20100211105551_add_admin_networks_to_library_group.rb +1 -1
- data/spec/dummy/db/migrate/20100223121519_rename_series_statement_title_to_original_title.rb +1 -1
- data/spec/dummy/db/migrate/20100314190054_add_opening_hour_to_library.rb +1 -1
- data/spec/dummy/db/migrate/20100321235924_add_series_statement_identifier_to_series_statement.rb +1 -1
- data/spec/dummy/db/migrate/20100525124311_create_manifestation_relationships.rb +1 -1
- data/spec/dummy/db/migrate/20100606065209_create_user_has_roles.rb +3 -5
- data/spec/dummy/db/migrate/20100606073747_create_agent_relationships.rb +1 -1
- data/spec/dummy/db/migrate/20100607044753_create_manifestation_relationship_types.rb +1 -1
- data/spec/dummy/db/migrate/20100814091104_add_position_to_agent_relationship.rb +1 -1
- data/spec/dummy/db/migrate/20100925043847_create_resource_import_results.rb +1 -1
- data/spec/dummy/db/migrate/20100925074559_create_agent_import_results.rb +1 -1
- data/spec/dummy/db/migrate/20101212070145_add_acquired_at_to_item.rb +1 -1
- data/spec/dummy/db/migrate/20110222073537_add_url_to_library_group.rb +1 -1
- data/spec/dummy/db/migrate/20110301035123_add_pub_date_to_manifestation.rb +1 -1
- data/spec/dummy/db/migrate/20110301121550_add_birth_date_and_death_date_to_agent.rb +1 -1
- data/spec/dummy/db/migrate/20110301134521_add_expire_date_to_reserve.rb +9 -0
- data/spec/dummy/db/migrate/20110318183304_add_valid_period_for_new_user_to_user_group.rb +1 -1
- data/spec/dummy/db/migrate/20110328130826_add_current_checkout_count_to_user_group_has_checkout_type.rb +9 -0
- data/spec/dummy/db/migrate/20110603184217_add_edit_mode_to_resource_import_file.rb +1 -1
- data/spec/dummy/db/migrate/20110619064807_add_edition_string_to_manifestation.rb +1 -1
- data/spec/dummy/db/migrate/20110620173525_add_bookstore_id_to_item.rb +1 -1
- data/spec/dummy/db/migrate/20110621093332_remove_expire_date_from_reserve.rb +9 -0
- data/spec/dummy/db/migrate/20110627034940_create_series_statement_merge_lists.rb +1 -1
- data/spec/dummy/db/migrate/20110627035057_create_series_statement_merges.rb +1 -1
- data/spec/dummy/db/migrate/20110627122938_add_number_of_day_to_notify_overdue_to_user_group.rb +13 -0
- data/spec/dummy/db/migrate/20110913115320_add_lft_and_rgt_to_message.rb +1 -1
- data/spec/dummy/db/migrate/20110916091020_add_volume_number_to_manifestation.rb +1 -1
- data/spec/dummy/db/migrate/20110916103953_add_manifestaiton_id_to_series_statement.rb +1 -1
- data/spec/dummy/db/migrate/20110918162329_add_note_to_series_statement.rb +1 -1
- data/spec/dummy/db/migrate/20111124110059_create_create_types.rb +1 -1
- data/spec/dummy/db/migrate/20111124110319_create_realize_types.rb +1 -1
- data/spec/dummy/db/migrate/20111124110355_create_produce_types.rb +1 -1
- data/spec/dummy/db/migrate/20111124112131_add_create_type_to_create.rb +1 -1
- data/spec/dummy/db/migrate/20111129044509_add_pickup_location_to_reserve.rb +6 -0
- data/spec/dummy/db/migrate/20120105074911_add_isil_to_library.rb +1 -1
- data/spec/dummy/db/migrate/20120125050502_add_depth_to_message.rb +1 -1
- data/spec/dummy/db/migrate/20120125152919_add_title_subseries_transcription_to_series_statement.rb +1 -1
- data/spec/dummy/db/migrate/20120129014038_create_budget_types.rb +1 -1
- data/spec/dummy/db/migrate/20120129020544_add_budget_type_id_to_item.rb +1 -1
- data/spec/dummy/db/migrate/20120319120638_add_content_type_id_to_manifestation.rb +1 -1
- data/spec/dummy/db/migrate/20120319173203_create_accepts.rb +1 -1
- data/spec/dummy/db/migrate/20120410104851_add_year_of_publication_to_manifestation.rb +1 -1
- data/spec/dummy/db/migrate/20120413072700_add_picture_meta_to_picture_file.rb +1 -1
- data/spec/dummy/db/migrate/20120413100352_add_fingerprint_to_picture_file.rb +1 -1
- data/spec/dummy/db/migrate/20120413161340_add_fingerprint_to_resource_import_file.rb +1 -1
- data/spec/dummy/db/migrate/20120413161403_add_fingerprint_to_agent_import_file.rb +1 -1
- data/spec/dummy/db/migrate/20120413170705_add_error_message_to_resource_import_file.rb +1 -1
- data/spec/dummy/db/migrate/20120413170720_add_error_message_to_agent_import_file.rb +1 -1
- data/spec/dummy/db/migrate/20120415164821_add_attachment_meta_to_manifestation.rb +1 -1
- data/spec/dummy/db/migrate/20120418081407_add_month_of_publication_to_manifestation.rb +1 -1
- data/spec/dummy/db/migrate/20120424103932_add_librarian_id_to_checked_item.rb +5 -0
- data/spec/dummy/db/migrate/20120510140958_add_closed_to_shelf.rb +1 -1
- data/spec/dummy/db/migrate/20120511072422_add_agent_identifier_to_agent.rb +1 -1
- data/spec/dummy/db/migrate/20120602141129_add_edit_mode_to_agent_import_file.rb +1 -1
- data/spec/dummy/db/migrate/20121116031206_add_fulltext_content_to_manifestation.rb +1 -1
- data/spec/dummy/db/migrate/20130221154434_add_additional_attributes_to_user.rb +1 -2
- data/spec/dummy/db/migrate/20130303124821_add_retained_at_to_reserve.rb +5 -0
- data/spec/dummy/db/migrate/20130304015019_add_postponed_at_to_reserve.rb +5 -0
- data/spec/dummy/db/migrate/20130412083556_add_latitude_and_longitude_to_library.rb +1 -1
- data/spec/dummy/db/migrate/20130416054135_add_circulation_status_id_to_item.rb +1 -1
- data/spec/dummy/db/migrate/20130421093852_add_periodical_to_manifestation.rb +1 -1
- data/spec/dummy/db/migrate/20130421155019_add_creator_string_to_series_statement.rb +1 -1
- data/spec/dummy/db/migrate/20130421164124_add_series_master_to_series_statement.rb +1 -1
- data/spec/dummy/db/migrate/20130429020822_add_root_manifestation_id_to_series_statement.rb +1 -1
- data/spec/dummy/db/migrate/20130506175303_create_identifier_types.rb +1 -1
- data/spec/dummy/db/migrate/20130506175834_create_identifiers.rb +1 -1
- data/spec/dummy/db/migrate/20130509185724_add_statement_of_responsibility_to_manifestation.rb +1 -1
- data/spec/dummy/db/migrate/20130519065638_add_lock_version_to_reserve.rb +5 -0
- data/spec/dummy/db/migrate/20130519065837_add_lock_version_to_checkin.rb +5 -0
- data/spec/dummy/db/migrate/20140110122216_create_user_import_files.rb +1 -1
- data/spec/dummy/db/migrate/20140110131010_create_user_import_results.rb +1 -1
- data/spec/dummy/db/migrate/20140122054321_create_profiles.rb +5 -6
- data/spec/dummy/db/migrate/20140518050147_create_reserve_transitions.rb +18 -0
- data/spec/dummy/db/migrate/20140518111006_create_message_transitions.rb +1 -1
- data/spec/dummy/db/migrate/20140518135713_create_message_request_transitions.rb +1 -1
- data/spec/dummy/db/migrate/20140519170214_create_resource_import_file_transitions.rb +1 -1
- data/spec/dummy/db/migrate/20140519171220_create_import_request_transitions.rb +1 -1
- data/spec/dummy/db/migrate/20140524020735_create_agent_import_file_transitions.rb +1 -1
- data/spec/dummy/db/migrate/20140524074813_create_user_import_file_transitions.rb +2 -6
- data/spec/dummy/db/migrate/20140528045518_create_user_checkout_stat_transitions.rb +18 -0
- data/spec/dummy/db/migrate/20140528045539_create_user_reserve_stat_transitions.rb +18 -0
- data/spec/dummy/db/migrate/20140528045600_create_manifestation_checkout_stat_transitions.rb +18 -0
- data/spec/dummy/db/migrate/20140528045617_create_manifestation_reserve_stat_transitions.rb +18 -0
- data/spec/dummy/db/migrate/20140610123439_drop_email_unique_constraint_enju_leaf_rc10.rb +1 -1
- data/spec/dummy/db/migrate/20140614065404_create_resource_export_files.rb +1 -1
- data/spec/dummy/db/migrate/20140614141500_create_resource_export_file_transitions.rb +1 -1
- data/spec/dummy/db/migrate/20140628072217_add_user_encoding_to_user_import_file.rb +1 -1
- data/spec/dummy/db/migrate/20140628073524_add_user_encoding_to_agent_import_file.rb +1 -1
- data/spec/dummy/db/migrate/20140628073535_add_user_encoding_to_resource_import_file.rb +1 -1
- data/spec/dummy/db/migrate/20140709113413_create_user_export_files.rb +1 -1
- data/spec/dummy/db/migrate/20140709113905_create_user_export_file_transitions.rb +2 -6
- data/spec/dummy/db/migrate/20140720140916_add_binding_item_identifier_to_item.rb +1 -1
- data/spec/dummy/db/migrate/20140720170714_add_default_library_id_to_user_import_file.rb +1 -1
- data/spec/dummy/db/migrate/20140720170735_add_default_user_group_id_to_user_import_file.rb +1 -1
- data/spec/dummy/db/migrate/20140721151416_add_default_shelf_id_to_resource_import_file.rb +1 -1
- data/spec/dummy/db/migrate/20140802082007_add_manifestation_id_to_item.rb +1 -1
- data/spec/dummy/db/migrate/20140810061942_add_user_id_to_user_checkout_stat.rb +8 -0
- data/spec/dummy/db/migrate/20140810091231_add_checkout_icalendar_token_to_profile.rb +6 -0
- data/spec/dummy/db/migrate/20140810091417_add_save_checkout_history_to_profile.rb +5 -0
- data/spec/dummy/db/migrate/20140811031145_add_expired_at_to_profile.rb +1 -1
- data/spec/dummy/db/migrate/20140813182425_add_publication_place_to_manifestation.rb +1 -1
- data/spec/dummy/db/migrate/20140821151023_create_colors.rb +1 -1
- data/spec/dummy/db/migrate/20140822114527_add_error_message_to_resource_import_result.rb +1 -1
- data/spec/dummy/db/migrate/20140823083524_add_extent_to_manifestation.rb +1 -1
- data/spec/dummy/db/migrate/20140823094847_add_dimensions_to_manifestation.rb +1 -1
- data/spec/dummy/db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb +1 -1
- data/spec/dummy/db/migrate/20141003181336_add_full_name_transcription_to_profile.rb +1 -1
- data/spec/dummy/db/migrate/20141003182825_add_date_of_birth_to_profile.rb +1 -1
- data/spec/dummy/db/migrate/20141014065831_add_shelf_id_to_checkout.rb +5 -0
- data/spec/dummy/db/migrate/20141020120523_add_library_id_to_checkout.rb +5 -0
- data/spec/dummy/db/migrate/20150106001709_create_demands.rb +11 -0
- data/spec/dummy/db/migrate/20150117111136_add_foreign_key_to_items_referencing_manifestations.rb +1 -1
- data/spec/dummy/db/migrate/20150221063719_add_settings_to_library_group.rb +1 -1
- data/spec/dummy/db/migrate/20150506105356_add_error_message_to_user_import_result.rb +1 -1
- data/spec/dummy/db/migrate/20150924115059_create_withdraws.rb +1 -1
- data/spec/dummy/db/migrate/20151125004028_add_profile_id_to_agent.rb +1 -1
- data/spec/dummy/db/migrate/20160319144230_create_issn_records.rb +11 -0
- data/spec/dummy/db/migrate/20160506144040_create_isbn_records.rb +11 -0
- data/spec/dummy/db/migrate/20160610093229_add_html_snippet_to_library_group.rb +1 -1
- data/spec/dummy/db/migrate/20160627232219_add_most_recent_to_user_import_file_transitions.rb +1 -1
- data/spec/dummy/db/migrate/20160627232316_add_most_recent_to_user_export_file_transitions.rb +1 -1
- data/spec/dummy/db/migrate/20160703184619_add_most_recent_to_reserve_transitions.rb +9 -0
- data/spec/dummy/db/migrate/20160703184650_add_most_recent_to_manifestation_checkout_stat_transitions.rb +9 -0
- data/spec/dummy/db/migrate/20160703184723_add_most_recent_to_manifestation_reserve_stat_transitions.rb +9 -0
- data/spec/dummy/db/migrate/20160703184747_add_most_recent_to_user_checkout_stat_transitions.rb +9 -0
- data/spec/dummy/db/migrate/20160703184805_add_most_recent_to_user_reserve_stat_transitions.rb +9 -0
- data/spec/dummy/db/migrate/20160703185015_add_most_recent_to_message_transitions.rb +1 -1
- data/spec/dummy/db/migrate/20160703190209_add_foreign_key_on_manifestation_id_to_reserve.rb +5 -0
- data/spec/dummy/db/migrate/20160801080612_add_most_recent_to_import_request_transitions.rb +1 -1
- data/spec/dummy/db/migrate/20160801080619_add_most_recent_to_resource_import_file_transitions.rb +1 -1
- data/spec/dummy/db/migrate/20160801080637_add_most_recent_to_resource_export_file_transitions.rb +1 -1
- data/spec/dummy/db/migrate/20160801080643_add_most_recent_to_agent_import_file_transitions.rb +1 -1
- data/spec/dummy/db/migrate/20160811102604_add_picture_width_to_picture_file.rb +1 -1
- data/spec/dummy/db/migrate/20160813191647_add_max_number_of_results_to_library_group.rb +1 -1
- data/spec/dummy/db/migrate/20160813191733_add_family_name_first_to_library_group.rb +1 -1
- data/spec/dummy/db/migrate/20160813192542_add_pub_year_facet_range_interval_to_library_group.rb +1 -1
- data/spec/dummy/db/migrate/20160813203039_add_user_id_to_library_group.rb +1 -1
- data/spec/dummy/db/migrate/20160814165332_add_most_recent_to_message_request_transitions.rb +1 -1
- data/spec/dummy/db/migrate/20160820004638_add_attachment_attachment_to_carrier_types.rb +1 -1
- data/spec/dummy/db/migrate/20170116134107_create_issn_record_and_manifestations.rb +11 -0
- data/spec/dummy/db/migrate/20170116134120_create_isbn_record_and_manifestations.rb +11 -0
- data/spec/dummy/db/migrate/20170305064014_add_csv_charset_conversion_to_library_group.rb +1 -1
- data/spec/dummy/db/migrate/20171014084528_add_header_logo_to_library_group.rb +1 -1
- data/spec/dummy/db/migrate/20171119051258_set_not_null_to_manifestation_id_on_items.rb +1 -1
- data/spec/dummy/db/migrate/20171126133835_rename_login_banner_to_old_login_banner.rb +1 -1
- data/spec/dummy/db/migrate/20171126135238_add_foreign_key_to_library_group_id_on_library.rb +1 -1
- data/spec/dummy/db/migrate/20180102162311_add_header_logo_meta_to_library_group.rb +1 -1
- data/spec/dummy/db/migrate/20180107160726_add_constraints_to_most_recent_for_user_import_file_transitions.rb +2 -2
- data/spec/dummy/db/migrate/20180107160740_add_constraints_to_most_recent_for_user_export_file_transitions.rb +2 -2
- data/spec/dummy/db/migrate/20180107161035_add_constraints_to_most_recent_for_reserve_transitions.rb +13 -0
- data/spec/dummy/db/migrate/20180107161311_add_constraints_to_most_recent_for_agent_import_file_transitions.rb +1 -1
- data/spec/dummy/db/migrate/20180107161331_add_constraints_to_most_recent_for_resource_import_file_transitions.rb +1 -1
- data/spec/dummy/db/migrate/20180107161347_add_constraints_to_most_recent_for_resource_export_file_transitions.rb +1 -1
- data/spec/dummy/db/migrate/20180107161410_add_constraints_to_most_recent_for_import_request_transitions.rb +1 -1
- data/spec/dummy/db/migrate/20180107161951_add_constraints_to_most_recent_for_user_checkout_stat_transitions.rb +13 -0
- data/spec/dummy/db/migrate/20180107162009_add_constraints_to_most_recent_for_user_reserve_stat_transitions.rb +13 -0
- data/spec/dummy/db/migrate/20180107162029_add_constraints_to_most_recent_for_manifestation_checkout_stat_transitions.rb +13 -0
- data/spec/dummy/db/migrate/20180107162048_add_constraints_to_most_recent_for_manifestation_reserve_stat_transitions.rb +13 -0
- data/spec/dummy/db/migrate/20180107162659_add_constraints_to_most_recent_for_message_transitions.rb +13 -0
- data/spec/dummy/db/migrate/20180107162711_add_constraints_to_most_recent_for_message_request_transitions.rb +13 -0
- data/spec/dummy/db/migrate/20190102034126_create_doi_records.rb +13 -0
- data/spec/dummy/db/migrate/20190208135957_create_active_storage_tables.active_storage.rb +27 -0
- data/spec/dummy/db/migrate/20190311154610_create_periodicals.rb +10 -0
- data/spec/dummy/db/migrate/20190312033839_create_periodical_and_manifestations.rb +11 -0
- data/spec/dummy/db/migrate/20190508160525_create_retains.rb +10 -0
- data/spec/dummy/db/migrate/20190629134017_rename_user_group_has_checkout_type_due_date_before_to_due_date_after.rb +5 -0
- data/spec/dummy/db/migrate/20190630113817_add_display_name_translations_to_library_group.rb +12 -0
- data/spec/dummy/db/migrate/20190630115523_add_login_banner_translations_to_library_group.rb +6 -0
- data/spec/dummy/db/migrate/20190630151446_add_display_name_translations_to_role.rb +5 -0
- data/spec/dummy/db/migrate/20190706052525_add_display_name_translations_to_circulation_status.rb +5 -0
- data/spec/dummy/db/migrate/20190712163038_add_display_name_translations_to_carrier_type.rb +21 -0
- data/spec/dummy/db/migrate/20190713114724_add_checkout_id_to_checkin.rb +5 -0
- data/spec/dummy/db/migrate/20190713114940_add_profile_id_to_user.rb +5 -0
- data/spec/dummy/db/migrate/20190713115451_add_full_name_translations_to_profile.rb +5 -0
- data/spec/dummy/db/migrate/20190814120827_add_display_name_translations_to_checkout_type.rb +5 -0
- data/spec/dummy/db/migrate/20191216131755_add_email_to_library_group.rb +6 -0
- data/spec/dummy/db/schema.rb +677 -250
- data/spec/dummy/private/system/inventory_files/inventories/000/000/001/original/inventory_file_sample.tsv +7 -0
- data/spec/dummy/private/system/inventory_files/inventories/000/000/004/original/inventory_file_sample.tsv +7 -0
- data/spec/dummy/private/system/inventory_files/inventories/000/000/005/original/inventory_file_sample.tsv +7 -0
- data/spec/dummy/private/system/inventory_files/inventories/000/000/006/original/inventory_file_sample.tsv +7 -0
- data/spec/dummy/tmp/storage/44/EP/44EPGy51PkTDwfmTxaT6bkhT +7 -0
- data/spec/dummy/tmp/storage/8u/8S/8u8SLMCn4ucazrnX5sceDGyN +7 -0
- data/spec/dummy/tmp/storage/Pt/M2/PtM2McsVVncm4itnL9emW7tf +7 -0
- data/spec/dummy/tmp/storage/SD/S9/SDS9jy6GHmDGPTZH5jEDLyHR +7 -0
- data/spec/dummy/tmp/storage/Se/bT/SebTtBwFrnqgh4Wi2kQf9dfb +7 -0
- data/spec/dummy/tmp/storage/W1/qT/W1qThC54yEwDqeFGuUrn7nfJ +7 -0
- data/spec/dummy/tmp/storage/XS/yf/XSyf3usm5HqkUNg6kJat9rat +7 -0
- data/spec/dummy/tmp/storage/YN/d9/YNd9Sptz3jzMDua7FYS6j2nr +7 -0
- data/spec/dummy/tmp/storage/cZ/Kz/cZKzVzcLQKWD1EKJ2YeqiDQr +7 -0
- data/spec/dummy/tmp/storage/dS/Nb/dSNbW2qin16LDx7jd9XKURJi +7 -0
- data/spec/dummy/tmp/storage/f7/R1/f7R1iEBpQ9CUKuWqNU5HehYi +7 -0
- data/spec/dummy/tmp/storage/oD/Gq/oDGqxmchhQqZxKykKyuCHVcv +7 -0
- data/spec/dummy/tmp/storage/q2/11/q2119zvGpdZvtvM68uJsW5Xr +7 -0
- data/spec/dummy/tmp/storage/qZ/Cd/qZCdPbtgCau79NVK7cXQFchn +7 -0
- data/spec/dummy/tmp/storage/wR/xX/wRxXBFaEq6vnkyGr8q9Z71Rv +7 -0
- data/spec/dummy/tmp/storage/yL/yQ/yLyQ8YsYFzq3PovvAQFVSNi8 +7 -0
- data/spec/dummy/tmp/storage/yT/UN/yTUNMB52xMbMFbWoMwg61NsE +7 -0
- data/spec/dummy/tmp/storage/zR/Vr/zRVrVidPksQY9LNsE34MTRy2 +7 -0
- data/spec/factories/profile.rb +9 -0
- data/spec/factories/user.rb +25 -31
- data/spec/fixtures/carrier_types.yml +12 -15
- data/spec/fixtures/circulation_statuses.yml +26 -34
- data/spec/fixtures/content_types.yml +20 -31
- data/spec/fixtures/inventories.yml +19 -7
- data/spec/fixtures/inventory_files.yml +5 -17
- data/spec/fixtures/items.yml +28 -37
- data/spec/fixtures/libraries.yml +28 -30
- data/spec/fixtures/library_groups.yml +38 -19
- data/spec/fixtures/manifestations.yml +19 -23
- data/spec/fixtures/profiles.yml +9 -12
- data/spec/fixtures/roles.yml +22 -5
- data/spec/fixtures/shelves.yml +16 -15
- data/spec/fixtures/users.yml +7 -0
- data/spec/models/inventory_file_spec.rb +6 -9
- data/spec/models/inventory_spec.rb +7 -7
- metadata +421 -274
- data/app/assets/config/enju_inventory_manifest.js +0 -0
- data/spec/dummy/db/migrate/20080830172106_create_exemplifies.rb +0 -13
- data/spec/dummy/db/migrate/20090719201843_create_extents.rb +0 -12
- data/spec/dummy/db/migrate/20091202124834_create_versions.rb +0 -18
- data/spec/dummy/db/migrate/20121116033446_add_doi_to_manifestation.rb +0 -6
- data/spec/dummy/db/migrate/20150124152756_add_foreign_key_to_shelves_referencing_libraries.rb +0 -6
- data/spec/dummy/db/migrate/20151213070943_add_translation_table_to_library_group.rb +0 -26
- data/spec/dummy/db/migrate/20151213072705_add_footer_banner_to_library_group.rb +0 -22
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: daadafa422975299c0e6c5b031aa4be4e3f182b3359e3f65adc5ed07f3d92bd3
|
4
|
+
data.tar.gz: fd07ec0b28170120ce33ee2577fbc6bd37ac69f0f73154013017792061c05ad7
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 51179e641573492400a9507617c41af8593548e8762c7dcb9e871273bbc7785e30f8444fd10e11ad530301996c1f041b3e292d5de82b2e98261cf4d65d3b660d
|
7
|
+
data.tar.gz: 0bfe47159548d4c1716e1f86a9747f051a53cf882c37faf4116265baf69e3bf9ef04cd543cb64fef0475db0423d364f79e567b39bc916ef4df86bdaad0120e53
|
data/README.md
CHANGED
@@ -1,11 +1,9 @@
|
|
1
|
-
#
|
2
|
-
[![
|
3
|
-
[![Coverage Status](https://coveralls.io/repos/github/next-l/enju_inventory/badge.svg?branch=
|
4
|
-
[![security](https://hakiri.io/github/next-l/enju_inventory/1.3.svg)](https://hakiri.io/github/next-l/enju_inventory/1.3)
|
1
|
+
# EnjuInventory
|
2
|
+
[![CircleCI](https://circleci.com/gh/next-l/enju_inventory/tree/2.x.svg?style=svg)](https://circleci.com/gh/next-l/enju_inventory/tree/2.x)
|
3
|
+
[![Coverage Status](https://coveralls.io/repos/github/next-l/enju_inventory/badge.svg?branch=2.x)](https://coveralls.io/github/next-l/enju_inventory?branch=2.x)
|
5
4
|
|
6
5
|
This project rocks and uses MIT-LICENSE.
|
7
6
|
|
8
7
|
## 製作者・貢献者 (Authors and contributors)
|
9
8
|
* [TANABE, Kosuke](https://github.com/nabeta) ([@nabeta](https://twitter.com/nabeta))
|
10
9
|
* [Project Next-L](https://www.next-l.jp) ([@ProjectNextL](https://twitter.com/ProjectNextL))
|
11
|
-
|
data/Rakefile
CHANGED
data/app/models/inventory.rb
CHANGED
@@ -38,12 +38,12 @@ end
|
|
38
38
|
#
|
39
39
|
# Table name: inventories
|
40
40
|
#
|
41
|
-
# id :
|
42
|
-
# item_id :
|
43
|
-
# inventory_file_id :
|
41
|
+
# id :bigint not null, primary key
|
42
|
+
# item_id :bigint
|
43
|
+
# inventory_file_id :bigint
|
44
44
|
# note :text
|
45
|
-
# created_at :datetime
|
46
|
-
# updated_at :datetime
|
47
|
-
# item_identifier :string
|
48
|
-
# current_shelf_name :string
|
45
|
+
# created_at :datetime not null
|
46
|
+
# updated_at :datetime not null
|
47
|
+
# item_identifier :string not null
|
48
|
+
# current_shelf_name :string not null
|
49
49
|
#
|
@@ -70,18 +70,15 @@ end
|
|
70
70
|
#
|
71
71
|
# Table name: inventory_files
|
72
72
|
#
|
73
|
-
# id :
|
74
|
-
#
|
75
|
-
# content_type :string
|
76
|
-
# size :integer
|
77
|
-
# user_id :integer
|
73
|
+
# id :bigint not null, primary key
|
74
|
+
# user_id :bigint
|
78
75
|
# note :text
|
79
|
-
# created_at :datetime
|
80
|
-
# updated_at :datetime
|
76
|
+
# created_at :datetime not null
|
77
|
+
# updated_at :datetime not null
|
81
78
|
# inventory_file_name :string
|
82
79
|
# inventory_content_type :string
|
83
80
|
# inventory_file_size :integer
|
84
81
|
# inventory_updated_at :datetime
|
85
82
|
# inventory_fingerprint :string
|
86
|
-
# shelf_id :
|
83
|
+
# shelf_id :bigint not null
|
87
84
|
#
|
@@ -3,8 +3,8 @@
|
|
3
3
|
|
4
4
|
<div class="field">
|
5
5
|
<%= f.label "#{t('activerecord.models.library')} / #{t('activerecord.models.shelf')}" -%>
|
6
|
-
<%= f.select :library_id, @libraries.map{|l| [l.display_name
|
7
|
-
<%= f.select :shelf_id, @shelves.map{|s| [s.display_name
|
6
|
+
<%= f.select :library_id, @libraries.map{|l| [l.display_name, l.id]} %>
|
7
|
+
<%= f.select :shelf_id, @shelves.map{|s| [s.display_name, s.id]} %>
|
8
8
|
<%= render 'observe_field' %>
|
9
9
|
</div>
|
10
10
|
|
@@ -1,17 +1,10 @@
|
|
1
|
-
class CreateInventoryFiles < ActiveRecord::Migration[
|
2
|
-
def
|
1
|
+
class CreateInventoryFiles < ActiveRecord::Migration[5.2]
|
2
|
+
def change
|
3
3
|
create_table :inventory_files do |t|
|
4
|
-
t.
|
5
|
-
t.string :content_type
|
6
|
-
t.integer :size
|
7
|
-
t.references :user, index: true
|
4
|
+
t.references :user
|
8
5
|
t.text :note
|
9
6
|
|
10
7
|
t.timestamps
|
11
8
|
end
|
12
9
|
end
|
13
|
-
|
14
|
-
def self.down
|
15
|
-
drop_table :inventory_files
|
16
|
-
end
|
17
10
|
end
|
@@ -1,4 +1,4 @@
|
|
1
|
-
class AddAttachmentsInventoryToInventoryFile < ActiveRecord::Migration[
|
1
|
+
class AddAttachmentsInventoryToInventoryFile < ActiveRecord::Migration[5.2]
|
2
2
|
def self.up
|
3
3
|
add_column :inventory_files, :inventory_file_name, :string
|
4
4
|
add_column :inventory_files, :inventory_content_type, :string
|
@@ -1,4 +1,5 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
1
|
+
namespace :enju_inventory do
|
2
|
+
desc "Import inventory result"
|
3
|
+
task import: :environment do
|
4
|
+
end
|
5
|
+
end
|
@@ -4,12 +4,13 @@ require 'rails/all'
|
|
4
4
|
|
5
5
|
Bundler.require(*Rails.groups)
|
6
6
|
require "enju_inventory"
|
7
|
+
require "enju_circulation"
|
7
8
|
require "enju_leaf"
|
8
9
|
|
9
10
|
module Dummy
|
10
11
|
class Application < Rails::Application
|
11
12
|
# Initialize configuration defaults for originally generated Rails version.
|
12
|
-
config.load_defaults 5.
|
13
|
+
config.load_defaults 5.2
|
13
14
|
|
14
15
|
# Settings in config/environments/* take precedence over those specified here.
|
15
16
|
# Application configuration should go into files in config/initializers
|
@@ -1,25 +1,86 @@
|
|
1
|
-
#
|
2
|
-
# gem install sqlite3
|
1
|
+
# PostgreSQL. Versions 9.1 and up are supported.
|
3
2
|
#
|
4
|
-
#
|
5
|
-
# gem
|
3
|
+
# Install the pg driver:
|
4
|
+
# gem install pg
|
5
|
+
# On OS X with Homebrew:
|
6
|
+
# gem install pg -- --with-pg-config=/usr/local/bin/pg_config
|
7
|
+
# On OS X with MacPorts:
|
8
|
+
# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
|
9
|
+
# On Windows:
|
10
|
+
# gem install pg
|
11
|
+
# Choose the win32 build.
|
12
|
+
# Install PostgreSQL and put its /bin directory on your path.
|
13
|
+
#
|
14
|
+
# Configure Using Gemfile
|
15
|
+
# gem 'pg'
|
6
16
|
#
|
7
17
|
default: &default
|
8
|
-
adapter:
|
18
|
+
adapter: postgresql
|
19
|
+
encoding: unicode
|
20
|
+
# For details on connection pooling, see Rails configuration guide
|
21
|
+
# http://guides.rubyonrails.org/configuring.html#database-pooling
|
9
22
|
pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
|
10
|
-
|
23
|
+
username: postgres
|
11
24
|
|
12
25
|
development:
|
13
26
|
<<: *default
|
14
|
-
database:
|
27
|
+
database: enju_inventory_dummy_development
|
28
|
+
|
29
|
+
# The specified database role being used to connect to postgres.
|
30
|
+
# To create additional roles in postgres see `$ createuser --help`.
|
31
|
+
# When left blank, postgres will use the default role. This is
|
32
|
+
# the same name as the operating system user that initialized the database.
|
33
|
+
#username: enju_inventory_dummy
|
34
|
+
|
35
|
+
# The password associated with the postgres role (username).
|
36
|
+
#password:
|
37
|
+
|
38
|
+
# Connect on a TCP socket. Omitted by default since the client uses a
|
39
|
+
# domain socket that doesn't need configuration. Windows does not have
|
40
|
+
# domain sockets, so uncomment these lines.
|
41
|
+
#host: localhost
|
42
|
+
|
43
|
+
# The TCP port the server listens on. Defaults to 5432.
|
44
|
+
# If your server runs on a different port number, change accordingly.
|
45
|
+
#port: 5432
|
46
|
+
|
47
|
+
# Schema search path. The server defaults to $user,public
|
48
|
+
#schema_search_path: myapp,sharedapp,public
|
49
|
+
|
50
|
+
# Minimum log levels, in increasing order:
|
51
|
+
# debug5, debug4, debug3, debug2, debug1,
|
52
|
+
# log, notice, warning, error, fatal, and panic
|
53
|
+
# Defaults to warning.
|
54
|
+
#min_messages: notice
|
15
55
|
|
16
56
|
# Warning: The database defined as "test" will be erased and
|
17
57
|
# re-generated from your development database when you run "rake".
|
18
58
|
# Do not set this db to the same as development or production.
|
19
59
|
test:
|
20
60
|
<<: *default
|
21
|
-
database:
|
61
|
+
database: enju_inventory_dummy_test
|
22
62
|
|
63
|
+
# As with config/secrets.yml, you never want to store sensitive information,
|
64
|
+
# like your database password, in your source code. If your source code is
|
65
|
+
# ever seen by anyone, they now have access to your database.
|
66
|
+
#
|
67
|
+
# Instead, provide the password as a unix environment variable when you boot
|
68
|
+
# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database
|
69
|
+
# for a full rundown on how to provide these environment variables in a
|
70
|
+
# production deployment.
|
71
|
+
#
|
72
|
+
# On Heroku and other platform providers, you may have a full connection URL
|
73
|
+
# available as an environment variable. For example:
|
74
|
+
#
|
75
|
+
# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase"
|
76
|
+
#
|
77
|
+
# You can use this database configuration with:
|
78
|
+
#
|
79
|
+
# production:
|
80
|
+
# url: <%= ENV['DATABASE_URL'] %>
|
81
|
+
#
|
23
82
|
production:
|
24
83
|
<<: *default
|
25
|
-
database:
|
84
|
+
database: enju_inventory_dummy_production
|
85
|
+
username: enju_inventory_dummy
|
86
|
+
password: <%= ENV['DUMMY_DATABASE_PASSWORD'] %>
|
@@ -0,0 +1,34 @@
|
|
1
|
+
test:
|
2
|
+
service: Disk
|
3
|
+
root: <%= Rails.root.join("tmp/storage") %>
|
4
|
+
|
5
|
+
local:
|
6
|
+
service: Disk
|
7
|
+
root: <%= Rails.root.join("storage") %>
|
8
|
+
|
9
|
+
# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key)
|
10
|
+
# amazon:
|
11
|
+
# service: S3
|
12
|
+
# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %>
|
13
|
+
# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %>
|
14
|
+
# region: us-east-1
|
15
|
+
# bucket: your_own_bucket
|
16
|
+
|
17
|
+
# Remember not to checkin your GCS keyfile to a repository
|
18
|
+
# google:
|
19
|
+
# service: GCS
|
20
|
+
# project: your_project
|
21
|
+
# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %>
|
22
|
+
# bucket: your_own_bucket
|
23
|
+
|
24
|
+
# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key)
|
25
|
+
# microsoft:
|
26
|
+
# service: AzureStorage
|
27
|
+
# storage_account_name: your_account_name
|
28
|
+
# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %>
|
29
|
+
# container: your_container_name
|
30
|
+
|
31
|
+
# mirror:
|
32
|
+
# service: Mirror
|
33
|
+
# primary: local
|
34
|
+
# mirrors: [ amazon, google, microsoft ]
|
@@ -1,4 +1,4 @@
|
|
1
|
-
class CreateAgents < ActiveRecord::Migration[
|
1
|
+
class CreateAgents < ActiveRecord::Migration[5.2]
|
2
2
|
def change
|
3
3
|
create_table :agents do |t|
|
4
4
|
t.string :last_name
|
@@ -13,7 +13,6 @@ class CreateAgents < ActiveRecord::Migration[4.2]
|
|
13
13
|
t.text :full_name_transcription
|
14
14
|
t.text :full_name_alternative
|
15
15
|
t.timestamps
|
16
|
-
t.datetime :deleted_at
|
17
16
|
t.string :zip_code_1
|
18
17
|
t.string :zip_code_2
|
19
18
|
t.text :address_1
|
@@ -1,4 +1,4 @@
|
|
1
|
-
class CreateManifestations < ActiveRecord::Migration[
|
1
|
+
class CreateManifestations < ActiveRecord::Migration[5.2]
|
2
2
|
def change
|
3
3
|
create_table :manifestations do |t|
|
4
4
|
t.text :original_title, null: false
|
@@ -9,7 +9,6 @@ class CreateManifestations < ActiveRecord::Migration[4.2]
|
|
9
9
|
t.datetime :date_of_publication
|
10
10
|
t.datetime :copyright_date
|
11
11
|
t.timestamps
|
12
|
-
t.datetime :deleted_at
|
13
12
|
t.string :access_address
|
14
13
|
t.integer :language_id, default: 1, null: false
|
15
14
|
t.integer :carrier_type_id, default: 1, null: false
|
@@ -1,10 +1,9 @@
|
|
1
|
-
class CreateItems < ActiveRecord::Migration[
|
1
|
+
class CreateItems < ActiveRecord::Migration[5.2]
|
2
2
|
def change
|
3
3
|
create_table :items do |t|
|
4
4
|
t.string :call_number
|
5
5
|
t.string :item_identifier
|
6
6
|
t.timestamps
|
7
|
-
t.datetime :deleted_at
|
8
7
|
t.integer :shelf_id, default: 1, null: false
|
9
8
|
t.boolean :include_supplements, default: false, null: false
|
10
9
|
t.text :note
|
@@ -1,4 +1,4 @@
|
|
1
|
-
class CreateOwns < ActiveRecord::Migration[
|
1
|
+
class CreateOwns < ActiveRecord::Migration[5.2]
|
2
2
|
def change
|
3
3
|
create_table :owns do |t|
|
4
4
|
t.references :agent, null: false
|
@@ -6,7 +6,5 @@ class CreateOwns < ActiveRecord::Migration[4.2]
|
|
6
6
|
t.integer :position
|
7
7
|
t.timestamps
|
8
8
|
end
|
9
|
-
add_index :owns, :agent_id
|
10
|
-
add_index :owns, :item_id
|
11
9
|
end
|
12
10
|
end
|
@@ -1,4 +1,4 @@
|
|
1
|
-
class CreateCreates < ActiveRecord::Migration[
|
1
|
+
class CreateCreates < ActiveRecord::Migration[5.2]
|
2
2
|
def change
|
3
3
|
create_table :creates do |t|
|
4
4
|
t.references :agent, null: false
|
@@ -6,7 +6,5 @@ class CreateCreates < ActiveRecord::Migration[4.2]
|
|
6
6
|
t.integer :position
|
7
7
|
t.timestamps
|
8
8
|
end
|
9
|
-
add_index :creates, :agent_id
|
10
|
-
add_index :creates, :work_id
|
11
9
|
end
|
12
10
|
end
|
@@ -0,0 +1,20 @@
|
|
1
|
+
class CreateCheckouts < ActiveRecord::Migration[5.2]
|
2
|
+
def self.up
|
3
|
+
create_table :checkouts do |t|
|
4
|
+
t.references :user, index: true, foreign_key: true
|
5
|
+
t.references :item, index: true, foreign_key: true, null: false
|
6
|
+
t.references :checkin, index: true, foreign_key: true
|
7
|
+
t.references :librarian, index: true
|
8
|
+
t.references :basket, index: true
|
9
|
+
t.datetime :due_date
|
10
|
+
t.integer :checkout_renewal_count, default: 0, null: false
|
11
|
+
t.integer :lock_version, default: 0, null: false
|
12
|
+
t.timestamps
|
13
|
+
end
|
14
|
+
add_index :checkouts, [:item_id, :basket_id], unique: true
|
15
|
+
end
|
16
|
+
|
17
|
+
def self.down
|
18
|
+
drop_table :checkouts
|
19
|
+
end
|
20
|
+
end
|
@@ -0,0 +1,21 @@
|
|
1
|
+
class CreateReserves < ActiveRecord::Migration[5.2]
|
2
|
+
def self.up
|
3
|
+
create_table :reserves do |t|
|
4
|
+
t.references :user, index: true, foreign_key: true, null: false
|
5
|
+
t.references :manifestation, index: true, null: false
|
6
|
+
t.references :item, index: true
|
7
|
+
t.references :request_status_type, null: false
|
8
|
+
t.datetime :checked_out_at
|
9
|
+
t.timestamps
|
10
|
+
t.datetime :canceled_at
|
11
|
+
t.datetime :expired_at
|
12
|
+
t.datetime :deleted_at
|
13
|
+
t.boolean :expiration_notice_to_patron, default: false
|
14
|
+
t.boolean :expiration_notice_to_library, default: false
|
15
|
+
end
|
16
|
+
end
|
17
|
+
|
18
|
+
def self.down
|
19
|
+
drop_table :reserves
|
20
|
+
end
|
21
|
+
end
|