-
Notifications
You must be signed in to change notification settings - Fork 61
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
SLUB: Fix interlibrary loans and requests (#611)
* convert pickup location code to location name * change format "*" to "FL" for unnamed ill media formats * take json field "X_FL_renewable" into account: 0 = item is not an ill item (or ill item is not renewable at all?) 1 = not yet renewable (X_is_renewable == 0 in this case) 2 = renewable (X_is_renewable == 1 in this case) * don't set id for ill items as it doesn't point to SLUB catalog * avoid redundant entries of ill items in reservations, don't show if: status == 6 as item is also in the "hold" section and shows as reservation status == 11 or 13 as it's no longer relevant (item is returned) status == 16 as item is also in the "loans" section and shows as lent item
- Loading branch information
Showing
7 changed files
with
307 additions
and
108 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
229 changes: 229 additions & 0 deletions
229
opacclient/libopac/src/test/resources/slub/account/account-ill.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,229 @@ | ||
{ | ||
"status": "1", | ||
"userID": "1234567", | ||
"memberInfo": { | ||
"name": " Max Mustermann", | ||
"email": "[email protected]", | ||
"address": "Musterstr. 1, 01069 Dresden", | ||
"expires": "2020-03-31T00:00:00Z", | ||
"status": "N", | ||
"X_status_desc": "Normal", | ||
"X_name": { | ||
"givenname": "Max", | ||
"surname": "Mustermann" | ||
}, | ||
"X_post_address": { | ||
"street_1": "Musterstr. 1", | ||
"plz": "01069", | ||
"ort": "Dresden" | ||
}, | ||
"X_residental_address": [], | ||
"X_alternative_address": [], | ||
"X_date_of_joining": "2000-01-01T00:00:00Z", | ||
"X_date_of_last_issue_int": "65375", | ||
"X_date_of_last_issue_ext": "2019-12-28", | ||
"X_gender": "M", | ||
"X_branch": "zell1", | ||
"X_branch_desc": "Zentralbibliothek", | ||
"X_category": "NE", | ||
"X_category_desc": "Normal Email", | ||
"X_blacklists": [], | ||
"X_notes": [], | ||
"X_webopac_notes": [], | ||
"type": "NE" | ||
}, | ||
"items": { | ||
"ill": [ | ||
{ | ||
"Fernleih_ID": "145073", | ||
"Titel": "Title1", | ||
"Autor": "Author1", | ||
"Datum_intern": "65381", | ||
"Datum_extern": "2020-01-02T23:00:00Z", | ||
"Datum_Ausleihe_intern": "65381", | ||
"Datum_Ausleihe_extern": "2020-01-02T23:00:00Z", | ||
"Zweigstelle": "zell1", | ||
"Status": "2", | ||
"Status_DESC": "Bestellung ausgelöst", | ||
"Medientyp": "", | ||
"History": [] | ||
}, | ||
{ | ||
"Fernleih_ID": "155976", | ||
"Titel": "Title2", | ||
"Autor": "", | ||
"Datum_intern": "65700", | ||
"Datum_extern": "2020-11-16T23:00:00Z", | ||
"Datum_Ausleihe_intern": "65700", | ||
"Datum_Ausleihe_extern": "2020-11-16T23:00:00Z", | ||
"Zweigstelle": "zell1", | ||
"Status": "6", | ||
"Status_DESC": "Medium bereitgestellt", | ||
"Medientyp": "*", | ||
"History": [] | ||
}, | ||
{ | ||
"Fernleih_ID": "145073", | ||
"Titel": "Title3", | ||
"Autor": "Author3", | ||
"Datum_intern": "65381", | ||
"Datum_extern": "2020-01-02T23:00:00Z", | ||
"Datum_Ausleihe_intern": "65381", | ||
"Datum_Ausleihe_extern": "2020-01-02T23:00:00Z", | ||
"Zweigstelle": "zell1", | ||
"Status": "11", | ||
"Status_DESC": "Medium zurückgegeben", | ||
"Medientyp": "*", | ||
"History": [] | ||
}, | ||
{ | ||
"Fernleih_ID": "145073", | ||
"Titel": "Title4", | ||
"Autor": "Author4", | ||
"Datum_intern": "65381", | ||
"Datum_extern": "2020-01-02T23:00:00Z", | ||
"Datum_Ausleihe_intern": "65381", | ||
"Datum_Ausleihe_extern": "2020-01-02T23:00:00Z", | ||
"Zweigstelle": "zell1", | ||
"Status": "13", | ||
"Status_DESC": "Abgeschlossen/Abgeholt", | ||
"Medientyp": "*", | ||
"History": [] | ||
}, | ||
{ | ||
"Fernleih_ID": "155976", | ||
"Titel": "Title5", | ||
"Autor": "", | ||
"Datum_intern": "65700", | ||
"Datum_extern": "2020-11-16T23:00:00Z", | ||
"Datum_Ausleihe_intern": "65700", | ||
"Datum_Ausleihe_extern": "2020-11-16T23:00:00Z", | ||
"Zweigstelle": "zell1", | ||
"Status": "16", | ||
"Status_DESC": "Medium ausgeliehen", | ||
"Medientyp": "*", | ||
"History": [] | ||
}, | ||
{ | ||
"Fernleih_ID": "155976", | ||
"Titel": "Title6", | ||
"Autor": "", | ||
"Datum_intern": "65700", | ||
"Datum_extern": "2020-11-16T23:00:00Z", | ||
"Datum_Ausleihe_intern": "65700", | ||
"Datum_Ausleihe_extern": "2020-11-16T23:00:00Z", | ||
"Zweigstelle": "zell1", | ||
"Status": "16", | ||
"Status_DESC": "Medium ausgeliehen", | ||
"Medientyp": "*", | ||
"History": [] | ||
} | ||
], | ||
"hold": [ | ||
{ | ||
"status": 4, | ||
"about": "Title2", | ||
"label": "12047398N", | ||
"starttime": "2020-12-03T23:00:00Z", | ||
"X_status_desc": "on hold", | ||
"X_pickup_code": "a13", | ||
"X_pickup_desc": "Zentralbibliothek Servicetheke", | ||
"X_medientyp": "FL", | ||
"X_exstatus": "FL", | ||
"X_exstatus_desc": "Fernleihe", | ||
"X_ill_duedate": "2021-01-08", | ||
"X_ill_request_id": "155976", | ||
"X_author": [], | ||
"X_internal_date_reserved": "65717", | ||
"X_date_reserved": "2020-12-04", | ||
"X_internal_date_noticed": "65718", | ||
"X_date_noticed": "2020-12-05", | ||
"X_provided_item": "12047398N", | ||
"X_provided": 1, | ||
"X_rsn": 16787924 | ||
} | ||
], | ||
"loan": [ | ||
{ | ||
"status": 3, | ||
"about": "Title5", | ||
"label": "12047398N", | ||
"queue": "0", | ||
"renewals": 0, | ||
"starttime": "2020-12-05T11:22:58Z", | ||
"endtime": "2021-01-07T23:00:00Z", | ||
"X_status_desc": "on loan", | ||
"X_barcode": "12047398N", | ||
"X_author": [], | ||
"X_medientyp": "FL", | ||
"X_exstatus": "FL", | ||
"X_exstatus_desc": "Fernleihe", | ||
"X_shelfLocation": "FL", | ||
"X_internal_date_issued": "65718,44578", | ||
"X_date_issued": "2020-12-05 12:22:58", | ||
"X_internal_date_due": "65752", | ||
"X_date_due": "2021-01-08", | ||
"X_days_to_due": "34", | ||
"X_is_reserved": 0, | ||
"X_is_renewable": 0, | ||
"X_RenewMax": 5, | ||
"X_RenewalCount": 0, | ||
"X_is_flrenewable": 1, | ||
"X_ill_id": 155976, | ||
"X_rsn": 16787924 | ||
}, | ||
{ | ||
"status": 3, | ||
"about": "Title6", | ||
"label": "12047398N", | ||
"queue": "0", | ||
"renewals": 0, | ||
"starttime": "2020-12-05T11:22:58Z", | ||
"endtime": "2021-01-07T23:00:00Z", | ||
"X_status_desc": "on loan", | ||
"X_barcode": "12047398N", | ||
"X_author": [], | ||
"X_medientyp": "FL", | ||
"X_exstatus": "FL", | ||
"X_exstatus_desc": "Fernleihe", | ||
"X_shelfLocation": "FL", | ||
"X_internal_date_issued": "65718,44578", | ||
"X_date_issued": "2020-12-05 12:22:58", | ||
"X_internal_date_due": "65752", | ||
"X_date_due": "2021-01-08", | ||
"X_days_to_due": "3", | ||
"X_is_reserved": 0, | ||
"X_is_renewable": 1, | ||
"X_RenewMax": 11, | ||
"X_RenewalCount": 0, | ||
"X_is_flrenewable": 2, | ||
"X_ill_id": 155976, | ||
"X_rsn": 16787924 | ||
} | ||
] | ||
}, | ||
"fees": { | ||
"amount": "0,00 EUR", | ||
"subset": "open", | ||
"amount_list": "0,00 EUR", | ||
"paid_all": "0,00 EUR", | ||
"paid_list": "0,00 EUR", | ||
"fee_all": "0,00 EUR", | ||
"fee_list": "0,00 EUR", | ||
"topay_all": "0,00 EUR", | ||
"topay_list": "0,00 EUR", | ||
"overdue_paid": "0,00 EUR", | ||
"overdue_fee": "0,00 EUR", | ||
"ill_paid": "0,00 EUR", | ||
"ill_fee": "0,00 EUR", | ||
"other_paid": "0,00 EUR", | ||
"other_fee": "0,00 EUR", | ||
"fee": [] | ||
}, | ||
"arguments": { | ||
"controller": "API", | ||
"action": "account", | ||
"username": "1234567" | ||
} | ||
} | ||
|
Oops, something went wrong.