http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8133 Elliott Davis <elliott@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED CC| |elliott@bywatersolutions.co | |m Assignee|kyle.m.hall@gmail.com |elliott@bywatersolutions.co | |m -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8133 Elliott Davis <elliott@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |8528 -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8133 Elliott Davis <elliott@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |8528 -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8133 Jesse Weaver <jweaver@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |jweaver@bywatersolutions.co | |m Assignee|elliott@bywatersolutions.co |jweaver@bywatersolutions.co |m |m -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8133 Jesse Weaver <jweaver@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |Needs Signoff Patch complexity|--- |Medium patch Change sponsored?|--- |Sponsored -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8133 --- Comment #4 from Jesse Weaver <jweaver@bywatersolutions.com> --- Created attachment 19494 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=19494&action=edit Followup to bug 8133 - fix JS escaping in data literals There was some unescaped data being put into JS literals, which could cause the calendar interface to fail to load. Note for testing: Template::Plugin::JavaScript must be installed, either from CPAN or libtemplate-plugin-javascript-perl. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8133 Liz Rea <liz@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #19326|0 |1 is obsolete| | Attachment #19494|0 |1 is obsolete| | --- Comment #5 from Liz Rea <liz@catalyst.net.nz> --- Created attachment 19740 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=19740&action=edit Followup to bug 8133 - fix JS escaping in data literals There was some unescaped data being put into JS literals, which could cause the calendar interface to fail to load. Note for testing: Template::Plugin::JavaScript must be installed, either from CPAN or libtemplate-plugin-javascript-perl. Signed-off-by: Liz Rea <liz@catalyst.net.nz> Interface seems to work, I don't note any regressions. I tested the following: Normal, non holiday circulation with no hours set - due dates seem correct and consistent. Holiday set for today, library opens at 9am, closes at 10:30am. Item checked out at 10am, due 10:30am - seems right! UseDaysMode was set to "calendar" Holiday set for today, library opens at 9am, closes at 10:30am. Item checked out at 10am, due tomorrow at 9:30 - seems right! UseDaysMode was set to "days" Interface looks nice, thanks! -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8133 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |katrin.fischer@bsz-bw.de --- Comment #6 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Wow - this is huge! I am a bit worried about the test plan, although I see that Liz has gone beyond it already. I think it's not only the calendar interface we need to check here, but also due date calculation, overdue fine calculation (on checkin, using the cronjobs, etc.) I think getting some more eyes on this would be good. And also some documentation about the new feature and how it will impact circulation. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8133 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA CC| |jonathan.druart@biblibre.co | |m --- Comment #7 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to Katrin Fischer from comment #6)

Wow - this is huge!

Yes, it is. Jesse, do you think it is possible to divide this patch into smaller ones? Creating many iterations will help moving ahead this patch. This patch does not apply anymore, so I just look at the code. Here are some notes: 1/ Use qa-tools in order to flush out some wrong lines (e.g. Koha is under the GPLv3 license, not v2). 2/ my $hours = { %{ $self->get_hours( $dt ) } }; is not it the same as $self->get_hours( $dt ) ? 3/ IN DUPLICATE is a Mysqlism. 4/ in updatedb: use a transaction to avoid a lost of data. 5/ Please use "git mv" for renaming files (e.g. tools/holidays.tt and tools/calendar.tt). The changes in the git history will be easier to read. 6/ try to provide several small patches (if possible). 7/ provide a more detailed test plan Marked as Failed QA. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8133 marjorie barry-vila <marjorie.barry-vila@ccsr.qc.ca> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |marjorie.barry-vila@ccsr.qc | |.ca -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8133 --- Comment #9 from Jesse Weaver <jweaver@bywatersolutions.com> --- (In reply to Jonathan Druart from comment #7)

