enju_event 0.4.0.beta.2 → 0.4.0.rc.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (245) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +1 -1
  3. data/app/controllers/event_import_files_controller.rb +1 -0
  4. data/app/controllers/event_import_results_controller.rb +2 -2
  5. data/app/mailers/event_export_mailer.rb +2 -2
  6. data/app/mailers/event_import_mailer.rb +2 -2
  7. data/app/models/event.rb +48 -30
  8. data/app/models/event_category.rb +3 -3
  9. data/app/models/event_export_file.rb +15 -21
  10. data/app/models/event_export_file_transition.rb +3 -3
  11. data/app/models/event_import_file.rb +7 -14
  12. data/app/models/event_import_file_transition.rb +1 -1
  13. data/app/models/event_import_result.rb +5 -6
  14. data/app/models/participate.rb +5 -5
  15. data/app/models/place.rb +2 -2
  16. data/app/views/event_import_files/_results.html.erb +26 -0
  17. data/app/views/event_import_files/show.html.erb +70 -74
  18. data/app/views/event_import_results/index.html.erb +15 -26
  19. data/app/views/events/index.txt.ruby +7 -0
  20. data/config/locales/translation_en.yml +1 -0
  21. data/config/locales/translation_ja.yml +1 -0
  22. data/db/migrate/113_create_events.rb +2 -7
  23. data/db/migrate/114_create_event_categories.rb +1 -1
  24. data/db/migrate/20081028093607_create_event_import_files.rb +1 -1
  25. data/db/migrate/20090519203307_create_participates.rb +1 -1
  26. data/db/migrate/20100925074639_create_event_import_results.rb +1 -1
  27. data/db/migrate/20120413051535_add_event_import_fingerprint_to_event_import_file.rb +1 -1
  28. data/db/migrate/20120413170734_add_error_message_to_event_import_file.rb +1 -1
  29. data/db/migrate/20120415060342_rename_event_import_file_imported_at_to_executed_at.rb +1 -1
  30. data/db/migrate/20140523171309_create_event_import_file_transitions.rb +1 -1
  31. data/db/migrate/20140628071719_add_user_encoding_to_event_import_file.rb +1 -1
  32. data/db/migrate/20140720192418_add_default_library_id_to_event_import_file.rb +1 -1
  33. data/db/migrate/20140812152348_create_event_export_files.rb +1 -1
  34. data/db/migrate/20140812153137_create_event_export_file_transitions.rb +1 -1
  35. data/db/migrate/20140814070854_add_default_event_category_id_to_event_import_file.rb +1 -1
  36. data/db/migrate/20151128142913_create_places.rb +1 -1
  37. data/db/migrate/20151201163718_add_place_id_to_event.rb +1 -1
  38. data/db/migrate/20160703184258_add_most_recent_to_event_import_file_transitions.rb +1 -1
  39. data/db/migrate/20160703184311_add_most_recent_to_event_export_file_transitions.rb +1 -1
  40. data/db/migrate/20180107164558_add_constraints_to_most_recent_for_event_import_file_transitions.rb +1 -1
  41. data/db/migrate/20180107164617_add_constraints_to_most_recent_for_event_export_file_transitions.rb +1 -1
  42. data/lib/enju_event/engine.rb +0 -1
  43. data/lib/enju_event/version.rb +1 -1
  44. data/lib/generators/enju_event/setup/setup_generator.rb +3 -3
  45. data/spec/controllers/event_import_results_controller_spec.rb +2 -2
  46. data/spec/dummy/app/controllers/application_controller.rb +0 -1
  47. data/spec/dummy/db/migrate/001_create_agents.rb +1 -2
  48. data/spec/dummy/db/migrate/005_create_manifestations.rb +1 -2
  49. data/spec/dummy/db/migrate/006_create_items.rb +1 -2
  50. data/spec/dummy/db/migrate/012_create_owns.rb +1 -3
  51. data/spec/dummy/db/migrate/015_create_creates.rb +1 -3
  52. data/spec/dummy/db/migrate/041_create_roles.rb +1 -1
  53. data/spec/dummy/db/migrate/047_create_produces.rb +1 -3
  54. data/spec/dummy/db/migrate/059_create_libraries.rb +1 -2
  55. data/spec/dummy/db/migrate/069_create_shelves.rb +1 -2
  56. data/spec/dummy/db/migrate/073_create_carrier_types.rb +1 -1
  57. data/spec/dummy/db/migrate/077_create_user_groups.rb +1 -2
  58. data/spec/dummy/db/migrate/080_create_library_groups.rb +1 -1
  59. data/spec/dummy/db/migrate/112_create_frequencies.rb +1 -1
  60. data/spec/dummy/db/migrate/117_create_form_of_works.rb +1 -1
  61. data/spec/dummy/db/migrate/120_create_baskets.rb +1 -1
  62. data/spec/dummy/db/migrate/124_create_bookstores.rb +1 -2
  63. data/spec/dummy/db/migrate/125_create_donates.rb +1 -1
  64. data/spec/dummy/db/migrate/130_create_request_status_types.rb +1 -1
  65. data/spec/dummy/db/migrate/131_create_request_types.rb +1 -1
  66. data/spec/dummy/db/migrate/133_create_agent_merges.rb +1 -1
  67. data/spec/dummy/db/migrate/134_create_agent_merge_lists.rb +1 -1
  68. data/spec/dummy/db/migrate/149_create_message_templates.rb +1 -1
  69. data/spec/dummy/db/migrate/154_create_messages.rb +1 -1
  70. data/spec/dummy/db/migrate/20080819181903_create_message_requests.rb +2 -7
  71. data/spec/dummy/db/migrate/20080830154109_create_realizes.rb +1 -3
  72. data/spec/dummy/db/migrate/20080905191442_create_agent_types.rb +1 -1
  73. data/spec/dummy/db/migrate/20081006090811_create_subscriptions.rb +1 -2
  74. data/spec/dummy/db/migrate/20081006093246_create_subscribes.rb +1 -1
  75. data/spec/dummy/db/migrate/20081023092436_create_search_engines.rb +1 -1
  76. data/spec/dummy/db/migrate/20081025083323_create_countries.rb +1 -1
  77. data/spec/dummy/db/migrate/20081025083905_create_languages.rb +1 -1
  78. data/spec/dummy/db/migrate/20081027150907_create_picture_files.rb +1 -1
  79. data/spec/dummy/db/migrate/20081028083142_create_agent_import_files.rb +1 -1
  80. data/spec/dummy/db/migrate/20081028083208_create_resource_import_files.rb +1 -1
  81. data/spec/dummy/db/migrate/20090705133942_add_attachments_picture_to_picture_file.rb +1 -1
  82. data/spec/dummy/db/migrate/20090705212043_add_attachments_attachment_to_manifestation.rb +1 -1
  83. data/spec/dummy/db/migrate/20090720091106_create_medium_of_performances.rb +1 -1
  84. data/spec/dummy/db/migrate/20090720091429_create_content_types.rb +1 -1
  85. data/spec/dummy/db/migrate/20090812151902_create_agent_relationship_types.rb +1 -1
  86. data/spec/dummy/db/migrate/20091012101112_add_dcndl_schema.rb +1 -1
  87. data/spec/dummy/db/migrate/20091025080447_create_licenses.rb +1 -1
  88. data/spec/dummy/db/migrate/20091214131723_create_series_statements.rb +1 -1
  89. data/spec/dummy/db/migrate/20100129142347_create_import_requests.rb +1 -1
  90. data/spec/dummy/db/migrate/20100211105551_add_admin_networks_to_library_group.rb +1 -1
  91. data/spec/dummy/db/migrate/20100223121519_rename_series_statement_title_to_original_title.rb +1 -1
  92. data/spec/dummy/db/migrate/20100314190054_add_opening_hour_to_library.rb +1 -1
  93. data/spec/dummy/db/migrate/20100321235924_add_series_statement_identifier_to_series_statement.rb +1 -1
  94. data/spec/dummy/db/migrate/20100525124311_create_manifestation_relationships.rb +1 -1
  95. data/spec/dummy/db/migrate/20100606065209_create_user_has_roles.rb +1 -1
  96. data/spec/dummy/db/migrate/20100606073747_create_agent_relationships.rb +1 -1
  97. data/spec/dummy/db/migrate/20100607044753_create_manifestation_relationship_types.rb +1 -1
  98. data/spec/dummy/db/migrate/20100814091104_add_position_to_agent_relationship.rb +1 -1
  99. data/spec/dummy/db/migrate/20100925043847_create_resource_import_results.rb +1 -1
  100. data/spec/dummy/db/migrate/20100925074559_create_agent_import_results.rb +1 -1
  101. data/spec/dummy/db/migrate/20101212070145_add_acquired_at_to_item.rb +1 -1
  102. data/spec/dummy/db/migrate/20110222073537_add_url_to_library_group.rb +1 -1
  103. data/spec/dummy/db/migrate/20110301035123_add_pub_date_to_manifestation.rb +1 -1
  104. data/spec/dummy/db/migrate/20110301121550_add_birth_date_and_death_date_to_agent.rb +1 -1
  105. data/spec/dummy/db/migrate/20110318183304_add_valid_period_for_new_user_to_user_group.rb +1 -1
  106. data/spec/dummy/db/migrate/20110603184217_add_edit_mode_to_resource_import_file.rb +1 -1
  107. data/spec/dummy/db/migrate/20110619064807_add_edition_string_to_manifestation.rb +1 -1
  108. data/spec/dummy/db/migrate/20110620173525_add_bookstore_id_to_item.rb +1 -1
  109. data/spec/dummy/db/migrate/20110627034940_create_series_statement_merge_lists.rb +1 -1
  110. data/spec/dummy/db/migrate/20110627035057_create_series_statement_merges.rb +1 -1
  111. data/spec/dummy/db/migrate/20110913115320_add_lft_and_rgt_to_message.rb +1 -1
  112. data/spec/dummy/db/migrate/20110916091020_add_volume_number_to_manifestation.rb +1 -1
  113. data/spec/dummy/db/migrate/20110916103953_add_manifestaiton_id_to_series_statement.rb +1 -1
  114. data/spec/dummy/db/migrate/20110918162329_add_note_to_series_statement.rb +1 -1
  115. data/spec/dummy/db/migrate/20111124110059_create_create_types.rb +1 -1
  116. data/spec/dummy/db/migrate/20111124110319_create_realize_types.rb +1 -1
  117. data/spec/dummy/db/migrate/20111124110355_create_produce_types.rb +1 -1
  118. data/spec/dummy/db/migrate/20111124112131_add_create_type_to_create.rb +1 -1
  119. data/spec/dummy/db/migrate/20120105074911_add_isil_to_library.rb +1 -1
  120. data/spec/dummy/db/migrate/20120125050502_add_depth_to_message.rb +1 -1
  121. data/spec/dummy/db/migrate/20120125152919_add_title_subseries_transcription_to_series_statement.rb +1 -1
  122. data/spec/dummy/db/migrate/20120129014038_create_budget_types.rb +1 -1
  123. data/spec/dummy/db/migrate/20120129020544_add_budget_type_id_to_item.rb +1 -1
  124. data/spec/dummy/db/migrate/20120319120638_add_content_type_id_to_manifestation.rb +1 -1
  125. data/spec/dummy/db/migrate/20120319173203_create_accepts.rb +1 -1
  126. data/spec/dummy/db/migrate/20120410104851_add_year_of_publication_to_manifestation.rb +1 -1
  127. data/spec/dummy/db/migrate/20120413072700_add_picture_meta_to_picture_file.rb +1 -1
  128. data/spec/dummy/db/migrate/20120413100352_add_fingerprint_to_picture_file.rb +1 -1
  129. data/spec/dummy/db/migrate/20120413161340_add_fingerprint_to_resource_import_file.rb +1 -1
  130. data/spec/dummy/db/migrate/20120413161403_add_fingerprint_to_agent_import_file.rb +1 -1
  131. data/spec/dummy/db/migrate/20120413170705_add_error_message_to_resource_import_file.rb +1 -1
  132. data/spec/dummy/db/migrate/20120413170720_add_error_message_to_agent_import_file.rb +1 -1
  133. data/spec/dummy/db/migrate/20120415164821_add_attachment_meta_to_manifestation.rb +1 -1
  134. data/spec/dummy/db/migrate/20120418081407_add_month_of_publication_to_manifestation.rb +1 -1
  135. data/spec/dummy/db/migrate/20120510140958_add_closed_to_shelf.rb +1 -1
  136. data/spec/dummy/db/migrate/20120511072422_add_agent_identifier_to_agent.rb +1 -1
  137. data/spec/dummy/db/migrate/20120602141129_add_edit_mode_to_agent_import_file.rb +1 -1
  138. data/spec/dummy/db/migrate/20121116031206_add_fulltext_content_to_manifestation.rb +1 -1
  139. data/spec/dummy/db/migrate/20130221154434_add_additional_attributes_to_user.rb +1 -2
  140. data/spec/dummy/db/migrate/20130412083556_add_latitude_and_longitude_to_library.rb +1 -1
  141. data/spec/dummy/db/migrate/20130421093852_add_periodical_to_manifestation.rb +1 -1
  142. data/spec/dummy/db/migrate/20130421155019_add_creator_string_to_series_statement.rb +1 -1
  143. data/spec/dummy/db/migrate/20130421164124_add_series_master_to_series_statement.rb +1 -1
  144. data/spec/dummy/db/migrate/20130429020822_add_root_manifestation_id_to_series_statement.rb +1 -1
  145. data/spec/dummy/db/migrate/20130506175303_create_identifier_types.rb +1 -1
  146. data/spec/dummy/db/migrate/20130506175834_create_identifiers.rb +1 -1
  147. data/spec/dummy/db/migrate/20130509185724_add_statement_of_responsibility_to_manifestation.rb +1 -1
  148. data/spec/dummy/db/migrate/20140110122216_create_user_import_files.rb +1 -1
  149. data/spec/dummy/db/migrate/20140110131010_create_user_import_results.rb +1 -1
  150. data/spec/dummy/db/migrate/20140122054321_create_profiles.rb +1 -1
  151. data/spec/dummy/db/migrate/20140518111006_create_message_transitions.rb +2 -6
  152. data/spec/dummy/db/migrate/20140518135713_create_message_request_transitions.rb +2 -6
  153. data/spec/dummy/db/migrate/20140519170214_create_resource_import_file_transitions.rb +1 -1
  154. data/spec/dummy/db/migrate/20140519171220_create_import_request_transitions.rb +1 -1
  155. data/spec/dummy/db/migrate/20140524020735_create_agent_import_file_transitions.rb +1 -1
  156. data/spec/dummy/db/migrate/20140524074813_create_user_import_file_transitions.rb +2 -6
  157. data/spec/dummy/db/migrate/20140610123439_drop_email_unique_constraint_enju_leaf_rc10.rb +1 -1
  158. data/spec/dummy/db/migrate/20140614065404_create_resource_export_files.rb +1 -1
  159. data/spec/dummy/db/migrate/20140614141500_create_resource_export_file_transitions.rb +1 -1
  160. data/spec/dummy/db/migrate/20140628072217_add_user_encoding_to_user_import_file.rb +1 -1
  161. data/spec/dummy/db/migrate/20140628073524_add_user_encoding_to_agent_import_file.rb +1 -1
  162. data/spec/dummy/db/migrate/20140628073535_add_user_encoding_to_resource_import_file.rb +1 -1
  163. data/spec/dummy/db/migrate/20140709113413_create_user_export_files.rb +1 -1
  164. data/spec/dummy/db/migrate/20140709113905_create_user_export_file_transitions.rb +2 -6
  165. data/spec/dummy/db/migrate/20140720140916_add_binding_item_identifier_to_item.rb +1 -1
  166. data/spec/dummy/db/migrate/20140720170714_add_default_library_id_to_user_import_file.rb +1 -1
  167. data/spec/dummy/db/migrate/20140720170735_add_default_user_group_id_to_user_import_file.rb +1 -1
  168. data/spec/dummy/db/migrate/20140721151416_add_default_shelf_id_to_resource_import_file.rb +1 -1
  169. data/spec/dummy/db/migrate/20140802082007_add_manifestation_id_to_item.rb +1 -1
  170. data/spec/dummy/db/migrate/20140811031145_add_expired_at_to_profile.rb +1 -1
  171. data/spec/dummy/db/migrate/20140813182425_add_publication_place_to_manifestation.rb +1 -1
  172. data/spec/dummy/db/migrate/20140821151023_create_colors.rb +1 -1
  173. data/spec/dummy/db/migrate/20140822114527_add_error_message_to_resource_import_result.rb +1 -1
  174. data/spec/dummy/db/migrate/20140823083524_add_extent_to_manifestation.rb +1 -1
  175. data/spec/dummy/db/migrate/20140823094847_add_dimensions_to_manifestation.rb +1 -1
  176. data/spec/dummy/db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb +1 -1
  177. data/spec/dummy/db/migrate/20141003181336_add_full_name_transcription_to_profile.rb +1 -1
  178. data/spec/dummy/db/migrate/20141003182825_add_date_of_birth_to_profile.rb +1 -1
  179. data/spec/dummy/db/migrate/20150117111136_add_foreign_key_to_items_referencing_manifestations.rb +1 -1
  180. data/spec/dummy/db/migrate/20150221063719_add_settings_to_library_group.rb +1 -1
  181. data/spec/dummy/db/migrate/20150506105356_add_error_message_to_user_import_result.rb +1 -1
  182. data/spec/dummy/db/migrate/20150924115059_create_withdraws.rb +1 -1
  183. data/spec/dummy/db/migrate/20151125004028_add_profile_id_to_agent.rb +1 -1
  184. data/spec/dummy/db/migrate/20160319144230_create_issn_records.rb +11 -0
  185. data/spec/dummy/db/migrate/20160506144040_create_isbn_records.rb +11 -0
  186. data/spec/dummy/db/migrate/20160610093229_add_html_snippet_to_library_group.rb +1 -1
  187. data/spec/dummy/db/migrate/20160627232219_add_most_recent_to_user_import_file_transitions.rb +1 -1
  188. data/spec/dummy/db/migrate/20160627232316_add_most_recent_to_user_export_file_transitions.rb +1 -1
  189. data/spec/dummy/db/migrate/20160703185015_add_most_recent_to_message_transitions.rb +1 -1
  190. data/spec/dummy/db/migrate/20160801080612_add_most_recent_to_import_request_transitions.rb +1 -1
  191. data/spec/dummy/db/migrate/20160801080619_add_most_recent_to_resource_import_file_transitions.rb +1 -1
  192. data/spec/dummy/db/migrate/20160801080637_add_most_recent_to_resource_export_file_transitions.rb +1 -1
  193. data/spec/dummy/db/migrate/20160801080643_add_most_recent_to_agent_import_file_transitions.rb +1 -1
  194. data/spec/dummy/db/migrate/20160811102604_add_picture_width_to_picture_file.rb +1 -1
  195. data/spec/dummy/db/migrate/20160813191647_add_max_number_of_results_to_library_group.rb +1 -1
  196. data/spec/dummy/db/migrate/20160813191733_add_family_name_first_to_library_group.rb +1 -1
  197. data/spec/dummy/db/migrate/20160813192542_add_pub_year_facet_range_interval_to_library_group.rb +1 -1
  198. data/spec/dummy/db/migrate/20160813203039_add_user_id_to_library_group.rb +1 -1
  199. data/spec/dummy/db/migrate/20160814165332_add_most_recent_to_message_request_transitions.rb +1 -1
  200. data/spec/dummy/db/migrate/20160820004638_add_attachment_attachment_to_carrier_types.rb +1 -1
  201. data/spec/dummy/db/migrate/20170116134107_create_issn_record_and_manifestations.rb +11 -0
  202. data/spec/dummy/db/migrate/20170116134120_create_isbn_record_and_manifestations.rb +11 -0
  203. data/spec/dummy/db/migrate/20170305064014_add_csv_charset_conversion_to_library_group.rb +1 -1
  204. data/spec/dummy/db/migrate/20171014084528_add_header_logo_to_library_group.rb +1 -1
  205. data/spec/dummy/db/migrate/20171119051258_set_not_null_to_manifestation_id_on_items.rb +1 -1
  206. data/spec/dummy/db/migrate/20171126133835_rename_login_banner_to_old_login_banner.rb +1 -1
  207. data/spec/dummy/db/migrate/20171126135238_add_foreign_key_to_library_group_id_on_library.rb +1 -1
  208. data/spec/dummy/db/migrate/20180102162311_add_header_logo_meta_to_library_group.rb +1 -1
  209. data/spec/dummy/db/migrate/20180107160726_add_constraints_to_most_recent_for_user_import_file_transitions.rb +1 -1
  210. data/spec/dummy/db/migrate/20180107160740_add_constraints_to_most_recent_for_user_export_file_transitions.rb +1 -1
  211. data/spec/dummy/db/migrate/20180107161311_add_constraints_to_most_recent_for_agent_import_file_transitions.rb +1 -1
  212. data/spec/dummy/db/migrate/20180107161331_add_constraints_to_most_recent_for_resource_import_file_transitions.rb +1 -1
  213. data/spec/dummy/db/migrate/20180107161347_add_constraints_to_most_recent_for_resource_export_file_transitions.rb +1 -1
  214. data/spec/dummy/db/migrate/20180107161410_add_constraints_to_most_recent_for_import_request_transitions.rb +1 -1
  215. data/spec/dummy/db/migrate/20180107162659_add_constraints_to_most_recent_for_message_transitions.rb +1 -1
  216. data/spec/dummy/db/migrate/20180107162711_add_constraints_to_most_recent_for_message_request_transitions.rb +1 -1
  217. data/spec/dummy/db/migrate/20190102034126_create_doi_records.rb +13 -0
  218. data/spec/dummy/db/migrate/20190311154610_create_periodicals.rb +10 -0
  219. data/spec/dummy/db/migrate/20190312033839_create_periodical_and_manifestations.rb +11 -0
  220. data/spec/dummy/db/migrate/20190818075603_add_memo_to_manifestation.rb +5 -0
  221. data/spec/dummy/db/migrate/20190818075628_add_memo_to_item.rb +5 -0
  222. data/spec/dummy/db/migrate/20191216131755_add_email_to_library_group.rb +6 -0
  223. data/spec/dummy/db/migrate/20191219122214_create_custom_properties.rb +12 -0
  224. data/spec/dummy/db/schema.rb +386 -296
  225. data/spec/fixtures/event_categories.yml +3 -3
  226. data/spec/fixtures/event_export_files.yml +4 -4
  227. data/spec/fixtures/event_import_files.yml +7 -7
  228. data/spec/fixtures/event_import_results.yml +5 -5
  229. data/spec/fixtures/events.yml +6 -7
  230. data/spec/fixtures/library_groups.yml +1 -1
  231. data/spec/fixtures/participates.yml +5 -5
  232. data/spec/models/event_category_spec.rb +3 -3
  233. data/spec/models/event_export_file_spec.rb +4 -4
  234. data/spec/models/event_import_file_spec.rb +7 -7
  235. data/spec/models/event_import_result_spec.rb +5 -5
  236. data/spec/models/event_spec.rb +6 -7
  237. data/spec/models/participate_spec.rb +5 -5
  238. data/spec/system/event_export_files_spec.rb +16 -0
  239. data/spec/system/event_import_files_spec.rb +16 -0
  240. data/spec/system/event_import_results_spec.rb +17 -0
  241. data/spec/system/events_spec.rb +5 -0
  242. data/spec/system/participates_spec.rb +16 -0
  243. data/spec/system/places_spec.rb +16 -0
  244. metadata +46 -13
  245. data/app/views/events/index.txt.erb +0 -4
