enju_biblio 0.1.0.pre52 → 0.1.0.pre53

Sign up to get free protection for your applications and to get access to all the features.
Files changed (334) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/agent_import_files_controller.rb +6 -0
  3. data/app/controllers/agent_import_results_controller.rb +1 -1
  4. data/app/controllers/manifestations_controller.rb +8 -0
  5. data/app/controllers/resource_export_files_controller.rb +100 -0
  6. data/app/controllers/resource_import_files_controller.rb +6 -0
  7. data/app/controllers/resource_import_results_controller.rb +2 -2
  8. data/app/models/agent.rb +0 -2
  9. data/app/models/agent_import_file.rb +38 -52
  10. data/app/models/agent_import_file_state_machine.rb +19 -0
  11. data/app/models/agent_import_file_transition.rb +20 -0
  12. data/app/models/enju_biblio/ability.rb +14 -12
  13. data/app/models/import_request.rb +21 -17
  14. data/app/models/import_request_state_machine.rb +9 -0
  15. data/app/models/import_request_transition.rb +20 -0
  16. data/app/models/item.rb +0 -2
  17. data/app/models/manifestation.rb +63 -2
  18. data/app/models/resource_export_file.rb +59 -0
  19. data/app/models/resource_export_file_state_machine.rb +15 -0
  20. data/app/models/resource_export_file_transition.rb +20 -0
  21. data/app/models/resource_import_file.rb +42 -57
  22. data/app/models/resource_import_file_state_machine.rb +19 -0
  23. data/app/models/resource_import_file_transition.rb +20 -0
  24. data/app/views/agent_import_files/edit.html.erb +2 -2
  25. data/app/views/agent_import_files/index.html.erb +4 -4
  26. data/app/views/agent_import_files/new.html.erb +16 -3
  27. data/app/views/agent_import_files/show.html.erb +13 -3
  28. data/app/views/agent_import_results/index.html.erb +6 -6
  29. data/app/views/agent_import_results/{index.csv.erb → index.tsv.erb} +0 -0
  30. data/app/views/agent_import_results/show.html.erb +2 -2
  31. data/app/views/agent_relationship_types/edit.html.erb +2 -2
  32. data/app/views/agent_relationship_types/index.html.erb +2 -2
  33. data/app/views/agent_relationship_types/new.html.erb +2 -2
  34. data/app/views/agent_relationship_types/show.html.erb +2 -2
  35. data/app/views/agent_relationships/edit.html.erb +2 -2
  36. data/app/views/agent_relationships/index.html.erb +2 -2
  37. data/app/views/agent_relationships/new.html.erb +2 -2
  38. data/app/views/agent_relationships/show.html.erb +2 -2
  39. data/app/views/agent_types/edit.html.erb +2 -2
  40. data/app/views/agent_types/index.html.erb +2 -2
  41. data/app/views/agent_types/new.html.erb +2 -2
  42. data/app/views/agent_types/show.html.erb +2 -2
  43. data/app/views/agents/_index.html.erb +2 -2
  44. data/app/views/agents/_index_agent.html.erb +2 -2
  45. data/app/views/agents/_index_expression.html.erb +2 -2
  46. data/app/views/agents/_index_manifestation.html.erb +2 -2
  47. data/app/views/agents/_index_work.html.erb +2 -2
  48. data/app/views/agents/edit.html.erb +2 -2
  49. data/app/views/agents/new.html.erb +2 -2
  50. data/app/views/agents/show.html.erb +2 -2
  51. data/app/views/carrier_types/edit.html.erb +2 -2
  52. data/app/views/carrier_types/index.html.erb +2 -2
  53. data/app/views/carrier_types/new.html.erb +2 -2
  54. data/app/views/carrier_types/show.html.erb +2 -2
  55. data/app/views/content_types/edit.html.erb +2 -2
  56. data/app/views/content_types/index.html.erb +2 -2
  57. data/app/views/content_types/new.html.erb +2 -2
  58. data/app/views/content_types/show.html.erb +2 -2
  59. data/app/views/countries/edit.html.erb +2 -2
  60. data/app/views/countries/index.html.erb +2 -2
  61. data/app/views/countries/new.html.erb +2 -2
  62. data/app/views/countries/show.html.erb +2 -2
  63. data/app/views/create_types/edit.html.erb +2 -2
  64. data/app/views/create_types/index.html.erb +2 -2
  65. data/app/views/create_types/new.html.erb +2 -2
  66. data/app/views/create_types/show.html.erb +2 -2
  67. data/app/views/creates/_index.html.erb +2 -2
  68. data/app/views/creates/_index_agent.html.erb +2 -2
  69. data/app/views/creates/_index_work.html.erb +2 -2
  70. data/app/views/creates/edit.html.erb +2 -2
  71. data/app/views/creates/new.html.erb +2 -2
  72. data/app/views/creates/show.html.erb +2 -2
  73. data/app/views/donates/edit.html.erb +2 -2
  74. data/app/views/donates/index.html.erb +2 -2
  75. data/app/views/donates/new.html.erb +2 -2
  76. data/app/views/donates/show.html.erb +2 -2
  77. data/app/views/exemplifies/edit.html.erb +2 -2
  78. data/app/views/exemplifies/index.html.erb +2 -2
  79. data/app/views/exemplifies/new.html.erb +2 -2
  80. data/app/views/exemplifies/show.html.erb +2 -2
  81. data/app/views/extents/edit.html.erb +2 -2
  82. data/app/views/extents/index.html.erb +2 -2
  83. data/app/views/extents/new.html.erb +2 -2
  84. data/app/views/extents/show.html.erb +2 -2
  85. data/app/views/form_of_works/edit.html.erb +2 -2
  86. data/app/views/form_of_works/index.html.erb +2 -2
  87. data/app/views/form_of_works/new.html.erb +2 -2
  88. data/app/views/form_of_works/show.html.erb +2 -2
  89. data/app/views/frequencies/edit.html.erb +2 -2
  90. data/app/views/frequencies/index.html.erb +2 -2
  91. data/app/views/frequencies/new.html.erb +2 -2
  92. data/app/views/frequencies/show.html.erb +2 -2
  93. data/app/views/identifier_types/edit.html.erb +2 -2
  94. data/app/views/identifier_types/index.html.erb +2 -2
  95. data/app/views/identifier_types/new.html.erb +2 -2
  96. data/app/views/identifier_types/show.html.erb +2 -2
  97. data/app/views/import_requests/edit.html.erb +2 -2
  98. data/app/views/import_requests/index.html.erb +9 -7
  99. data/app/views/import_requests/new.html.erb +2 -2
  100. data/app/views/import_requests/show.html.erb +3 -3
  101. data/app/views/items/_form.html.erb +1 -1
  102. data/app/views/items/edit.html.erb +2 -2
  103. data/app/views/items/index.html.erb +2 -2
  104. data/app/views/items/new.html.erb +2 -2
  105. data/app/views/items/show.html.erb +2 -2
  106. data/app/views/languages/edit.html.erb +2 -2
  107. data/app/views/languages/index.html.erb +2 -2
  108. data/app/views/languages/new.html.erb +2 -2
  109. data/app/views/languages/show.html.erb +2 -2
  110. data/app/views/licenses/edit.html.erb +2 -2
  111. data/app/views/licenses/index.html.erb +2 -2
  112. data/app/views/licenses/new.html.erb +2 -2
  113. data/app/views/licenses/show.html.erb +2 -2
  114. data/app/views/manifestation_relationship_types/edit.html.erb +2 -2
  115. data/app/views/manifestation_relationship_types/index.html.erb +2 -2
  116. data/app/views/manifestation_relationship_types/new.html.erb +2 -2
  117. data/app/views/manifestation_relationship_types/show.html.erb +2 -2
  118. data/app/views/manifestation_relationships/edit.html.erb +2 -2
  119. data/app/views/manifestation_relationships/index.html.erb +2 -2
  120. data/app/views/manifestation_relationships/new.html.erb +2 -2
  121. data/app/views/manifestation_relationships/show.html.erb +2 -2
  122. data/app/views/manifestations/_pickup.html.erb +1 -1
  123. data/app/views/manifestations/_show_detail_librarian.html.erb +1 -1
  124. data/app/views/manifestations/_show_detail_user.html.erb +2 -2
  125. data/app/views/manifestations/_show_holding.html.erb +6 -1
  126. data/app/views/manifestations/_title.html.erb +1 -1
  127. data/app/views/manifestations/_title.mobile.erb +1 -1
  128. data/app/views/manifestations/edit.html.erb +2 -2
  129. data/app/views/manifestations/index.html.erb +2 -2
  130. data/app/views/manifestations/index.sru.builder +1 -1
  131. data/app/views/manifestations/new.html.erb +2 -2
  132. data/app/views/manifestations/show.html.erb +3 -3
  133. data/app/views/manifestations/show.mobile.erb +1 -1
  134. data/app/views/medium_of_performances/edit.html.erb +2 -2
  135. data/app/views/medium_of_performances/index.html.erb +2 -2
  136. data/app/views/medium_of_performances/new.html.erb +2 -2
  137. data/app/views/medium_of_performances/show.html.erb +2 -2
  138. data/app/views/notifier/manifestation_info.en.text.erb +1 -1
  139. data/app/views/notifier/manifestation_info.ja.text.erb +1 -1
  140. data/app/views/owns/edit.html.erb +2 -2
  141. data/app/views/owns/index.html.erb +2 -2
  142. data/app/views/owns/new.html.erb +2 -2
  143. data/app/views/owns/show.html.erb +2 -2
  144. data/app/views/picture_files/_index.html.erb +2 -2
  145. data/app/views/picture_files/_index_agent.html.erb +2 -2
  146. data/app/views/picture_files/_index_event.html.erb +2 -2
  147. data/app/views/picture_files/_index_manifestation.html.erb +2 -2
  148. data/app/views/picture_files/_index_shelf.html.erb +2 -2
  149. data/app/views/picture_files/edit.html.erb +2 -2
  150. data/app/views/picture_files/new.html.erb +2 -2
  151. data/app/views/picture_files/show.html.erb +2 -2
  152. data/app/views/produce_types/edit.html.erb +2 -2
  153. data/app/views/produce_types/index.html.erb +2 -2
  154. data/app/views/produce_types/new.html.erb +2 -2
  155. data/app/views/produce_types/show.html.erb +2 -2
  156. data/app/views/produces/_index.html.erb +2 -2
  157. data/app/views/produces/_index_agent.html.erb +2 -2
  158. data/app/views/produces/_index_manifestation.html.erb +2 -2
  159. data/app/views/produces/edit.html.erb +2 -2
  160. data/app/views/produces/new.html.erb +2 -2
  161. data/app/views/produces/show.html.erb +2 -2
  162. data/app/views/realize_types/edit.html.erb +2 -2
  163. data/app/views/realize_types/index.html.erb +2 -2
  164. data/app/views/realize_types/new.html.erb +2 -2
  165. data/app/views/realize_types/show.html.erb +2 -2
  166. data/app/views/realizes/_index.html.erb +2 -2
  167. data/app/views/realizes/_index_agent.html.erb +2 -2
  168. data/app/views/realizes/_index_expression.html.erb +2 -2
  169. data/app/views/realizes/edit.html.erb +2 -2
  170. data/app/views/realizes/new.html.erb +2 -2
  171. data/app/views/realizes/show.html.erb +2 -2
  172. data/app/views/resource_export_files/_form.html.erb +22 -0
  173. data/app/views/resource_export_files/edit.html.erb +6 -0
  174. data/app/views/resource_export_files/index.html.erb +44 -0
  175. data/app/views/resource_export_files/new.html.erb +16 -0
  176. data/app/views/resource_export_files/show.html.erb +31 -0
  177. data/app/views/resource_import_files/edit.html.erb +2 -2
  178. data/app/views/resource_import_files/index.html.erb +4 -4
  179. data/app/views/resource_import_files/new.html.erb +16 -3
  180. data/app/views/resource_import_files/show.html.erb +13 -3
  181. data/app/views/resource_import_results/index.html.erb +6 -6
  182. data/app/views/resource_import_results/{index.csv.erb → index.tsv.erb} +0 -0
  183. data/app/views/resource_import_results/show.html.erb +2 -2
  184. data/app/views/series_statements/_index.html.erb +2 -2
  185. data/app/views/series_statements/_index_manifestation.html.erb +2 -2
  186. data/app/views/series_statements/_index_series_statement_merge_list.html.erb +2 -2
  187. data/app/views/series_statements/edit.html.erb +2 -2
  188. data/app/views/series_statements/new.html.erb +2 -2
  189. data/app/views/series_statements/show.html.erb +2 -2
  190. data/app/workers/agent_import_file_queue.rb +7 -0
  191. data/app/workers/resource_export_file_queue.rb +7 -0
  192. data/app/workers/resource_import_file_queue.rb +7 -0
  193. data/config/locales/translation_en.yml +12 -1
  194. data/config/locales/translation_ja.yml +12 -0
  195. data/config/routes.rb +3 -1
  196. data/db/migrate/001_create_agents.rb +0 -1
  197. data/db/migrate/005_create_manifestations.rb +0 -1
  198. data/db/migrate/006_create_items.rb +0 -1
  199. data/db/migrate/20081028083142_create_agent_import_files.rb +0 -2
  200. data/db/migrate/20081028083208_create_resource_import_files.rb +0 -2
  201. data/db/migrate/20100129142347_create_import_requests.rb +0 -1
  202. data/db/migrate/20140519170214_create_resource_import_file_transitions.rb +14 -0
  203. data/db/migrate/20140519171220_create_import_request_transitions.rb +14 -0
  204. data/db/migrate/20140524020735_create_agent_import_file_transitions.rb +14 -0
  205. data/db/migrate/20140614065404_create_resource_export_files.rb +11 -0
  206. data/db/migrate/20140614141500_create_resource_export_file_transitions.rb +14 -0
  207. data/db/migrate/20140628073524_add_user_encoding_to_agent_import_file.rb +5 -0
  208. data/db/migrate/20140628073535_add_user_encoding_to_resource_import_file.rb +5 -0
  209. data/lib/enju_biblio/engine.rb +1 -0
  210. data/lib/enju_biblio/version.rb +1 -1
  211. data/lib/generators/enju_biblio/setup/templates/config/schedule.rb +1 -1
  212. data/spec/controllers/manifestations_controller_spec.rb +4 -4
  213. data/spec/controllers/resource_export_files_controller_spec.rb +292 -0
  214. data/spec/dummy/app/models/ability.rb +1 -0
  215. data/spec/dummy/config/initializers/statesman.rb +3 -0
  216. data/spec/dummy/db/migrate/154_create_messages.rb +0 -1
  217. data/spec/dummy/db/migrate/20080819181903_create_message_requests.rb +0 -2
  218. data/spec/dummy/db/migrate/20081028093607_create_event_import_files.rb +0 -2
  219. data/spec/dummy/db/migrate/20081212080038_create_manifestation_checkout_stats.rb +0 -1
  220. data/spec/dummy/db/migrate/20081212151614_create_bookmark_stats.rb +0 -3
  221. data/spec/dummy/db/migrate/20081215094302_create_user_checkout_stats.rb +0 -1
  222. data/spec/dummy/db/migrate/20081216190724_create_manifestation_reserve_stats.rb +0 -1
  223. data/spec/dummy/db/migrate/20081220023628_create_user_reserve_stats.rb +0 -1
  224. data/spec/dummy/db/migrate/20090321130448_add_completed_at_to_user_checkout_stat.rb +0 -4
  225. data/spec/dummy/db/schema.rb +63 -31
  226. data/spec/dummy/db/test.sqlite3 +0 -0
  227. data/spec/dummy/private/system/resource_import_files/resource_imports/000/000/004/original/resource_import_file_sample1.tsv +19 -19
  228. data/spec/dummy/public/system/resource_export_files/resource_exports/000/000/004/original/resource_export_file_20140705-26819-14hii8j.txt +147 -0
  229. data/spec/dummy/solr/default/data/index/segments.gen +0 -0
  230. data/spec/dummy/solr/default/data/index/segments_1 +0 -0
  231. data/spec/dummy/solr/test/data/index/segments.gen +0 -0
  232. data/spec/dummy/solr/test/data/index/segments_6y +0 -0
  233. data/spec/dummy/solr/test/data/tlog/{tlog.0000000000000016453 → tlog.0000000000000000243} +0 -0
  234. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000000244 +0 -0
  235. data/spec/dummy/solr/test/data/tlog/{tlog.0000000000000016455 → tlog.0000000000000000245} +0 -0
  236. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000000246 +0 -0
  237. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000000247 +0 -0
  238. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000000248 +0 -0
  239. data/spec/dummy/tmp/cache/4F7/F90/default_role +0 -0
  240. data/spec/dummy/tmp/cache/6E4/420/search_engine_all +0 -0
  241. data/spec/factories/create_types.rb +13 -0
  242. data/spec/factories/produce_types.rb +13 -0
  243. data/spec/factories/realize_types.rb +13 -0
  244. data/spec/fixtures/agent_import_files.yml +1 -5
  245. data/spec/fixtures/agents.yml +0 -2
  246. data/spec/fixtures/import_requests.yml +0 -4
  247. data/spec/fixtures/items.yml +0 -2
  248. data/spec/fixtures/manifestation_checkout_stats.yml +0 -2
  249. data/spec/fixtures/manifestation_reserve_stats.yml +0 -2
  250. data/spec/fixtures/manifestations.yml +0 -2
  251. data/spec/fixtures/message_requests.yml +0 -2
  252. data/spec/fixtures/messages.yml +0 -4
  253. data/spec/fixtures/resource_export_files.yml +26 -0
  254. data/spec/fixtures/resource_import_files.yml +1 -4
  255. data/spec/fixtures/user_checkout_stats.yml +0 -2
  256. data/spec/fixtures/user_reserve_stats.yml +0 -2
  257. data/spec/models/agent_import_file_spec.rb +14 -8
  258. data/spec/models/agent_spec.rb +4 -6
  259. data/spec/models/import_request_spec.rb +0 -2
  260. data/spec/models/item_spec.rb +7 -8
  261. data/spec/models/manifestation_spec.rb +8 -10
  262. data/spec/models/resource_export_file_spec.rb +28 -0
  263. data/spec/models/resource_import_file_spec.rb +15 -5
  264. data/spec/routing/manifestations_routing_spec.rb +1 -1
  265. data/spec/routing/resource_export_files_routing_spec.rb +35 -0
  266. data/spec/spec_helper.rb +3 -0
  267. data/spec/support/resque.rb +32 -0
  268. data/spec/views/import_requests/edit.html.erb_spec.rb +19 -0
  269. data/spec/views/import_requests/index.html.erb_spec.rb +33 -0
  270. data/spec/views/import_requests/new.html.erb_spec.rb +21 -0
  271. data/spec/views/import_requests/show.html.erb_spec.rb +22 -0
  272. data/spec/views/resource_export_files/edit.html.erb_spec.rb +16 -0
  273. data/spec/views/resource_export_files/index.html.erb_spec.rb +17 -0
  274. data/spec/views/resource_export_files/new.html.erb_spec.rb +16 -0
  275. data/spec/views/resource_export_files/show.html.erb_spec.rb +13 -0
  276. metadata +139 -157
  277. data/app/views/manifestations/_series_form.html.erb +0 -127
  278. data/spec/dummy/db/development.sqlite3 +0 -0
  279. data/spec/dummy/solr/default/data/index/_da.fdt +0 -0
  280. data/spec/dummy/solr/default/data/index/_da.fdx +0 -0
  281. data/spec/dummy/solr/default/data/index/_da.fnm +0 -0
  282. data/spec/dummy/solr/default/data/index/_da.nvd +0 -0
  283. data/spec/dummy/solr/default/data/index/_da.nvm +0 -0
  284. data/spec/dummy/solr/default/data/index/_da.si +0 -0
  285. data/spec/dummy/solr/default/data/index/_da_Lucene41_0.doc +0 -0
  286. data/spec/dummy/solr/default/data/index/_da_Lucene41_0.pos +0 -0
  287. data/spec/dummy/solr/default/data/index/_da_Lucene41_0.tim +0 -0
  288. data/spec/dummy/solr/default/data/index/_da_Lucene41_0.tip +0 -0
  289. data/spec/dummy/solr/default/data/index/segments_ip +0 -0
  290. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000668 +0 -0
  291. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000669 +0 -0
  292. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000670 +0 -0
  293. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000671 +0 -0
  294. data/spec/dummy/solr/test/data/index/segments_cp8 +0 -0
  295. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000016454 +0 -0
  296. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000016456 +0 -0
  297. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000016457 +0 -0
  298. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000016458 +0 -0
  299. data/spec/dummy/tmp/cache/assets/test/sprockets/01c388ec88c5fa6d00409d725549a506 +0 -0
  300. data/spec/dummy/tmp/cache/assets/test/sprockets/0440b81b0aae840cf287a686585a8cec +0 -0
  301. data/spec/dummy/tmp/cache/assets/test/sprockets/0c8f59d97121b79a2e2a0d009d6da9c3 +0 -0
  302. data/spec/dummy/tmp/cache/assets/test/sprockets/13fe41fee1fe35b49d145bcc06610705 +0 -0
  303. data/spec/dummy/tmp/cache/assets/test/sprockets/1572dfd6f1e555f4be1aa60ddc3cb0c0 +0 -0
  304. data/spec/dummy/tmp/cache/assets/test/sprockets/19a44bc29c5173edea456f9416243854 +0 -0
  305. data/spec/dummy/tmp/cache/assets/test/sprockets/2d65b40e585725207fd52ce4cf5134f4 +0 -0
  306. data/spec/dummy/tmp/cache/assets/test/sprockets/2f5173deea6c795b8fdde723bb4b63af +0 -0
  307. data/spec/dummy/tmp/cache/assets/test/sprockets/357970feca3ac29060c1e3861e2c0953 +0 -0
  308. data/spec/dummy/tmp/cache/assets/test/sprockets/3fc2b4de95dbb94dfe82ccfc97265cc4 +0 -0
  309. data/spec/dummy/tmp/cache/assets/test/sprockets/4aa18096a209e515f5f1df487622cdf4 +0 -0
  310. data/spec/dummy/tmp/cache/assets/test/sprockets/4db7c7b5ea13aacccd89ea32460e2de0 +0 -0
  311. data/spec/dummy/tmp/cache/assets/test/sprockets/55de678ed3c84c51b3a4b4cf473da823 +0 -0
  312. data/spec/dummy/tmp/cache/assets/test/sprockets/64ee480e95febf6b404c1264755ea42e +0 -0
  313. data/spec/dummy/tmp/cache/assets/test/sprockets/7de140ed6f303b9d00d8d703cced3349 +0 -0
  314. data/spec/dummy/tmp/cache/assets/test/sprockets/80348afae86df384b25e1e3bff21b13e +0 -0
  315. data/spec/dummy/tmp/cache/assets/test/sprockets/814bc1bed3effa0bb4588eb8b75ab92a +0 -0
  316. data/spec/dummy/tmp/cache/assets/test/sprockets/8488002e0e6035b7d00c3800c2c0e27e +0 -0
  317. data/spec/dummy/tmp/cache/assets/test/sprockets/86dfe8a3e156aeb6ebcd456b2251fab7 +0 -0
  318. data/spec/dummy/tmp/cache/assets/test/sprockets/89c9228bae34e0ff18fd8fe7f6eb5847 +0 -0
  319. data/spec/dummy/tmp/cache/assets/test/sprockets/a2474b74df12470fb37c668b85b562c6 +0 -0
  320. data/spec/dummy/tmp/cache/assets/test/sprockets/a2ee8688f63b884277632a234086f7df +0 -0
  321. data/spec/dummy/tmp/cache/assets/test/sprockets/a3cea75f1356ef55329e78f86b4c72b1 +0 -0
  322. data/spec/dummy/tmp/cache/assets/test/sprockets/aa2e1ada35daa496bb08e85fcb817536 +0 -0
  323. data/spec/dummy/tmp/cache/assets/test/sprockets/b0e11c6d89683eaa7256a44a164a2a12 +0 -0
  324. data/spec/dummy/tmp/cache/assets/test/sprockets/bf17ca8affe2a1febca7f2a4e37cd77b +0 -0
  325. data/spec/dummy/tmp/cache/assets/test/sprockets/c36b7431da1ae91722b1c4091e4ba084 +0 -0
  326. data/spec/dummy/tmp/cache/assets/test/sprockets/c40786442706ae0cc6c793c6ee2500d3 +0 -0
  327. data/spec/dummy/tmp/cache/assets/test/sprockets/cffd775d018f68ce5dba1ee0d951a994 +0 -0
  328. data/spec/dummy/tmp/cache/assets/test/sprockets/d771ace226fc8215a3572e0aa35bb0d6 +0 -0
  329. data/spec/dummy/tmp/cache/assets/test/sprockets/e58908ad0ccad6546faf9bcab669b0cd +0 -0
  330. data/spec/dummy/tmp/cache/assets/test/sprockets/e8f801eeda49cba4a03cfd9e2a4562ae +0 -0
  331. data/spec/dummy/tmp/cache/assets/test/sprockets/eef93e7d091d8118419fb96adf80387b +0 -0
  332. data/spec/dummy/tmp/cache/assets/test/sprockets/f7cbd26ba1d28d48de824f0e94586655 +0 -0
  333. data/spec/dummy/tmp/cache/assets/test/sprockets/fb91323d4585f2e27d281cdb4193beb1 +0 -0
  334. data/spec/dummy/tmp/cache/assets/test/sprockets/ff64e9ded481959dfa8c78718e59e607 +0 -0
