enju_biblio 0.3.10.rc.1 → 0.3.12

data/app/models/picture_file.rb

@@ -45,9 +45,7 @@ end
 #  id                      :integer          not null, primary key
 #  picture_attachable_id   :integer
 #  picture_attachable_type :string
-#  content_type            :string
 #  title                   :text
-#  thumbnail               :string
 #  position                :integer
 #  created_at              :datetime
 #  updated_at              :datetime

data/app/models/resource_export_file.rb

@@ -31,8 +31,10 @@ class ResourceExportFile < ApplicationRecord
     transition_to!(:started)
     role_name = user.try(:role).try(:name)
     tsv = Manifestation.export(role: role_name)
-    self.resource_export = StringIO.new(tsv)
-    self.resource_export.instance_write(:filename, "resource_export.txt")
+    file = StringIO.new(tsv)
+    file.class.class_eval { attr_accessor :original_filename, :content_type }
+    file.original_filename =  'resource_export.txt'
+    self.resource_export = file
     save!
     transition_to!(:completed)
     mailer = ResourceExportMailer.completed(self)

data/app/models/resource_import_file.rb

@@ -322,55 +322,15 @@ class ResourceImportFile < ApplicationRecord
     rows.each do |row|
       row_num += 1
       import_result = ResourceImportResult.create!(resource_import_file_id: id, body: row.fields.join("\t"))
-      item_identifier = row['item_identifier'].to_s.strip
-      item = Item.find_by(item_identifier: item_identifier) if item_identifier.present?
+      item = Item.find_by(item_identifier: row['item_identifier'].to_s.strip) if row['item_identifier'].to_s.strip.present?
+      unless item
+        item = Item.find_by(id: row['item_id'].to_s.strip) if row['item_id'].to_s.strip.present?
+      end
+
       if item
         if item.manifestation
           fetch(row, edit_mode: 'update')
-        end
-
-        shelf = Shelf.find_by(name: row['shelf'].to_s.strip)
-        bookstore = Bookstore.find_by(name: row['bookstore'])
-        required_role = Role.find_by(name: row['required_role'])
-
-        item.shelf = shelf if shelf
-        item.bookstore = bookstore if bookstore
-        item.required_role = required_role if required_role
-
-        acquired_at = Time.zone.parse(row['acquired_at']) rescue nil
-        binded_at = Time.zone.parse(row['binded_at']) rescue nil
-        item.acquired_at = acquired_at if acquired_at
-        item.binded_at = binded_at if binded_at
-
-        if defined?(EnjuCirculation)
-          circulation_status = CirculationStatus.find_by(name: row['circulation_status'])
-          checkout_type = CheckoutType.find_by(name: row['checkout_type'])
-          use_restriction = UseRestriction.find_by(name: row['use_restriction'].to_s.strip)
-          item.circulation_status = circulation_status if circulation_status
-          item.checkout_type = checkout_type if checkout_type
-          item.use_restriction = use_restriction if use_restriction
-        end
-
-        item_columns = %w(
-          call_number
-          binding_item_identifier binding_call_number binded_at
-        )
-        item_columns.each do |column|
-          if row[column].present?
-            item.assign_attributes(:"#{column}" => row[column])
-          end
-        end
-
-        item.price = row['item_price'] if row['item_price'].present?
-        item.note = row['item_note'].try(:gsub, /\\n/, "\n") if row['item_note'].present?
-        item.url = row['item_url'] if row['item_url'].present?
-
-        if row['include_supplements']
-          if %w(t true).include?(row['include_supplements'].downcase.strip)
-            item.include_supplements = true
-          else
-            item.include_supplements = false if item.include_supplements
-          end
+          item = update_item(item, row)
         end
 
         ResourceImportFile.import_item_custom_value(row, item).each do |value|
@@ -419,8 +379,11 @@ class ResourceImportFile < ApplicationRecord
 
     rows.each do |row|
       row_num += 1