@@ -3,7 +3,7 @@
3
3
  <div id="content_list">
4
4
  <% if @event_import_file %>
5
5
  <h2 class="event_title">
6
- <%= link_to @event_import_file.event_import_file_name, @event_import_file %>
6
+ <%= link_to @event_import_file.event_import.blob.filename, @event_import_file %>
7
7
  </h2>
8
8
  <% end %>
9
9
 
@@ -14,20 +14,20 @@
14
14
  <th></th>
15
15
  </tr>
16
16
 
17
- <% @event_import_results.each do |event_import_result| %>
18
- <tr class="line<%= cycle("0", "1") -%>">
19
- <td>
20
- <%= link_to event_import_result.event_import_file.event_import_file_name, event_import_result.event_import_file %>
21
- <br />
22
- <%=l event_import_result.created_at %>
23
- </td>
24
- <td><%= link_to event_import_result.event.display_name, event_import_result.event if event_import_result.event %></td>
25
- <td>
26
- <%= link_to t('page.show'), event_import_result %>
27
- <%= link_to t('page.destroy'), event_import_result, data: {confirm: t('page.are_you_sure')}, method: :delete %>
28
- </td>
29
- </tr>
30
- <% end %>
17
+ <% @event_import_results.each do |event_import_result| %>
18
+ <tr class="line<%= cycle("0", "1") -%>">
19
+ <td>
20
+ <%= link_to event_import_result.event_import_file.event_import_file_name, event_import_result.event_import_file %>
21
+ <br />
22
+ <%=l event_import_result.created_at %>
23
+ </td>
24
+ <td><%= link_to event_import_result.event.display_name, event_import_result.event if event_import_result.event %></td>
25
+ <td>
26
+ <%= link_to t('page.show'), event_import_result %>
27
+ <%= link_to t('page.destroy'), event_import_result, data: {confirm: t('page.are_you_sure')}, method: :delete %>
28
+ </td>
29
+ </tr>
30
+ <% end %>
31
31
  </table>
