From 18fa92394872e1fe46cd06ae44212a2937abcdaa Mon Sep 17 00:00:00 2001
From: Mark Noble <mdnoble73@gmail.com>
Date: Fri, 15 Nov 2024 08:59:10 -0700
Subject: [PATCH] Correct 24.11 issues found during testing

- When showing multi-select options within a One To Many Block, show all selected options
- Correct sorting of formats within a grouped work if the grouped work display settings do not have valid format sorting options.
- Do not allow adding OverDrive Scopes from the OverDrive Scopes list. They should be added within the settings instead.
- Update the list of libraries and locations that apply to an OverDrive scope to be checkboxes rather than individual dropdowns.
- Add additional notes to Library Settings and Scopes within OverDrive settings to better explain what they do.
- Do not allow sorting requests needing holds based on Format.
- Make cloudSourceBaseUrl within Library Settings a TINYTEXT field instead of VARCHAR to avoid row size limits.
---
 code/web/RecordDrivers/GroupedWorkDriver.php  |  26 +-
 .../responsive/DataObjectUtil/oneToMany.tpl   |  16 +-
 code/web/release_notes/24.11.00.MD            | 218 ++++++++++++++
 code/web/services/OverDrive/Scopes.php        |   6 +-
 .../version_updates/24.11.00.php              | 283 ++++++++++++++++++
 .../MaterialsRequests/MaterialsRequest.php    |   3 +-
 code/web/sys/OverDrive/OverDriveScope.php     | 119 +++++---
 code/web/sys/OverDrive/OverDriveSetting.php   |  66 +++-
 8 files changed, 663 insertions(+), 74 deletions(-)
 create mode 100644 code/web/release_notes/24.11.00.MD
 create mode 100644 code/web/sys/DBMaintenance/version_updates/24.11.00.php

diff --git a/code/web/RecordDrivers/GroupedWorkDriver.php b/code/web/RecordDrivers/GroupedWorkDriver.php
index 3a0b11263d..790a0de487 100644
--- a/code/web/RecordDrivers/GroupedWorkDriver.php
+++ b/code/web/RecordDrivers/GroupedWorkDriver.php
@@ -417,17 +417,23 @@ function compareRelatedManifestations($a, $b) {
 			$groupedWorkDisplaySettings = $library->getGroupedWorkDisplaySettings();
 			$this->_formatSorting = $groupedWorkDisplaySettings->getFormatSortingGroup();
 		}