-      item_identifier = row['item_identifier'].to_s.strip
-      item = Item.find_by(item_identifier: item_identifier)
+      item = Item.find_by(item_identifier: row['item_identifier'].to_s.strip) if row['item_identifier'].to_s.strip.present?
+      unless item
+        item = Item.find_by(id: row['item_id'].to_s.strip) if row['item_id'].to_s.strip.present?
+      end
+
       if item
         item.destroy if item.removable?
       end
@@ -444,10 +407,9 @@ class ResourceImportFile < ApplicationRecord
     row_num = 1
 
     rows.each do |row|
-      item_identifier = row['item_identifier'].to_s.strip
-      item = Item.find_by(item_identifier: item_identifier)
+      item = Item.find_by(item_identifier: row['item_identifier'].to_s.strip) if row['item_identifier'].to_s.strip.present?
       unless item
-        item = Item.find_by(id: row['item_id'].to_s.strip)
+        item = Item.find_by(id: row['item_id'].to_s.strip) if row['item_id'].to_s.strip.present?
       end
 
       manifestation_identifier = row['manifestation_identifier'].to_s.strip
@@ -603,12 +565,68 @@ class ResourceImportFile < ApplicationRecord
     item
   end
 
+  def update_item(item, row)
+    shelf = Shelf.find_by(name: row['shelf'].to_s.strip)
+    bookstore = Bookstore.find_by(name: row['bookstore'])
+    required_role = Role.find_by(name: row['required_role'])
+
+    item.shelf = shelf if shelf
+    item.bookstore = bookstore if bookstore
+    item.required_role = required_role if required_role
+
+    acquired_at = Time.zone.parse(row['acquired_at']) rescue nil
+    binded_at = Time.zone.parse(row['binded_at']) rescue nil
+    item.acquired_at = acquired_at if acquired_at
+    item.binded_at = binded_at if binded_at
+
+    if defined?(EnjuCirculation)
+      circulation_status = CirculationStatus.find_by(name: row['circulation_status'])
+      checkout_type = CheckoutType.find_by(name: row['checkout_type'])
+      use_restriction = UseRestriction.find_by(name: row['use_restriction'].to_s.strip)
+      item.circulation_status = circulation_status if circulation_status
+      item.checkout_type = checkout_type if checkout_type
+      item.use_restriction = use_restriction if use_restriction
+    end
+
+    item_columns = %w(
+      call_number
+      binding_item_identifier binding_call_number binded_at
+    )
+    item_columns.each do |column|
+      if row[column].present?
+        item.assign_attributes(:"#{column}" => row[column])
+      end
+    end
+
+    item.price = row['item_price'] if row['item_price'].present?
+    item.note = row['item_note'].try(:gsub, /\\n/, "\n") if row['item_note'].present?
+    item.url = row['item_url'] if row['item_url'].present?
+
+    if row['include_supplements']
+      if %w(t true).include?(row['include_supplements'].downcase.strip)
+        item.include_supplements = true
+      else
+        item.include_supplements = false if item.include_supplements
+      end
+    end
+
+    item
+  end
+
   def fetch(row, options = {edit_mode: 'create'})
-    case options[:edit_mode]
-    when 'create'
-      manifestation = nil
-    when 'update'
-      manifestation = Item.find_by(item_identifier: row['item_identifier'].to_s.strip).try(:manifestation)
+    manifestation = nil
+    item = nil
+
+    if options[:edit_mode] == 'update'
+      if row['item_identifier'].to_s.strip.present?
+        item = Item.find_by(item_identifier: row['item_identifier'].to_s.strip)
+      end
+      if row['item_id'].to_s.strip.present?
+        item = Item.find_by(id: row['item_id'].to_s.strip)
+      end
+
+      manifestation = item.manifestation if item
+
       unless manifestation
         manifestation_identifier = row['manifestation_identifier'].to_s.strip
         manifestation = Manifestation.find_by(manifestation_identifier: manifestation_identifier) if manifestation_identifier

data/app/policies/item_custom_property_policy.rb

@@ -8,14 +8,14 @@ class ItemCustomPropertyPolicy < ApplicationPolicy
   end
 
   def create?
-    true if user.try(:has_role?, 'Librarian')
+    true if user.try(:has_role?, 'Administrator')
   end
 
   def update?
