+++ This bug was initially created as a clone of Bug #6968 +++ The Check Expiration page in Serials is now hardcoded (bug 15171) to always show all subscriptions that expire/expired before the date specified. We should have optionally enabled filtering out the historic expirations that have happened before today rather than removing that feature entirely.
Created attachment 91138 [details] [review] Bug 23243: Restore filtering out historic expired subscriptions The 'Check Expiration' page in Serials is now hardcoded to display all expired subscriptions before the entered date. This patch restores the ability to limit the results to just those expiring between 'today' and the date entered. Original code taken from bug 6968 autored by Maxime Pelletier, rebased by Charles Farmer and then moved to a new report and rebased again by Martin Renvoize. Test plan: 1) Without the patch any results after a search from this page will result in matches both before after todays date (but before the date you entered). 2) With the patch you should see a 'Show historic expirations' checkbox which will allow you to limit the results to just those that expire between the date you enter and today. Sponsored-by: CCSR Rescued-by: Charles Farmer <charles.farmer@inlibro.com> Rescued-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Patch reworked from bug 6968 and attached, ready for testing.
I am sorry, some issues with the QA script here: FAIL koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt OK filters OK forbidden patterns OK git manipulation OK js_in_body OK spelling FAIL tt_valid lines 50 OK valid_template FAIL serials/checkexpiration.pl OK critic OK forbidden patterns OK git manipulation OK pod OK spelling FAIL valid Global symbol "$expiration_dt" requires explicit package name (did you forget to declare "my $expiration_dt"?) serials/checkexpiration.pl had compilation errors.
Hmm, I just ran the QA scripts here and can't replicate the failures.. Will try to grab you on IRC later Katrin and see if we can replicate it together.
Created attachment 96215 [details] [review] Bug 23243: Adjust previous patch
*** Bug 12452 has been marked as a duplicate of this bug. ***
I can see the point of this change and agree with it, but wonder if it really makes things clearer to the end user: What is a historic expiration? (and how to translate that...) Wondering if usability wise this would be a better solution: Provide 2 date fields: Expired between (preset to today) And ____ Or maybe instead of 'history expirations' we should say: Include expirations before today. The date logic on the form is a bit hard to grasp in training in my experience. QA tools are clean now.
Hi Martin, could you please take a look at my last comment?
I'm OK with `Include expirations before today.` Seems like a simple change; I'm less sure about expanding it to two inputs, I think that adds more complexity to the patch than is really required here.
Created attachment 105491 [details] [review] Bug 23243: Restore filtering out historic expired subscriptions The 'Check Expiration' page in Serials is now hardcoded to display all expired subscriptions before the entered date. This patch restores the ability to limit the results to just those expiring between 'today' and the date entered. Original code taken from bug 6968 autored by Maxime Pelletier, rebased by Charles Farmer and then moved to a new report and rebased again by Martin Renvoize. Test plan: 1) Without the patch any results after a search from this page will result in matches both before after todays date (but before the date you entered). 2) With the patch you should see a 'Show historic expirations' checkbox which will allow you to limit the results to just those that expire between the date you enter and today. Sponsored-by: CCSR Rescued-by: Charles Farmer <charles.farmer@inlibro.com> Rescued-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Created attachment 105492 [details] [review] Bug 23243: Adjust previous patch Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Created attachment 105493 [details] [review] Bug 23243: (follow-up) Update wording as requested
Created attachment 119129 [details] [review] Bug 23243: Restore filtering out historic expired subscriptions The 'Check Expiration' page in Serials is now hardcoded to display all expired subscriptions before the entered date. This patch restores the ability to limit the results to just those expiring between 'today' and the date entered. Original code taken from bug 6968 autored by Maxime Pelletier, rebased by Charles Farmer and then moved to a new report and rebased again by Martin Renvoize. Test plan: 1) Without the patch any results after a search from this page will result in matches both before after todays date (but before the date you entered). 2) With the patch you should see a 'Show historic expirations' checkbox which will allow you to limit the results to just those that expire between the date you enter and today. Sponsored-by: CCSR Rescued-by: Charles Farmer <charles.farmer@inlibro.com> Rescued-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr>
Created attachment 119130 [details] [review] Bug 23243: Adjust previous patch Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr>
Created attachment 119131 [details] [review] Bug 23243: (follow-up) Update wording as requested Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr>
Created attachment 119826 [details] [review] Bug 23243: Restore filtering out historic expired subscriptions The 'Check Expiration' page in Serials is now hardcoded to display all expired subscriptions before the entered date. This patch restores the ability to limit the results to just those expiring between 'today' and the date entered. Original code taken from bug 6968 autored by Maxime Pelletier, rebased by Charles Farmer and then moved to a new report and rebased again by Martin Renvoize. Test plan: 1) Without the patch any results after a search from this page will result in matches both before after todays date (but before the date you entered). 2) With the patch you should see a 'Show historic expirations' checkbox which will allow you to limit the results to just those that expire between the date you enter and today. Sponsored-by: CCSR Rescued-by: Charles Farmer <charles.farmer@inlibro.com> Rescued-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Created attachment 119827 [details] [review] Bug 23243: Adjust previous patch Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Created attachment 119828 [details] [review] Bug 23243: (follow-up) Update wording as requested Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Pushed to master for 21.05, thanks to everybody involved!
Enhancement not pushed to 20.11.x