enju_library 0.1.0.pre43 → 0.1.0.pre44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 767d1a2574aa91d33f0942d5f420d18ab116dae6
-  data.tar.gz: ce58f1227a0b7b218349fc8ea9ea1aec067837a7
+  metadata.gz: 752e1b1865d6fab37bcfc7716c40d081f496bdd8
+  data.tar.gz: f794648175585896e9bebba01a9a51e51b812ae6
 SHA512:
-  metadata.gz: 462c6d6bcc2961b23c4720fa695c5f93312e134455fafdcd84c7232d520e68b5c4bf8376a90b4dcf6704fc71d7356a8f7c59533082d4d4849e9ce16e74a604c2
-  data.tar.gz: 1d7d237e366edba4e726f09813640b1307b38d229435465e437e121e3cf850feb48e6afc36529d10324c5924855e7a74ea922f2fa122560a0098cdd7d99e68f9
+  metadata.gz: f9126d3c31b219ce771b2d982ce9711ed29c4ebcd3508c91d911eb43440be6d012855b0f3d7807e6f258140aebf52e0c2dd44b9b2b40d46a3cd82082be158d24
+  data.tar.gz: 909755817fabc00e07348ff1d4b3723b983ee4720c4d91f74eb346526a5cc5f7f02b883c24c87de5052115bfe89daa2da8181ff076d9c179d608da0e70d9bd05

data/app/controllers/accepts_controller.rb

@@ -18,9 +18,9 @@ class AcceptsController < ApplicationController
         @accepts = Accept.order('accepts.created_at DESC').where(item_id: item.id).page(params[:page])
       else
         if @basket
-          @accepts = @basket.accepts.page(params[:page])
+          @accepts = @basket.accepts.order('accepts.created_at DESC').page(params[:page])
         else
-          @accepts = Accept.page(params[:page])
+          @accepts = Accept.order('accepts.created_at DESC').page(params[:page])
         end
       end
     end

data/app/controllers/withdraws_controller.rb

