enju_inventory 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c4d50b7e15533f78ab52f9721131bfe8e2d0e6b8
-  data.tar.gz: 977c970e7f16fbf01ecd99d5f0408dda975e4bc2
+SHA256:
+  metadata.gz: '09b6a818e259d2e0e210cb2e3b3c89c67cdcf797ba7aa992e58155844578335c'
+  data.tar.gz: d11633b8f3cd04fb6e794c4735b9d399b651db6c668251a8e2c52e607132c11c
 SHA512:
-  metadata.gz: f4b3690aff8c0c36c109e39b2773c2cc84c1a6ff0b7615cdc79955e1611026277c3fcc9f51f0f2aa2cf62ba4d12310918adafd9666e4224cb69c4d39d03c9809
-  data.tar.gz: 7d1da914990a234ab0137652557c2bebc3d3a4d0c88b169f36cbdf65cc5993216e197c12b707f375ae2c2200f449f0847077476e4d9a724ff474d502cdd7d28e
+  metadata.gz: fe5a4047cc652ac45a71b364d91760562b5502e2b0038017e553c37d1bacfafadf19d086271ff032e89d9c66f165cd5c6d39c90ced51e0ba1cfde72354b0ffca
+  data.tar.gz: 0654e486b8d1d3feff510fa0e185e603dfcc9e786e6d89c6859f1948e6247546a417bcb9cd92f527c2cd38ed4912e5136c71444157144ab606b86f38ed0c9353

data/README.md

