enju_library 0.1.0.pre43 → 0.1.0.pre44

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

@@ -0,0 +1,50 @@
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.withdraw')) -%></h1>
+<div id="content_list">
+
+<div class="search_form">
+  <%= form_for(:withdraw, html: {method: :get}) do |f| %>
+    <p>
+      <%= label_tag :item_identifier, t('activerecord.attributes.item.item_identifier') -%>:
+      <%= f.search_field :item_identifier, value: @query, class: 'resource_item_identifier' -%>
+      <%= f.submit t('page.search') -%>
+    </p>
+  <%- end -%>
+</div>
+
+<table class="table table-striped index">
+  <tr>
+    <th><%= t('activerecord.models.item') -%></th>
+    <th></th>
+  </tr>
+  <%- @withdraws.each_with_index do |withdraw, i| -%>
+    <tr class="line<%= cycle("0", "1") -%>">
+      <td>
+        <% if withdraw.item %>
+          <%= render 'manifestations/show_index', manifestation: withdraw.item.manifestation %>
+          <%= link_to withdraw.item.item_identifier, withdraw.item -%> / <%= withdraw.item.call_number %>
+          (<%= link_to withdraw.item.shelf.library.display_name.localize, withdraw.item.shelf.library %> /
+          <%= link_to withdraw.item.shelf.display_name.localize, withdraw.item.shelf %>)<br />
+          <%=l withdraw.created_at %>
+        <% end %>
+      </td>
+      <td>
+        <%- if can? :delete, withdraw -%>
+          <%= link_to t('page.destroy'), withdraw, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
+        <%- end -%>
+      </td>
+    </tr>
+  <%- end -%>
+</table>
+  <%= javascript_tag("$(function(){$('#withdraw_item_identifier').focus()})") %>
+
+  <%= paginate(@withdraws) %>
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all ui-widget-content">
+  <ul>
+    <li><%= link_to t('page.new', model: t('activerecord.models.withdraw')), new_withdraw_path -%></li>
+    <li><%= link_to t('page.listing', model: t('activerecord.attributes.withdraw.removed_items', status: CirculationStatus.where(name: 'Removed').first.display_name.localize) + t('activerecord.models.item')), items_path(circulation_status: 'Removed')  -%></li>
+  </ul>
+</div>

data/app/views/withdraws/index.js.erb

@@ -0,0 +1 @@
+$("#withdraw_list").html("<%= escape_javascript(render('withdraws/list')) %>");

data/app/views/withdraws/index.txt.csv

@@ -0,0 +1,4 @@
+item_identifier	basket_id	withdrawed_at
+<% @withdraws.each do |withdraw| %>
+<%= withdraw.item.item_identifier %>	<%= withdraw.basket_id %>	<%= withdraw.created_at %>
+<% end %>

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

@@ -0,0 +1,15 @@
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.withdraw')) -%></h1>
+<div id="content_list">
+  <div id="withdraw_list">
+    <%= render 'list' -%>
+  </div>
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all ui-widget-content">
+  <ul>
+    <li><%= link_to t('page.listing', model: t('activerecord.models.withdraw')), withdraws_path -%></li>
+    <li><%= link_to t('page.listing', model: t('activerecord.attributes.withdraw.removed_items', status: CirculationStatus.where(name: 'Removed').first.display_name.localize) + t('activerecord.models.item')), items_path(circulation_status: 'Removed')  -%></li>
+  </ul>
+</div>

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

@@ -0,0 +1,31 @@
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.withdraw')) -%></h1>
+<div id="content_list">
+<p id="notice"><%= notice %></p>
+
+<p>
+  <strong><%= t('activerecord.models.item') -%>:</strong>
+  <% if @withdraw.item %>
+    <%= link_to @withdraw.item.item_identifier, @withdraw.item -%>
+    (<%= link_to @withdraw.item.manifestation.original_title, @withdraw.item.manifestation %>)
+  <% end %>
+</p>
+
+<p>
+  <strong><%= t('activerecord.models.user') -%>:</strong>
+  <%= link_to @withdraw.librarian.username, @withdraw.librarian.profile if @withdraw.librarian.try(:profile) -%>
+</p>
+
+<p>
+  <strong><%= t('page.created_at') -%>:</strong>
+  <%=l @withdraw.created_at %>
+</p>
+
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all ui-widget-content">
+  <ul>
+    <li><%= back_to_index(flash[:page_info]) -%></li>
+  </ul>
+</div>