32
32
 
33
33
  <%= paginate(@event_import_results) %>
@@ -36,15 +36,4 @@
36
36
  </div>
37
37
 
38
38
  <div id="submenu" class="ui-corner-all ui-widget-content">
39
- <ul>
40
- <li>
41
- <% if @event_import_file %>
42
- <%= link_to (image_tag 'icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV'), event_import_results_path(event_import_file_id: @event_import_file.id, format: :txt, locale: @locale.to_s) -%>
43
- (<%= link_to 'TSV', event_import_results_path(event_import_file_id: @event_import_file.id, format: :txt, locale: @locale.to_s) -%>)
44
- <% else %>
45
- <%= link_to (image_tag 'icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV'), event_import_results_path(format: :txt, locale: @locale.to_s) -%>
46
- (<%= link_to 'TSV', event_import_results_path(format: :txt, locale: @locale.to_s) -%>)
47
- <% end %>
48
- </li>
49
- </ul>
50
39
  </div>
@@ -0,0 +1,7 @@
1
+ Event.csv_header(
2
+ role: current_user_role_name
3
+ ).to_csv(col_sep: "\t") + @events.map{|event|
4
+ event.to_hash(
5
+ role: current_user_role_name
6
+ ).values.to_csv(col_sep: "\t")
7
+ }.join
@@ -38,6 +38,7 @@ en:
38
38
  default_event_category_id: Default event category
