refactor: Move Linked Users Filter and Scope Display Selected

Fix issue found in testing, move linked user filter to display whether
or not there are holds found and ensure display selected effectd only
the unavailable holds section

Author: AlexanderBlanchardAC

code/web/interface/themes/responsive/MyAccount/holdsList.tpl

@@ -1,5 +1,23 @@
 {assign var="hideCoversFormDisplayed" value=false}
-{assign var="linkedUsersDropdownDisplayed" value=false}
+
+{if count($linkedUsers) > 0 && empty($linkedUsersDropdownDisplayed)}
+	<div id="linkedUsersDropdownContainer" class="form-group mt-2 mt-md-0 ms-md-3">
+		<label for="linkedUsersDropdown" class="control-label me-2 mb-0">{translate text="Linked Users" isPublicFacing=true}&nbsp;</label>
+		<select id="linkedUsersDropdown" class="form-control" name="linkedUserIds[]" multiple="multiple" size="2">
+			<option value="" {if empty($selectedUsers)}selected{/if}>All</option>
+			<option value="{$currentUserId}" {if in_array($currentUserId, $selectedUsers)} selected="selected"{/if}>
+				{$currentUserName}
+			</option>
+			{foreach from=$linkedUsers item=user}
+				<option value="{$user->id}"{if in_array($user->id, $selectedUsers)} selected="selected"{/if}>{$user->displayName}</option>
+			{/foreach}
+		</select>
+		<button type="button" class="btn btn-primary" style="margin-top: 10px;" onclick="AspenDiscovery.Account.filterOutLinkedUsers();">
+			{translate text="Show Users" isPublicFacing=true}
+		</button>
+	</div>
+{/if}
+
 {foreach from=$recordList item=sectionData key=sectionKey}
 	<h2>{if $sectionKey == 'available'}{translate text="Holds Ready For Pickup" isPublicFacing=true}{else}{if $source=='interlibrary_loan'}{translate text="Pending Requests" isPublicFacing=true}{else}{translate text="Pending Holds" isPublicFacing=true}{/if}{/if}</h2>
 	<p class="alert alert-info">
@@ -33,24 +51,7 @@
 				{/foreach}
 			</select>
 
-			{if count($linkedUsers) > 0 && empty($linkedUsersDropdownDisplayed)}
-				<div id="linkedUsersDropdownContainer" class="form-group d-flex align-items-center mt-2 mt-md-0 ms-md-3">
-					<label for="linkedUsersDropdown" class="control-label me-2 mb-0">{translate text="Linked Users" isPublicFacing=true}&nbsp;</label>
-					<select id="linkedUsersDropdown" class="form-control me-2 mt-2 mt-md-0" name="linkedUserIds[]" multiple="multiple" size="2">
-						<option value="" {if empty($selectedUsers)}selected{/if}>All</option>
-						<option value="{$currentUserId}" {if in_array($currentUserId, $selectedUsers)} selected="selected"{/if}>
-							{$currentUserName}
-						</option>
-						{foreach from=$linkedUsers item=user}
-							<option value="{$user->id}"{if in_array($user->id, $selectedUsers)} selected="selected"{/if}>{$user->displayName}</option>
-						{/foreach}
-					</select>
-					<button type="button" class="btn btn-primary mt-2 mt-md-0" onclick="AspenDiscovery.Account.filterOutLinkedUsers();">
-						{translate text="Show Users" isPublicFacing=true}
-					</button>
-				</div>
-				{assign var="linkedUsersDropdownDisplayed" value=true}
-			{/if}
+			
 
 			{if empty($hideCoversFormDisplayed)}
 				{* Display the Hide Covers switch above the first section that has holds; and only display it once *}

code/web/services/MyAccount/AJAX.php

@@ -3578,36 +3578,44 @@ public function filterHolds(array $allHolds, array $selectedUsers, $selectedHold
 
 		$allUsersSelected = in_array("", $selectedUsers);
 
-		foreach (['available', 'unavailable'] as $type) {
-			foreach ($allHolds[$type] as $key => $hold) {
-				$includeHold = false;
+		foreach ($allHolds['available'] as $key => $hold) {
+			$includeHold = false;
 
-				if ($allUsersSelected || empty($selectedUsers)  || in_array($hold->userId, $selectedUsers)) {
-					$includeHold = true;
-				}
+			if ($allUsersSelected || empty($selectedUsers) || in_array($hold->userId, $selectedUsers)) {
+				$includeHold = true;
+			}
 
-				if (!empty($selectedHolds)) {
-					$matchFound = false;
-					foreach ($selectedHolds as $selectedHold) {
+			if ($includeHold) {
+				$filteredHolds['available'][$key] = $hold;
+			}
+		}
 
-						$holdRecordId = intval(trim($hold->recordId));
-						$selectedHoldRecordId = intval(trim($selectedHold['recordId']));
-						$holdUserId = intval(trim($hold->userId));
-						$selectedHoldUserId = intval(trim($selectedHold['userId']));
-						if ($holdRecordId == $selectedHoldRecordId && $holdUserId == $selectedHoldUserId){
-							$matchFound = true;
-							break;
-						}
-					}
-					if (!$matchFound) {
-						$includeHold = false;
+		foreach ($allHolds['unavailable'] as $key => $hold) {
+			$includeHold = false;
+
+			if ($allUsersSelected || empty($selectedUsers) || in_array($hold->userId, $selectedUsers)) {
+				$includeHold = true;
+			}
+			if (!empty($selectedHolds)) {
+				$matchFound = false;
+				foreach ($selectedHolds as $selectedHold) {
+					$holdRecordId = intval(trim($hold->recordId));
+					$selectedHoldRecordId = intval(trim($selectedHold['recordId']));
+					$holdUserId = intval(trim($hold->userId));
+					$selectedHoldUserId = intval(trim($selectedHold['userId']));
+					if ($holdRecordId == $selectedHoldRecordId && $holdUserId == $selectedHoldUserId){
+						$matchFound = true;
+						break;
 					}
 				}
-
-				if ($includeHold) {
-					$filteredHolds[$type][$key] = $hold;
+				if (!$matchFound) {
+					$includeHold = false;
 				}
 			}
+
+			if ($includeHold) {
+				$filteredHolds['unavailable'][$key] = $hold;
+			}
 		}
 		return $filteredHolds;
 	}
@@ -3737,6 +3745,9 @@ public function getHolds(): array {
 				if (!$offlineMode) {
 					if ($user) {
 						$allHolds = $this->filterHolds($user->getHolds(true, $selectedUnavailableSortOption, $selectedAvailableSortOption, $source), $selectedUsers, $selectedHolds);
+						error_log('Available Holds: ' . print_r($allHolds['available'], true));
+                    	error_log('Unavailable Holds: ' . print_r($allHolds['unavailable'], true));
+
 						$interface->assign('recordList', $allHolds);
 					}
 				}