data/config/locales/translation_en.yml

@@ -12,6 +12,7 @@ en:
       request_status_type: Request status type
       request_type: Request type
       search_engine: Search engine
+      withdraw: Bulk Withdraw
 
     attributes:
       library:
@@ -55,6 +56,7 @@ en:
         url: URL
         color: Color
         max_number_of_results: Max number of results
+        book_jacket_source: Book jacket source
       bookstore:
         name: Name
         zip_code: Zip code
@@ -98,6 +100,9 @@ en:
         additional_param: Additional param
         note: Note
         position: Position
+      withdraw:
+        item_id: Item
+        removed_items: "%{status} "
 
   library:
     map: "Map"
@@ -114,3 +119,9 @@ en:
     already_accepted: " is already accepted."
     accept: "Accept!"
     successfully_accepted: "This items was successfully accepted."
+  withdraw:
+    item_not_found: " not found."
+    enter_item_identifier: "Enter item identifier."
+    already_withdrawn: " is already withdrawn."
+    withdraw: "Withdraw!"
+    successfully_withdrawn: "This items was successfully withdrawn."

data/config/locales/translation_ja.yml

@@ -12,6 +12,7 @@ ja:
       request_status_type: 依頼の状態の種類
       request_type: 依頼の種類
       search_engine: 検索エンジン
+      withdraw: 連続除籍
 
     attributes:
       library:
@@ -55,6 +56,7 @@ ja:
         url: URL
         color: 色
         max_number_of_results: 検索結果の最大件数
+        book_jacket_source: 書影の取得元
       bookstore:
         name: 名前
         zip_code: 郵便番号
@@ -98,6 +100,9 @@ ja:
         additional_param: 追加のパラメータ
         note: 注記
         position: 位置
+      withdraw:
+        item_id: 個別資料
+        removed_items: "%{status}の"
 
   library:
     map: "地図"
@@ -114,3 +119,9 @@ ja:
     already_accepted: "はすでに検収されています。"
     accept: "検収"
     successfully_accepted: "この資料は正常に検収されました。"
+  withdraw:
+    item_not_found: "が見つかりません。"
+    enter_item_identifier: "所蔵情報番号を入力してください。"
+    already_withdrawn: "はすでに除籍されています。"
+    withdraw: "除籍"
+    successfully_withdrawn: "この資料は正常に除籍されました。"

data/config/routes.rb

@@ -1,12 +1,13 @@
 Rails.application.routes.draw do
+  resources :withdraws, except: [:edit, :update]
   resources :libraries
   resources :shelves
 
   resources :baskets
-  resources :accepts, :except => [:edit, :update]
+  resources :accepts, except: [:edit, :update]
 
   resources :bookstores
-  resources :library_groups, :except => [:new, :create, :destroy]
+  resources :library_groups, except: [:new, :create, :destroy]
   resources :subscriptions
   resources :subscribes
   resources :search_engines

data/db/migrate/20150924115059_create_withdraws.rb

@@ -0,0 +1,13 @@
+class CreateWithdraws < ActiveRecord::Migration
+  def change
+    create_table :withdraws do |t|
+      t.integer :basket_id
+      t.integer :item_id
+      t.integer :librarian_id
+
+      t.timestamps null: false
+    end
+    add_index :withdraws, :basket_id
+    add_index :withdraws, :item_id
+  end
+end

data/lib/enju_library/version.rb

@@ -1,3 +1,3 @@
 module EnjuLibrary
-  VERSION = "0.1.0.pre43"
+  VERSION = "0.1.0.pre44"
 end

data/spec/controllers/accepts_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe AcceptsController do
   fixtures :all
@@ -22,7 +22,7 @@ describe AcceptsController do
       describe "When basket_id is specified" do
         it "assigns all accepts as @accepts" do
           get :index, :basket_id => 10
-          assigns(:accepts).should eq Basket.find(10).accepts.page(1)
+          assigns(:accepts).should eq baskets(:basket_00010).accepts.order('accepts.created_at DESC').page(1)
           response.should be_success
         end
       end