39
39
  event_import_result:
40
40
  body: Body
41
+ lineno: Line
41
42
  event_export_file:
42
43
  event_export_file_name: Filename
43
44
  event_export_file_size: Size
@@ -38,6 +38,7 @@ ja:
38
38
  default_event_category_id: 既定の催し物の種別
39
39
  event_import_result:
40
40
  body: 本文
41
+ lineno: 行数
41
42
  event_export_file:
42
43
  event_export_file_name: ファイル名
43
44
  event_export_file_size: ファイルサイズ
@@ -1,5 +1,5 @@
1
- class CreateEvents < ActiveRecord::Migration[4.2]
2
- def self.up
1
+ class CreateEvents < ActiveRecord::Migration[5.2]
2
+ def change
3
3
  create_table :events do |t|
4
4
  t.references :library, index: true, null: false
5
5
  t.references :event_category, index: true, null: false
@@ -8,14 +8,9 @@ class CreateEvents < ActiveRecord::Migration[4.2]
8
8
  t.datetime :start_at
9
9
  t.datetime :end_at
10
10
  t.boolean :all_day, default: false, null: false
11
- t.datetime :deleted_at
12
11
  t.text :display_name
13
12
 
14
13
  t.timestamps
15
14
  end
16
15
  end
17
-
18
- def self.down
19
- drop_table :events
20
- end
21
16
  end
