enju_event 0.1.17.pre17 → 0.1.17.pre18

data/app/views/event_import_files/index.html.erb

@@ -1,10 +1,10 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.event_import_file')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
   <tr>
-    <th>ID</th>
+    <th>Id</th>
     <th><%= t('activerecord.attributes.event_import_file.event_import_file_name') -%></th>
     <th><%= t('activerecord.attributes.event_import_file.executed_at') -%></th>
     <th><%= t('activerecord.models.user') -%></th>
@@ -20,7 +20,7 @@
     <td><%= l(event_import_file.executed_at) if event_import_file.executed_at -%></td>
     <td><%= link_to event_import_file.user.username, event_import_file.user -%></td>
     <td><%= event_import_file.edit_mode -%></td>
-    <td><%= localized_state(event_import_file.state) -%></td>
+    <td><%= localized_state(event_import_file.current_state) -%></td>
     <td>
       <%= link_to t('page.show'), event_import_file -%>
       <%= link_to t('page.destroy'), event_import_file, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
@@ -33,7 +33,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.new', :model => t('activerecord.models.event_import_file')), new_event_import_file_path -%></li>
   </ul>

data/app/views/event_import_files/new.html.erb

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
   <h1 class="title"><%= t('page.new', :model => t('activerecord.models.event_import_file')) -%></h1>
 <div id="content_list">
 
@@ -20,16 +20,29 @@
     <%= f.label :edit_mode, t('page.destroy'), :value => 'destroy' %>
   </div>
 
+  <div class="field">
+    <%= f.label :user_encoding -%><br />
+    <%= f.radio_button :user_encoding, 'auto_detect', :checked => 'checked' %>
+    <%= f.label :user_encoding, t('import.auto_detect'), :value => 'auto_detect' %>
+    <%= f.radio_button :user_encoding, 'utf-8' %>
+    <%= f.label :user_encoding, 'UTF-8', :value => 'utf-8' %>
+    <%= f.radio_button :user_encoding, 'shift_jis' %>
+    <%= f.label :user_encoding, 'Shift_JIS', :value => 'shift_jis' %>
+    <%= f.radio_button :user_encoding, 'euc-ho' %>
+    <%= f.label :user_encoding, 'EUC-JP', :value => 'euc-jp' %>
+  </div>
+
   <div class="actions">
-    <%= f.submit %>
+    <%= f.hidden_field :mode, value: 'import' %>
+    <%= f.submit t('page.start_import') %>
   </div>
 <%- end -%>
 
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.back'), event_import_files_path -%></li>
+    <li><%= back_to_index(flash[:page_info]) %></li>
   </ul>
 </div>

data/app/views/event_import_files/show.html.erb

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.event_import_file')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
@@ -43,9 +43,14 @@
   <%= @event_import_file.edit_mode -%>
 </p>
 
+<p>
+  <strong><%= t('activerecord.attributes.event_import_file.user_encoding') -%>:</strong>
+  <%= @event_import_file.user_encoding -%>
+</p>
+
 <p>
   <strong><%= t('activerecord.attributes.event_import_file.state') -%>:</strong>
-  <%= localized_state(@event_import_file.state) -%>
+  <%= localized_state(@event_import_file.current_state) -%>
 </p>
 
 <p>
@@ -61,9 +66,14 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
+  <%= form_for(@event_import_file) do |f| %>
   <ul>
     <li><%= link_to t('activerecord.models.event_import_result'), event_import_file_event_import_results_path(@event_import_file) -%></li>
     <li><%= back_to_index(flash[:page_info]) -%></li>
+    <% if current_user.has_role?('Administrator') %>
+      <li><%= link_to 'Resque', resque_path %></li>
+    <% end %>
   </ul>
+  <% end %>
 </div>

data/app/views/event_import_results/index.html.erb

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.event_import_result')) -%></h1>
 <div id="content_list">
   <% if @event_import_file %>
@@ -35,15 +35,15 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li>
     <% if @event_import_file %>
-      <%= link_to (image_tag 'icons/page_white_excel.png', :size => '16x16', :alt => 'CSV', :class => 'icon'), event_import_file_event_import_results_path(@event_import_file, :format => :csv, :locale => @locale.to_s) -%>
-      (<%= link_to 'CSV', event_import_file_event_import_results_path(:format => :csv, :locale => @locale.to_s) -%>)
+      <%= link_to (image_tag 'icons/page_white_excel.png', :size => '16x16', :alt => 'TSV', :class => 'icon'), event_import_file_event_import_results_path(@event_import_file, :format => :tsv, :locale => @locale.to_s) -%>
+      (<%= link_to 'TSV', event_import_file_event_import_results_path(:format => :tsv, :locale => @locale.to_s) -%>)
     <% else %>
