Display status of item locations by status priority.

module/VuFind/src/VuFind/AjaxHandler/GetItemStatuses.php

@@ -330,22 +330,12 @@ protected function getItemStatusGroup($record, $callnumberSetting)
         // Summarize call number, location and availability info across all items:
         $locations = [];
         foreach ($record as $info) {
-            $availabilityStatus = $info['availability'];
-            // Find an available copy
-            if ($availabilityStatus->isAvailable()) {
-                if ('true' !== ($locations[$info['location']]['available'] ?? null)) {
-                    $locations[$info['location']]['available'] = $availabilityStatus->getStatusDescription();
-                }
-            }
-            // Check for a use_unknown_message flag
-            if ($availabilityStatus->is(AvailabilityStatusInterface::STATUS_UNKNOWN)) {
-                $locations[$info['location']]['status_unknown'] = true;
-            }
             // Store call number/location info:
             $locations[$info['location']]['callnumbers'][] = $this->formatCallNo(
                 $info['callnumber_prefix'] ?? '',
                 $info['callnumber']
             );
+            $locations[$info['location']]['items'][] = $info;
         }
 
         // Build list split out by location:
@@ -362,16 +352,21 @@ protected function getItemStatusGroup($record, $callnumberSetting)
                 $callnumberSetting,
                 'Multiple Call Numbers'
             );
+
+            // Get combined availability for location
+            $locationStatus = $this->availabilityStatusManager->combine($details['items']);
+            $locationAvailability = $locationStatus['availability'];
+
             $locationInfo = [
-                'availability' => $details['available'] ?? false,
+                'availability' =>
+                    $locationAvailability->availabilityAsString(),
                 'location' => htmlentities(
                     $this->translateWithPrefix('location_', $location),
                     ENT_COMPAT,
                     'UTF-8'
                 ),
                 'callnumbers' =>
                     htmlentities($locationCallnumbers, ENT_COMPAT, 'UTF-8'),
-                'status_unknown' => $details['status_unknown'] ?? false,
                 'callnumber_handler' => $callnumberHandler,
             ];
             $locationList[] = $locationInfo;

module/VuFind/src/VuFind/ILS/Logic/AvailabilityStatus.php