@@ -1,4 +1,4 @@
1
- class CreateEventCategories < ActiveRecord::Migration[4.2]
1
+ class CreateEventCategories < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  create_table :event_categories do |t|
4
4
  t.string :name, null: false
@@ -1,4 +1,4 @@
1
- class CreateEventImportFiles < ActiveRecord::Migration[4.2]
1
+ class CreateEventImportFiles < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  create_table :event_import_files do |t|
4
4
  t.references :parent, index: true
@@ -1,4 +1,4 @@
1
- class CreateParticipates < ActiveRecord::Migration[4.2]
1
+ class CreateParticipates < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  create_table :participates do |t|
4
4
  t.references :agent, index: true, null: false
@@ -1,4 +1,4 @@
1
- class CreateEventImportResults < ActiveRecord::Migration[4.2]
1
+ class CreateEventImportResults < ActiveRecord::Migration[5.2]
2
2
  def self.up
3
3
  create_table :event_import_results do |t|
4
4
  t.references :event_import_file
@@ -1,4 +1,4 @@
1
- class AddEventImportFingerprintToEventImportFile < ActiveRecord::Migration[4.2]
1
+ class AddEventImportFingerprintToEventImportFile < ActiveRecord::Migration[5.2]
2
2
  def change
3
3
  add_column :event_import_files, :event_import_fingerprint, :string
