Merge pull request #1213 from sul-dlss/availability-fix

Few related fixes for availability
sul-dlss · Feb 26, 2016 · 1111eaa · 1111eaa
2 parents 635680b + 85c8cf6
commit 1111eaa
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 8 deletions.
diff --git a/app/assets/javascripts/jquery.live-lookup.js b/app/assets/javascripts/jquery.live-lookup.js
@@ -27,8 +27,10 @@
             if ( live_data.due_date ) {
               current_location.append(' Due ' + live_data.due_date);
             }
-            if ( live_data.due_date && target.hasClass('unknown') ) {
+
+            if ( live_data.due_date && (target.hasClass('unknown') || target.hasClass('page')) ) {
               target.removeClass('unknown');
+              target.removeClass('page');
               target.addClass('unavailable');
               status_text.text(''); // The due date/current location acts as the status text at this point
               if (target.attr('title')) {

diff --git a/lib/constants.rb b/lib/constants.rb
@@ -896,6 +896,9 @@ module Constants
   HIDE_DUE_DATE_CURRENT_LOCS = [
     'ART-AT-ENG',
     'IC-DISPLAY',
+    'LOST-ASSUM',
+    'LOST-CLAIM',
+    'LOST-PAID',
     'NEWBOOKS',
     'SEE-LOAN'
   ]

diff --git a/lib/holdings/noncirc.rb b/lib/holdings/noncirc.rb
@@ -37,7 +37,7 @@ def location_is_default_noncirc?
       end
 
       def type_is_default_noncirc?
-        ["REF", "NONCIRC", "LIBUSEONLY"].include?(@callnumber.type)
+        %w(LIBUSEONLY NH-INHOUSE NONCIRC REF).include?(@callnumber.type)
       end
 
       def sanitized_library

diff --git a/lib/holdings/status.rb b/lib/holdings/status.rb
@@ -13,6 +13,8 @@ def initialize(callnumber)
 
     def availability_class
       case
+      when unavailable?
+        'unavailable'
       when noncirc_page?
         'noncirc_page'
       when noncirc?
@@ -21,8 +23,6 @@ def availability_class
         'page'
       when available?
         'available'
-      when unavailable?
-        'unavailable'
       when unknown?
         'unknown'
       else

diff --git a/lib/holdings/unavailable.rb b/lib/holdings/unavailable.rb
@@ -30,7 +30,7 @@ def unavailable_current_location?
 
       def current_location_ends_with_loan?
         @callnumber.current_location.try(:code) &&
-        @callnumber.current_location.code != "SEE-LOAN" &&
+        @callnumber.current_location.code != 'SPE-LOAN' &&
         @callnumber.current_location.code.ends_with?("-LOAN")
       end
     end

diff --git a/spec/lib/holdings/noncirc_spec.rb b/spec/lib/holdings/noncirc_spec.rb
@@ -22,7 +22,8 @@
       let(:noncirc_types) {
         [OpenStruct.new(type: 'REF'),
          OpenStruct.new(type: 'NONCIRC'),
-         OpenStruct.new(type: 'LIBUSEONLY')
+         OpenStruct.new(type: 'LIBUSEONLY'),
+         OpenStruct.new(type: 'NH-INHOUSE')
         ]
       }
       let(:circ_type) { OpenStruct.new(type: "SOMETHING") }

diff --git a/spec/lib/holdings/status_spec.rb b/spec/lib/holdings/status_spec.rb
@@ -91,6 +91,27 @@
       expect(status.availability_class).to eq 'unknown'
     end
   end
+
+  describe 'precedence' do
+    subject { Holdings::Status.new(callnumber) }
+
+    describe 'unavailable' do
+      let(:callnumber) do
+        double(
+          'Call number',
+          library: 'SAL3',
+          home_location: 'STACKS',
+          current_location: double('Location', code: 'LOST-ASSUM'),
+          type: 'STACKS'
+        )
+      end
+
+      it 'takes precedence over things like page' do
+        expect(subject.availability_class).to eq 'unavailable'
+      end
+    end
+  end
+
   describe '#as_json' do
     let(:as_json) { status.as_json }
     it 'should return a json hash with the availability class and status text' do

diff --git a/spec/lib/holdings/unavailable_spec.rb b/spec/lib/holdings/unavailable_spec.rb
@@ -27,8 +27,8 @@
     it "should handle identify -LOAN properly as unavailable" do
       expect(Holdings::Status::Unavailable.new(OpenStruct.new(current_location: Holdings::Location.new("SOMETHING-LOAN")))).to be_unavailable
     end
-    it "should not identify SEE-LOAN as unavailable" do
-      expect(Holdings::Status::Unavailable.new(OpenStruct.new(current_location: Holdings::Location.new("SEE-LOAN")))).to_not be_unavailable
+    it "should not identify SPE-LOAN as unavailable" do
+      expect(Holdings::Status::Unavailable.new(OpenStruct.new(current_location: Holdings::Location.new("SPE-LOAN")))).to_not be_unavailable
     end
   end
 end