-      <%= link_to (image_tag 'icons/page_white_excel.png', :size => '16x16', :alt => 'CSV', :class => 'icon'), event_import_results_path(:format => :csv, :locale => @locale.to_s) -%>
-      (<%= link_to 'CSV', event_import_results_path(:format => :csv, :locale => @locale.to_s) -%>)
+      <%= link_to (image_tag 'icons/page_white_excel.png', :size => '16x16', :alt => 'TSV', :class => 'icon'), event_import_results_path(:format => :tsv, :locale => @locale.to_s) -%>
+      (<%= link_to 'TSV', event_import_results_path(:format => :tsv, :locale => @locale.to_s) -%>)
     <% end %>
     </li>
   </ul>

data/app/views/event_import_results/show.html.erb

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.event_import_result')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
@@ -26,7 +26,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= back_to_index(flash[:page_info]) -%></li>
   </ul>

data/app/views/events/edit.html.erb

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.editing', :model => t('activerecord.models.event')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
@@ -6,7 +6,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.show'), @event -%></li>
     <li><%= link_to t('page.back'), events_path(:page => flash[:page] ||= nil) -%></li>

data/app/views/events/index.html.erb

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.event')) -%></h1>
 <div id="content_list">
 
@@ -67,7 +67,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.calendar'), calendar_path -%></li>
   </ul>

data/app/views/events/new.html.erb

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.new', :model => t('activerecord.models.event')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
@@ -6,7 +6,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <%- if @library -%>
       <li><%= link_to t('page.back'), library_events_path(@library) -%></li>

data/app/views/events/show.html.erb

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.event')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
@@ -19,9 +19,14 @@
 
 <%- if @event.all_day -%>
   <p>
-    <strong><%= t('activerecord.attributes.event.all_day') -%>:</strong>
+    <strong><%= t('activerecord.attributes.event.start_at') -%>:</strong>
     <%= l(@event.start_at, :format => :only_date) -%>
   </p>
+
+  <p>
+    <strong><%= t('activerecord.attributes.event.end_at') -%>:</strong>
+    <%= l(@event.end_at, :format => :only_date) -%>
+  </p>
 <%- else -%>
   <p>
     <strong><%= t('activerecord.attributes.event.start_at') -%>:</strong>
@@ -42,7 +47,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.edit'), edit_event_path(@event) -%></li>
     <li><%= back_to_index(flash[:page_info]) -%></li>

data/app/views/participates/edit.html.erb

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.editing', :model => t('activerecord.models.participate')) -%></h1>
 <div id="content_list">
 
@@ -20,7 +20,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.show'), @participate %></li>
     <li><%= link_to t('page.back'), participates_path %></li>

data/app/views/participates/index.html.erb

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.participate')) -%></h1>
 <div id="content_list">
 
@@ -23,7 +23,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.new', :model => t('activerecord.models.participate')), new_participate_path -%></li>
   </ul>

data/app/views/participates/new.html.erb

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.new', :model => t('activerecord.models.participate')) -%></h1>
 <div id="content_list">
 
@@ -20,7 +20,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.back'), participates_path %></li>
   </ul>

data/app/views/participates/show.html.erb

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.participate')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
@@ -16,7 +16,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.edit'), edit_participate_path(@participate) %></li>
     <li><%= back_to_index(flash[:page_info]) %></li>

data/app/workers/event_import_file_queue.rb

@@ -0,0 +1,7 @@
+class EventImportFileQueue
+  @queue = :event_import_file
+
+  def self.perform(event_import_file_id)
+    EventImportFile.find(event_import_file_id).import_start
+  end
+end

data/config/locales/translation_en.yml

@@ -32,6 +32,7 @@ en:
         state: State
         edit_mode: Edit mode
         error_message: Error message
+        user_encoding: Encoding
       event_import_result:
         body: Body
 

data/config/locales/translation_ja.yml

@@ -32,6 +32,7 @@ ja:
         state: 状態
         edit_mode: 編集モード
         error_message: エラーメッセージ
+        user_encoding: 文字コード
       event_import_result:
         body: 本文
 

data/db/migrate/20081028093607_create_event_import_files.rb

@@ -7,7 +7,6 @@ class CreateEventImportFiles < ActiveRecord::Migration
       t.integer :user_id
       t.text :note
       t.datetime :imported_at