@@ -0,0 +1,11 @@
+# EnjuEvent
+[![Travis CI](https://travis-ci.com/next-l/enju_inventory.svg?branch=1.3)](https://travis-ci.com/next-l/enju_inventory)
+[![Coverage Status](https://coveralls.io/repos/github/next-l/enju_inventory/badge.svg?branch=1.3)](https://coveralls.io/github/next-l/enju_inventory?branch=1.3)
+[![security](https://hakiri.io/github/next-l/enju_inventory/1.3.svg)](https://hakiri.io/github/next-l/enju_inventory/1.3)
+
+This project rocks and uses MIT-LICENSE.
+
+## 製作者・貢献者 (Authors and contributors)
+* [TANABE, Kosuke](https://github.com/nabeta) ([@nabeta](https://twitter.com/nabeta))
+* [Project Next-L](https://www.next-l.jp) ([@ProjectNextL](https://twitter.com/ProjectNextL))
+

data/app/controllers/inventory_files_controller.rb

@@ -1,6 +1,7 @@
 class InventoryFilesController < ApplicationController
   before_action :set_inventory_file, only: [:show, :edit, :update, :destroy]
   before_action :check_policy, only: [:index, :new, :create]
+  before_action :prepare_options, only: [:new, :edit]
 
   # GET /inventory_files
   # GET /inventory_files.json
@@ -21,6 +22,7 @@ class InventoryFilesController < ApplicationController
         file = @inventory_file.inventory.path
       end
     end
+    @inventories = @inventory_file.inventories.page(params[:page])
 
     respond_to do |format|
       format.html # show.html.erb
@@ -64,6 +66,7 @@ class InventoryFilesController < ApplicationController
         format.html { redirect_to(@inventory_file) }
         format.json { render json: @inventory_file, status: :created, location: @inventory_file }
       else
+        prepare_options
         format.html { render action: "new" }
         format.json { render json: @inventory_file.errors, status: :unprocessable_entity }
       end
@@ -79,6 +82,7 @@ class InventoryFilesController < ApplicationController
         format.html { redirect_to(@inventory_file) }
         format.json { head :no_content }
       else
+        prepare_options
         format.html { render action: "edit" }
         format.json { render json: @inventory_file.errors, status: :unprocessable_entity }
       end
@@ -106,7 +110,12 @@ class InventoryFilesController < ApplicationController
     authorize InventoryFile
   end
 
+  def prepare_options
+    @libraries = Library.order(:position)
+    @shelves = Shelf.order(:position)
+  end
+
   def inventory_file_params
-    params.require(:inventory_file).permit(:inventory, :note)
+    params.require(:inventory_file).permit(:inventory, :shelf_id, :note)
   end
 end

data/app/models/inventory.rb

@@ -1,22 +1,49 @@
-class Inventory < ActiveRecord::Base
-  belongs_to :item
+class Inventory < ApplicationRecord
+  belongs_to :item, optional: true
   belongs_to :inventory_file
 
-  validates_associated :item, :inventory_file
-  validates_presence_of :item, :inventory_file
-  validates_uniqueness_of :item_id, scope: :inventory_file_id
+  validates :item_identifier, :current_shelf_name, presence: true
+  validates :item_id, :item_identifier, uniqueness: {scope: :inventory_file_id}
 
   paginates_per 10
+
+  def to_hash
+    {
+      created_at: created_at,
+      identifier: item_identifier,
+      item_identifier: item.try(:item_identifier),
+      current_shelf: current_shelf_name,
+      shelf: item.try(:shelf),
+      call_number: item.try(:call_number),
+      circulation_status: item.try(:circulation_status).try(:name),
+      title: item.try(:manifestation).try(:original_title),
+      extent: item.try(:manifestation).try(:extent)
+    }
+  end
+
+  def lost
+    item.circulation_status = CirculationStatus.find_by(name: 'Missing')
+  end
+
+  def found
+    if item.rended?
+      item.circulation_status = CirculationStatus.find_by(name: 'On Loan')
+    else
+      item.circulation_status = CirculationStatus.find_by(name: 'Available On Shelf')
+    end
+  end
 end
 
 # == Schema Information
 #
 # Table name: inventories
 #
-#  id                :integer          not null, primary key
-#  item_id           :integer
-#  inventory_file_id :integer
-#  note              :text
-#  created_at        :datetime
-#  updated_at        :datetime
+#  id                 :integer          not null, primary key
+#  item_id            :integer
+#  inventory_file_id  :integer
+#  note               :text
+#  created_at         :datetime
+#  updated_at         :datetime
+#  item_identifier    :string
+#  current_shelf_name :string
 #

data/app/models/inventory_file.rb

@@ -1,8 +1,8 @@
-class InventoryFile < ActiveRecord::Base
+class InventoryFile < ApplicationRecord
   has_many :inventories, dependent: :destroy
   has_many :items, through: :inventories
   belongs_to :user
-  validates_presence_of :user
+  belongs_to :shelf
 
   if ENV['ENJU_STORAGE'] == 's3'
     has_attached_file :inventory, storage: :s3,
@@ -17,7 +17,8 @@ class InventoryFile < ActiveRecord::Base
       path: ":rails_root/private/system/:class/:attachment/:id_partition/:style/:filename"
   end
   validates_attachment_content_type :inventory, content_type: ['text/csv', 'text/plain', 'text/tab-separated-values']
-  validates_attachment_presence :inventory
+  validates_attachment_presence :inventory, on: :create
+  attr_accessor :library_id
 
   paginates_per 10
 
@@ -26,16 +27,43 @@ class InventoryFile < ActiveRecord::Base
     file = File.open(self.inventory.path)
     reader = file.read
     reader.split.each do |row|
-      item = Item.where(item_identifier: row.to_s.strip).first
+      identifier = row.to_s.strip
+      item = Item.find_by(item_identifier: identifier)
       if item
         unless self.items.where(id: item.id).select('items.id').first
-          self.items << item
+          Inventory.create(
+            inventory_file: self,
+            item: item,
+            current_shelf_name: shelf.name,
+            item_identifier: identifier
+          )
         end
       end
     end
     file.close
     true
   end
+
+  def export(col_sep: "\t")
+    file = Tempfile.create('inventory_file') do |f|
+      inventories.each do |inventory|
+        f.write inventory.to_hash.values.to_csv(col_sep)
+      end
+
+      f.rewind
+      f.read
+    end
+
+    file
+  end
+
+  def missing_items
+    Item.where(Inventory.where('items.id = inventories.item_id AND inventories.inventory_file_id = ?', id).exists.not)
+  end
+
+  def found_items
+    items
+  end
 end
 
 # == Schema Information
@@ -55,4 +83,5 @@ end
 #  inventory_file_size    :integer
 #  inventory_updated_at   :datetime
 #  inventory_fingerprint  :string
+#  shelf_id               :integer
 #

data/app/views/inventory_files/_form.html.erb

@@ -0,0 +1,23 @@
+<%= form_for(@inventory_file) do |f| -%>
+  <%= f.error_messages -%>
+
+  <div class="field">
+    <%= f.label "#{t('activerecord.models.library')} / #{t('activerecord.models.shelf')}" -%>
+    <%= f.select :library_id, @libraries.map{|l| [l.display_name.localize, l.id]} %>
+    <%= f.select :shelf_id, @shelves.map{|s| [s.display_name.localize, s.id]} %>
+    <%= render 'observe_field' %>
+  </div>
+
+  <div class="field">
+    <%= f.label t('page.file') -%><br />
+    <%= f.file_field :inventory -%>
+  </div>
+
+  <div class="field">
+    <%= f.label :note -%> <br />
+    <%= f.text_area :note -%>
+  </div>
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<%- end -%>

data/app/views/inventory_files/_observe_field.html.erb

@@ -0,0 +1,7 @@
+<script type="text/javascript">
+  function displayVals() {
+    var libraryValue = $("#inventory_file_library_id").val();
+    $("#inventory_file_shelf_id").load('<%= shelves_path %>?mode=select&library_id=' + libraryValue);
+  }
+  $("#inventory_file_library_id").change(displayVals);
+</script>

data/app/views/inventory_files/_results.html.erb

@@ -0,0 +1,36 @@
+<h2><%= t('activerecord.models.inventory') %></h2>
+
+<p>
+  <%= link_to((image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'enju_icon'), inventories_path(inventory_file_id: @inventory_file.id, format: :txt)) -%>
+  (<%= link_to 'TSV', inventories_path(inventory_file_id: @inventory_file.id, format: :txt) -%>)
+</p>
+
+<table class="table table-striped index">
+  <tr>
+    <th><%= t('activerecord.attributes.inventory.lineno') %></th>
+    <th><%= t('activerecord.attributes.inventory.current_shelf_name') %></th>
+    <th><%= t('activerecord.attributes.inventory.item_identifier') %></th>
+    <th><%= t('activerecord.models.manifestation') %></th>
+    <th></th>
+  </tr>
+<% @inventories.each_with_index do |inventory, idx| %>
+  <tr class="line<%= cycle("0", "1") -%>">
+    <td><%= @inventories.offset_value + idx + 1 %></td>
+    <td><%= inventory.current_shelf_name %></td>
+    <td><%= inventory.item_identifier %></td>
+    </td>
+    <td>
+      <% if inventory.item %>
+        <%= link_to inventory.item.item_identifier, inventory.item %>
+        <br />
+        <%= link_to inventory.item.manifestation.original_title, inventory.item.manifestation if inventory.item.try(:manifestation) %>
+      <% end %>
+    </td>
+    <td>
+      <%= link_to t('page.show'), inventory %>
+      <%= link_to t('page.destroy'), inventory, data: {confirm: t('page.are_you_sure')}, method: :delete %>
+    </td>
+  </tr>
+<% end %>
+</table>
+<%= paginate(@inventories) %>

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

@@ -1,40 +1,10 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.inventory_file')) -%></h1>
-<div id="content_list">
+  <h1 class="title"><%= t('page.editing', :model => t('activerecord.models.inventory_file')) -%></h1>
+  <div id="content_list">
 
-<%= form_for(@inventory_file) do |f| -%>
-  <%= f.error_messages -%>
+    <%= render 'form' %>
 
-  <div class="field">
-    <%= f.label :inventory_file_name -%> <br />
-    <%= f.text_field :inventory_file_name -%>
   </div>
-  <div class="field">
-    <%= f.label :inventory_content_type -%> <br />
-    <%= f.text_field :inventory_content_type -%>
-  </div>
-  <div class="field">
-    <%= f.label :inventory_file_size -%> <br />
-    <%= f.text_field :inventory_file_size -%>
-  </div>
-  <div class="field">
-    <%= f.label :inventory_fingerprint -%> <br />
-    <%= f.text_field :inventory_fingerprint -%>
-  </div>
-  <div class="field">
-    <%= f.label :user_id -%> <br />
-    <%= f.text_field :user_id -%>
-  </div>
-  <div class="field">
-    <%= f.label :note -%> <br />
-    <%= f.text_area :note -%>
-  </div>
-  <div class="actions">
-    <%= f.submit %>
-  </div>
-<%- end -%>
-
-</div>
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">

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

@@ -4,24 +4,22 @@
 
 <table class="table table-striped index">
   <tr>
+    <th><%= t('activerecord.attributes.inventory_file.shelf') -%> </th>
     <th><%= t('activerecord.attributes.inventory_file.inventory_file_name') -%> </th>
-    <th><%= t('activerecord.attributes.inventory_file.inventory_content_type') -%> </th>
     <th><%= t('activerecord.attributes.inventory_file.inventory_file_size') -%> </th>
-    <th><%= t('activerecord.attributes.inventory_file.inventory_fingerprint') -%> </th>
     <th><%= t('activerecord.models.user') -%> </th>
     <th></th>
   </tr>
 
 <%- @inventory_files.each do |inventory_file| -%>
   <tr class="line<%= cycle("0", "1") -%>">
+    <td><%= link_to inventory_file.shelf.display_name, inventory_file.shelf %></td>
     <td>
       <%= link_to inventory_file.inventory_file_name, inventory_file -%>
       <br />
       <%= inventory_file.created_at -%>
     </td>
-    <td><%= inventory_file.inventory_content_type -%> </td>
     <td><%= inventory_file.inventory_file_size -%> </td>
-    <td><%= inventory_file.inventory_fingerprint -%> </td>
     <td><%= link_to inventory_file.user.username, inventory_file.user.profile if inventory_file.user.try(:profile) -%> </td>
     <td>
       <%= link_to t('page.edit'), edit_inventory_file_path(inventory_file) -%>

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

@@ -1,21 +1,10 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.inventory_file')) -%> </h1>
-<div id="content_list">
+  <h1 class="title"><%= t('page.new', :model => t('activerecord.models.inventory_file')) -%> </h1>
+  <div id="content_list">
 
-<%= form_for(@inventory_file, :html => {:multipart => true}) do |f| -%>
-  <%= f.error_messages -%>
+    <%= render 'form' %>
 
-  <div class="field">
-    <%= f.label t('page.file') -%><br />
-    <%= f.file_field :inventory -%>
   </div>
-
-  <div class="actions">
-    <%= f.submit %>
-  </div>
-<%- end -%>
-
-</div>
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">

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

@@ -1,39 +1,48 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.inventory_file')) -%></h1>
-<div id="content_list">
-<p id="notice"><%= notice %></p>
-
-<p>
-  <strong><%= t('activerecord.attributes.inventory_file.inventory_file_name') -%> :</strong>
-  <%= @inventory_file.inventory_file_name -%>
-</p>
-
-<p>
-  <strong><%= t('activerecord.attributes.inventory_file.inventory_content_type') -%> :</strong>
-  <%= @inventory_file.inventory_content_type -%>
-</p>
-
-<p>
-  <strong><%= t('activerecord.attributes.inventory_file.inventory_file_size') -%> :</strong>
-  <%= @inventory_file.inventory_file_size -%>
-</p>
-
-<p>
-  <strong><%= t('activerecord.attributes.inventory_file.inventory_fingerprint') -%> :</strong>
-  <%= @inventory_file.inventory_fingerprint -%>
-</p>
-
-<p>
-  <strong><%= t('activerecord.models.user') -%> :</strong>
-  <%= link_to @inventory_file.user.username, @inventory_file.user.profile if @inventory_file.user.try(:profile) -%>
-</p>
-
-<p>
-  <strong><%= t('activerecord.attributes.inventory_file.note') -%> :</strong>
-  <%= @inventory_file.note -%>
-</p>
-
-</div>
+  <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.inventory_file')) -%></h1>
+  <div id="content_list">
+    <p id="notice"><%= notice %></p>
+
+    <p>
+      <strong><%= t('activerecord.attributes.inventory_file.shelf') -%> :</strong>
+      <%= link_to @inventory_file.shelf.display_name, @inventory_file.shelf -%>
+    </p>
+
+    <p>
+      <strong><%= t('activerecord.attributes.inventory_file.inventory_file_name') -%> :</strong>
+      <%= @inventory_file.inventory_file_name -%>
+    </p>
+
+    <p>
+      <strong><%= t('activerecord.attributes.inventory_file.inventory_content_type') -%> :</strong>
+      <%= @inventory_file.inventory_content_type -%>
+    </p>
+
+    <p>
+      <strong><%= t('activerecord.attributes.inventory_file.inventory_file_size') -%> :</strong>
+      <%= @inventory_file.inventory_file_size -%>
+    </p>
+
+    <p>
+      <strong><%= t('activerecord.attributes.inventory_file.inventory_fingerprint') -%> :</strong>
+      <%= @inventory_file.inventory_fingerprint -%>
+    </p>
+
+    <p>
+      <strong><%= t('activerecord.models.user') -%> :</strong>
+      <%= link_to @inventory_file.user.username, @inventory_file.user.profile if @inventory_file.user.try(:profile) -%>
+    </p>
+
+    <p>
+      <strong><%= t('activerecord.attributes.inventory_file.note') -%> :</strong>
+      <%= @inventory_file.note -%>
+    </p>
+
+    <% if @inventories %>
+      <%= render 'results' %>
+    <% end %>
+
+  </div>
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">