Attachment 135030 Details for Bug 28854 – Bug 28854: Improve lost details display for bundle items

[patch] Bug 28854: Improve lost details display for bundle items

Bug-28854-Improve-lost-details-display-for-bundle-.patch (text/plain), 6.01 KB, created by Martin Renvoize (ashimema) on 2022-05-16 14:23:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2022-05-16 14:23:42 UTC

Size: 6.01 KB

patch

obsolete

>From 52546e4988cc8186b0e417a1c6902d197698e42d Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Thu, 25 Nov 2021 12:10:57 +0000
>Subject: [PATCH] Bug 28854: Improve lost details display for bundle items
>
>This patch adds the return claim details to the bundle item status
>display on the catalogue details page.
>
>Test plan
>---
> Koha/Checkouts/ReturnClaims.pm | 2 +-
> Koha/Item.pm | 17 +++++++++++++++++
> api/v1/swagger/definitions/item.yaml | 8 ++++++++
> api/v1/swagger/paths/items.yaml | 3 +++
> .../prog/en/modules/catalogue/detail.tt | 18 +++++++++++++-----
> 5 files changed, 42 insertions(+), 6 deletions(-)
>
>diff --git a/Koha/Checkouts/ReturnClaims.pm b/Koha/Checkouts/ReturnClaims.pm
>index c1c2b3bd44..1174cdd1a2 100644
>--- a/Koha/Checkouts/ReturnClaims.pm
>+++ b/Koha/Checkouts/ReturnClaims.pm
>@@ -60,7 +60,7 @@ sub resolved {
> return Koha::Checkouts::ReturnClaims->_new_from_dbic( $results );
> }
> 
>-=head3 type
>+=head3 _type
> 
> =cut
> 
>diff --git a/Koha/Item.pm b/Koha/Item.pm
>index 37deb713c8..041fddd62e 100644
>--- a/Koha/Item.pm
>+++ b/Koha/Item.pm
>@@ -431,6 +431,23 @@ sub return_claims {
> return Koha::Checkouts::ReturnClaims->_new_from_dbic( $claims_rs );
> }
> 
>+=head3 return_claim
>+
>+ my $return_claim = $item->return_claim;
>+
>+Returns the most recent unresolved return_claims associated with this item
>+
>+=cut
>+
>+sub return_claim {
>+ my ( $self ) = @_;
>+ my $claims_rs =
>+ $self->_result->return_claims->search( { resolution => undef },
>+ { order_by => { '-desc' => 'created_on' } } )->single;
>+ return unless $claims_rs;
>+ return Koha::Checkouts::ReturnClaim->_new_from_dbic( $claims_rs );
>+}
>+
> =head3 holds
> 
> my $holds = $item->holds();
>diff --git a/api/v1/swagger/definitions/item.yaml b/api/v1/swagger/definitions/item.yaml
>index b525c16484..22df7d4aad 100644
>--- a/api/v1/swagger/definitions/item.yaml
>+++ b/api/v1/swagger/definitions/item.yaml
>@@ -212,6 +212,14 @@ properties:
> exclude_from_local_holds_priority:
> type: boolean
> description: Exclude this item from local holds priority.
>+ return_claims:
>+ type: array
>+ description: An array of all return claims associated with this item
>+ return_claim:
>+ type:
>+ - object
>+ - "null"
>+ description: A return claims object if one exists that's unresolved
> additionalProperties: false
> required:
> - item_id
>diff --git a/api/v1/swagger/paths/items.yaml b/api/v1/swagger/paths/items.yaml
>index 38399e9908..7c947f6e3f 100644
>--- a/api/v1/swagger/paths/items.yaml
>+++ b/api/v1/swagger/paths/items.yaml
>@@ -202,6 +202,9 @@
> x-koha-embed:
> - biblio
> - checkout
>+ - return_claims
>+ - return_claim
>+ - return_claim.patron
> "/items/{item_id}/bundled_items/{bundled_item_id}":
> delete:
> x-mojo-to: Items#remove_from_bundle
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>index 9f9bc9698f..a667af4abe 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>@@ -1399,6 +1399,7 @@ Note that permanent location is a code, and location may be an authval.
> [% Asset.js("lib/jquery/plugins/jquery.dataTables.columnFilter.js") | $raw %]
> [% INCLUDE 'columns_settings.inc' %]
> [% INCLUDE 'js-date-format.inc' %]
>+ [% INCLUDE 'js-patron-format.inc' %]
> [% Asset.js("js/browser.js") | $raw %]
> [% Asset.js("js/table_filters.js") | $raw %]
> <script>
>@@ -1432,7 +1433,8 @@ Note that permanent location is a code, and location may be an authval.
> },
> "header_filter": false,
> "embed": [
>- "biblio"
>+ "biblio",
>+ "return_claim.patron"
> ],
> "order": [[ 1, "asc" ]],
> "columnDefs": [ {
>@@ -1495,15 +1497,22 @@ Note that permanent location is a code, and location may be an authval.
> "orderable": true,
> },
> {
>- "data": "lost_status:last_seen_date",
>+ "data": "lost_status:last_seen_date:return_claim.patron",
> "title": "Status",
> "searchable": false,
> "orderable": true,
> "render": function(data, type, row, meta) {
> if ( row.lost_status == bundle_lost_value ) {
>- return "Last seen: " + row.last_seen_date;
>+ let out = '' + _("Last seen") + ': ' + row.last_seen_date + '';
>+ if ( row.return_claim ) {
>+ out = out + '' + _("Claims returned by") + ': ' + $patron_to_html( row.return_claim.patron, { display_cardnumber: false, url: true } ) + '';
>+ }
>+ return out;
> }
>- return "Present";
>+ else if ( row.lost_status !== 0 ) {
>+ return '' + _("Lost") + ': ' + row.lost_status + '';
>+ }
>+ return '' + _("Present") + '';
> }
> },
> {
>@@ -1518,7 +1527,6 @@ Note that permanent location is a code, and location may be an authval.
> }
> ]
> }, bundle_columns, 1);
>-
> $(".tbundle").on("click", ".remove", function(){
> var bundle_table = $(this).closest('table');
> var host_itemnumber = bundle_table.data('itemnumber');
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 28854: 124319 | 124498 | 124616 | 125200 | 125201 | 125202 | 125203 | 125204 | 125205 | 125206 | 126103 | 126104 | 126105 | 126106 | 126107 | 126108 | 126109 | 126110 | 126148 | 126149 | 126150 | 126151 | 126152 | 126153 | 126154 | 126155 | 126166 | 126167 | 126168 | 126169 | 126170 | 126171 | 126172 | 126173 | 127498 | 127499 | 127500 | 127501 | 127502 | 127503 | 127504 | 127505 | 127659 | 127660 | 127661 | 127662 | 127663 | 127664 | 127665 | 127666 | 127829 | 127830 | 127831 | 127832 | 127833 | 127834 | 127835 | 127836 | 127837 | 127838 | 130313 | 130314 | 130315 | 130316 | 130317 | 130318 | 130319 | 130320 | 130321 | 130322 | 130323 | 130324 | 130325 | 130326 | 130327 | 130328 | 130329 | 130330 | 130331 | 130332 | 130456 | 132703 | 132704 | 132705 | 132706 | 132707 | 132708 | 132709 | 132710 | 132711 | 132712 | 132713 | 132714 | 132715 | 132716 | 132717 | 132718 | 132719 | 132720 | 132721 | 132722 | 132723 | 135019 | 135020 | 135021 | 135022 | 135023 | 135024 | 135025 | 135026 | 135027 | 135028 | 135029 | 135030 | 135031 | 135032 | 135033 | 135034 | 135035 | 135036 | 135037 | 136226 | 136227 | 136228 | 136229 | 136230 | 136231 | 136232 | 136233 | 136234 | 136235 | 136236 | 136237 | 136238 | 136239 | 136240 | 136241 | 136242 | 136243 | 136244 | 136249 | 136253 | 136254 | 136264 | 136265 | 136266 | 136267 | 136268 | 136269 | 136270 | 136271 | 136272 | 136273 | 136274 | 136275 | 136276 | 136277 | 136278 | 136279 | 136280 | 136281 | 136282 | 136283 | 136284 | 136285 | 136287 | 136340 | 136341 | 136342 | 136343 | 136344 | 136345 | 136346 | 136347 | 136348 | 136349 | 136350 | 136351 | 136352 | 136353 | 136354 | 136355 | 136356 | 136357 | 136358 | 136359 | 136360 | 136361 | 136362 | 136363 | 136364 | 136365 | 136366 | 136367 | 136368 | 136369 | 136370 | 136371 | 136498 | 136529 | 136530 | 136613 | 136614 | 136615 | 136616 | 136617 | 136618 | 136619 | 136620 | 136621 | 136622 | 136623 | 136624 | 136625 | 136626 | 136627 | 136628 | 136629 | 136630 | 136631 | 136632 | 136633 | 136634 | 136635 | 136636 | 136637 | 136638 | 136639 | 136640 | 136641 | 136642 | 136643 | 136644 | 136645 | 136646 | 136647 | 136648 | 136649 | 136650 | 136651 | 136652 | 136654 | 136655 | 136806 | 136809 | 136811 | 136814 | 136817 | 136821 | 136824 | 136826 | 136829 | 136832 | 136835 | 136838 | 136841 | 136843 | 136846 | 136849 | 136850 | 136851 | 136852 | 136853 | 136854 | 136855 | 136856 | 136857 | 136858 | 136859 | 136860 | 136861 | 136862 | 136863 | 136864 | 136865 | 136866 | 136867 | 136868 | 136869 | 136870 | 136871 | 136872 | 136873 | 136874 | 136875 | 136876 | 136877 | 136905 | 136906 | 136907 | 136908 | 136909 | 136910 | 136911 | 136912 | 136913 | 136914 | 136915 | 136916 | 136917 | 136918 | 136919 | 136920 | 136921 | 136922 | 136923 | 136924 | 136925 | 136926 | 136927 | 136928 | 136929 | 136930 | 136931 | 136932 | 136933 | 136934 | 136935 | 136936 | 136937 | 136938 | 136939 | 136940 | 136941 | 136942 | 136943 | 136944 | 136945 | 136946 | 136947 | 136949 | 136978 | 136979 | 136980 | 136981 | 136982 | 136985 | 136988 | 136989 | 136990 | 136991 | 136992 | 136993 | 136994 | 136995 | 136996 | 136997 | 136998 | 136999 | 137000 | 137001 | 137002 | 137003 | 137004 | 137005 | 137006 | 137007 | 137008 | 137009 | 137010 | 137011 | 137012 | 137013 | 137014 | 137015 | 137016 | 137017 | 137018 | 137019 | 137020 | 137021 | 137022 | 137461 | 137462 | 137463 | 137464 | 137465 | 137466 | 137467 | 137468 | 137469 | 137470 | 137471 | 137472 | 137473 | 137474 | 137475 | 137476 | 137477 | 137478 | 137479 | 137480 | 137481 | 137482 | 137483 | 137484 | 137485 | 137486 | 137487 | 137488 | 137489 | 137490 | 137491 | 137492 | 137493 | 137494 | 137495 | 137496 | 137497 | 137498 | 137499 | 137500 | 137501 | 137503 | 137506 | 137524 | 137525 | 137527 | 137528 | 137529 | 137530 | 137531 | 137532 | 137533 | 137534 | 137535 | 137536 | 137537 | 137538 | 137540 | 137541 | 137542 | 137543 | 137544 | 137545 | 137546 | 137547 | 137548 | 137549 | 137550 | 137551 | 137552 | 137553 | 137554 | 137555 | 137556 | 137557 | 137558 | 137559 | 137560 | 137561 | 137562 | 137563 | 137564 | 137565 | 137566 | 137567 | 137568 | 137569 | 137570 | 137571 | 137684 | 137685 | 139347