data/app/views/realize_types/show.html.erb CHANGED
@@ -1,4 +1,4 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.realize_type')) -%></h1>
3
3
  <div id="content_list">
4
4
  <p id="notice"><%= notice %></p>
@@ -21,7 +21,7 @@
21
21
  </div>
22
22
  </div>
23
23
 
24
- <div id="submenu" class="ui-corner-all">
24
+ <div id="submenu" class="ui-corner-all ui-widget-content">
25
25
  <ul>
26
26
  <li><%= link_to t('page.edit'), edit_realize_type_path(@realize_type) -%></li>
27
27
  <li><%= back_to_index(flash[:page_info]) -%></li>
data/app/views/realizes/_index.html.erb CHANGED
@@ -1,4 +1,4 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.realize')) -%></h1>
3
3
  <div id="content_list">
4
4
 
@@ -27,7 +27,7 @@
27
27
  </div>
28
28
  </div>
29
29
 
30
- <div id="submenu" class="ui-corner-all">
30
+ <div id="submenu" class="ui-corner-all ui-widget-content">
31
31
  <%- if can? :create, Realize -%>
32
32
  <ul>
33
33
  <li><%= link_to t('page.new', :model => t('activerecord.models.realize')), new_realize_path -%></li>
data/app/views/realizes/_index_agent.html.erb CHANGED
@@ -1,4 +1,4 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.realize')) -%></h1>
3
3
  <div id="content_list">
