Bugzilla – Attachment 87418 Details for
Bug 19630
"Hold is suspended" message appears in barcode field in holds table
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 19630: Added Status column to Patron Holds table
Bug-19630-Added-Status-column-to-Patron-Holds-tabl.patch (text/plain), 7.53 KB, created by
Michal Denar
on 2019-04-04 14:44:54 UTC
(
hide
)
Description:
Bug 19630: Added Status column to Patron Holds table
Filename:
MIME Type:
Creator:
Michal Denar
Created:
2019-04-04 14:44:54 UTC
Size:
7.53 KB
patch
obsolete
>From a39ec194f505bae1c34de36223853f24907d69e4 Mon Sep 17 00:00:00 2001 >From: Hayley Mapley <hayleymapley@catalyst.net.nz> >Date: Thu, 14 Mar 2019 21:37:36 +0000 >Subject: [PATCH] Bug 19630: Added Status column to Patron Holds table > >When a hold has been suspended or is waiting, the status >message appears in the Barcode column of the Holds table. This patch >fixes this by adding a separate Status column which details the status >of the Hold, whether it has been suspended, or is in transit, etc. > >Test plan: >1) Place an item level hold and a 'Next Available' record level hold for >a patron. >2) View the holds in Patrons->Patron details for that Patron in the Check out and Details tabs >3) Suspend one of the holds, and note that the status appears in the >barcode column >4) Set a hold to be waiting for pickup, and note the status appears in >the barcode column >5) Apply the patch >6) Check the same holds and note that the statuses now appear in the new >column called Status, and note that if a hold has status effect that the >row reads "Hold has been placed" >7) Verify that this is the case in both the Holds tables (in Check out > tab and Details tab) > >Sponsored-by: Catalyst IT >Signed-off-by: Jose-Mario Monteiro-Santos <jose-mario.monteiro-santos@inLibro.com> >Signed-off-by: Michal Denar <black23@gmail.com> >--- > .../prog/en/modules/circ/circulation.tt | 1 + > .../prog/en/modules/members/moremember.tt | 1 + > koha-tmpl/intranet-tmpl/prog/js/holds.js | 73 ++++++++++++---------- > 3 files changed, 43 insertions(+), 32 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >index 5490ea64f6..da0712d965 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -895,6 +895,7 @@ No patron matched <span class="ex">[% message | html %]</span> > <th>Priority</th> > <th>Cancel?</th> > <th>Suspend?</th> >+ <th>Status</th> > </tr> > </thead> > </table> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >index 91c3750cd3..d64be13549 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -764,6 +764,7 @@ > <th>Priority</th> > <th>Delete?</th> > <th>Suspend?</th> >+ <th>Status</th> > </tr> > </thead> > </table> >diff --git a/koha-tmpl/intranet-tmpl/prog/js/holds.js b/koha-tmpl/intranet-tmpl/prog/js/holds.js >index 0ca8fb8930..48d13fbce9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/holds.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/holds.js >@@ -53,37 +53,7 @@ $(document).ready(function() { > { > "mDataProp": function( oObj ) { > var data = ""; >- >- if ( oObj.suspend == 1 ) { >- data += "<p>" + HOLD_IS_SUSPENDED; >- if ( oObj.suspend_until ) { >- data += " " + UNTIL.format( oObj.suspend_until_formatted ); >- } >- data += "</p>"; >- } >- >- if ( oObj.itemtype_limit ) { >- data += NEXT_AVAILABLE_ITYPE.format( oObj.itemtype_limit ); >- } >- > if ( oObj.barcode ) { >- data += "<em>"; >- if ( oObj.found == "W" ) { >- >- if ( oObj.waiting_here ) { >- data += ITEM_IS_WAITING_HERE; >- } else { >- data += ITEM_IS_WAITING; >- data += " " + AT.format( oObj.waiting_at ); >- } >- >- } else if ( oObj.transferred ) { >- data += ITEM_IS_IN_TRANSIT.format( oObj.from_branch, oObj.date_sent ); >- } else if ( oObj.not_transferred ) { >- data += NOT_TRANSFERRED_YET.format( oObj.not_transferred_by ); >- } >- data += "</em>"; >- > data += " <a href='/cgi-bin/koha/catalogue/detail.pl?biblionumber=" > + oObj.biblionumber > + "&itemnumber=" >@@ -94,7 +64,6 @@ $(document).ready(function() { > + oObj.barcode.escapeHtml() > + "</a>"; > } >- > return data; > } > }, >@@ -159,7 +128,47 @@ $(document).ready(function() { > + "<i class='fa fa-pause'></i> " + SUSPEND + "</a>"; > } > } >- } >+ }, >+ { >+ "mDataProp": function( oObj ) { >+ var data = ""; >+ if ( oObj.suspend != 1 && !oObj.itemtype_limit) { >+ data = _("Hold has been placed\n"); >+ } >+ >+ if ( oObj.suspend == 1 ) { >+ data += "<p>" + HOLD_IS_SUSPENDED; >+ if ( oObj.suspend_until ) { >+ data += " " + UNTIL.format( oObj.suspend_until_formatted ); >+ } >+ data += "</p>"; >+ } >+ >+ if ( oObj.itemtype_limit ) { >+ data += NEXT_AVAILABLE_ITYPE.format( oObj.itemtype_limit ); >+ } >+ >+ if ( oObj.barcode ) { >+ data += "<em>"; >+ if ( oObj.found == "W" ) { >+ >+ if ( oObj.waiting_here ) { >+ data += ITEM_IS_WAITING_HERE; >+ } else { >+ data += ITEM_IS_WAITING; >+ data += " " + AT.format( oObj.waiting_at ); >+ } >+ >+ } else if ( oObj.transferred ) { >+ data += ITEM_IS_IN_TRANSIT.format( oObj.from_branch, oObj.date_sent ); >+ } else if ( oObj.not_transferred ) { >+ data += NOT_TRANSFERRED_YET.format( oObj.not_transferred_by ); >+ } >+ data += "</em>"; >+ } >+ return data; >+ } >+ } > ], > "bPaginate": false, > "bProcessing": true, >-- >2.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 19630
:
69169
|
86633
|
86687
|
87418
|
87485
|
87543
|
87544
|
87556
|
87557