enju_library 0.3.9 → 0.4.0.beta.1

data/app/models/shelf.rb

@@ -12,6 +12,7 @@ class Shelf < ApplicationRecord
   before_update :reset_position
 
   acts_as_list scope: :library
+  translates :display_name
 
   searchable do
     string :shelf_name do
@@ -53,15 +54,16 @@ end
 #
 # Table name: shelves
 #
-#  id           :integer          not null, primary key
-#  name         :string           not null
-#  display_name :text
-#  note         :text
-#  library_id   :integer          not null
-#  items_count  :integer          default(0), not null
-#  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
-#  deleted_at   :datetime
-#  closed       :boolean          default(FALSE), not null
+#  id                        :integer          not null, primary key
+#  name                      :string           not null
+#  display_name              :text
+#  note                      :text
+#  library_id                :integer          not null
+#  items_count               :integer          default(0), not null
+#  position                  :integer
+#  created_at                :datetime
+#  updated_at                :datetime
+#  deleted_at                :datetime
+#  closed                    :boolean          default(FALSE), not null
+#  display_name_translations :jsonb            not null
 #

data/app/models/user_export_file.rb

@@ -61,7 +61,7 @@ end
 #  user_id                  :integer
 #  user_export_file_name    :string
 #  user_export_content_type :string
-#  user_export_file_size    :integer
+#  user_export_file_size    :bigint
 #  user_export_updated_at   :datetime
 #  executed_at              :datetime
 #  created_at               :datetime

data/app/models/user_export_file_state_machine.rb

@@ -6,7 +6,7 @@ class UserExportFileStateMachine
   state :completed
   state :failed
 
-  transition from: :pending, to: [:started, :failed]
+  transition from: :pending, to: :started
   transition from: :started, to: [:completed, :failed]
 
   after_transition(from: :pending, to: :started) do |user_export_file|

data/app/models/user_group.rb

@@ -5,6 +5,7 @@ class UserGroup < ApplicationRecord
   validates_numericality_of :valid_period_for_new_user,
     greater_than_or_equal_to: 0,
     allow_blank: true
+  translates :display_name
 
   paginates_per 10
 end
@@ -26,4 +27,5 @@ end
 #  number_of_day_to_notify_overdue  :integer          default(7), not null
 #  number_of_day_to_notify_due_date :integer          default(3), not null
 #  number_of_time_to_notify_overdue :integer          default(3), not null
+#  display_name_translations        :jsonb            not null
 #

data/app/models/user_import_file.rb

@@ -45,7 +45,7 @@ class UserImportFile < ApplicationRecord
   # 利用者情報をTSVファイルを用いて作成します。
   def import
     transition_to!(:started)
-    num = { user_imported: 0, user_found: 0, failed: 0, error: 0 }
+    num = { user_imported: 0, user_found: 0, error: 0 }
     rows = open_import_file(create_import_temp_file(user_import))
     row_num = 1
 
@@ -69,34 +69,35 @@ class UserImportFile < ApplicationRecord
         num[:user_found] += 1
       else
         new_user = User.new
-        new_user.role = Role.find_by(name: row['role'])
-        if new_user.role
-          unless user.has_role?(new_user.role.name)
-            num[:failed] += 1
-            next
-          end
-        else
-          new_user.role = Role.find(2) # User
-        end
         new_user.username = username
         new_user.assign_attributes(set_user_params(row))
         profile = Profile.new
         profile.assign_attributes(set_profile_params(row))
+        if row['role'].present?
+          role = Role.find_by(name: row['role'])
+        else
+          role = Role.find(2) # User
+        end
 
         Profile.transaction do
-          if new_user.valid? and profile.valid?
+          if profile.valid? && role
             new_user.profile = profile
-            import_result.user = new_user
-            import_result.save!
-            num[:user_imported] += 1
-          else
-            error_message = "line #{row_num}: "
-            error_message += new_user.errors.full_messages.join(" ")
-            error_message += profile.errors.full_messages.join(" ")
-            import_result.error_message = error_message
-            import_result.save
-            num[:error] += 1
+            new_user.role = role
+
+            if new_user.save
+              import_result.user = new_user
+              import_result.save!
+              num[:user_imported] += 1
+              next
+            end
           end
+
+          error_message = "line #{row_num}: "
+          error_message += new_user.errors.full_messages.join(" ")
+          error_message += profile.errors.full_messages.join(" ")
+          import_result.error_message = error_message
+          import_result.save
+          num[:error] += 1
         end
       end
     end