4
4
  <h2 class="resource_title">
@@ -31,7 +31,7 @@
31
31
  </div>
32
32
  </div>
33
33
 
34
- <div id="submenu" class="ui-corner-all">
34
+ <div id="submenu" class="ui-corner-all ui-widget-content">
35
35
  <ul>
36
36
  <%- if can? :create, Realize -%>
37
37
  <li><%= link_to t('page.new', :model => t('activerecord.models.realize')), new_agent_realize_path(agent) -%></li>
data/app/views/realizes/_index_expression.html.erb CHANGED
@@ -1,4 +1,4 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.realize')) -%></h1>
3
3
  <div id="content_list">
4
4
  <h2 class="resource_title">
@@ -33,7 +33,7 @@
33
33
  </div>
34
34
  </div>
35
35
 
36
- <div id="submenu" class="ui-corner-all">
36
+ <div id="submenu" class="ui-corner-all ui-widget-content">
37
37
  <ul>
38
38
  <li><%= link_to t('page.listing', :model => t('activerecord.models.agent')), expression_agents_path(expression) -%></li>
39
39
  <%- if can? :create, Realize -%>
data/app/views/realizes/edit.html.erb CHANGED
@@ -1,11 +1,11 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.editing', :model => t('activerecord.models.realize')) -%></h1>
3
3
  <div id="content_list">