(In reply to Katrin Fischer from comment #6)

...

Wow - this is huge!

Yes, it is.

Jesse, do you think it is possible to divide this patch into smaller ones? Creating many iterations will help moving ahead this patch.

Yes, going to separate it into 2 bugs and 2 or 3 patches.

This patch does not apply anymore, so I just look at the code. Here are some notes: 1/ Use qa-tools in order to flush out some wrong lines (e.g. Koha is under the GPLv3 license, not v2).

Will do.

2/ my $hours = { %{ $self->get_hours( $dt ) } }; is not it the same as $self->get_hours( $dt ) ?

This is used to clone the hash in question.

3/ IN DUPLICATE is a Mysqlism. 4/ in updatedb: use a transaction to avoid a lost of data.

Good idea, changing this.

5/ Please use "git mv" for renaming files (e.g. tools/holidays.tt and tools/calendar.tt). The changes in the git history will be easier to read.

I did so, the changes afterwards were too much for git to keep track of. The separated patches should show the rename if the changes are less drastic.

6/ try to provide several small patches (if possible). 7/ provide a more detailed test plan

Will do so, but within reason. None of the circulation or overdues UI has been changed at all (except for a couple minor cronjobs), and testing them separately from the unit tests for Koha::Calendar accomplishes nothing. The only changes to C4::Circulation and C4::Overdues were to remove unused subs that depended on C4::Calendar (this can be verified with a quick grep).

Marked as Failed QA.

-- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8133 --- Comment #10 from Maxime Beaulieu <maxime.beaulieu@inlibro.com> --- Created attachment 29336 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=29336&action=edit Bug 8133 - New fix: hourly loans doesn't know when library closed Overdues now take into account opening and closing time. Fines will not be applied when the library is closed. A test script 't/Calendar1.t' is provided for preleminary testing. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8133 Marc Véron <veron@veron.ch> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |11055 -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8133 --- Comment #12 from Blou <philippe.blouin@inlibro.com> --- I can help there. I asked Maxime to provide an alternative solution to Jesse's. We've had this solution ready for over a year now, but put it aside with the objective to use the community's instead (at that point Jesse had started working on it) Our solution is not as ambitious as Jesse's, and does not offer the same amount of flexibility. But it's available. And it was required for use to push our "minute loans" patch (see #11055). I see that the old patches are still there, so this creates confusion. Maxime's patch is "standalone". This provides a calendar, and the overdue calculation function are modified to use the hours to determines the fines. In short. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8133 Francois Charbonnier <francois.charbonnier@inlibro.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |francois.charbonnier@inlibr | |o.com -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8133 Jesse Weaver <jweaver@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #19326|0 |1 is obsolete| | Attachment #19740|0 |1 is obsolete| | --- Comment #14 from Jesse Weaver <jweaver@bywatersolutions.com> --- Created attachment 31973 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=31973&action=edit Bug 8133 - hourly loans doesn't know when library closed This adds support for storing library hours in the calendar, and using those hours to compute hourly loan duetimes. A large amount of cleanup was also performed to expunge duplication of code between C4::Calendar and Koha::Calendar. Test plan: 1) Apply patch. 2) Update database. 3) Verify that the calendar administration interface still exists and works as expected. 4) Run t/Calendar.t and t/db_dependent/Calendar.t. (This version is truly based on bug 11211, and folds in Liz's followup.) -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8133 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Severity|enhancement |normal -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8133 Brendan Gallagher <brendan@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |brendan@bywatersolutions.co | |m --- Comment #17 from Brendan Gallagher <brendan@bywatersolutions.com> --- (In reply to Chris Cormack from comment #16)

Applying: Bug 8133 - hourly loans doesn't know when library closed fatal: sha1 information is lacking or useless (C4/Calendar.pm). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 8133 - hourly loans doesn't know when library closed

Chris - I think you need to make sure you apply 11211 first - because it applied cleanly for me after that. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8133 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #31973|0 |1 is obsolete| | --- Comment #18 from Chris Cormack <chris@bigballofwax.co.nz> --- Created attachment 32176 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=32176&action=edit Bug 8133 - hourly loans doesn't know when library closed This adds support for storing library hours in the calendar, and using those hours to compute hourly loan duetimes. A large amount of cleanup was also performed to expunge duplication of code between C4::Calendar and Koha::Calendar. Test plan: 1) Apply patch. 2) Update database. 3) Verify that the calendar administration interface still exists and works as expected. 4) Run t/Calendar.t and t/db_dependent/Calendar.t. Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8133 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA --- Comment #19 from Jonathan Druart <jonathan.druart@biblibre.com> --- Hi Jesse, Please use the qa script and fix the errors, most of them are trailing spaces and tab chars and license. One is about datatables, you must use the include file. I have one concern about the new dependency: the module has not been updated since 2010, maybe it could worth to write our own module (or retrieve the one on the CPAN). -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8133 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #32176|0 |1 is obsolete| | --- Comment #20 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 32327 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=32327&action=edit Bug 8133 [QA Followup] - Fix koha-qa.pl violations -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8133 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |BLOCKED --- Comment #21 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Currently blocked by bug 11211 not applying. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8133 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Severity|normal |new feature -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8133 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |BLOCKED --- Comment #24 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Blocked by 11211 being failed QA right now. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8133 --- Comment #26 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 32986 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=32986&action=edit Bug 8133 [QA Followup] - Fix koha-qa.pl violations -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8133 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #32990|0 |1 is obsolete| | --- Comment #28 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 32991 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=32991&action=edit Bug 8133 [QA Followup 2] - Fix unit tests -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8133 --- Comment #30 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- There is no documenation about the new options in the GUI and how this will change how things work. Please, provide a description how the calculations for hourly loans will be made. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8133 Viktor Sarge <viktor.sarge@regionhalland.se> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |http://bugs.koha-community. | |org/bugzilla3/show_bug.cgi? | |id=8822 -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8133 --- Comment #32 from Magnus Enger <magnus@enger.priv.no> --- I get an error when I try to apply the patches: $ git bz apply 8133 Bug 8133 - hourly loans doesn't know when library closed 32985 - Bug 8133 - hourly loans doesn't know when library closed 32986 - Bug 8133 [QA Followup] - Fix koha-qa.pl violations 32991 - Bug 8133 [QA Followup 2] - Fix unit tests Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 8133 - hourly loans doesn't know when library closed /home/vagrant/kohaclone/.git/rebase-apply/patch:62: trailing whitespace. }, { Slice => {} }, $branchcode ); /home/vagrant/kohaclone/.git/rebase-apply/patch:314: trailing whitespace. }, 'weekday', { Slice => {} }, $branch ); /home/vagrant/kohaclone/.git/rebase-apply/patch:399: trailing whitespace. if ( $self->{days_mode} eq 'Calendar' ) { /home/vagrant/kohaclone/.git/rebase-apply/patch:429: trailing whitespace. if ( $self->{days_mode} eq 'Calendar' ) { /home/vagrant/kohaclone/.git/rebase-apply/patch:595: trailing whitespace. warning: squelched 36 whitespace errors warning: 41 lines add whitespace errors. Using index info to reconstruct a base tree... <stdin>:62: trailing whitespace. }, { Slice => {} }, $branchcode ); <stdin>:314: trailing whitespace. }, 'weekday', { Slice => {} }, $branch ); <stdin>:399: trailing whitespace. if ( $self->{days_mode} eq 'Calendar' ) { <stdin>:429: trailing whitespace. if ( $self->{days_mode} eq 'Calendar' ) { <stdin>:595: trailing whitespace. warning: squelched 36 whitespace errors warning: 41 lines applied after fixing whitespace errors. Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/calendar.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc Auto-merging installer/data/mysql/updatedatabase.pl Auto-merging installer/data/mysql/kohastructure.sql Auto-merging C4/Circulation.pm Applying: Bug 8133 [QA Followup] - Fix koha-qa.pl violations fatal: sha1 information is lacking or useless (C4/Calendar.pm). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 8133 [QA Followup] - Fix koha-qa.pl violations When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-8133-QA-Followup---Fix-koha-qapl-violations-admQOe.patch But I did get some weirdness when running the tests from bug 11211 (see bug 11211 comment 26), so perhaps there is something about my setup that is borken. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8133 Marc Véron <veron@veron.ch> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |12450 -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8133 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |6796 -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8133 Marc Véron <veron@veron.ch> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |veron@veron.ch -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8133 Theodoros Theodoropoulos <theod@lib.auth.gr> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |theod@lib.auth.gr -- You are receiving this mail because: You are watching all bug changes.