-    true if user.try(:has_role?, 'Librarian')
+    true if user.try(:has_role?, 'Administrator')
   end
 
   def destroy?
-    true if user.try(:has_role?, 'Librarian')
+    true if user.try(:has_role?, 'Administrator')
   end
 end

data/app/policies/manifestation_custom_property_policy.rb

@@ -8,14 +8,14 @@ class ManifestationCustomPropertyPolicy < ApplicationPolicy
   end
 
   def create?
-    true if user.try(:has_role?, 'Librarian')
+    true if user.try(:has_role?, 'Administrator')
   end
 
   def update?
-    true if user.try(:has_role?, 'Librarian')
+    true if user.try(:has_role?, 'Administrator')
   end
 
   def destroy?
-    true if user.try(:has_role?, 'Librarian')
+    true if user.try(:has_role?, 'Administrator')
   end
 end

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

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

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

@@ -1,5 +1,6 @@
-<div class="row">
-  <div class="col-md-9">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+  <h1 class="title"><%= t('page.listing', model: t('activerecord.models.item_custom_property')) -%></h1>
+  <div id="content_list">
     <p id="notice"><%= notice %></p>
 
     <h1><%= t('page.listing', model: t('activerecord.models.item_custom_property')) -%></h1>
@@ -7,6 +8,7 @@
     <table class='table table-striped index'>
       <thead>
         <tr>
+          <th id="position"></th>
           <th><%= t('activerecord.attributes.item_custom_property.name') %></th>
           <th><%= t('activerecord.attributes.item_custom_property.display_name') %></th>
           <th><%= t('activerecord.attributes.item_custom_property.note') %></th>
@@ -17,6 +19,11 @@
       <tbody>
         <% @item_custom_properties.each do |item_custom_property| %>
           <tr>
+            <td>
+              <%- if policy(item_custom_property).update? -%>
+                <%= move_position(item_custom_property) -%>
+              <%- end -%>
+            </td>
             <td><%= link_to item_custom_property.name, item_custom_property %></td>
             <td><%= item_custom_property.display_name.localize %></td>
             <td><%= item_custom_property.note %></td>
@@ -27,10 +34,10 @@
       </tbody>
     </table>
   </div>
+</div>
 
-  <div class="col">
-    <div class="card card-body">
-      <%= link_to t('page.new', model: t('activerecord.models.item_custom_property')), new_item_custom_property_path -%>
-    </div>
-  </div>
+<div id="submenu" class="ui-corner-all ui-widget-content">
+  <ul>
+    <li><%= link_to t('page.new', model: t('activerecord.models.item_custom_property')), new_item_custom_property_path -%></li>
+  </ul>
 </div>

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

@@ -1,5 +1,12 @@
-<h1><%= t('page.new', model: t('activerecord.models.item_custom_property')) -%></h1>
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+  <h1 class="title"><%= t('page.new', model: t('activerecord.models.item_custom_property')) -%></h1>
+  <div id="content_list">
+    <%= render 'form', item_custom_property: @item_custom_property %>
+  </div>
+</div>
 
-<%= render 'form', item_custom_property: @item_custom_property %>
-
-<%= link_to t('page.back'), item_custom_properties_path %>
+<div id="submenu" class="ui-corner-all ui-widget-content">
+  <ul>
+    <li><%= link_to t('page.back'), item_custom_properties_path %></li>
+  </ul>
+</div>

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

@@ -1,21 +1,28 @@
-<h1><%= t('page.showing', model: t('activerecord.models.item_custom_property')) -%></h1>
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+  <h1 class="title"><%= t('page.showing', model: t('activerecord.models.item_custom_property')) -%></h1>
+  <div id="content_list">
+    <p id="notice"><%= notice %></p>
 
-<p id="notice"><%= notice %></p>
+    <p>
+      <strong><%= t('activerecord.attributes.item_custom_property.name') %>:</strong>
+      <%= @item_custom_property.name %>
+    </p>
 