4
4
  <%= render 'form' %>
5
5
  </div>
6
6
  </div>
7
7
 
8
- <div id="submenu" class="ui-corner-all">
8
+ <div id="submenu" class="ui-corner-all ui-widget-content">
9
9
  <ul>
10
10
  <li><%= link_to t('page.show'), @realize -%></li>
11
11
  <li><%= link_to t('page.back'), realizes_path -%></li>
data/app/views/realizes/new.html.erb CHANGED
@@ -1,11 +1,11 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.new', :model => t('activerecord.models.realize')) -%></h1>
3
3
  <div id="content_list">
4
4
  <%= render 'form' %>
5
5
  </div>
6
6
  </div>
7
7
 
8
- <div id="submenu" class="ui-corner-all">
8
+ <div id="submenu" class="ui-corner-all ui-widget-content">
9
9
  <ul>
10
10
  <%- if @realize.agent -%>
11
11
  <li><%= link_to t('page.listing', :model => t('activerecord.models.manifestation')), contributor_manifestations_path(@realize.agent) -%></li>
data/app/views/realizes/show.html.erb CHANGED
@@ -1,4 +1,4 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.realize')) -%></h1>
3
3
  <div id="content_list">
4
4
  <p id="notice"><%= notice %></p>
@@ -16,7 +16,7 @@
16
16
  </div>