4
4
  end
@@ -1,4 +1,4 @@
1
- class AddErrorMessageToEventImportFile < ActiveRecord::Migration[4.2]
1
+ class AddErrorMessageToEventImportFile < ActiveRecord::Migration[5.2]
2
2
  def change
3
3
  add_column :event_import_files, :error_message, :text
4
4
  end
@@ -1,4 +1,4 @@
1
- class RenameEventImportFileImportedAtToExecutedAt < ActiveRecord::Migration[4.2]
1
+ class RenameEventImportFileImportedAtToExecutedAt < ActiveRecord::Migration[5.2]
2
2
  def up
3
3
  rename_column :event_import_files, :imported_at, :executed_at
4
4
  end
@@ -1,4 +1,4 @@
1
- class CreateEventImportFileTransitions < ActiveRecord::Migration[4.2]
1
+ class CreateEventImportFileTransitions < ActiveRecord::Migration[5.2]
2
2
  def change
3
3
  create_table :event_import_file_transitions do |t|
4
4
  t.string :to_state
@@ -1,4 +1,4 @@
1
- class AddUserEncodingToEventImportFile < ActiveRecord::Migration[4.2]
1
+ class AddUserEncodingToEventImportFile < ActiveRecord::Migration[5.2]
2
2
  def change