@@ -40,7 +40,7 @@ describe AcceptsController do
       describe "When basket_id is specified" do
         it "assigns all accepts as @accepts" do
           get :index, :basket_id => 9
-          assigns(:accepts).should eq Basket.find(9).accepts.page(1)
+          assigns(:accepts).should eq baskets(:basket_00009).accepts.order('accepts.created_at DESC').page(1)
           response.should be_success
         end
       end

data/spec/controllers/withdraws_controller_spec.rb

@@ -0,0 +1,132 @@
+require 'rails_helper'
+
+# This spec was generated by rspec-rails when you ran the scaffold generator.
+# It demonstrates how one might use RSpec to specify the controller code that
+# was generated by Rails when you ran the scaffold generator.
+#
+# It assumes that the implementation code is generated by the rails scaffold
+# generator.  If you are using any extension libraries to generate different
+# controller code, this generated spec may or may not pass.
+#
+# It only uses APIs available in rails and/or rspec-rails.  There are a number
+# of tools you can use to make these specs even more expressive, but we're
+# sticking to rails and rspec-rails APIs to keep things simple and stable.
+#
+# Compared to earlier versions of this generator, there is very limited use of
+# stubs and message expectations in this spec.  Stubs are only used when there
+# is no simpler way to get a handle on the object needed for the example.
+# Message expectations are only used when there is no simpler way to specify
+# that an instance is receiving a specific message.
+
+RSpec.describe WithdrawsController, type: :controller do
+  fixtures :all
+
+  # This should return the minimal set of attributes required to create a valid
+  # Withdraw. As you add validations to Withdraw, be sure to
+  # adjust the attributes here as well.
+  let(:valid_attributes) {
+    FactoryGirl.build(:withdraw).attributes.with_indifferent_access
+  }
+  let(:invalid_attributes) {
+    { item_id: nil }
+  }
+  let(:valid_create_attributes) {
+    { basket_id: Basket.find(valid_attributes[:basket_id]).id,
+      withdraw: { item_identifier: Item.find(valid_attributes[:item_id]).item_identifier }
+    }
+  }
+
+  # This should return the minimal set of values that should be in the session
+  # in order to pass any filters (e.g. authentication) defined in
+  # WithdrawsController. Be sure to keep this updated too.
+  let(:valid_session) { {} }
+
+  describe "GET #index" do
+    describe "When logged in as Administrator" do
+      login_fixture_admin
+      it "assigns all withdraws as @withdraws" do
+        withdraw = Withdraw.create! valid_attributes
+        get :index, :basket_id => 1
+        expect(assigns(:withdraws)).to eq baskets(:basket_00001).withdraws.order('withdraws.created_at DESC').page(1)
+      end
+    end
+  end
+
+  describe "GET #show" do
+    describe "When logged in as Administrator" do
+      login_fixture_admin
+      it "assigns the requested withdraw as @withdraw" do
+        withdraw = Withdraw.create! valid_attributes
+        get :show, {:id => withdraw.to_param}
+        expect(assigns(:withdraw)).to eq(withdraw)
+        response.should be_success
+      end
+    end
+  end
+
+  describe "GET #new" do
+    describe "When logged in as Administrator" do
+      login_fixture_admin
+      it "assigns a new withdraw as @withdraw" do
+        get :new, {}
+        expect(assigns(:withdraw)).to be_a_new(Withdraw)
+      end
+    end
+  end
+
+  describe "POST #create" do
+    describe "When logged in as Administrator" do
+      login_fixture_admin
+      context "with valid params" do
+        it "creates a new Withdraw" do
+          expect {
+            post :create, valid_create_attributes
+          }.to change(Withdraw, :count).by(1)
+          expect(assigns(:withdraw)).to be_persisted
+        end
+
+        it "assigns a newly created withdraw as @withdraw" do
+          post :create, valid_create_attributes
+          expect(assigns(:withdraw)).to be_a(Withdraw)
+          expect(assigns(:withdraw)).to be_persisted
+        end
+
+        it "redirects to the created withdraw" do
+          post :create, valid_create_attributes
+          expect(response).to redirect_to(withdraws_path(basket_id: valid_create_attributes[:basket_id]))
+        end
+      end
+
+      context "with invalid params" do
+        it "assigns a newly created but unsaved withdraw as @withdraw" do
+          post :create, {:basket_id => valid_create_attributes[:basket_id], :withdraw => {item_id: nil}}
+          expect(assigns(:withdraw)).to be_a_new(Withdraw)
+        end
+
+        it "re-renders the 'new' template" do
+          post :create, {:basket_id => valid_create_attributes[:basket_id], :withdraw => {item_id: nil}}
+          expect(response).to render_template("index")
+        end
+      end
+    end
+  end
+
+  describe "DELETE #destroy" do
+    describe "When logged in as Administrator" do
+      login_fixture_admin
+      it "destroys the requested withdraw" do
+        withdraw = Withdraw.create! valid_attributes
+        expect {
+          delete :destroy, {:id => withdraw.to_param}
+        }.to change(Withdraw, :count).by(-1)
+      end
+
+      it "redirects to the withdraws list" do
+        withdraw = Withdraw.create! valid_attributes
+        delete :destroy, {:id => withdraw.to_param}
+        expect(response).to redirect_to(withdraws_url)
+      end
+    end
+  end
+
+end