17
17
  </div>
18
18
 
19
- <div id="submenu" class="ui-corner-all">
19
+ <div id="submenu" class="ui-corner-all ui-widget-content">
20
20
  <ul>
21
21
  <li><%= link_to t('page.back_to', :model => t('activerecord.models.agent')), expression_agents_path(@realize.expression) -%></li>
22
22
  <li><%= link_to t('page.back_to', :model => t('activerecord.models.manifestation')), contributor_manifestations_path(@realize.agent) -%></li>
data/app/views/resource_export_files/_form.html.erb ADDED
@@ -0,0 +1,22 @@
1
+ <%= form_for(@resource_export_file) do |f| %>
2
+ <%= f.error_messages %>
3
+
4
+ <%= f.hidden_field :mode, value: 'export' if @resource_export_file.new_record? %><br>
5
+ <!--
6
+ <div class="field">
7
+ <%= f.label :user_id %><br>
8
+ <%= @resource_export_file.user.username %>
9
+ </div>
10
+ <div class="field">
11
+ <%= f.label :resource_export %><br>
12
+ <%= f.text_field :resource_export %>
13
+ </div>
14
+ -->
15
+ <div class="actions">
16
+ <% if @resource_export_file.new_record? %>
17
+ <%= f.submit t('page.export') %>
18
+ <% else %>
19
+ <%= f.submit %>
20
+ <% end %>
21
+ </div>
22
+ <% end %>
data/app/views/resource_export_files/edit.html.erb ADDED
@@ -0,0 +1,6 @@
1
+ <h1>Editing resource_export_file</h1>
2
+
3
+ <%= render 'form' %>
4
+
5
+ <%= link_to 'Show', @resource_export_file %> |
6
+ <%= link_to 'Back', resource_export_files_path %>
data/app/views/resource_export_files/index.html.erb ADDED
@@ -0,0 +1,44 @@
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
+ <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.resource_export_file')) -%></h1>
3
+ <div id="content_list">
4
+
5
+ <table class="table table-striped index">
6
+ <thead>
7
+ <tr>
8
+ <th>Id</th>
9
+ <th><%= t('activerecord.models.user') %></th>
10
+ <th><%= t('activerecord.attributes.resource_export_file.resource_export_file_name') -%></th>
11
+ <th><%= t('activerecord.attributes.resource_export_file.state') -%></th>
12
+ <th></th>
13
+ </tr>
14
+ </thead>
15
+
16
+ <tbody>
17
+ <% @resource_export_files.each do |resource_export_file| %>
18
+ <tr class="line<%= cycle("0", "1") -%>">
19
+ <td><%= link_to resource_export_file.id, resource_export_file %></td>
20
+ <td><%= resource_export_file.user.try(:username) %></td>
21
+ <td>
22
+ <%= link_to resource_export_file.resource_export_file_name, resource_export_file.resource_export.url if resource_export_file.resource_export.path %>
23
+ <br />
24
+ <%= resource_export_file.created_at %>
25
+ </td>
26
+ <td><%= localized_state(resource_export_file.current_state) -%></td>
27
+ <td>
28
+ <%= link_to t('page.destroy'), resource_export_file, method: :delete, data: {confirm: t('page.are_you_sure')}, :method => :delete -%>
29
+ </td>
30
+ </tr>
31
+ <% end %>
32
+ </tbody>
33
+ </table>
34
+
35
+ <%= paginate(@resource_export_files) %>
36
+
37
+ </div>
38
+ </div>
39
+
40
+ <div id="submenu" class="ui-corner-all ui-widget-content">
41
+ <ul>
42
+ <li><%= link_to t('page.new', :model => t('activerecord.models.resource_export_file')), new_resource_export_file_path -%></li>
43
+ </ul>
44
+ </div>
data/app/views/resource_export_files/new.html.erb ADDED
@@ -0,0 +1,16 @@
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
+ <h1 class="title"><%= t('page.new', :model => t('activerecord.models.resource_export_file')) -%></h1>
3
+ <div id="content_list">
4
+
5
+ <p><%= t('export.are_you_sure_to_export') %></p>
6
+
7
+ <%= render 'form' %>
8
+
9
+ </div>
10
+ </div>
11
+
12
+ <div id="submenu" class="ui-corner-all ui-widget-content">
13
+ <ul>
14
+ <li><%= link_to t('page.listing', :model => t('activerecord.models.resource_export_file')), resource_export_files_path -%></li>
15
+ </ul>
16
+ </div>
data/app/views/resource_export_files/show.html.erb ADDED
@@ -0,0 +1,31 @@
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
+ <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.resource_export_file')) -%></h1>
3
+ <div id="content_list">
4
+ <p id="notice"><%= notice %></p>
5
+
6
+ <p>
7
+ <strong><%= t('activerecord.models.user') %></strong>
8
+ <%= @resource_export_file.user.try(:username) %>
9
+ </p>
10
+
11
+ <p>
12
+ <strong><%= t('activerecord.attributes.resource_export_file.resource_export_file_name') -%></strong>
13
+ <%= link_to @resource_export_file.resource_export_file_name, @resource_export_file.resource_export.url if @resource_export_file.resource_export_file_name %>
14
+ </p>
15
+
16
+ <p>
17
+ <strong><%= t('activerecord.attributes.resource_export_file.state') -%>:</strong>
18
+ <%= localized_state(@resource_export_file.current_state) -%>
19
+ </p>
20
+
21
+ </div>
22
+ </div>
23
+
24
+ <div id="submenu" class="ui-corner-all ui-widget-content">
25
+ <ul>
26
+ <li><%= back_to_index(flash[:page_info]) -%></li>
27
+ <% if current_user.has_role?('Administrator') %>
28
+ <li><%= link_to 'Resque', resque_path %></li>
29
+ <% end %>
30
+ </ul>
31
+ </div>
data/app/views/resource_import_files/edit.html.erb CHANGED
@@ -1,4 +1,4 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.editing', :model => t('activerecord.models.resource_import_file')) -%></h1>
3
3
  <div id="content_list">
