Hide queue button when there is an available kursbok (#235)

ub-digit · Jun 19, 2019 · 4c35002 · 4c35002
1 parent 8571e61
commit 4c35002
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 6 deletions.
diff --git a/app/models/biblio.rb b/app/models/biblio.rb
@@ -29,6 +29,11 @@ def can_be_queued
     return has_items_available_for_queue && !has_item_level_queue
   end
 
+  def has_available_kursbok
+    return @items.any? {|item| item.is_availible && item.item_type_kursbok?}
+  end
+
+
   def has_item_level_queue
     # Biblios wrongly cataloged as monographs should be considered as serials if subscriptions exist
     return true if !@subscriptiongroups.empty?
@@ -48,7 +53,7 @@ def self.queue_level record_type
   end
 
   def as_json options = {}
-    super.merge(can_be_queued: can_be_queued, has_item_level_queue: has_item_level_queue)
+    super.merge(can_be_queued: can_be_queued, has_item_level_queue: has_item_level_queue, has_available_kursbok: has_available_kursbok)
   end
 
   def initialize id, bib_xml, items_data, reserves_data, subscriptions

diff --git a/frontend/app/locales/en/translations.js b/frontend/app/locales/en/translations.js
@@ -60,6 +60,7 @@ export default {
       "header": "Your request",
       "items": {
         "items-are-available": "There are available items for you to request",
+        "kursbok-is-available": "There are available items that you can collect from the shelf",
         "next-button": "Continue",
         "select-button": "Select",
         "order-subscription-button": "Request",

diff --git a/frontend/app/locales/sv/translations.js b/frontend/app/locales/sv/translations.js
@@ -60,6 +60,7 @@ export default {
       "header": "Din beställning",
       "items": {
         "items-are-available": "Det finns tillgängliga exemplar som du kan beställa",
+        "kursbok-is-available": "Det finns tillgängliga exemplar som du kan hämta själv från hyllan",
         "next-button": "Fortsätt",
         "select-button": "Välj",
         "order-subscription-button": "Beställ",

diff --git a/frontend/app/models/biblio.js b/frontend/app/models/biblio.js
@@ -12,5 +12,6 @@ export default DS.Model.extend({
   items: DS.hasMany('item'),
   subscriptiongroups: DS.hasMany('subscriptiongroup'),
   hasEnum: DS.attr('boolean'),
-  biblioCallNumber: DS.attr('string')
+  biblioCallNumber: DS.attr('string'),
+  hasAvailableKursbok: DS.attr('boolean')
 });
diff --git a/frontend/app/templates/request/order/items.hbs b/frontend/app/templates/request/order/items.hbs
@@ -109,14 +109,20 @@
           {{#if hasItemAvailableForOrder}}
             <div class="panel-body center">
               <span>{{t "request.order.items.items-are-available"}}</span>
-            </div>  
-          {{else }}
+            </div>
+          {{else}}
+            {{#if request.model.biblio.hasAvailableKursbok}}
+              <div class="panel-body center">
+                <span>{{t "request.order.items.kursbok-is-available"}}</span>
+              </div>
+            {{else}}
               <div class="panel panel-default">
                 <div class="panel-body center">
                   <strong>{{request.model.biblio.noInQueue}} {{t "request.order.items.number-of-people-in-queue"}}</strong>
                   <button class="btn btn-primary btn-space-left" {{action 'setItemToOrder' null true}}>{{t "request.order.items.queue-up"}}</button>
-            </div>
-          </div>
+                </div>
+              </div>
+            {{/if}}          
           {{/if}}
         </div>
       </div>