@@ -143,9 +143,9 @@ public function availabilityAsString(): string
     {
         switch ($this->availability) {
             case AvailabilityStatusInterface::STATUS_UNAVAILABLE:
-                return 'false';
+                return 'unavailable';
             case AvailabilityStatusInterface::STATUS_AVAILABLE:
-                return 'true';
+                return 'available';
             case AvailabilityStatusInterface::STATUS_UNKNOWN:
                 return 'unknown';
             default:

themes/bootstrap3/js/check_item_statuses.js

@@ -58,27 +58,12 @@
       el.querySelectorAll('.callnumber,.hideIfDetailed,.location').forEach((e) => e.classList.add('hidden'));
       var locationListHTML = "";
       for (var x = 0; x < result.locationList.length; x++) {
+        var status = result.locationList[x].status;
         locationListHTML += '<div class="groupLocation">';
-        if (result.locationList[x].availability) {
-          locationListHTML += '<span class="text-success">'
-            + VuFind.icon("status-available")
-            + result.locationList[x].location
-            + '</span> ';
-        } else if (typeof(result.locationList[x].status_unknown) !== 'undefined'
-          && result.locationList[x].status_unknown
-        ) {
-          if (result.locationList[x].location) {
-            locationListHTML += '<span class="text-warning">'
-              + VuFind.icon("status-unknown")
-              + result.locationList[x].location
-              + '</span> ';
-          }
-        } else {
-          locationListHTML += '<span class="text-danger">'
-            + VuFind.icon("status-unavailable")
-            + result.locationList[x].location
-            + '</span> ';
-        }
+        locationListHTML += '<span class="' + availabilityClasses[status] + '">'
+          + VuFind.icon('status-' + status)
+          + result.locationList[x].location
+          + '</span> ';
         locationListHTML += '</div>';
         locationListHTML += '<div class="groupCallnumber">';
         locationListHTML += (result.locationList[x].callnumbers)

themes/bootstrap3/templates/search/results-scripts.phtml

@@ -14,3 +14,21 @@ if (($this->listViewOption ?? 'full') !== 'full') {
 if ($this->jsResults ?? false) {
     $this->headScript()->appendFile('search.js');
 }
+
+$statuses = [
+    \VuFind\ILS\Logic\AvailabilityStatus::STATUS_AVAILABLE,
+    \VuFind\ILS\Logic\AvailabilityStatus::STATUS_UNAVAILABLE,
+    \VuFind\ILS\Logic\AvailabilityStatus::STATUS_UNKNOWN,
+    \VuFind\ILS\Logic\AvailabilityStatus::STATUS_UNCERTAIN,
+];
+
+$availabilityStatuses = [];
+foreach ($statuses as $status) {
+    $status = new \VuFind\ILS\Logic\AvailabilityStatus($status);
+    $availabilityStatusClasses[$status->availabilityAsString()] =
+        $this->availabilityStatus()->getClass($status);
+}
+
+$this->headScript()->appendScript(<<<JS
+    var availabilityStatusClasses = $availabilityStatuses;
+JS);

themes/bootstrap3/theme.config.php

@@ -295,6 +295,7 @@
             'status-pending' => 'FontAwesome:clock-o',
             'status-ready' => 'FontAwesome:bell',
             'status-unavailable' => 'FontAwesome:times',
+            'status-uncertain' => 'FontAwesome:circle',
             'status-unknown' => 'FontAwesome:circle',
             'tag-add' => 'Alias:ui-add',
             'tag-remove' => 'Alias:ui-remove',

themes/bootstrap5/js/check_item_statuses.js

@@ -58,27 +58,12 @@
       el.querySelectorAll('.callnumber,.hideIfDetailed,.location').forEach((e) => e.classList.add('hidden'));
       var locationListHTML = "";
       for (var x = 0; x < result.locationList.length; x++) {
+        var status = result.locationList[x].status;
         locationListHTML += '<div class="groupLocation">';
-        if (result.locationList[x].availability) {
-          locationListHTML += '<span class="text-success">'
-            + VuFind.icon("status-available")
-            + result.locationList[x].location
-            + '</span> ';
-        } else if (typeof(result.locationList[x].status_unknown) !== 'undefined'
-          && result.locationList[x].status_unknown
-        ) {
-          if (result.locationList[x].location) {
-            locationListHTML += '<span class="text-warning">'
-              + VuFind.icon("status-unknown")
-              + result.locationList[x].location
-              + '</span> ';
-          }
-        } else {
-          locationListHTML += '<span class="text-danger">'
-            + VuFind.icon("status-unavailable")
-            + result.locationList[x].location
-            + '</span> ';
-        }
+        locationListHTML += '<span class="' + availabilityClasses[status] + '">'
+          + VuFind.icon('status-' + status)
+          + result.locationList[x].location
+          + '</span> ';
         locationListHTML += '</div>';
         locationListHTML += '<div class="groupCallnumber">';
         locationListHTML += (result.locationList[x].callnumbers)

themes/bootstrap5/templates/search/results-scripts.phtml

@@ -14,3 +14,22 @@ if (($this->listViewOption ?? 'full') !== 'full') {
 if ($this->jsResults ?? false) {
     $this->headScript()->appendFile('search.js');
 }
+
+$statuses = [
+    \VuFind\ILS\Logic\AvailabilityStatus::STATUS_AVAILABLE,
+    \VuFind\ILS\Logic\AvailabilityStatus::STATUS_UNAVAILABLE,
+    \VuFind\ILS\Logic\AvailabilityStatus::STATUS_UNKNOWN,
+    \VuFind\ILS\Logic\AvailabilityStatus::STATUS_UNCERTAIN,
+];
+
+$availabilityStatuses = [];
+foreach ($statuses as $status) {
+    $status = new \VuFind\ILS\Logic\AvailabilityStatus($status);
+    $availabilityClasses[$status->availabilityAsString()] =
+        $this->availabilityStatus()->getClass($status);
+}
+
+$availabilityClassesJson = json_encode($availabilityClasses);
+$this->headScript()->appendScript(<<<JS
+    var availabilityClasses = $availabilityClassesJson;
+JS);

themes/bootstrap5/theme.config.php

@@ -294,6 +294,7 @@
             'status-pending' => 'FontAwesome:clock-o',
             'status-ready' => 'FontAwesome:bell',
             'status-unavailable' => 'FontAwesome:times',
+            'status-uncertain' => 'FontAwesome:circle',
             'status-unknown' => 'FontAwesome:circle',
             'tag-add' => 'Alias:ui-add',
             'tag-remove' => 'Alias:ui-remove',