4
4
 
@@ -17,7 +17,7 @@
17
17
  </div>
18
18
  </div>
19
19
 
20
- <div id="submenu" class="ui-corner-all">
20
+ <div id="submenu" class="ui-corner-all ui-widget-content">
21
21
  <ul>
22
22
  <li><%= link_to t('page.show'), @resource_import_file -%></li>
23
23
  <li><%= link_to t('page.back'), resource_import_files_path -%></li>
data/app/views/resource_import_files/index.html.erb CHANGED
@@ -1,10 +1,10 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.resource_import_file')) -%></h1>
3
3
  <div id="content_list">
4
4
 
5
5
  <table class="table table-striped index">
6
6
  <tr>
7
- <th>ID</th>
7
+ <th>Id</th>
8
8
  <th><%= t('activerecord.attributes.resource_import_file.resource_import_file_name') -%></th>
9
9
  <th><%= t('activerecord.attributes.resource_import_file.executed_at') -%></th>
10
10
  <th><%= t('activerecord.models.user') -%></th>
@@ -20,7 +20,7 @@
20
20
  <td><%= l(resource_import_file.executed_at) if resource_import_file.executed_at -%></td>
21
21
  <td><%= link_to resource_import_file.user.username, resource_import_file.user -%></td>
22
22
  <td><%= resource_import_file.edit_mode -%></td>