data/spec/dummy/app/assets/javascripts/application.js

@@ -2,14 +2,12 @@
 // listed below.
 //
 // Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
 //
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
+// compiled file.
 //
-// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
-// GO AFTER THE REQUIRES BELOW.
+// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
+// about supported directives.
 //
-//= require jquery
-//= require jquery_ujs
 //= require_tree .

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150221063719) do
+ActiveRecord::Schema.define(version: 20150924115059) do
 
   create_table "accepts", force: :cascade do |t|
     t.integer  "basket_id"
@@ -1466,4 +1466,15 @@ ActiveRecord::Schema.define(version: 20150221063719) do
 
   add_index "versions", ["item_type", "item_id"], name: "index_versions_on_item_type_and_item_id"
 
+  create_table "withdraws", force: :cascade do |t|
+    t.integer  "basket_id"
+    t.integer  "item_id"
+    t.integer  "librarian_id"
+    t.datetime "created_at",   null: false
+    t.datetime "updated_at",   null: false
+  end
+
+  add_index "withdraws", ["basket_id"], name: "index_withdraws_on_basket_id"
+  add_index "withdraws", ["item_id"], name: "index_withdraws_on_item_id"
+
 end

data/spec/factories/accepts.rb

@@ -16,6 +16,6 @@ end
 #  basket_id    :integer
 #  item_id      :integer
 #  librarian_id :integer
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  created_at   :datetime
+#  updated_at   :datetime
 #

data/spec/factories/budget_types.rb

@@ -9,10 +9,10 @@ end
 # Table name: budget_types
 #
 #  id           :integer          not null, primary key
-#  name         :string(255)
+#  name         :string
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  created_at   :datetime
+#  updated_at   :datetime
 #

data/spec/factories/withdraw.rb

@@ -0,0 +1,21 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :withdraw do
+    item_id{FactoryGirl.create(:item).id}
+    librarian_id{FactoryGirl.create(:librarian).id}
+    basket_id{FactoryGirl.create(:basket, user_id: librarian_id).id}
+  end
+end
+
+# == Schema Information
+#
+# Table name: withdraws
+#
+#  id           :integer          not null, primary key
+#  basket_id    :integer
+#  item_id      :integer
+#  librarian_id :integer
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#

data/spec/fixtures/baskets.yml

@@ -74,7 +74,6 @@ basket_00011:
 #  user_id      :integer
 #  note         :text
 #  lock_version :integer          default(0), not null
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  created_at   :datetime
+#  updated_at   :datetime
 #
-

data/spec/fixtures/bookstores.yml

@@ -93,15 +93,14 @@ bookstore_00007:
 #
 #  id               :integer          not null, primary key
 #  name             :text             not null
-#  zip_code         :string(255)
+#  zip_code         :string
 #  address          :text
 #  note             :text
-#  telephone_number :string(255)
-#  fax_number       :string(255)
-#  url              :string(255)
+#  telephone_number :string
+#  fax_number       :string
+#  url              :string
 #  position         :integer
 #  deleted_at       :datetime
-#  created_at       :datetime         not null
-#  updated_at       :datetime         not null
+#  created_at       :datetime
+#  updated_at       :datetime
 #