@@ -145,7 +146,7 @@ class UserImportFile < ApplicationRecord
       )
 
       username = row['username']
-      new_user = User.find_by(username: username)
+      new_user = User.where(username: username).first
       if new_user.try(:profile)
         new_user.assign_attributes(set_user_params(row))
         new_user.profile.assign_attributes(set_profile_params(row))
@@ -192,7 +193,7 @@ class UserImportFile < ApplicationRecord
     rows.each do |row|
       row_num += 1
       username = row['username'].to_s.strip
-      remove_user = User.find_by(username: username)
+      remove_user = User.where(username: username).first
       if remove_user.try(:deletable_by?, user)
         UserImportFile.transaction do
           remove_user.destroy
@@ -288,15 +289,15 @@ class UserImportFile < ApplicationRecord
   # @param [Hash] row 利用者情報のハッシュ
   def set_profile_params(row)
     params = {}
-    user_group = UserGroup.find_by(name: row['user_group'])
+    user_group = UserGroup.where(name: row['user_group']).first
     unless user_group
       user_group = default_user_group
     end
     params[:user_group_id] = user_group.id if user_group
 
-    required_role = Role.find_by(name: row['required_role'])
+    required_role = Role.where(name: row['required_role']).first
     unless required_role
-      required_role = Role.find_by(name: 'Librarian')
+      required_role = Role.where(name: 'Librarian').first
     end
     params[:required_role_id] = required_role.id if required_role
 
@@ -318,7 +319,7 @@ class UserImportFile < ApplicationRecord
       params[:locale] = row['locale']
     end
 
-    library = Library.find_by(name: row['library'].to_s.strip)
+    library = Library.where(name: row['library'].to_s.strip).first
     unless library
       library = default_library || Library.web
     end

data/app/models/user_import_file_state_machine.rb

@@ -6,7 +6,7 @@ class UserImportFileStateMachine
   state :completed
   state :failed
 
-  transition from: :pending, to: [:started, :failed]
+  transition from: :pending, to: :started
   transition from: :started, to: [:completed, :failed]
 
   after_transition(from: :pending, to: :started) do |user_import_file|

data/app/models/withdraw.rb

@@ -7,10 +7,16 @@ class Withdraw < ApplicationRecord
     uniqueness: true, #{ message: I18n.t('withdraw.already_withdrawn', locale: I18n.default_locale) },
     presence: true #, { message: I18n.translate('withdraw.item_not_found', locale: I18n.default_locale) }
   validates_presence_of :basket_id
+  validate :check_item
 
   attr_accessor :item_identifier
 
   paginates_per 10
+
+  def check_item
+    errors.add(:item) if item.try(:rent?)
+    errors.add(:item) if item.try(:reserved?)
+  end
 end
 
 # == Schema Information

data/app/policies/shelf_policy.rb

@@ -17,7 +17,7 @@ class ShelfPolicy < ApplicationPolicy
 
   def destroy?
     if user.try(:has_role?, 'Administrator')
-      true if record.items.count == 0 && !record.web_shelf?
+      true if record.items.empty? && !record.web_shelf?
     end
   end
 end

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

@@ -20,8 +20,8 @@
       <td>
         <%= render 'manifestations/show_index', manifestation: accept.item.manifestation %>
         <%= link_to accept.item.item_identifier, accept.item -%> / <%= accept.item.call_number %>
-        (<%= link_to accept.item.shelf.library.display_name.localize, accept.item.shelf.library %> /
-        <%= link_to accept.item.shelf.display_name.localize, accept.item.shelf %>)<br />
+        (<%= link_to accept.item.shelf.library.display_name, accept.item.shelf.library %> /
+        <%= link_to accept.item.shelf.display_name, accept.item.shelf %>)<br />
         <%=l accept.created_at %>
       </td>
     </tr>

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

@@ -23,8 +23,8 @@
         <% if accept.item %>
           <%= render 'manifestations/show_index', manifestation: accept.item.manifestation %>
           <%= link_to accept.item.item_identifier, accept.item -%> / <%= accept.item.call_number %>
-          (<%= link_to accept.item.shelf.library.display_name.localize, accept.item.shelf.library %> /
-          <%= link_to accept.item.shelf.display_name.localize, accept.item.shelf %>)<br />
+          (<%= link_to accept.item.shelf.library.display_name, accept.item.shelf.library %> /
+          <%= link_to accept.item.shelf.display_name, accept.item.shelf %>)<br />
           <%=l accept.created_at %>
         <% end %>
       </td>

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