@@ -0,0 +1,126 @@
+class WithdrawsController < ApplicationController
+  load_and_authorize_resource except: :index
+  authorize_resource only: :index
+  before_filter :get_basket, only: [:index, :create]
+
+  # GET /withdraws
+  # GET /withdraws.json
+  def index
+    if params[:format] == 'txt'
+      @withdraws = Withdraw.order('withdraws.created_at DESC').page(params[:page]).per(65534)
+    else
+      if params[:withdraw]
+        @query = params[:withdraw][:item_identifier].to_s.strip
+        item = Item.where(item_identifier: @query).first if @query.present?
+      end
+
+      if item
+        @withdraws = Withdraw.order('withdraws.created_at DESC').where(item_id: item.id).page(params[:page])
+      else
+        if @basket
+          @withdraws = @basket.withdraws.order('withdraws.created_at DESC').page(params[:page])
+        else
+          @withdraws = Withdraw.order('withdraws.created_at DESC').page(params[:page])
+        end
+      end
+    end
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @withdraws }
+      format.js { @withdraw = Withdraw.new }
+      format.txt
+    end
+  end
+
+  # GET /withdraws/1
+  # GET /withdraws/1.json
+  def show
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @withdraw }
+    end
+  end
+
+  # GET /new
+  # GET /new.json
+  def new
+    @basket = Basket.new
+    @basket.user = current_user
+    @basket.save!
+    @withdraw = Withdraw.new
+    @withdraws = []
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @withdraw }
+    end
+  end
+
+  # GET /withdraws/new
+  # GET /withdraws/1/edit
+  def edit
+  end
+
+  # POST /withdraws
+  # POST /withdraws.json
+  def create
+    unless @basket
+      access_denied; return
+    end
+    @withdraw.basket = @basket
+    @withdraw.librarian = current_user
+
+    flash[:message] = ''
+    if @withdraw.item_identifier.blank?
+      flash[:message] << t('withdraw.enter_item_identifier') if @withdraw.item_identifier.blank?
+    else
+      item = Item.where(item_identifier: @withdraw.item_identifier.to_s.strip).first
+    end
+    @withdraw.item = item
+
+    respond_to do |format|
+      if @withdraw.save
+        flash[:message] << t('withdraw.successfully_withdrawn', model: t('activerecord.models.withdraw'))
+        format.html { redirect_to withdraws_url(basket_id: @basket.id) }
+        format.json { render json: @withdraw, status: :created, location:  @withdraw }
+        format.js { redirect_to withdraws_url(basket_id: @basket.id, format: :js) }
+      else
+        @withdraws = @basket.withdraws.page(params[:page])
+        format.html { render action: "index" }
+        format.json { render json: @withdraw.errors, status: :unprocessable_entity }
+        format.js { render action: "index" }
+      end
+    end
+  end
+
+  # PUT /withdraws/1
+  # PUT /withdraws/1.json
+  def update
+    respond_to do |format|
+      if @withdraw.update_attributes(withdraw_params)
+        format.html { redirect_to @withdraw, notice: t('controller.successfully_updated', model: t('activerecord.models.withdraw')) }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @withdraw.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /withdraws/1
+  # DELETE /withdraws/1.json
+  def destroy
+    @withdraw.destroy
+
+    respond_to do |format|
+      format.html { redirect_to withdraws_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.withdraw')) }
+      format.json { head :no_content }
+    end
+  end
+
+  private
+  def withdraw_params
+    params.require(:withdraw).permit(:item_identifier, :librarian_id, :item_id)
+  end
+end

data/app/models/accept.rb

@@ -23,7 +23,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/app/models/basket.rb

@@ -3,6 +3,7 @@ class Basket < ActiveRecord::Base
   scope :will_expire, lambda {|date| where('created_at < ?', date)}
   belongs_to :user, validate: true
   has_many :accepts
+  has_many :withdraws
 
   enju_circulation_basket_model if defined?(EnjuCirculation)
 
@@ -35,7 +36,6 @@ end
 #  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/app/models/bookstore.rb

@@ -19,15 +19,14 @@ end
 #
 #  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/app/models/budget_type.rb

@@ -15,11 +15,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/app/models/color.rb

@@ -14,9 +14,9 @@ end
 #
 #  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/app/models/enju_library/ability.rb

@@ -24,7 +24,8 @@ module EnjuLibrary
           BudgetType,
           SearchEngine,
           Subscribe,
-          Subscription
+          Subscription,
+          Withdraw
         ]
         can :update, [
           LibraryGroup,
@@ -40,7 +41,8 @@ module EnjuLibrary
         can :manage, [
           Accept,
           Subscribe,
-          Subscription
+          Subscription,
+          Withdraw
         ]
         can :read, [
           Bookstore,

data/app/models/library.rb

@@ -69,7 +69,7 @@ class Library < ActiveRecord::Base
     else
       "#{street.to_s.localize(locale)} #{locality.to_s.localize(locale)} #{region.to_s.localize(locale)}"
     end
-  rescue
+  rescue Psych::SyntaxError
     nil
   end
 
@@ -98,29 +98,28 @@ end
 # 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/app/models/library_group.rb

@@ -75,16 +75,17 @@ end
 # 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/app/models/request_status_type.rb

@@ -15,11 +15,10 @@ end
 # 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/app/models/request_type.rb

@@ -14,11 +14,10 @@ end
 # 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/app/models/search_engine.rb

@@ -33,16 +33,15 @@ end
 # 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
 #
-

data/app/models/shelf.rb

@@ -52,15 +52,14 @@ end
 # Table name: shelves
 #
 #  id           :integer          not null, primary key
-#  name         :string(255)      not null
+#  name         :string           not null
 #  display_name :text
 #  note         :text
 #  library_id   :integer          default(1), not null
 #  items_count  :integer          default(0), not null
 #  position     :integer
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  created_at   :datetime
+#  updated_at   :datetime
 #  deleted_at   :datetime
 #  closed       :boolean          default(FALSE), not null
 #
-

data/app/models/subscribe.rb

@@ -16,7 +16,6 @@ end
 #  work_id         :integer          not null
 #  start_at        :datetime         not null
 #  end_at          :datetime         not null
-#  created_at      :datetime         not null
-#  updated_at      :datetime         not null
+#  created_at      :datetime
+#  updated_at      :datetime
 #
-

data/app/models/subscription.rb

@@ -35,7 +35,6 @@ end
 #  order_list_id    :integer
 #  deleted_at       :datetime
 #  subscribes_count :integer          default(0), not null
-#  created_at       :datetime         not null
-#  updated_at       :datetime         not null
+#  created_at       :datetime
+#  updated_at       :datetime
 #
-

data/app/models/withdraw.rb

@@ -0,0 +1,27 @@
+class Withdraw < ActiveRecord::Base
+  belongs_to :basket
+  belongs_to :item, touch: true
+  belongs_to :librarian, class_name: 'User'
+
+  enju_circulation_withdraw_model if defined?(EnjuCirculation)
+
+  validates_uniqueness_of :item_id, message:  I18n.t('withdraw.already_withdrawn')
+  validates_presence_of :item_id, message:  I18n.t('withdraw.item_not_found')
+  validates_presence_of :basket_id
+
+  attr_accessor :item_identifier
+
+  paginates_per 10
+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/app/views/accepts/new.html.erb

@@ -9,6 +9,6 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.back'), accepts_path -%></li>
+    <li><%= link_to t('page.listing', model: t('activerecord.models.accept')), accepts_path -%></li>
   </ul>
 </div>

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

@@ -12,7 +12,7 @@
 
   <%- unless @library.web? -%>
   <p>
-    <%= t('library.address') -%>: <%= @library.zip_code -%> <%= @library.address.localize -%>
+    <%= t('library.address') -%>: <%= @library.zip_code -%> <%= @library.address -%>
     <br />
     <%= t('activerecord.attributes.library.telephone_number_1') -%>: <%= @library.telephone_number_1 -%>
     <%= t('activerecord.attributes.library.telephone_number_2') -%>: <%= @library.telephone_number_2 -%>
@@ -29,7 +29,9 @@
   <div id="tabs">
       <ul>
         <li title="active" class="selected"><a href="#tab1"><em><%= t('library.map') -%></em></a></li>
-        <li><a href="#tab2"><em><%= t('library.staff') -%></em></a></li>
+      	<% if current_user.try(:has_role?, 'Librarian') %>
+       	  <li><a href="#tab2"><em><%= t('library.staff') -%></em></a></li>
+        <% end %>
         <li><a href="#tab3"><em><%= t('activerecord.models.shelf') -%></em></a></li>
         <% if defined?(EnjuEvent) %>
           <li><a href="#tab4"><em><%= t('activerecord.models.event') -%></em></a></li>
@@ -41,21 +43,23 @@
       <div id="tab1">
         <%= render 'libraries/map', library: @library if @library.latitude and @library.longitude -%>
       </div>
-      <div id="tab2">
-        <%- if @library.profiles.librarians.exists? -%>
-          <ul>
-            <%- @library.profiles.librarians.each do |librarian| -%>
-              <li>
-                <%= link_to librarian.user.username, librarian -%>
-                <%- unless librarian.note.blank? -%>
-                  <br />
-                  <%= librarian.note -%>
-                <%- end -%>
-              </li>
-            <%- end -%>
-          </ul>
-        <%- end -%>
-      </div>
+      <% if current_user.try(:has_role?, 'Librarian') %>
+      	<div id="tab2">
+          <%- if @library.profiles.librarians.exists? -%>
+            <ul>
+              <%- @library.profiles.librarians.each do |librarian| -%>
+                <li>
+                  <%= link_to librarian.user.username, librarian -%>
+                  <%- unless librarian.note.blank? -%>
+                    <br />
+                    <%= librarian.note -%>
+                  <%- end -%>
+                </li>
+              <%- end -%>
+            </ul>
+          <%- end -%>
+        </div>
+      <%- end -%>
       <div id="tab3">
         <p><%= link_to t('shelf.update_display_order'), shelves_path(library_id: @library.name) %>
         <table class="table table-striped index">

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

@@ -31,6 +31,11 @@
     <%= f.number_field :max_number_of_results -%>
   </div>
 
+  <div class="field">
+    <%= f.label :book_jacket_source -%>
+    <%= f.select :book_jacket_source, [['Google', 'google']] -%><br />
+  </div>
+
   <div class="field">
     <%= f.label :color -%><br />
     <%= f.fields_for :colors do |color_form| %>

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

@@ -23,15 +23,20 @@
   <%= @library_group.url -%>
 </p>
 
-<div>
+<p>
   <strong><%= t('activerecord.attributes.library_group.login_banner') -%>:</strong>
   <%= markdown_helper(@library_group.login_banner) -%>
-</div>
+</p>
 
-<div>
+<p>
   <strong><%= t('activerecord.attributes.library_group.max_number_of_results') -%>:</strong>
   <%= @library_group.max_number_of_results -%>
-</div>
+</p>
+
+<p>
+  <strong><%= t('activerecord.attributes.library_group.book_jacket_source') -%>:</strong>
+  <%= @library_group.book_jacket_source -%>
+</p>
 
 <div>
   <strong><%= t('activerecord.attributes.library_group.color') -%>:</strong>

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

@@ -0,0 +1,11 @@
+<%= simple_form_for(@withdraw) do |f| %>
+  <%= f.error_messages %>
+
+  <div class="form-inputs">
+    <%= f.input :item_id %>
+  </div>
+
+  <div class="form-actions">
+    <%= f.button :submit %>
+  </div>
+<% end %>

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

@@ -0,0 +1,31 @@
+<div style="color: red"><%= flash[:message] -%></div>
+
+<div class="search_form">
+<%= form_for(:withdraw, url: withdraws_path(basket_id: @basket.id), remote: true) do |f| %>
+  <%= f.error_messages %>
+  <p>
+    <%= label_tag :item_identifier, t('activerecord.attributes.item.item_identifier') -%>:
+    <%= f.search_field :item_identifier, class: 'resource_item_identifier', value: nil -%>
+    <%= f.submit t('withdraw.withdraw'), 'data-disable-with' => t('page.saving') -%>
+  </p>
+<%- end -%>
+</div>
+
+<table class="index">
+  <tr>
+    <th><%= t('activerecord.models.item') -%></th>
+  </tr>
+  <%- @withdraws.each_with_index do |withdraw, i| -%>
+    <tr class="line<%= cycle("0", "1") -%>">
+      <td>
+        <%= 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 %>
+      </td>
+    </tr>
+  <%- end -%>
+</table>
+
+<%= javascript_tag("$(function(){$('#withdraw_item_identifier').focus()})") %>

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

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