-		$groupedWork = $this->getGroupedWorkObject();
-		if ($groupedWork->grouping_category == 'book') {
-			$sortMethod = $this->_formatSorting->bookSortMethod;
-		}elseif ($groupedWork->grouping_category == 'comic') {
-			$sortMethod = $this->_formatSorting->comicSortMethod;
-		}elseif ($groupedWork->grouping_category == 'movie') {
-			$sortMethod = $this->_formatSorting->movieSortMethod;
-		}elseif ($groupedWork->grouping_category == 'music') {
-			$sortMethod = $this->_formatSorting->musicSortMethod;
+
+		//Format sorting can still be null before the format sorting is fully setup
+		if ($this->_formatSorting == null) {
+			$sortMethod = 1;
 		}else{
-			$sortMethod = $this->_formatSorting->otherSortMethod;
+			$groupedWork = $this->getGroupedWorkObject();
+			if ($groupedWork->grouping_category == 'book') {
+				$sortMethod = $this->_formatSorting->bookSortMethod;
+			}elseif ($groupedWork->grouping_category == 'comic') {
+				$sortMethod = $this->_formatSorting->comicSortMethod;
+			}elseif ($groupedWork->grouping_category == 'movie') {
+				$sortMethod = $this->_formatSorting->movieSortMethod;
+			}elseif ($groupedWork->grouping_category == 'music') {
+				$sortMethod = $this->_formatSorting->musicSortMethod;
+			}else{
+				$sortMethod = $this->_formatSorting->otherSortMethod;
+			}
 		}
 
 		if ($sortMethod == 1) {
diff --git a/code/web/interface/themes/responsive/DataObjectUtil/oneToMany.tpl b/code/web/interface/themes/responsive/DataObjectUtil/oneToMany.tpl
index 4a53f1b45d..caa1e303ca 100644
--- a/code/web/interface/themes/responsive/DataObjectUtil/oneToMany.tpl
+++ b/code/web/interface/themes/responsive/DataObjectUtil/oneToMany.tpl
@@ -8,7 +8,7 @@
 					<th>{translate text="Sort" isAdminFacing=true}</th>
 				{/if}
 				{foreach from=$property.structure item=subProperty}
-					{if (in_array($subProperty.type, array('text', 'regularExpression', 'multilineRegularExpression', 'enum', 'date', 'checkbox', 'integer', 'textarea', 'html', 'dynamic_label')) || ($subProperty.type == 'multiSelect' && $subProperty.listStyle == 'checkboxList')) && empty($subProperty.hideInLists) }
+					{if (in_array($subProperty.type, array('text', 'regularExpression', 'multilineRegularExpression', 'enum', 'date', 'checkbox', 'integer', 'textarea', 'html', 'dynamic_label', 'multiSelect')) || ($subProperty.type == 'multiSelect' && $subProperty.listStyle == 'checkboxList')) && empty($subProperty.hideInLists) }
 						<th{if in_array($subProperty.type, array('text', 'regularExpression', 'multilineRegularExpression', 'enum', 'html', 'multiSelect'))} style="min-width:150px"{/if}>{translate text=$subProperty.label isAdminFacing=true}</th>
 					{/if}
 				{/foreach}
@@ -29,7 +29,7 @@
 						</td>
 					{/if}
 					{foreach from=$property.structure item=subProperty}
-						{if in_array($subProperty.type, array('text', 'regularExpression', 'enum', 'date', 'checkbox', 'integer', 'textarea', 'html', 'dynamic_label'))  && empty($subProperty.hideInLists)}
+						{if in_array($subProperty.type, array('text', 'regularExpression', 'enum', 'date', 'checkbox', 'integer', 'textarea', 'html', 'dynamic_label', 'multiSelect'))  && empty($subProperty.hideInLists)}
 							<td>
 								{assign var=subPropName value=$subProperty.property}
 								{assign var=subPropValue value=$subObject->$subPropName}
@@ -46,6 +46,16 @@
 										{if $subPropValue == 1}{translate text='Yes' isAdminFacing=true}{else}{translate text='No' isAdminFacing=true}{/if}
 									{/if}
 									<input type='checkbox' name='{$propName}_{$subPropName}[{$subObject->id}]' {if $subPropValue == 1}checked='checked'{/if} {if !empty($subProperty.readOnly) || !empty($property.readOnly)} style="display: none"{/if} data-id="{$subObject->id}"/>
+								{elseif $subProperty.type=='multiSelect'}
+									<span id="{$propName}_{$subPropName}_{$subObject->id}" data-id="{$subObject->id}">
+										{if is_array($subPropValue) && count($subPropValue) > 0}
+											{foreach from=$subProperty.values item=propertyName key=propertyValue}
+												{if array_key_exists($propertyValue, $subPropValue)}{$propertyName|escape}<br/>{/if}
+											{/foreach}
+										{else}
+											{translate text="No values selected" isAdminFacing='true'}
+										{/if}
+									<span>
 								{else}
 									{if $subObject->canActiveUserChangeSelection()}
 										<select name='{$propName}_{$subPropName}[{$subObject->id}]' id='{$propName}{$subPropName}_{$subObject->id}' class='form-control {if !empty($subProperty.required)} required{/if}' {if !empty($subProperty.onchange)}onchange="{$subProperty.onchange}"{/if} {if !empty($subProperty.readOnly) || !empty($property.readOnly)} readonly disabled{/if} data-id="{$subObject->id}">
@@ -205,4 +215,4 @@
 		}
 		{/literal}
 	</script>
-</div>
\ No newline at end of file
+</div>
diff --git a/code/web/release_notes/24.11.00.MD b/code/web/release_notes/24.11.00.MD
new file mode 100644
index 0000000000..7ffab4b360
--- /dev/null
+++ b/code/web/release_notes/24.11.00.MD
@@ -0,0 +1,218 @@
+## Aspen LiDA Updates
+- Show the home library name of linked accounts on the Library Card page. Only show the library logo if it's correct for the home library. (Ticket 128681) (*KP*)
+- Fixed a bug where holds needing confirmation were causing the app to crash. (Ticket 139245) (*KK*)
+- Fixed a bug where Koha was returning a 400 error when placing a hold. (Ticket 137232) (*KK*)
+- Updated functions for renewing checkouts, returning checkouts, thawing/freezing holds that are OverDrive items to send sourceId instead of recordId to accommodate for multiple OverDrive settings. (DIS-40) (*KK-G*)
+- For libraries with multiple OverDrive connections, holds and checkouts will now display Collection name. (DIS-40) (*KK-G*)
+- On the Grouped Work screen, OverDrive items will now display "Where Is It?" to give patrons the Collection name when multiple OverDrive are present. (DIS-40) (*KK-G*)
+- Added Self Registration to the Login screen. (*KK*)
+- To comply with the app store rules when enabling self-registration, users can now delete their Aspen Discovery account within Aspen LiDA in the 'More' menu. This only deletes user data related to Aspen Discovery such as lists, searches, cached holds/checkouts, etc. and does not affect their account with the ILS. (*KK*)
+- When looking at which Greenhouse call to make for fetching libraries, updated checking the app slug to only look at the beginning of the string to start with "aspen-lida" to determine if it's the Aspen LiDA Community app, or a branded/alternative app. (*KK-G*)
+
+## Aspen Discovery Updates
+### Admin Updates
+- Create a new Background Process that will allow long-running tasks to be executed in the background. This is currently used for generating reading history for test users, and recalculating cost savings. When executed, a user message is displayed when the task finishes so the user can do other tasks while the process runs. When results of the process are viewed, the message is automatically cleared. (*MDN*)
+- Null pointer check when updating translatable text blocks (*MDN*)
+- When showing multi-select options within a One To Many Block, show all selected options. This is currently used within OverDrive Scopes to show a list of all libraries when viewing scopes for the library. (*MDN*)
+
+<div markdown="1" class="settings">
+
+#### New Settings
+- System Reports > Background Processes
+
+</div>
+
+### API Updates
+- Avoid recursive call when no libraries can be found in the greenhouse. (*MDN*)
+
+### CARL.X Updates
+- When checking for order records based on shelf location, allow any casing of XORD. (*MDN*)
+
+### eCommerce Updates
+- Add extra error logging for NCR Payments (Ticket 134771) (*KL*)
+- Fix an issue where staff users with permissions to see only their library's ecommerce report yielded no results (Ticket 140792) (*KL*)
+
+### Greenhouse Updates
+- Add additional debugging information to Aspen LiDA Site Listing Cache. (*MDN*)
+
+### Indexing Updates
+- When determining CD+Book format, do not mark as CD+Book if the 300e includes booklet rather than book. (*MDN*)
+- Add a new format for Zines based on the 655a (*MDN*)
+- Update indexer to avoid errors during concurrent (multithreaded) indexing of materials. (*MDN*)
+- When determining Book+DVD format, check for videodisc in addition to dvd in 300e (Ticket 139639) (*KL*)
+
+### Install Updates
+- Make it easier to create new Symphony sites by creating account profiles and indexing profiles (similar to how Koha sites can be set up). (*MDN*)
+- Update Debian servers to install Java 17 by default rather than Java 11. (*MDN*)
+- Remove setting permissions on old solr directory that is no longer used. (*MDN*)
+
+### Koha Updates
+- Fixed an issue that caused Aspen to ignore the OPACSuggestionUnwantedFields setting (from Koha) by displaying fields even if they were there. (Ticket 105308) (*LM*)
+
+### Library Savings
+- Update recalculating library cost savings from the Replacement Costs page to be done in the background to support libraries which have a large number of patrons with reading history. (*MDN*)
+- Correct loading the default text for library cost savings. (*MDN*)
+
+### Library System Updates
+- Carl.X only: Add the ability to set the payment branch for fines and eCommerce transactions. (*JStaub*)
+- Update default username and password labels in library settings.
+
+<div markdown="1" class="settings">
+
+#### New Settings
+- Primary Configuration > Library Systems > Fines/eCommerce > Payment Branch Source (Carl.X only)
+- Primary Configuration > Library Systems > Fines/eCommerce > Specified Payment Branch Code (Carl.X only)
+
+</div>
+
+### Linked Account Updates
+- Add the patron's display name to Aspen when adding a Linked Account. (Tickets 136957, 127427, 128681 (partial)) (*KP*)
+- Include the expiry date for linked accounts in the API and LiDA. (Ticket 136902) (*KP*)
+
+### Masquerade Updates
+- Change the Masquerade flow. A Masquerade session will start on the page the guiding user was on when they initiated Masquerade instead of the active user's MyAccount page. When a Masquerade session is ended, the guiding user will return to the page they were on when they initiated Masquerade, instead of being redirected to the guiding user's MyAccount page (*JStaub*)
+
+### Materials Request Updates
+- Correct updating the internal formatId of requests when a request is created or updated. (*MDN*)
+- Update hold candidate generation log to sort newest to oldest. (*MDN*)
+- Correct pagination on the requests needing holds page. (*MDN*)
+- Do not allow sorting requests needing holds based on Format. (*MDN*)
+
+### OverDrive Updates
+- Allow a single library to access multiple OverDrive collections. (DIS-29) (*MDN*)
+  - Split the information within OverDrive Scopes into:
+    - Scopes which define the records to include for a library (Adult, Teen, Kids)
+    - Library Settings which define the information about how to connect to the OverDrive collection which does not change based on the records included
+  - Allow multiple OverDrive Settings to be attached to a single library.
+  - When loading information from OverDrive about the records that are owned by a library, add an item for each collection that provides the title.
+  - If a library has access to more than one OverDrive collection, add a "Where is it?" link to search results and full record views.
+  - When selecting the "Where is it?" link, Aspen will display a list of owning collections with the total number of copies, available copies, and number of holds.
+  - Within the Copies section of full record view, display the number of holds on each collection for each copy.
+  - Display information about what collection a title is from within Holds and Checkouts if the library has access to more than one collection.
+  - When placing a hold or checking out a title, determine the best collection to place the hold in or borrow the title from. This takes into account whether the patron has remaining checkouts and/or holds, the availability of the title within each collection, and the hold ratio of titles in each collection if the title is not available.
+  - When freezing holds, thawing holds, returning titles, and accessing titles, ensure that the credentials for the proper collection are used.
+  - Allow patrons to view and modify the default loan periods for each collection.
+  - Update API data page to properly handle multiple OverDrive collections for a library.
+  - Display additional information on the Aspen Data page to more easily see the information stored in the database about each title and the collections it belongs in.
+- Rename the old Format section to Available Platforms within the OverDrive full record page to meet OverDrive implementation standards. (*MDN*)
+- When displaying format information, drop references to EPUB, PDF, etc. and use preferred terminology of Libby eBook, Libby eAudiobook. Where Libby will be automatically renamed with the reader name defined in settings. (*MDN*)
+- Remove the old fulfillment interface that was deprecated by OverDrive. Fulfillment will be done using the new iFrame method. (*MDN*)
+- Simplify loading number of copies owned, number of copies checked out, and number of holds for records within each collection. (*MDN*)
+- Allow naming the OverDrive platform within settings, so it can be used independently of the reader name. (DIS-29) (*MDN*)
+- Clean up usage of the OverDrive reader name to properly separate the reader name from the OverDrive platform. (DIS-29) (*MDN*)
+- Fix spacing after reader name within the account menu so the count of titles on hold or checked out is not directly after the label. (*MDN*)
+- Add handling within staff view if an OverDrive record is not attached to a Grouped Work and does not have bookcover information. (*MDN*)
+- Default PIN required on within OverDrive Settings. (*MDN*)
+- Remove unused code within OverDrive indexer. (*MDN*)
+- Cleanup all OverDrive related code to remove style issues and warnings. (*MDN*)
+- Do not allow adding OverDrive Scopes from the OverDrive Scopes list. They should be added within the settings instead. (*MDN*)
+- Update the list of libraries and locations that apply to an OverDrive scope to be checkboxes rather than individual dropdowns. (*MDN*)
+- Add additional notes to Library Settings and Scopes within OverDrive settings to better explain what they do. (*MDN*)
+
+<div markdown="1" class="settings">
+
+#### New Settings
+- Primary Configuration > OverDrive > Settings > Name
+- Primary Configuration > OverDrive > Settings > Reader Name
+- Primary Configuration > OverDrive > Settings > Library Settings
+- Primary Configuration > Library Systems > OverDrive > OverDrive Settings
+- Primary Configuration > Library Systems > OverDrive > OverDrive Scopes
+
+</div>
+
+### Reports Updates
+- Nashville-specific: Student report now includes book cover images. (*JStaub*)
+- Nashville-specific: Student report now includes Masquerade links. (*JStaub*)
+
+### SHAREit Updates
+- Add the ability to search SHAREit as an Inter Library Loan Service. (DIS-27) (*MDN*)
+  - Patrons can repeat their search in SHAREit from the search bar.
+  - Search results from SHAREit are automatically shown at the bottom of search results.
+  - Results from SHAREit can be configured to show within Combined Results.
+  - Results from SHAREit can be enabled to be shown within full record displays.
+
+<div markdown="1" class="settings">
+
+#### New Settings
+- Primary Configuration > Library Systems > Interlibrary loans > Interlibrary Loan System: Added SHAREit as an option
+- Primary Configuration > Library Systems > Interlibrary loans > SHAREit > Repeat in SHAREit
+- Primary Configuration > Library Systems > Interlibrary loans > SHAREit > SHAREit CID
+- Primary Configuration > Library Systems > Interlibrary loans > SHAREit > SHAREit LID
+- Primary Configuration > Library Systems > Interlibrary loans > SHAREit > SHAREit Username
+- Primary Configuration > Library Systems > Interlibrary loans > SHAREit > SHAREit Password
+- Primary Configuration > Library Systems > Locations > Searching > Search Box > Repeat in SHAREit
+- Catalog / Grouped Works > Grouped Work Display > Full Record Options: Added SHAREit as an option
+
+</div>
+
+### Sierra Updates
+- Hide the update username link in My Account if updating username is not allowed for the patron (Ticket 139915) (*KL*)
+
+### Testing Updates
+- Add the ability to generate test users. Up to 1000 test users can be generated at a time using popular names from around the world. The new tool is located at Greenhouse > Testing Tools > Generate Test Users. (*MDN*)
+- Update the ability to generate reading history to process all test users, or all test users with no reading history in addition to generating reading history for a specific user. (*MDN*)
+
+### Other Updates
+- Fix uploading covers for a grouped work or individual record from a URL. (*MDN*)
+- If no status is returned from a database update that uses a function call, return an appropriate message. (*MDN*)
+- Properly set whether Explore More is shown within EBSCOhost results from a location interface. (*MDN*)
+- Remove some deprecated variables related to Self Registration from Library Settings Code. (*MDN*)
+- Remove old unused SSO code from Library Settings. (*MDN*)
+- Cleanup all Library and Location settings to remove style issues and warnings. (*MDN*)
+- Cleanup code for cached holds and checkouts to remove style issues and warnings. (*MDN*)
+- Do not display settings for inactive modules within Location settings. (*MDN*)
+- Make cloudSourceBaseUrl within Library Settings a TINYTEXT field instead of VARCHAR to avoid row size limits. (*MDN*)
+- Correct sorting of formats within a grouped work if the grouped work display settings do not have valid format sorting options. (*MDN*)
+- Use natural sort for selecting items to place a hold so that volumes are in order. (Ticket 137784 (partial)) (*KP*)
+- Add an [EditorConfig](https://editorconfig.org) file to the project source. (*TC*)
+- Github actions improvements to avoid false positives (*TC*)
+- Fix typos in GitHub Actions for building docker images (*KMH*)
+- Remove partner-specific directories in the /sites directory (*KL*)
+- Increase the allowed length for the alternate library card label (*KL*)
+- Make the setting to enable the Grapes Editor visible to any with the appropriate permissions (*KL*)
+- Add check to saveToList function to ensure the user attempting to add a book to the list is authorised to do so. (*AB*)
+- Ebsco EDS and host passwords are encrypted before being stored in the Aspen database (*CZ*)
+- Fix issue where the Available Now At facet was not showing related locations and home locations at the top of the list (Ticket 122986 (partial)) (*KL*)
+- Make sure cURL decodes the compressed response contents automatically (*TC*)
+
+## This release includes code contributions from
+###ByWater Solutions
+  - Katherine Perdue (KP)
+  - Kirstien Kroeger (KK)
+  - Kodi Lein (KL)
+
+###Grove For Libraries
+  - Mark Noble (MDN)
+  - Kirstien Kroeger (KK-G)
+
+###Nashville Public Library
+  - James Staub (JStaub)
+
+###PTFS-Europe
+  - Alexander Blanchard (AB)
+  - Chloe Zermatten (CZ)
+
+###Theke Solutions
+  - Lucas Montoya (LM)
+  - Tomás Cohen Arazi (TC)
+
+## Special Testing thanks to
+- Myranda Fuentes (Grove)
+- Bryan Jones (Nashville Public Library)
+- James Staub (Nashville Public Library)
+- Janeal Walker (Metropolitan Public Library)
+- Tricia Andrews (Metropolitan Public Library)
+- Kate Lozyk (ByWater Solutions)
+- Olivia Montolin (SWAN Library Services)
+- Chloe Zermatten (PTFS-Europe)
+- Aude Charillon (PTFS-Europe)
+- Tara Wood (SWAN Library Services)
+- Jordan Fields (Grove)
+
+## Special Documentation thanks to
+- Myranda Fuentes (Grove)
+- Jordan Fields (Grove)
+
+## This release includes sponsored developments from
+- Helen Plum Public Library
+- Panhandle Public Library Cooperative System
diff --git a/code/web/services/OverDrive/Scopes.php b/code/web/services/OverDrive/Scopes.php
index 4928febda0..1b2b9a635c 100644
--- a/code/web/services/OverDrive/Scopes.php
+++ b/code/web/services/OverDrive/Scopes.php
@@ -77,4 +77,8 @@ function getActiveAdminSection(): string {
 	function canView(): bool {
 		return UserAccount::userHasPermission('Administer Libby/Sora');
 	}
-}
\ No newline at end of file
+
+	function canAddNew() {
+		return false;
+	}
+}
diff --git a/code/web/sys/DBMaintenance/version_updates/24.11.00.php b/code/web/sys/DBMaintenance/version_updates/24.11.00.php
new file mode 100644
index 0000000000..29c9952791
--- /dev/null
+++ b/code/web/sys/DBMaintenance/version_updates/24.11.00.php
@@ -0,0 +1,283 @@
+<?php
+
+function getUpdates24_11_00(): array {
+	$curTime = time();
+	return [
+		/*'name' => [
+			 'title' => '',
+			 'description' => '',
+			 'continueOnError' => false,
+			 'sql' => [
+				 ''
+			 ]
+		 ], //name*/
+
+		//mark - Grove
+		'library_shareit_settings' => [
+			'title' => 'Library SHAREit Settings',
+			'description' => 'Add a new library SHAREit settings',
+			'continueOnError' => false,
+			'sql' => [
+				"ALTER TABLE library ADD COLUMN repeatInShareIt TINYINT(1) DEFAULT 0",
+				"ALTER TABLE library ADD COLUMN shareItCid VARCHAR(80) DEFAULT ''",
+				"ALTER TABLE library ADD COLUMN shareItLid VARCHAR(80) DEFAULT ''",
+			]
+		], //library_shareit_settings
+		'location_shareit_settings' => [
+			'title' => 'Location SHAREit Settings',
+			'description' => 'Add a new location SHAREit settings',
+			'continueOnError' => false,
+			'sql' => [
+				"ALTER TABLE location ADD COLUMN repeatInShareIt TINYINT(1) DEFAULT 0",
+			]
+		], //location_shareit_settings
+		'library_shareit_credentials' => [
+			'title' => 'Library SHAREit Credentials',
+			'description' => 'Add library SHAREit login credentials',
+			'continueOnError' => false,
+			'sql' => [
+				"ALTER TABLE library ADD COLUMN shareItUsername VARCHAR(80) DEFAULT ''",
+				"ALTER TABLE library ADD COLUMN shareItPassword VARCHAR(255) DEFAULT ''",
+			]
+		], //library_shareit_credentials
+		'multiple_overdrive_scopes' => [
+			'title' => 'Multiple OverDrive Scopes',
+			'description' => 'Enable libraries and locations to link to multiple overdrive scopes',
+			'continueOnError' => false,
+			'sql' => [
+				'CREATE TABLE library_overdrive_scope (
+					id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+					scopeId INT NOT NULL,
+					libraryId INT NOT NULL,
+					weight INT NOT NULL default 1,
+					unique (libraryId, scopeId)
+				) ENGINE InnoDB',
+				'CREATE TABLE location_overdrive_scope (
+					id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+					scopeId INT NOT NULL,
+					locationId INT NOT NULL,
+					weight INT NOT NULL default 1,
+					unique (locationId, scopeId)
+				) ENGINE InnoDB',
+				'INSERT INTO library_overdrive_scope (scopeId, libraryId) SELECT overDriveScopeId, libraryId from library where overDriveScopeId != -1',
+				'INSERT INTO location_overdrive_scope (scopeId, locationId) SELECT overDriveScopeId, locationId from location where overDriveScopeId > 0',
+				'INSERT INTO location_overdrive_scope (scopeId, locationId) SELECT library.overDriveScopeId, locationId from location inner join library on location.libraryId = library.libraryId where location.overDriveScopeId = -1 and library.overDriveScopeId != -1',
+			]
+		], //library_multiple_overdrive_collections
+		'setup_overdrive_advantage_and_auth_in_link_tables' => [
+			'title' => 'Setup Overdrive Advantage and Auth In Library Link Table',
+			'description' => 'Setup Overdrive Advantage and Auth In Library Link Table',
+			'continueOnError' => true,
+			'sql' => [
+				'ALTER TABLE library_overdrive_scope ADD COLUMN circulationEnabled TINYINT DEFAULT 1',
+				'ALTER TABLE library_overdrive_scope ADD COLUMN authenticationILSName VARCHAR(45) DEFAULT null',
+				'ALTER TABLE library_overdrive_scope ADD COLUMN requirePin tinyint(1) DEFAULT 0',
+				"ALTER TABLE library_overdrive_scope ADD COLUMN overdriveAdvantageName  varchar(128) DEFAULT ''",
+				"ALTER TABLE library_overdrive_scope ADD COLUMN overdriveAdvantageProductsKey varchar(20) DEFAULT ''",
+			]
+		], //setup_overdrive_advantage_and_auth_in_link_tables
+		'move_overdrive_reader_name_to_settings' => [
+			'title' => 'Move OverDrive Reader Name to Settings',
+			'description' => 'Move overdrive reader name to settings',
+			'continueOnError' => false,
+			'sql' => [
+				"ALTER TABLE overdrive_settings ADD COLUMN readerName varchar(25) DEFAULT 'Libby'",
+				"UPDATE overdrive_settings inner join overdrive_scopes on overdrive_settings.id = overdrive_scopes.settingId set overdrive_settings.readerName = overdrive_scopes.readerName"
+			]
+		], //move_overdrive_reader_name_to_settings
+		'add_overdrive_settings name' => [
+			'title' => 'Add OverDrive Settings Name',
+			'description' => 'Add OverDrive Settings Name',
+			'continueOnError' => false,
+			'sql' => [
+				"ALTER TABLE overdrive_settings ADD COLUMN name varchar(125) DEFAULT 'Libby'",
+			]
+		], //move_overdrive_reader_name_to_settings
+		'remove_overdrive_fulfillment_method' => [
+			'title' => 'Remove deprecated OverDrive fulfillment method',
+			'description' => 'Remove deprecated OverDrive fulfillment method',
+			'sql' => [
+				'ALTER TABLE overdrive_settings DROP COLUMN useFulfillmentInterface'
+			]
+		], //remove_overdrive_fulfillment_method
+		'fix_duplicate_variations' => [
+			'title' => 'Fix Duplicate Variations',
+			'description' => 'Fix duplicate variations for grouped works',
+			'sql' => [
+				'fixDuplicateVariations'
+			]
+		], //fix_duplicate_variations
+		'add_variation_index' => [
+			'title' => 'Add variation index',
+			'description' => 'Make Grouped Work Variations Unique',
+			'sql' => [
+				'ALTER TABLE grouped_work_variation ADD UNIQUE INDEX uniqueness(groupedWorkId, primaryLanguageId, eContentSourceId, formatId, formatCategoryId)'
+			]
+		], //add_variation_index
+		'remove_unused_primary_language_from_grouped_work' => [
+			'title' => 'Remove unused primary language from grouped work',
+			'description' => 'Remove unused primary language from grouped work',
+			'sql' => [
+				'ALTER TABLE grouped_work DROP COLUMN primary_language'
+			]
+		],
+		'create_overdrive_library_settings' => [
+			'title' => 'Create OverDrive Library Settings',
+			'description' => 'Create a new table to store library specific settings for an OverDrive collection',
+			'sql' => [
+				"CREATE TABLE library_overdrive_settings (
+					id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+					settingId INT NOT NULL,
+					weight INT DEFAULT 0,
+					libraryId INT NOT NULL,
+					clientSecret varchar(256) DEFAULT NULL,
+					clientKey varchar(50) DEFAULT NULL,
+					circulationEnabled tinyint(4) DEFAULT 1,
+					authenticationILSName varchar(45) DEFAULT NULL,
+					requirePin tinyint(1) DEFAULT 0,
+					overdriveAdvantageName varchar(128) DEFAULT '',
+					overdriveAdvantageProductsKey varchar(20) DEFAULT '',
+					UNIQUE librarySetting(settingId, libraryId)
+				) ENGINE INNODB CHARACTER SET utf8 COLLATE utf8_general_ci",
+				'INSERT INTO library_overdrive_settings (settingId, libraryId, clientSecret, clientKey, circulationEnabled, authenticationILSName, requirePin, overdriveAdvantageName, overdriveAdvantageProductsKey) SELECT overdrive_scopes.settingId, library.libraryId, clientSecret, clientKey, circulationEnabled, authenticationILSName, requirePin, overdriveAdvantageName, overdriveAdvantageProductsKey from library INNER JOIN overdrive_scopes ON library.overDriveScopeId = overdrive_scopes.id where overDriveScopeId != -1',
+			]
+		], //create_overdrive_library_settings
+		'overdrive_collection_name_for_circ' => [
+			'title' => 'OverDrive Collection Name for Circulation Entries',
+			'description' => 'Add Collection Name to holds and checkouts for OverDrive',
+			'sql' => [
+				'ALTER TABLE user_hold ADD COLUMN collectionName varchar(128) DEFAULT null',
+				'ALTER TABLE user_checkout ADD COLUMN collectionName varchar(128) DEFAULT null'
+			]
+		], //overdrive_collection_name_for_circ
+		'add_test_user_flag' => [
+			'title' => 'Add Test User Flag',
+			'description' => 'Add a test user flag to indicate users that are for testing only',
+			'sql' => [
+				'ALTER TABLE user ADD COLUMN isLocalTestUser TINYINT(1) DEFAULT 0'
+			]
+		],
+		'background_process' => [
+			'title' => 'Background Process',
+			'description' => 'Add table to store information about Background Processes run from the Aspen UI',
+			'sql' => [
+				"CREATE TABLE background_process (
+					id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+					owningUserId INT NOT NULL,
+					name VARCHAR(255) NOT NULL,
+					notes MEDIUMTEXT,
+					startTime INT NOT NULL,
+					endTime INT,
+					isRunning TINYINT(1) DEFAULT 1,
+					INDEX owningUserId (owningUserId)
+				) ENGINE INNODB CHARACTER SET utf8 COLLATE utf8_general_ci",
+			],
+		],
+		'user_message_related_object' => [
+			'title' => 'User Message Related Object',
+			'description' => 'Add a related object id to user messages to allow for automatic dismissal and other behavior',
+			'sql' => [
+				'ALTER TABLE user_messages ADD COLUMN relatedObjectId INT',
+			]
+		],
+		'make_cloudsource_baseurl_text' => [
+			'title' => 'Update Library cloudSourceBaseUrl From Varchar To Text',
+			'description' => 'Update Library cloudSourceBaseUrl From Varchar To Text',
+			'continueOnError' => true,
+			'sql' => [
+				//Some systems had issues with this update in 24.10.10 so, add it again as TINYTEXT
+				"ALTER TABLE library ADD COLUMN cloudSourceBaseUrl TINYTEXT",
+				"ALTER TABLE library CHANGE COLUMN cloudSourceBaseUrl cloudSourceBaseUrl TINYTEXT",
+			]
+		],
+		/*
+		//TODO: Remove this when 24.10 is closer to done
+		'remove_library_and_location_overdrive_scopes' => [
+			'title' => 'Remove Library and Location Overdrive Scopes',
+			'description' => 'Remove library and location overdrive scopes - completes multiple overdrive scopes',
+			'sql' => [
+				'ALTER TABLE library DROP COLUMN overDriveScopeId',
+				'ALTER TABLE location DROP COLUMN overDriveScopeId',
+				'ALTER TABLE overdrive_settings
+			]
+		],*/
+
+		//katherine - ByWater
+
+		//kirstien - ByWater
+
+		//kodi - ByWater
+		'alternate_card_varchar_limit' => [
+			'title' => 'Alternate Card Label Character Limits',
+			'description' => 'Increase the character limit for the alternate library car label and alternate library card password label fields',
+			'sql' => [
+				"ALTER TABLE library MODIFY COLUMN alternateLibraryCardLabel VARCHAR(100) DEFAULT ''",
+				"ALTER TABLE library MODIFY COLUMN alternateLibraryCardPasswordLabel VARCHAR(100) DEFAULT ''",
+			],
+		], //alternate_card_varchar_limit
+
+		//alexander - PTFS-Europe
+
+		//chloe - PTFS-Europe
+		'ebsco_passwords_are_stored_as_hash' => [
+			'title' => 'EBSCO Passwords Are Stored As Hash',
+			'description' => 'allow for longer strings so passwords can be stored as hashed values',
+			'continueOnError' => false,
+			'sql' => [
+				"ALTER TABLE ebsco_eds_settings MODIFY COLUMN edsApiPassword VARCHAR(255)",
+				"ALTER TABLE ebscohost_settings MODIFY COLUMN profilePwd VARCHAR(255)"
+			]
+		], // ebsco_passwords_are_stored_as_hash
+
+		//pedro - PTFS-Europe
+
+		//James Staub - Nashville Public Library
+		'payment_branch_settings' => [
+			'title' => 'Payment Branch Settings',
+			'description' => 'Add a new Library setting to associate an eCommerce payment with a branch',
+			'continueOnError' => false,
+			'sql' => [
+				"ALTER TABLE library ADD COLUMN paymentBranchSource enum('notApplicable','patronHomeLocation','specified') DEFAULT 'notApplicable'",
+				"ALTER TABLE library ADD COLUMN specifiedPaymentBranchCode varchar(6) DEFAULT ''",
+			]
+		]
+
+		//Jeremy Eden - Howell Carnegie District Library
+
+		//other
+
+	];
+}
+
+
+/** @noinspection PhpUnused */
+function fixDuplicateVariations(&$update) : void {
+	global $aspen_db;
+	$numUpdated = 0;
+	$results = $aspen_db->query('SELECT MIN(id) as minId, groupedWorkId, primaryLanguageId, eContentSourceId, formatId, formatCategoryId, count(*) as numRecords FROM `grouped_work_variation` group by groupedWorkId, primaryLanguageId, eContentSourceId, formatId, formatCategoryId having numRecords > 1;', PDO::FETCH_ASSOC);
+	if ($results) {
+		require_once ROOT_DIR . '/sys/Grouping/GroupedWorkVariation.php';
+		while ($row = $results->fetch()){
+			$minId = $row['minId'];
+			$groupedWorkVariation = new GroupedWorkVariation();
+			$groupedWorkVariation->groupedWorkId = $row['groupedWorkId'];
+			$groupedWorkVariation->primaryLanguageId = $row['primaryLanguageId'];
+			$groupedWorkVariation->eContentSourceId = $row['eContentSourceId'];
+			$groupedWorkVariation->formatId = $row['formatId'];
+			$groupedWorkVariation->formatCategoryId = $row['formatCategoryId'];
+			$allVariationIds = $groupedWorkVariation->fetchAll('id', 'id');
+			foreach ($allVariationIds as $variationId) {
+				if ($variationId != $minId) {
+					$aspen_db->query("UPDATE grouped_work_record_items set groupedWorkVariationId = $minId WHERE groupedWorkVariationId = $variationId");
+					$groupedWorkVariation = new GroupedWorkVariation();
+					$groupedWorkVariation->id = $variationId;
+					$groupedWorkVariation->delete();
+					$numUpdated++;
+				}
+			}
+		}
+		$update['success'] = true;
+		$update['status'] = "Updated $numUpdated Variations";
+
+	}
+}
diff --git a/code/web/sys/MaterialsRequests/MaterialsRequest.php b/code/web/sys/MaterialsRequests/MaterialsRequest.php
index 0dfb7c9f45..04e456cef9 100644
--- a/code/web/sys/MaterialsRequests/MaterialsRequest.php
+++ b/code/web/sys/MaterialsRequests/MaterialsRequest.php
@@ -87,6 +87,7 @@ public static function getObjectStructure(string $context) : array {
 					'type' => 'label',
 					'label' => 'Format',
 					'description' => 'The format of the request',
+					'canSort' => false,
 				],
 				'numHoldCandidates' => [
 					'property' => 'numHoldCandidates',
@@ -859,4 +860,4 @@ public function getSelectedHoldCandidate() : MaterialsRequestHoldCandidate|bool{
 		return $this->_selectedHoldCandidate;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/code/web/sys/OverDrive/OverDriveScope.php b/code/web/sys/OverDrive/OverDriveScope.php
index ffb34bf14d..9417212c63 100644
--- a/code/web/sys/OverDrive/OverDriveScope.php
+++ b/code/web/sys/OverDrive/OverDriveScope.php
@@ -149,20 +149,20 @@ public static function getObjectStructure($context = ''): array {
 				'property' => 'libraries',
 				'type' => 'multiSelect',
 				'listStyle' => 'checkboxSimple',
-				'label' => 'Libraries',
-				'description' => 'Define libraries that use this scope',
+				'label' => "Libraries",
+				'description' => "The libraries that use this scope",
 				'values' => $libraryList,
-				'forcesReindex' => true,
+				'hideInLists' => false,
 			],
 
 			'locations' => [
 				'property' => 'locations',
 				'type' => 'multiSelect',
 				'listStyle' => 'checkboxSimple',
-				'label' => 'Locations',
-				'description' => 'Define locations that use this scope',
+				'label' => "Locations",
+				'description' => "The locations that use this scope",
 				'values' => $locationList,
-				'forcesReindex' => true,
+				'hideInLists' => false,
 			],
 		];
 	}