3
3
  add_column :event_import_files, :user_encoding, :string
4
4
  end
@@ -1,4 +1,4 @@
1
- class AddDefaultLibraryIdToEventImportFile < ActiveRecord::Migration[4.2]
1
+ class AddDefaultLibraryIdToEventImportFile < ActiveRecord::Migration[5.2]
2
2
  def change
3
3
  add_reference :event_import_files, :default_library
4
4
  end
@@ -1,4 +1,4 @@
1
- class CreateEventExportFiles < ActiveRecord::Migration[4.2]
1
+ class CreateEventExportFiles < ActiveRecord::Migration[5.2]
2
2
  def change
3
3
  create_table :event_export_files do |t|
4
4
  t.references :user, index: true
@@ -1,4 +1,4 @@
1
- class CreateEventExportFileTransitions < ActiveRecord::Migration[4.2]
1
+ class CreateEventExportFileTransitions < ActiveRecord::Migration[5.2]
2
2
  def change
3
3
  create_table :event_export_file_transitions do |t|
4
4
  t.string :to_state
@@ -1,4 +1,4 @@
1
- class AddDefaultEventCategoryIdToEventImportFile < ActiveRecord::Migration[4.2]
1
+ class AddDefaultEventCategoryIdToEventImportFile < ActiveRecord::Migration[5.2]
2
2
  def change
3
3
  add_reference :event_import_files, :default_event_category
4
4
  end
@@ -1,4 +1,4 @@
1
- class CreatePlaces < ActiveRecord::Migration[4.2]
1
+ class CreatePlaces < ActiveRecord::Migration[5.2]
2
2
  def change
3
3
  create_table :places do |t|
4
4
  t.string :term
@@ -1,4 +1,4 @@
1
- class AddPlaceIdToEvent < ActiveRecord::Migration[4.2]
1
+ class AddPlaceIdToEvent < ActiveRecord::Migration[5.2]
2
2
  def change
3
3
  add_reference :events, :place, index: true
4
4
  end
@@ -1,4 +1,4 @@
1
- class AddMostRecentToEventImportFileTransitions < ActiveRecord::Migration[4.2]
1
+ class AddMostRecentToEventImportFileTransitions < ActiveRecord::Migration[5.2]
2
2
  def up
3
3
  add_column :event_import_file_transitions, :most_recent, :boolean, null: true
4
4
  end
@@ -1,4 +1,4 @@
1
- class AddMostRecentToEventExportFileTransitions < ActiveRecord::Migration[4.2]
1
+ class AddMostRecentToEventExportFileTransitions < ActiveRecord::Migration[5.2]
2
2
  def up
3
3
  add_column :event_export_file_transitions, :most_recent, :boolean, null: true
4
4
  end
@@ -1,4 +1,4 @@
1
- class AddConstraintsToMostRecentForEventImportFileTransitions < ActiveRecord::Migration[4.2]
1
+ class AddConstraintsToMostRecentForEventImportFileTransitions < ActiveRecord::Migration[5.2]
2
2
  disable_ddl_transaction!
3
3
 
4
4
  def up
@@ -1,4 +1,4 @@
1
- class AddConstraintsToMostRecentForEventExportFileTransitions < ActiveRecord::Migration[4.2]
1
+ class AddConstraintsToMostRecentForEventExportFileTransitions < ActiveRecord::Migration[5.2]
2
2
  disable_ddl_transaction!
3
3
 
4
4
  def up
@@ -2,7 +2,6 @@ require "enju_message"
2
2
  require "ri_cal"
3
3
  require "csv"
4
4
  require "nkf"
5
- require "jbuilder"
6
5
  begin
7
6
  require 'charlock_holmes/string'
8
7
  rescue LoadError
@@ -1,3 +1,3 @@
1
1
  module EnjuEvent
2
- VERSION = "0.4.0.beta.2"
2
+ VERSION = "0.4.0.rc.1".freeze
3
3
  end
@@ -5,10 +5,10 @@ class EnjuEvent::SetupGenerator < Rails::Generators::Base
5
5
  directory("db/fixtures", "db/fixtures/enju_event")
6
6
  rake("enju_event_engine:install:migrations")
7
7
  inject_into_file 'app/controllers/application_controller.rb',
