The holds table should show the waiting date for a hold in s similar manner to the way it does on catalogue/detail.pl
Created attachment 34958 [details] [review] Bug 13517 - Tidy request.pl
Created attachment 34959 [details] [review] Bug 13517 - Show waiting date on reserve/request.pl The holds table should show the waiting date for a hold in s similar manner to the way it does on catalogue/detail.pl Test Plan: 1) Apply this patch 2) Find a waiting hold 3) Browse to reserve/request.pl for that record 4) Notice the "Item waiting" message now has "since <waitingdate>"
Created attachment 35454 [details] [review] Bug 13517 - Show waiting date on reserve/request.pl The holds table should show the waiting date for a hold in s similar manner to the way it does on catalogue/detail.pl Test Plan: 1) Apply this patch 2) Find a waiting hold 3) Browse to reserve/request.pl for that record 4) Notice the "Item waiting" message now has "since <waitingdate>" Signed-off-by: Aleisha <aleishaamohia@hotmail.com>
(In reply to Kyle M Hall from comment #1) > Created attachment 34958 [details] [review] [review] > Bug 13517 - Tidy request.pl This is not needed, it will introduce conflict with other patches in the queue. Why did you tidy this file?
Created attachment 35834 [details] [review] Bug 13517 - Show waiting date on reserve/request.pl The holds table should show the waiting date for a hold in s similar manner to the way it does on catalogue/detail.pl Test Plan: 1) Apply this patch 2) Find a waiting hold 3) Browse to reserve/request.pl for that record 4) Notice the "Item waiting" message now has "since <waitingdate>" Signed-off-by: Aleisha <aleishaamohia@hotmail.com>
Comment on attachment 35834 [details] [review] Bug 13517 - Show waiting date on reserve/request.pl Review of attachment 35834 [details] [review]: ----------------------------------------------------------------- ::: C4/Reserves.pm @@ +303,4 @@ > # Find the desired items in the reserves > my @params; > my $query = " > + SELECT * FROM reserves WHERE biblionumber = ? "; Please keep the field list.
Created attachment 35861 [details] [review] Bug 13517 - Show waiting date on reserve/request.pl The holds table should show the waiting date for a hold in s similar manner to the way it does on catalogue/detail.pl Test Plan: 1) Apply this patch 2) Find a waiting hold 3) Browse to reserve/request.pl for that record 4) Notice the "Item waiting" message now has "since <waitingdate>" Signed-off-by: Aleisha <aleishaamohia@hotmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Created attachment 35862 [details] [review] Bug 13517: Reintroduce the field list It is preferable to list the fields we retrieve from the DB. Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Created attachment 35863 [details] [review] Bug 13517: Add a regression test Be sure GetReservesFromBiblionumber will return the waitingdate value. Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Created attachment 36983 [details] [review] Bug 13517 - Show waiting date on reserve/request.pl The holds table should show the waiting date for a hold in s similar manner to the way it does on catalogue/detail.pl In addition, if the ReservesMaxPickUpDelay syspref is set, we should display the date when the waiting hold expires. Test Plan: 1) Apply this patch 2) Set ReservesMaxPickUpDelay to 7 3) Find a waiting hold 4) Browse to reserve/request.pl for that record 5) Notice the "Item waiting" message now has "since <waitingdate>" 6) Notice the expiration field now has the date of <waitingdate> + 7 days
Created attachment 36986 [details] [review] Bug 13517 - Show waiting date on reserve/request.pl The holds table should show the waiting date for a hold in s similar manner to the way it does on catalogue/detail.pl In addition, if the ReservesMaxPickUpDelay syspref is set, we should display the date when the waiting hold expires. Test Plan: 1) Apply this patch 2) Set ReservesMaxPickUpDelay to 7 3) Find a waiting hold 4) Browse to reserve/request.pl for that record 5) Notice the "Item waiting" message now has "since <waitingdate>" 6) Notice the expiration field now has the date of <waitingdate> + 7 days
Created attachment 40025 [details] [review] Bug 13517 - Show waiting date on reserve/request.pl The holds table should show the waiting date for a hold in s similar manner to the way it does on catalogue/detail.pl In addition, if the ReservesMaxPickUpDelay syspref is set, we should display the date when the waiting hold expires. Test Plan: 1) Apply this patch 2) Set ReservesMaxPickUpDelay to 7 3) Find a waiting hold 4) Browse to reserve/request.pl for that record 5) Notice the "Item waiting" message now has "since <waitingdate>" 6) Notice the expiration field now has the date of <waitingdate> + 7 days
Created attachment 40032 [details] [review] Bug 13517 - Show waiting date on reserve/request.pl The holds table should show the waiting date for a hold in s similar manner to the way it does on catalogue/detail.pl In addition, if the ReservesMaxPickUpDelay syspref is set, we should display the date when the waiting hold expires. Test Plan: 1) Apply this patch 2) Set ReservesMaxPickUpDelay to 7 3) Find a waiting hold 4) Browse to reserve/request.pl for that record 5) Notice the "Item waiting" message now has "since <waitingdate>" 6) Notice the expiration field now has the date of <waitingdate> + 7 days
Created attachment 40036 [details] [review] [SIGNED-OFF] Bug 13517 - Show waiting date on reserve/request.pl The holds table should show the waiting date for a hold in s similar manner to the way it does on catalogue/detail.pl In addition, if the ReservesMaxPickUpDelay syspref is set, we should display the date when the waiting hold expires. Test Plan: 1) Apply this patch 2) Set ReservesMaxPickUpDelay to 7 3) Find a waiting hold 4) Browse to reserve/request.pl for that record 5) Notice the "Item waiting" message now has "since <waitingdate>" 6) Notice the expiration field now has the date of <waitingdate> + 7 days Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Cathi Wiggins <CWIGGINS@ci.arcadia.ca.us> Signed-off-by: Megan Wianecki <mwianecki@mplmain.mtpl.org>
Blocked by bug 13853.
Created attachment 40676 [details] [review] Bug 13517 - Show waiting date on reserve/request.pl The holds table should show the waiting date for a hold in s similar manner to the way it does on catalogue/detail.pl In addition, if the ReservesMaxPickUpDelay syspref is set, we should display the date when the waiting hold expires. Test Plan: 1) Apply this patch 2) Set ReservesMaxPickUpDelay to 7 3) Find a waiting hold 4) Browse to reserve/request.pl for that record 5) Notice the "Item waiting" message now has "since <waitingdate>" 6) Notice the expiration field now has the date of <waitingdate> + 7 days Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Cathi Wiggins <CWIGGINS@ci.arcadia.ca.us> Signed-off-by: Megan Wianecki <mwianecki@mplmain.mtpl.org>
Created attachment 40677 [details] [review] Bug 13517 [QA Followup] - Add unit tests
Comment on attachment 40677 [details] [review] Bug 13517 [QA Followup] - Add unit tests Review of attachment 40677 [details] [review]: ----------------------------------------------------------------- Please amend the last patch. ::: t/db_dependent/Hold.t @@ +48,5 @@ > is( $dt, undef, "Koha::Hold->waiting_expires_on returns undef if ReservesMaxPickUpDelay is not set"); > > is( $hold->is_waiting, 1, 'The hold is waiting' ); > +is( $hold->is_found, 1, 'The hold is found'); > +isnt( $hold->is_in_transit, 'The hold is not in transit' ); This is wrong. @@ +66,5 @@ > $dt = $hold->waiting_expires_on(); > is( $dt, undef, "Koha::Hold->waiting_expires_on returns undef if found is not 'W' ( Set to empty string )"); > isnt( $hold->is_waiting, 1, 'The hold is not waiting (W)' ); > +is( $hold->is_found, 0, 'The hold is not found' ); > +isnt( $hold->is_in_transit, 'The hold is not in transit' ); Same here.
Created attachment 40892 [details] [review] Bug 13517 [QA Followup] - Fix unit tests
Created attachment 40893 [details] [review] Bug 13517 [QA Followup] - Fix unit tests
So... I was passing qa on this one (I promise!) and, during my last test, I have found a waiting reserve in my DB without itemnumber (??) Which makes the script explodes: Can't call method "holdingbranch" on an undefined value at /home/koha/src/reserve/request.pl line 488. It's an old data and a DB I used to test, so maybe this case is impossible to reach reserve_id: 2051 borrowernumber: 7781 reservedate: 2011-08-19 biblionumber: 4934 constrainttype: a branchcode: MAURES notificationdate: NULL reminderdate: NULL cancellationdate: NULL reservenotes: priority: 0 found: W timestamp: 2015-04-28 16:41:22 itemnumber: NULL waitingdate: 2015-04-28 expirationdate: NULL lowestPriority: 0 suspend: 0 suspend_until: NULL Sorry I don't remember what I did on April 28th :) I don't really know what to do, we could let the code as it, and see if someone report the issue. Or add an existing test on the item. What do you prefer?
Created attachment 40898 [details] [review] Bug 13517 - Show waiting date on reserve/request.pl The holds table should show the waiting date for a hold in s similar manner to the way it does on catalogue/detail.pl In addition, if the ReservesMaxPickUpDelay syspref is set, we should display the date when the waiting hold expires. Test Plan: 1) Apply this patch 2) Set ReservesMaxPickUpDelay to 7 3) Find a waiting hold 4) Browse to reserve/request.pl for that record 5) Notice the "Item waiting" message now has "since <waitingdate>" 6) Notice the expiration field now has the date of <waitingdate> + 7 days Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Cathi Wiggins <CWIGGINS@ci.arcadia.ca.us> Signed-off-by: Megan Wianecki <mwianecki@mplmain.mtpl.org> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Created attachment 40899 [details] [review] Bug 13517 [QA Followup] - Add unit tests Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Created attachment 40900 [details] [review] Bug 13517 [QA Followup] - Fix unit tests Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(In reply to Jonathan Druart from comment #21) Ok, let's consider it comes from my DB. I think it's better to know if a bug exists somewhere else, instead of adding useless tests in this (already messy) script. But, dear RM, don't push it just before the release :)
Created attachment 42604 [details] [review] Bug 13517 - Show waiting date on reserve/request.pl The holds table should show the waiting date for a hold in s similar manner to the way it does on catalogue/detail.pl In addition, if the ReservesMaxPickUpDelay syspref is set, we should display the date when the waiting hold expires. Test Plan: 1) Apply this patch 2) Set ReservesMaxPickUpDelay to 7 3) Find a waiting hold 4) Browse to reserve/request.pl for that record 5) Notice the "Item waiting" message now has "since <waitingdate>" 6) Notice the expiration field now has the date of <waitingdate> + 7 days Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Cathi Wiggins <CWIGGINS@ci.arcadia.ca.us> Signed-off-by: Megan Wianecki <mwianecki@mplmain.mtpl.org> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Created attachment 42605 [details] [review] Bug 13517 [QA Followup] - Add unit tests Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Created attachment 42606 [details] [review] Bug 13517 [QA Followup] - Fix unit tests Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
To test bug 13918 I need to apply this patch set before but it does not apply anymore.
Created attachment 43066 [details] [review] Bug 13517 - Show waiting date on reserve/request.pl The holds table should show the waiting date for a hold in s similar manner to the way it does on catalogue/detail.pl In addition, if the ReservesMaxPickUpDelay syspref is set, we should display the date when the waiting hold expires. Test Plan: 1) Apply this patch 2) Set ReservesMaxPickUpDelay to 7 3) Find a waiting hold 4) Browse to reserve/request.pl for that record 5) Notice the "Item waiting" message now has "since <waitingdate>" 6) Notice the expiration field now has the date of <waitingdate> + 7 days Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Cathi Wiggins <CWIGGINS@ci.arcadia.ca.us> Signed-off-by: Megan Wianecki <mwianecki@mplmain.mtpl.org> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Created attachment 43067 [details] [review] Bug 13517 [QA Followup] - Add unit tests Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Created attachment 43068 [details] [review] Bug 13517 [QA Followup] - Fix unit tests Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Pushed to master. Thanks for your contribution!