@@ -234,18 +234,30 @@ public function saveLibraries() {
 			foreach ($libraryList as $libraryId => $displayName) {
 				$library = new Library();
 				$library->libraryId = $libraryId;
-				$library->find(true);
-				if (in_array($libraryId, $this->_libraries)) {
-					//We want to apply the scope to this library
-					if ($library->overDriveScopeId != $this->id) {
-						$library->overDriveScopeId = $this->id;
-						$library->update();
-					}
-				} else {
-					//It should not be applied to this scope. Only change if it was applied to the scope
-					if ($library->overDriveScopeId == $this->id) {
-						$library->overDriveScopeId = -1;
-						$library->update();
+				if ($library->find(true)) {
+					$libraryOverDriveScopes = $library->getLibraryOverdriveScopes();
+					if (in_array($libraryId, $this->_libraries)) {
+						$foundScope = false;
+						foreach ($libraryOverDriveScopes as $libraryOverDriveScope) {
+							if ($libraryOverDriveScope->scopeId == $this->id) {
+								$foundScope = true;
+								break;
+							}
+						}
+						//We want to apply the scope to this library
+						if (!$foundScope) {
+							$libraryOverDriveScope = new LibraryOverDriveScope();
+							$libraryOverDriveScope->scopeId = $this->id;
+							$libraryOverDriveScope->libraryId = $libraryId;
+							$libraryOverDriveScope->insert();
+						}
+					} else {
+						//It should not be applied to this scope. Only change if it was applied previously
+						foreach ($libraryOverDriveScopes as $libraryOverDriveScope) {
+							if ($libraryOverDriveScope->scopeId == $this->id) {
+								$libraryOverDriveScope->delete();
+							}
+						}
 					}
 				}
 			}
@@ -256,32 +268,33 @@ public function saveLibraries() {
 	public function saveLocations() {
 		if (isset ($this->_locations) && is_array($this->_locations)) {
 			$locationList = Location::getLocationList(!UserAccount::userHasPermission('Administer All Libraries') || UserAccount::userHasPermission('Administer Home Library Locations'));
-			/**
-			 * @var int $locationId
-			 * @var Location $location
-			 */
 			foreach ($locationList as $locationId => $displayName) {
 				$location = new Location();
 				$location->locationId = $locationId;
-				$location->find(true);
-				if (in_array($locationId, $this->_locations)) {
-					//We want to apply the scope to this library
-					if ($location->overDriveScopeId != $this->id) {
-						$location->overDriveScopeId = $this->id;
-						$location->update();
-					}
-				} else {
-					//It should not be applied to this scope. Only change if it was applied to the scope
-					if ($location->overDriveScopeId == $this->id) {
-						$library = new Library();
-						$library->libraryId = $location->libraryId;
-						$library->find(true);
-						if ($library->overDriveScopeId != -1) {
-							$location->overDriveScopeId = -1;
-						} else {
-							$location->overDriveScopeId = -2;
+				if ($location->find(true)) {
+					$locationOverDriveScopes = $location->getLocationOverdriveScopes();
+					if (in_array($locationId, $this->_locations)) {
+						$foundScope = false;
+						foreach ($locationOverDriveScopes as $locationOverDriveScope) {
+							if ($locationOverDriveScope->scopeId == $this->id) {
+								$foundScope = true;
+								break;
+							}
+						}
+						//We want to apply the scope to this location
+						if (!$foundScope) {
+							$locationOverDriveScope = new LocationOverDriveScope();
+							$locationOverDriveScope->scopeId = $this->id;
+							$locationOverDriveScope->locationId = $locationId;
+							$locationOverDriveScope->insert();
+						}
+					} else {
+						//It should not be applied to this scope. Only change if it was applied previously
+						foreach ($locationOverDriveScopes as $locationOverDriveScope) {
+							if ($locationOverDriveScope->scopeId == $this->id) {
+								$locationOverDriveScope->delete();
+							}
 						}
-						$location->update();
 					}
 				}
 			}
@@ -289,15 +302,33 @@ public function saveLocations() {
 		}
 	}
 
-	/** @return Library[] */
-	public function getLibraries() {
+	/** @return LibraryOverDriveScope[] */
+	public function getLibraries() : array {
+		if (!isset($this->_libraries) && $this->id) {
+			$this->_libraries = [];
+			if ($this->id > 0) {
+				require_once ROOT_DIR . '/sys/OverDrive/LibraryOverDriveScope.php';
+				$libraryOverDriveScope = new LibraryOverDriveScope();
+				$libraryOverDriveScope->scopeId = $this->id;
+				$this->_libraries = $libraryOverDriveScope->fetchAll('libraryId');
+			}
+		}
 		return $this->_libraries;
 	}
 
-	/** @return Location[]
+	/** @return LocationOverDriveScope[]
 	 * @noinspection PhpUnused
 	 */
-	public function getLocations() {
+	public function getLocations() : array {
+		if (!isset($this->_locations)) {
+			$this->_locations = [];
+			if ($this->id > 0) {
+				require_once ROOT_DIR . '/sys/OverDrive/LocationOverDriveScope.php';
+				$locationOverDriveScope = new LocationOverDriveScope();
+				$locationOverDriveScope->scopeId = $this->id;
+				$this->_locations = $locationOverDriveScope->fetchAll('locationId');
+			}
+		}
 		return $this->_locations;
 	}
 
diff --git a/code/web/sys/OverDrive/OverDriveSetting.php b/code/web/sys/OverDrive/OverDriveSetting.php
index 4ab6298820..16e0396f3c 100644
--- a/code/web/sys/OverDrive/OverDriveSetting.php
+++ b/code/web/sys/OverDrive/OverDriveSetting.php
@@ -166,22 +166,58 @@ public static function getObjectStructure($context = ''): array {
 				'description' => 'Whether or not request logging is done while extracting from Aspen.',
 				'default' => 0,
 			],
-			'scopes' => [
-				'property' => 'scopes',
-				'type' => 'oneToMany',
+			'librarySettingsSection' => [
+				'property' => 'librarySettingsSection',
+				'type' => 'section',
+				'label' => 'Authentication and Advantage Information',
+				'expandByDefault' => true,
+				'properties' => [
+					'librarySettings' => [
+						'property' => 'librarySettings',
+						'type' => 'oneToMany',
+						'label' => '',
+						'description' => '',
+						'note' => 'Define settings for how patron authentication is done as well as OverDrive Advantage information for each library that uses this collection.',
+						'keyThis' => 'id',
+						'keyOther' => 'settingId',
+						'subObjectType' => 'LibraryOverDriveSettings',
+						'structure' => $libraryOverDriveSettingsStructure,
+						'sortable' => false,
+						'storeDb' => true,
+						'allowEdit' => true,
+						'canEdit' => false,
+						'additionalOneToManyActions' => [],
+						'canAddNew' => true,
+						'canDelete' => true,
+					],
+				]
+			],
+
+			'scopesSection' => [
+				'property' => 'librarySettingsSection',
+				'type' => 'section',
 				'label' => 'Scopes',
-				'description' => 'Define scopes for the settings',
-				'keyThis' => 'id',
-				'keyOther' => 'settingId',
-				'subObjectType' => 'OverDriveScope',
-				'structure' => $overdriveScopeStructure,
-				'sortable' => false,
-				'storeDb' => true,
-				'allowEdit' => true,
-				'canEdit' => true,
-				'additionalOneToManyActions' => [],
-				'canAddNew' => true,
-				'canDelete' => true,
+				'expandByDefault' => true,
+				'properties' => [
+					'scopes' => [
+						'property' => 'scopes',
+						'type' => 'oneToMany',
+						'label' => '',
+						'description' => '',
+						'note' => 'Define the records to include for each library and location that uses this collection',
+						'keyThis' => 'id',
+						'keyOther' => 'settingId',
+						'subObjectType' => 'OverDriveScope',
+						'structure' => $overdriveScopeStructure,
+						'sortable' => false,
+						'storeDb' => true,
+						'allowEdit' => true,
+						'canEdit' => true,
+						'additionalOneToManyActions' => [],
+						'canAddNew' => true,
+						'canDelete' => true,
+					],
+				],
 			],
 		];
 		if (!(UserAccount::getActiveUserObj()->isAspenAdminUser())) {