@@ -3,7 +3,7 @@
 
   <div class="field">
     <%= f.label :name %><br />
-    <%= f.text_field :name %>
+    <%= f.text_field :name, required: true %>
   </div>
   <div class="field">
     <%= f.label :display_name %><br />

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

@@ -19,7 +19,7 @@
       <%- end -%>
     </td>
     <td><%= link_to budget_type.name, budget_type -%></td>
-    <td><%= link_to budget_type.display_name.localize, budget_type -%></td>
+    <td><%= link_to budget_type.display_name, budget_type -%></td>
     <td><%= budget_type.note -%></td>
     <td>
       <%- if policy(budget_type).update? -%>

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

@@ -10,7 +10,7 @@
 
 <p>
   <strong><%= t('activerecord.attributes.budget_type.display_name') -%>:</strong>
-  <%= @budget_type.display_name.localize -%>
+  <%= @budget_type.display_name -%>
 </p>
 
 <p>

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

@@ -3,7 +3,7 @@
   <ul>
     <%- @events.each do |event| -%>
       <li>
-        <%= link_to event.display_name.localize, event -%>
+        <%= link_to event.display_name, event -%>
         <% if event.all_day? %>
           (<%= l(event.start_at, format: :only_date) -%> - <%= l(event.end_at, format: :only_date) -%>)
         <% else %>

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

@@ -20,12 +20,12 @@
   <% unless @library.web? %>
   <div class="field">
     <%= f.label :isil -%><br />
-    <%= f.text_field :isil, class: 'resource_identifier' -%>
+    <%= f.text_field :isil, class: 'resource_identifierr' -%>
   </div>
 
   <div class="field">
     <%= f.label t('activerecord.models.country') -%><br />
-    <%= f.select(:country_id, @countries.collect{|c| [c.display_name.localize, c.id]}) -%>
+    <%= f.select(:country_id, @countries.collect{|c| [c.display_name, c.id]}) -%>
   </div>
 
   <div class="field">
@@ -48,16 +48,6 @@
     <%= f.text_area :street, class: 'resource_textarea' -%>
   </div>
 
-  <div class="field">
-    <%= f.label :latitude -%><br />
-    <%= f.text_field :latitude -%>
-  </div>
-
-  <div class="field">
-    <%= f.label :longitude -%><br />
-    <%= f.text_field :longitude -%>
-  </div>
-
   <div class="field">
     <%= f.label :telephone_number_1 -%><br />
     <%= f.phone_field :telephone_number_1 -%>

data/app/views/libraries/_map.html+phone.erb