-<p>
-  <strong><%= t('activerecord.attributes.item_custom_property.name') %>:</strong>
-  <%= @item_custom_property.name %>
-</p>
+    <p>
+      <strong><%= t('activerecord.attributes.item_custom_property.display_name') %>:</strong>
+      <%= @item_custom_property.display_name.localize %>
+    </p>
 
-<p>
-  <strong><%= t('activerecord.attributes.item_custom_property.display_name') %>:</strong>
-  <%= @item_custom_property.display_name.localize %>
-</p>
+    <p>
+      <strong><%= t('activerecord.attributes.item_custom_property.note') %>:</strong>
+      <%= @item_custom_property.note %>
+    </p>
+  </div>
+</div>
 
-<p>
-  <strong><%= t('activerecord.attributes.item_custom_property.note') %>:</strong>
-  <%= @item_custom_property.note %>
-</p>
-
-<%= link_to t('page.edit'), edit_item_custom_property_path(@item_custom_property) %> |
-<%= link_to t('page.back'), item_custom_properties_path %>
+<div id="submenu" class="ui-corner-all ui-widget-content">
+  <ul>
+    <li><%= link_to t('page.edit'), edit_item_custom_property_path(@item_custom_property) %></li>
+    <li><%= link_to t('page.back'), item_custom_properties_path %></li>
+  </ul>
+</div>

data/app/views/items/_item.json.jbuilder

@@ -0,0 +1,17 @@
+json.id item.id
+json.manifestation_id item.manifestation_id
+json.item_identifier item.item_identifier
+json.call_number item.call_number
+json.shelf item.shelf.name
+if defined?(EnjuCirculation)
+  json.circulation_status item.circulation_status&.name
+end
+json.binding_item_identifier item.binding_item_identifier
+json.binding_call_number item.binding_call_number
+json.binded_at item.binded_at
+json.acquired_at item.acquired_at
+json.include_supplements item.include_supplements
+json.url item.url
+json.note item.note
+json.created_at item.created_at
+json.updated_at item.updated_at

data/app/views/items/index.json.jbuilder

@@ -0,0 +1,5 @@
+json.results do
+  json.array!(@items) do |item|
+    json.partial!(item)
+  end
+end

data/app/views/items/show.json.jbuilder

@@ -0,0 +1 @@
+json.partial!(@item)

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

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

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

@@ -1,5 +1,6 @@
-<div class="row">
-  <div class="col-md-9">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+  <h1 class="title"><%= t('page.listing', model: t('activerecord.models.manifestation_custom_property')) -%></h1>
+  <div id="content_list">
     <p id="notice"><%= notice %></p>
 
     <h1><%= t('page.listing', model: t('activerecord.models.manifestation_custom_property')) -%></h1>
@@ -7,6 +8,7 @@
     <table class='table table-striped index'>
       <thead>
         <tr>
+          <th id="position"></th>
           <th><%= t('activerecord.attributes.manifestation_custom_property.name') %></th>
           <th><%= t('activerecord.attributes.manifestation_custom_property.display_name') %></th>
           <th><%= t('activerecord.attributes.manifestation_custom_property.note') %></th>
@@ -17,6 +19,11 @@
       <tbody>
         <% @manifestation_custom_properties.each do |manifestation_custom_property| %>
           <tr>
+            <td>
+              <%- if policy(manifestation_custom_property).update? -%>
+                <%= move_position(manifestation_custom_property) -%>
+              <%- end -%>
+            </td>
             <td><%= link_to manifestation_custom_property.name, manifestation_custom_property %></td>
             <td><%= manifestation_custom_property.display_name.localize %></td>
             <td><%= manifestation_custom_property.note %></td>
@@ -27,10 +34,10 @@
       </tbody>
     </table>
   </div>
+</div>
 
-  <div class="col">
-    <div class="card card-body">
-      <%= link_to t('page.new', model: t('activerecord.models.manifestation_custom_property')), new_manifestation_custom_property_path -%>
-    </div>
-  </div>
+<div id="submenu" class="ui-corner-all ui-widget-content">
+  <ul>
+    <li><%= link_to t('page.new', model: t('activerecord.models.manifestation_custom_property')), new_manifestation_custom_property_path -%></li>
+  </ul>
 </div>