8
- " enju_event\n", after: "enju_library\n"
8
+ " include EnjuEvent::Controller\n", after: "include EnjuLibrary::Controller\n"
9
9
  inject_into_file 'app/assets/stylesheets/application.css',
10
- " *= require enju_event/application\n", after: " *= require enju_leaf/application\n"
10
+ " *= require enju_event/application\n", after: " *= require enju_leaf\n"
11
11
  inject_into_file 'app/assets/javascripts/application.js',
12
- "//= require enju_event/application\n", after: "//= require enju_leaf/application\n"
12
+ "//= require enju_event/application\n", after: "//= require enju_leaf\n"
13
13
  end
14
14
  end
@@ -9,7 +9,7 @@ describe EventImportResultsController do
9
9
 
10
10
  it "assigns all event_import_results as @event_import_results" do
11
11
  get :index
12
- assigns(:event_import_results).should eq(EventImportResult.page(1))
12
+ assigns(:event_import_results).should eq(EventImportResult.order(created_at: :desc).page(1))
13
13
  end
14
14
  end
15
15
 
@@ -18,7 +18,7 @@ describe EventImportResultsController do
18
18
 
19
19
  it "assigns all event_import_results as @event_import_results" do
20
20
  get :index
21
- assigns(:event_import_results).should eq(EventImportResult.page(1))
21
+ assigns(:event_import_results).should eq(EventImportResult.order(created_at: :desc).page(1))
22
22
  end
23
23
  end
24
24
 
@@ -3,7 +3,6 @@ class ApplicationController < ActionController::Base
3
3
  include EnjuLibrary::Controller
4
4
  include EnjuBiblio::Controller
5
5
  include EnjuEvent::Controller
6
- before_action :set_paper_trail_whodunnit
7
6
  after_action :verify_authorized
8
7
 
9
8
  include Pundit
@@ -1,4 +1,4 @@
1
- class CreateAgents < ActiveRecord::Migration[4.2]
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[4.2]
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[4.2]
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[4.2]
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[4.2]
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
@@ -1,4 +1,4 @@
1
- class CreateRoles < ActiveRecord::Migration[4.2]
1
+ class CreateRoles < ActiveRecord::Migration[5.2]
2
2
  def change
3
3
  create_table "roles" do |t|
4
4
  t.column :name, :string, null: false
@@ -1,4 +1,4 @@
1
- class CreateProduces < ActiveRecord::Migration[4.2]
1
+ class CreateProduces < ActiveRecord::Migration[5.2]
2
2
  def change
3
3
  create_table :produces do |t|
4
4
  t.references :agent, null: false
@@ -6,7 +6,5 @@ class CreateProduces < ActiveRecord::Migration[4.2]
6
6
  t.integer :position
7
7
  t.timestamps
8
8
  end
9
- add_index :produces, :agent_id
10
- add_index :produces, :manifestation_id
11
9
  end
12
10
  end
@@ -1,4 +1,4 @@
1
- class CreateLibraries < ActiveRecord::Migration[4.2]
1
+ class CreateLibraries < ActiveRecord::Migration[5.2]
2
2
  def change
3
3
  create_table :libraries do |t|
4
4
  t.string :name, index: true, null: false
@@ -20,7 +20,6 @@ class CreateLibraries < ActiveRecord::Migration[4.2]
20
20
  t.references :country
21
21
 
22
22
  t.timestamps
23
- t.datetime :deleted_at
24
23
  end
25
24
  end
26
25
  end
@@ -1,4 +1,4 @@
1
- class CreateShelves < ActiveRecord::Migration[4.2]
1
+ class CreateShelves < ActiveRecord::Migration[5.2]
2
2
  def change
3
3
  create_table :shelves do |t|
4
4
  t.string :name, null: false
@@ -8,7 +8,6 @@ class CreateShelves < ActiveRecord::Migration[4.2]
8
8
  t.integer :items_count, default: 0, null: false
9
9
  t.integer :position
10
10
  t.timestamps
11
- t.datetime :deleted_at
12
11
  end
13
12
  end
14
13
  end
@@ -1,4 +1,4 @@
1
- class CreateCarrierTypes < ActiveRecord::Migration[4.2]
1
+ class CreateCarrierTypes < ActiveRecord::Migration[5.2]
2
2
  def change
3
3
  create_table :carrier_types do |t|
4
4
  t.string :name, null: false
@@ -1,4 +1,4 @@
1
- class CreateUserGroups < ActiveRecord::Migration[4.2]
1
+ class CreateUserGroups < ActiveRecord::Migration[5.2]
2
2
  def change
3
3
  create_table :user_groups do |t|
4
4
  t.string :name, not_null: true
@@ -6,7 +6,6 @@ class CreateUserGroups < ActiveRecord::Migration[4.2]
6
6
  t.text :note
7
7
  t.integer :position
8
8
  t.timestamps
9
- t.datetime :deleted_at
10
9
  end
11
10
  end
12
11
  end
@@ -1,4 +1,4 @@
1
- class CreateLibraryGroups < ActiveRecord::Migration[4.2]
1
+ class CreateLibraryGroups < ActiveRecord::Migration[5.2]
2
2
  def change
3
3
  create_table :library_groups do |t|
4
4
  t.string :name, null: false