@@ -12,10 +12,10 @@
     var marker = new google.maps.Marker({
 position: latlng,
       map: map,
-      title: '<%= library.display_name.localize %>'
+      title: '<%= library.display_name %>'
     });
     var infowindow = new google.maps.InfoWindow({
-      content: '<%= library.display_name.localize %>'
+      content: '<%= library.display_name %>'
     });
     google.maps.event.addListener(marker, 'click', function() {
       infowindow.open(map,marker);

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

@@ -1,12 +1,25 @@
-<div id="library_map" style="width: 500px; height: 500px;"></div>
-<script>
-  var mymap = L.map('library_map').setView([<%= @library.latitude %>, <%= @library.longitude %>], 13);
-  L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
-    attribution: 'Map data &copy; <a href="https://www.openstreetmap.org/">OpenStreetMap</a> contributors, <a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="https://www.mapbox.com/">Mapbox</a>',
-    maxZoom: 18
-}).addTo(mymap);
-  L.marker([<%= @library.latitude %>, <%= @library.longitude %>]).addTo(mymap).bindPopup('<%= @library.display_name.localize %>').openPopup();
-  jQuery(document).ready(function ($) {
-    mymap.invalidateSize();
+<script type="text/javascript" src="https://maps.google.com/maps/api/js?sensor=false"></script>
+<script type="text/javascript">
+  google.maps.event.addDomListener(window, 'load', function() {
+    var latlng = new google.maps.LatLng(<%= library.latitude %>, <%= library.longitude %>);
+    var options = {
+      zoom: 16,
+      center: latlng,
+      mapTypeId: google.maps.MapTypeId.ROADMAP,
+      scaleControl: true
+    };
+    var map = new google.maps.Map(document.getElementById("library_map"), options);
+    var marker = new google.maps.Marker({
+position: latlng,
+      map: map,
+      title: '<%= library.display_name %>'
+    });
+    var infowindow = new google.maps.InfoWindow({
+      content: '<%= library.display_name %>'
+    });
+    google.maps.event.addListener(marker, 'click', function() {
+      infowindow.open(map,marker);
+    });
   });
 </script>
+<div id="library_map" style="width: 500px; height: 500px;"></div>

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

@@ -47,7 +47,7 @@
     </td>
     <td><%= library.name -%></td>
     <td>
-      <%= link_to library.display_name.localize, library -%>
+      <%= link_to library.display_name, library -%>
       <br />
       <%= library.zip_code -%>
       <%= library.address -%>

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

@@ -1,6 +1,6 @@
 <div data-role="header">
   <a href="javascript:history.back()" data-icon="back" data-iconpos="notext" class="ui-btn-left"><%= t('page.back') %></a>
-  <h1 class="title"><%= @library.display_name.localize -%></h1>
+  <h1 class="title"><%= @library.display_name -%></h1>
 </div>
 <div data-role="content">
   <div id="detail">

data/app/views/libraries/show.html+phone.slim

@@ -2,7 +2,7 @@ div[data-role="header"]
   a.ui-btn-left[href="javascript:history.back()" data-icon="back" data-iconpos="notext"]
     = t('page.back')
   .panel-heading
-    = @library.display_name.localize
+    = @library.display_name
   div[data-role="content"]
     #detail
       p

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= @library.display_name.localize -%></h1>
+<h1 class="title"><%= @library.display_name -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 
@@ -71,7 +71,7 @@
           <%- @library.shelves.each do |shelf| -%>
             <tr class="line<%= cycle("0", "1") -%>">
               <td>
-                <%= link_to shelf.display_name.localize, shelf_path(shelf, library_id: @library.name) -%>
+                <%= link_to shelf.display_name, shelf_path(shelf, library_id: @library.name) -%>
                 <%- shelf.picture_files.each do |picture_file| -%>
                   <%= link_to image_tag('icons/picture.png', size: '16x16', class: 'enju_icon', alt: t('page.picture')), picture_file_path(picture_file, format: :download), rel: "shelf_#{h(shelf.id)}" -%>
                 <%- end -%>

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

@@ -6,10 +6,13 @@
     <%= f.text_field :name, class: 'short_name' -%>
   </div>
 
-  <div class="field">
-    <%= f.label :display_name -%><br />
-    <%= f.text_area :display_name, class: 'resource_textarea' -%>
-  </div>
+  <% I18n.available_locales.each do |locale| %>
+    <div class="field">
+      <% display_name = "display_name_#{locale.to_s}" %>
+      <%= f.label :display_name -%> (<%= locale.to_s %>)<br />
+      <%= f.text_field display_name -%>
+    </div>
+  <% end %>
 
   <div class="field">
     <%= f.label :header_logo -%><br />
@@ -31,17 +34,15 @@
     <%= f.url_field :url, class: 'resource_url' -%>
   </div>
 
-  <% @available_languages.each do |language| -%>
+  <% I18n.available_locales.each do |locale| -%>
     <div class="field">
-      <%= f.label :login_banner -%> (<%= language.display_name.localize -%>)<br />
-      <%= f.text_area LibraryGroup.localized_attr_name_for(:login_banner, language.iso_639_1) -%>
+      <%= f.label :login_banner -%> (<%= locale -%>)<br />
+      <%= f.text_area :"login_banner_#{locale.to_s}" -%>
     </div>
-  <% end -%>
 
-  <% @available_languages.each do |language| -%>
-    <div>
-      <%= f.label :footer_banner -%> (<%= language.display_name.localize -%>)<br />
-      <%= f.text_area LibraryGroup.localized_attr_name_for(:footer_banner, language.iso_639_1) -%>
+    <div class="field">
+      <%= f.label :footer_banner -%> (<%= locale -%>)<br />
+      <%= f.text_area :"footer_banner_#{locale.to_s}" -%>
     </div>
   <% end -%>
 
@@ -66,7 +67,7 @@
 
   <div class="field">
     <%= f.label t('activerecord.models.country') -%><br />
-    <%= f.select(:country_id, @countries.collect{|c| [c.display_name.localize, c.id]}) -%>
+    <%= f.select(:country_id, @countries.collect{|c| [c.display_name, c.id]}) -%>
   </div>
 
   <% if defined?(EnjuBookmark) %>