-

data/spec/fixtures/budget_types.yml

@@ -19,11 +19,10 @@ donation:
 # Table name: budget_types
 #
 #  id           :integer          not null, primary key
-#  name         :string(255)
+#  name         :string
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  created_at   :datetime
+#  updated_at   :datetime
 #
-

data/spec/fixtures/colors.yml

@@ -30,9 +30,9 @@ color_00004:
 #
 #  id               :integer          not null, primary key
 #  library_group_id :integer
-#  property         :string(255)
-#  code             :string(255)
+#  property         :string
+#  code             :string
 #  position         :integer
-#  created_at       :datetime         not null
-#  updated_at       :datetime         not null
+#  created_at       :datetime
+#  updated_at       :datetime
 #

data/spec/fixtures/libraries.yml

@@ -74,28 +74,28 @@ library_00004:
 # Table name: libraries
 #
 #  id                    :integer          not null, primary key
-#  name                  :string(255)      not null
+#  name                  :string           not null
 #  display_name          :text
-#  short_display_name    :string(255)      not null
-#  zip_code              :string(255)
+#  short_display_name    :string           not null
+#  zip_code              :string
 #  street                :text
 #  locality              :text
 #  region                :text
-#  telephone_number_1    :string(255)
-#  telephone_number_2    :string(255)
-#  fax_number            :string(255)
+#  telephone_number_1    :string
+#  telephone_number_2    :string
+#  fax_number            :string
 #  note                  :text
 #  call_number_rows      :integer          default(1), not null
-#  call_number_delimiter :string(255)      default("|"), not null
+#  call_number_delimiter :string           default("|"), not null
 #  library_group_id      :integer          default(1), not null
 #  users_count           :integer          default(0), not null
 #  position              :integer
 #  country_id            :integer
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
+#  created_at            :datetime
+#  updated_at            :datetime
 #  deleted_at            :datetime
 #  opening_hour          :text
-#  isil                  :string(255)
+#  isil                  :string
 #  latitude              :float
 #  longitude             :float
 #

data/spec/fixtures/library_groups.yml

@@ -17,21 +17,23 @@ one:
   <% else %>
     "---\n:max_number_of_results: 200\n:family_name_first: true\n"
   <% end %>
+
 # == Schema Information
 #
 # Table name: library_groups
 #
 #  id             :integer          not null, primary key
-#  name           :string(255)      not null
+#  name           :string           not null
 #  display_name   :text
-#  short_name     :string(255)      not null
+#  short_name     :string           not null
 #  my_networks    :text
 #  login_banner   :text
 #  note           :text
 #  country_id     :integer
 #  position       :integer
-#  created_at     :datetime         not null
-#  updated_at     :datetime         not null
+#  created_at     :datetime
+#  updated_at     :datetime
 #  admin_networks :text
-#  url            :string(255)      default("http://localhost:3000/")
+#  url            :string           default("http://localhost:3000/")
+#  settings       :text
 #

data/spec/fixtures/request_status_types.yml

@@ -53,10 +53,10 @@ request_status_type_00006:
 # Table name: request_status_types
 #
 #  id           :integer          not null, primary key
-#  name         :string(255)      not null
+#  name         :string           not null
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  created_at   :datetime
+#  updated_at   :datetime
 #

data/spec/fixtures/request_types.yml

@@ -45,10 +45,10 @@ request_type_00004:
 # Table name: request_types
 #
 #  id           :integer          not null, primary key
-#  name         :string(255)      not null
+#  name         :string           not null
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  created_at   :datetime
+#  updated_at   :datetime
 #

data/spec/fixtures/search_engines.yml

@@ -26,16 +26,15 @@ search_engine_00002:
 # Table name: search_engines
 #
 #  id               :integer          not null, primary key
-#  name             :string(255)      not null
+#  name             :string           not null
 #  display_name     :text
-#  url              :string(255)      not null
+#  url              :string           not null
 #  base_url         :text             not null
 #  http_method      :text             not null
 #  query_param      :text             not null
 #  additional_param :text
 #  note             :text
 #  position         :integer
-#  created_at       :datetime         not null
-#  updated_at       :datetime         not null
+#  created_at       :datetime
+#  updated_at       :datetime
 #
-