23
- <td><%= localized_state(resource_import_file.state) -%></td>
23
+ <td><%= localized_state(resource_import_file.current_state) -%></td>
24
24
  <td>
25
25
  <%= link_to t('page.show'), resource_import_file -%>
26
26
  <%= link_to t('page.destroy'), resource_import_file, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
@@ -33,7 +33,7 @@
33
33
  </div>
34
34
  </div>
35
35
 
36
- <div id="submenu" class="ui-corner-all">
36
+ <div id="submenu" class="ui-corner-all ui-widget-content">
37
37
  <ul>
38
38
  <li><%= link_to t('page.new', :model => t('activerecord.models.resource_import_file')), new_resource_import_file_path -%></li>
39
39
  </ul>
data/app/views/resource_import_files/new.html.erb CHANGED
@@ -1,4 +1,4 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.new', :model => t('activerecord.models.resource_import_file')) -%></h1>
3
3
  <div id="content_list">
4
4
 
@@ -22,15 +22,28 @@
22
22
  <%= f.label :edit_mode, t('page.destroy'), :value => 'destroy' %>
23
23
  </div>
24
24
 
25
+ <div class="field">
26
+ <%= f.label :user_encoding -%><br />
27
+ <%= f.radio_button :user_encoding, 'auto_detect', :checked => 'checked' %>
28
+ <%= f.label :user_encoding, t('import.auto_detect'), :value => 'auto_detect' %>
29
+ <%= f.radio_button :user_encoding, 'utf-8' %>
30
+ <%= f.label :user_encoding, 'UTF-8', :value => 'utf-8' %>
31
+ <%= f.radio_button :user_encoding, 'shift_jis' %>
32
+ <%= f.label :user_encoding, 'Shift_JIS', :value => 'shift_jis' %>
33
+ <%= f.radio_button :user_encoding, 'euc-ho' %>
34
+ <%= f.label :user_encoding, 'EUC-JP', :value => 'euc-jp' %>
35
+ </div>
36
+
25
37
  <div class="actions">
26
- <%= f.submit %>
38
+ <%= f.hidden_field :mode, value: 'import' %>
39
+ <%= f.submit t('page.start_import') %>
27
40
  </div>
28
41
  <%- end -%>
29
42
 
30
43
  </div>
31
44
  </div>
32
45
 
33
- <div id="submenu" class="ui-corner-all">
46
+ <div id="submenu" class="ui-corner-all ui-widget-content">
34
47
  <ul>
35
48
  <li><%= back_to_index(flash[:page_info]) %></li>
36
49
  </ul>
data/app/views/resource_import_files/show.html.erb CHANGED
@@ -1,4 +1,4 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.resource_import_file')) -%></h1>
3
3
  <div id="content_list">
4
4
  <p id="notice"><%= notice %></p>
@@ -43,9 +43,14 @@
43
43
  <%= @resource_import_file.edit_mode -%>
44
44
  </p>
45
45
 
46
+ <p>
47
+ <strong><%= t('activerecord.attributes.resource_import_file.user_encoding') -%>:</strong>
48
+ <%= @resource_import_file.user_encoding -%>
49
+ </p>
50
+
46
51
  <p>