-      t.string :state
       t.string :event_import_file_name
       t.string :event_import_content_type
       t.integer :event_import_file_size
@@ -18,7 +17,6 @@ class CreateEventImportFiles < ActiveRecord::Migration
     end
     add_index :event_import_files, :parent_id
     add_index :event_import_files, :user_id
-    add_index :event_import_files, :state
   end
 
   def self.down

data/db/migrate/20140523171309_create_event_import_file_transitions.rb

@@ -0,0 +1,14 @@
+class CreateEventImportFileTransitions < ActiveRecord::Migration
+  def change
+    create_table :event_import_file_transitions do |t|
+      t.string :to_state
+      t.text :metadata, default: "{}"
+      t.integer :sort_key
+      t.integer :event_import_file_id
+      t.timestamps
+    end
+
+    add_index :event_import_file_transitions, :event_import_file_id
+    add_index :event_import_file_transitions, [:sort_key, :event_import_file_id], unique: true, name: "index_event_import_file_transitions_on_sort_key_and_file_id"
+  end
+end

data/db/migrate/20140628071719_add_user_encoding_to_event_import_file.rb

@@ -0,0 +1,5 @@
+class AddUserEncodingToEventImportFile < ActiveRecord::Migration
+  def change
+    add_column :event_import_files, :user_encoding, :string
+  end
+end

data/lib/enju_event/engine.rb

@@ -2,7 +2,7 @@ require "enju_seed"
 require "inherited_resources"
 require "has_scope"
 require "paperclip"
-require "state_machine"
+require "statesman"
 require "ri_cal"
 require "csv"
 require "nkf"

data/lib/enju_event/version.rb

@@ -1,3 +1,3 @@
 module EnjuEvent
-  VERSION = "0.1.17.pre17"
+  VERSION = "0.1.17.pre18"
 end

data/spec/dummy/db/migrate/005_create_manifestations.rb

@@ -19,13 +19,6 @@ class CreateManifestations < ActiveRecord::Migration
       t.integer :height
       t.integer :width
       t.integer :depth
-      t.string :isbn
-      t.string :isbn10
-      t.string :wrong_isbn
-      t.string :nbn
-      t.string :lccn
-      t.string :oclc_number
-      t.string :issn
       t.integer :price # TODO: 通貨単位
       t.text :fulltext
       t.string :volume_number_list
@@ -43,11 +36,6 @@ class CreateManifestations < ActiveRecord::Migration
     end
     add_index :manifestations, :carrier_type_id
     add_index :manifestations, :required_role_id
-    add_index :manifestations, :isbn
-    add_index :manifestations, :nbn
-    add_index :manifestations, :lccn
-    add_index :manifestations, :oclc_number
-    add_index :manifestations, :issn
     add_index :manifestations, :access_address
     add_index :manifestations, :frequency_id
     add_index :manifestations, :manifestation_identifier

data/spec/dummy/db/migrate/006_create_items.rb

@@ -1,7 +1,7 @@
 class CreateItems < ActiveRecord::Migration
   def change
     create_table :items do |t|
-      #t.integer :manifestation_id
+      t.integer :manifestation_id
       t.string :call_number
       t.string :item_identifier
       t.timestamps
@@ -16,7 +16,7 @@ class CreateItems < ActiveRecord::Migration
       t.string :state
       t.integer :required_score, :default => 0, :null => false
     end
-    #add_index :items, :manifestation_id
+    add_index :items, :manifestation_id
     add_index :items, :shelf_id
     add_index :items, :item_identifier
     add_index :items, :required_role_id

data/spec/dummy/db/migrate/029_create_subjects.rb

@@ -0,0 +1,27 @@
+class CreateSubjects < ActiveRecord::Migration
+  def self.up
+    create_table :subjects do |t|
+      t.integer :parent_id
+      t.integer :use_term_id
+      t.string :term
+      t.text :term_transcription
+      t.integer :subject_type_id, :null => false
+      t.text :scope_note
+      t.text :note
+      t.integer :required_role_id, :default => 1, :null => false
+      t.integer :lock_version, :default => 0, :null => false
+      t.datetime :created_at
+      t.datetime :updated_at
+      t.datetime :deleted_at
+    end
+    add_index :subjects, :term
+    add_index :subjects, :parent_id
+    add_index :subjects, :use_term_id
+    add_index :subjects, :subject_type_id
+    add_index :subjects, :required_role_id
+  end
+
+  def self.down
+    drop_table :subjects
+  end
+end