47
52
  <strong><%= t('activerecord.attributes.resource_import_file.state') -%>:</strong>
48
- <%= localized_state(@resource_import_file.state) -%>
53
+ <%= localized_state(@resource_import_file.current_state) -%>
49
54
  </p>
50
55
 
51
56
  <p>
@@ -61,9 +66,14 @@
61
66
  </div>
62
67
  </div>
63
68
 
64
- <div id="submenu" class="ui-corner-all">
69
+ <div id="submenu" class="ui-corner-all ui-widget-content">
70
+ <%= form_for(@resource_import_file) do |f| %>
65
71
  <ul>
66
72
  <li><%= link_to t('activerecord.models.resource_import_result'), resource_import_file_resource_import_results_path(@resource_import_file) -%></li>
67
73
  <li><%= back_to_index(flash[:page_info]) -%></li>
74
+ <% if current_user.has_role?('Administrator') %>
75
+ <li><%= link_to 'Resque', resque_path %></li>
76
+ <% end %>
68
77
  </ul>
78
+ <% end %>
69
79
  </div>
data/app/views/resource_import_results/index.html.erb CHANGED
@@ -1,4 +1,4 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.resource_import_result')) -%></h1>
3
3
  <div id="content_list">
4
4
  <% if @resource_import_file %>
@@ -37,15 +37,15 @@
37
37
  </div>
38
38
  </div>
39
39
 
40
- <div id="submenu" class="ui-corner-all">
40
+ <div id="submenu" class="ui-corner-all ui-widget-content">
41
41
  <ul>
42
42
  <li>
43
43
  <% if @resource_import_file %>
44
- <%= link_to((image_tag 'icons/page_white_excel.png', :size => '16x16', :alt => 'TSV', :class => 'icon'), resource_import_file_resource_import_results_path(@resource_import_file, :format => :csv, :locale => @locale.to_s)) -%>
45
- (<%= link_to 'CSV', resource_import_file_resource_import_results_path(:format => :csv, :locale => @locale.to_s) -%>)
44
+ <%= link_to((image_tag 'icons/page_white_excel.png', :size => '16x16', :alt => 'TSV', :class => 'icon'), resource_import_file_resource_import_results_path(@resource_import_file, :format => :tsv, :locale => @locale.to_s)) -%>
45
+ (<%= link_to 'TSV', resource_import_file_resource_import_results_path(:format => :tsv, :locale => @locale.to_s) -%>)
46
46
  <% else %>
47
- <%= link_to((image_tag 'icons/page_white_excel.png', :size => '16x16', :alt => 'CSV', :class => 'icon'), resource_import_results_path(:format => :csv, :locale => @locale.to_s)) -%>
48
- (<%= link_to 'CSV', resource_import_results_path(:format => :csv, :locale => @locale.to_s) -%>)
47
+ <%= link_to((image_tag 'icons/page_white_excel.png', :size => '16x16', :alt => 'TSV', :class => 'icon'), resource_import_results_path(:format => :tsv, :locale => @locale.to_s)) -%>
48
+ (<%= link_to 'TSV', resource_import_results_path(:format => :tsv, :locale => @locale.to_s) -%>)
49
49
  <% end %>
50
50
  </li>
51
51
  </ul>
data/app/views/resource_import_results/show.html.erb CHANGED
@@ -1,4 +1,4 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.resource_import_result')) -%></h1>
3
3
  <div id="content_list">
4
4
  <p id="notice"><%= notice %></p>
@@ -31,7 +31,7 @@
31
31
  </div>
32
32
  </div>
33
33
 
34
- <div id="submenu" class="ui-corner-all">
34
+ <div id="submenu" class="ui-corner-all ui-widget-content">
35
35
  <ul>
36
36
  <li><%= back_to_index(flash[:page_info]) -%></li>
37
37
  </ul>
data/app/views/series_statements/_index.html.erb CHANGED
@@ -1,4 +1,4 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.series_statement')) -%></h1>
3
3
  <div id="content_list">
4
4
 
@@ -42,7 +42,7 @@
42
42
  </div>
43
43
  </div>
44
44
 
45
- <div id="submenu" class="ui-corner-all">
45
+ <div id="submenu" class="ui-corner-all ui-widget-content">
46
46
  <ul>
47
47
  <% if can? :create, SeriesStatement %>
48
48
  <li><%= link_to t('page.new', :model => t('activerecord.models.series_statement')), new_series_statement_path -%></li>
data/app/views/series_statements/_index_manifestation.html.erb CHANGED
@@ -1,4 +1,4 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.series_statement')) -%></h1>
3
3
  <div id="content_list">
4
4
 
@@ -37,7 +37,7 @@
37
37
  </div>
38
38
  </div>
39
39
 
40
- <div id="submenu" class="ui-corner-all">
40
+ <div id="submenu" class="ui-corner-all ui-widget-content">
41
41
  <ul>
42
42
  <li><%= link_to t('page.new', :model => t('activerecord.models.series_statement')), new_series_statement_path -%></li>
43
43
  </ul>
data/app/views/series_statements/_index_series_statement_merge_list.html.erb CHANGED
@@ -1,4 +1,4 @@
1
- <div id="content_detail" class="ui-corner-all">
1
+ <div id="content_detail" class="ui-corner-all ui-widget-content">
2
2
  <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.series_statement')) -%></h1>
3
3
  <div id="content_list">
4
4
 
@@ -44,7 +44,7 @@
44
44
  </div>
45
45
  </div>
46
46
 
47
- <div id="submenu" class="ui-corner-all">
47
+ <div id="submenu" class="ui-corner-all ui-widget-content">
48
48
  <ul>
49
49
  <li><%= link_to t('page.listing', :model => t('activerecord.models.series_statement_merge_list')), @series_statement_merge_list -%></li>
50
50
  </ul>