[Bug 11578] New: Improvement of the funds list view
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Bug ID: 11578 Summary: Improvement of the funds list view Change sponsored?: --- Product: Koha Version: master Hardware: All OS: All Status: NEW Severity: enhancement Priority: P5 - low Component: Acquisitions Assignee: koha-bugs@lists.koha-community.org Reporter: jonathan.druart@biblibre.com QA Contact: testopia@bugs.koha-community.org The funds list is not ergonomic and should be improved. -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Assignee|koha-bugs@lists.koha-commun |jonathan.druart@biblibre.co |ity.org |m -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 --- Comment #1 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 24505 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24505&action=edit Bug 11578: Upgrade the treetable jquery plugin This patch upgrade the treetable jquery plugin to the last version (3.1.0). It is only used on the funds list view. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 --- Comment #2 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 24506 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24506&action=edit Bug 11578: Improve the funds list view The current funds list view does not allow to search in the table and the ergonomics of the page is quite bad. This patch add the datatables plugin combined to the treetable plugin in order to offer a better view of the budgets/funds. Test plan: - Verify there is no regression on this page: try to add/modify/delete a fund and a budget. - Verify the funds hierarchie is correctly displayed. - Filter the funds using the branch and the budget filters. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 --- Comment #3 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 24507 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24507&action=edit Bug 11578: Add some css -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 --- Comment #4 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 24508 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24508&action=edit Funds list view -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Nicole C. Engard <nengard@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |nengard@gmail.com --- Comment #5 from Nicole C. Engard <nengard@gmail.com> --- Created attachment 25175 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=25175&action=edit screenshot after applying all patches I like the idea but there are a few issues. First the inactive Budgets are showing. Next I have only 1 2011 budget but for some reason it shows 2 times... also I don't see the budget headings as clear dividers. They kind of blend in by having the white background. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Nicole C. Engard <nengard@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 --- Comment #6 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to Nicole C. Engard from comment #5)
I like the idea but there are a few issues. First the inactive Budgets are showing. Next I have only 1 2011 budget but for some reason it shows 2 times... also I don't see the budget headings as clear dividers. They kind of blend in by having the white background.
I cannot reproduce your issues. Are you sure you clean your cache before testing? I asked Julian to test and he didn't reproduce neither. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 --- Comment #7 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 25245 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=25245&action=edit Bug 11578: Hide inactive budgets by default This patch hides inactive budgets by default. They can be shown/hidden using 2 new links "Hide/Show inactive budgets". -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 --- Comment #8 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 25246 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=25246&action=edit Bug 11578: Align budget names -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 --- Comment #9 from Owen Leonard <oleonard@myacpl.org> --- (In reply to Nicole C. Engard from comment #5)
also I don't see the budget headings as clear dividers. They kind of blend in by having the white background.
This is because of cached CSS. Shift-reload to get the correct view. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |11763 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 jmbroust <jean-manuel.broust@univ-lyon2.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |jean-manuel.broust@univ-lyo | |n2.fr --- Comment #10 from jmbroust <jean-manuel.broust@univ-lyon2.fr> --- <h1>Something went wrong !</h1>Applying: Bug 11578: Upgrade the treetable jquery plugin Applying: Bug 11578: Improve the funds list view Using index info to reconstruct a base tree... <stdin>:476: trailing whitespace. [% ELSIF ( budget.remaining_neg ) %] warning: 1 line adds whitespace errors. Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt Failed to merge in the changes. Patch failed at 0001 Bug 11578: Improve the funds list view 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. Bug 11578 - Improvement of the funds list view 24505 - Bug 11578: Upgrade the treetable jquery plugin 24506 - Bug 11578: Improve the funds list view 24507 - Bug 11578: Add some css 25245 - Bug 11578: Hide inactive budgets by default 25246 - Bug 11578: Align budget names -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #24505|0 |1 is obsolete| | Attachment #24506|0 |1 is obsolete| | Attachment #24507|0 |1 is obsolete| | Attachment #25245|0 |1 is obsolete| | Attachment #25246|0 |1 is obsolete| | --- Comment #11 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 26243 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=26243&action=edit Bug 11578: Upgrade the treetable jquery plugin This patch upgrade the treetable jquery plugin to the last version (3.1.0). It is only used on the funds list view. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 --- Comment #12 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 26244 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=26244&action=edit Bug 11578: Improve the funds list view The current funds list view does not allow to search in the table and the ergonomics of the page is quite bad. This patch add the datatables plugin combined to the treetable plugin in order to offer a better view of the budgets/funds. Test plan: - Verify there is no regression on this page: try to add/modify/delete a fund and a budget. - Verify the funds hierarchie is correctly displayed. - Filter the funds using the branch and the budget filters. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 --- Comment #13 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 26245 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=26245&action=edit Bug 11578: Add some css -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 --- Comment #14 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 26246 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=26246&action=edit Bug 11578: Hide inactive budgets by default This patch hides inactive budgets by default. They can be shown/hidden using 2 new links "Hide/Show inactive budgets". -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 --- Comment #15 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 26247 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=26247&action=edit Bug 11578: Align budget names -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Rafal Kopaczka <rkopaczka@afm.edu.pl> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |rkopaczka@afm.edu.pl -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Joel Sasse <jsasse@plumcreeklibrary.net> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |jsasse@plumcreeklibrary.net -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 M. de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |m.de.rooy@rijksmuseum.nl --- Comment #16 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- If this gets signed off, please remove the title marker from 11763. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA CC| |kyle@bywatersolutions.com --- Comment #17 from Kyle M Hall <kyle@bywatersolutions.com> --- Not sure what's going on, but I can see my 5 funds in master, but not with this patch. The datatable shows this: No entries to show (filtered from 5 total entries) -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 --- Comment #18 from Jonathan Druart <jonathan.druart@biblibre.com> --- Kyle, Thanks for testing. With this patch, inactive funds are hidden by default. Which does not make sense if a budget is chosen. I will provide a followup. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 --- Comment #19 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 27404 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=27404&action=edit Bug 11578: Hide filters if a budget (budgetperiod) is chosen If a budget_period_id is given, the filters should not be displayed. Moreover, it does not make sense to display the links for displaying/hiding inactive budgets in this case. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |katrin.fischer@bsz-bw.de --- Comment #20 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- I am sorry, but there are a lot of conflicts in aqbudgets.tt: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 11578: Upgrade the treetable jquery plugin Applying: Bug 11578: Improve the funds list view /home/katrin/kohaclone/.git/rebase-apply/patch:465: trailing whitespace. [% ELSIF ( budget.remaining_neg ) %] warning: 1 line adds whitespace errors. Using index info to reconstruct a base tree... M C4/Budgets.pm M admin/aqbudgets.pl M koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt <stdin>:465: trailing whitespace. [% ELSIF ( budget.remaining_neg ) %] warning: 1 line applied after fixing whitespace errors. Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt Auto-merging admin/aqbudgets.pl Auto-merging C4/Budgets.pm Failed to merge in the changes. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Signed Off -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #26244|0 |1 is obsolete| | --- Comment #21 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 27706 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=27706&action=edit Bug 11578: Improve the funds list view The current funds list view does not allow to search in the table and the ergonomics of the page is quite bad. This patch add the datatables plugin combined to the treetable plugin in order to offer a better view of the budgets/funds. Test plan: - Verify there is no regression on this page: try to add/modify/delete a fund and a budget. - Verify the funds hierarchie is correctly displayed. - Filter the funds using the branch and the budget filters. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #26245|0 |1 is obsolete| | --- Comment #22 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 27707 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=27707&action=edit Bug 11578: Add some css -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #26246|0 |1 is obsolete| | --- Comment #23 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 27708 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=27708&action=edit Bug 11578: Hide inactive budgets by default This patch hides inactive budgets by default. They can be shown/hidden using 2 new links "Hide/Show inactive budgets". -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #26247|0 |1 is obsolete| | --- Comment #24 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 27709 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=27709&action=edit Bug 11578: Align budget names -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #27404|0 |1 is obsolete| | --- Comment #25 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 27710 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=27710&action=edit Bug 11578: Hide filters if a budget (budgetperiod) is chosen If a budget_period_id is given, the filters should not be displayed. Moreover, it does not make sense to display the links for displaying/hiding inactive budgets in this case. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 --- Comment #26 from Jonathan Druart <jonathan.druart@biblibre.com> --- Last patches fix conflict with bug 7308. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA CC| |martin.renvoize@ptfs-europe | |.com --- Comment #27 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Sorry Jonathan, this is failing the QA script: FAIL koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt OK forbidden patterns FAIL tt_valid lines 310 OK valid_template -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Signed Off -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 --- Comment #28 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 27736 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=27736&action=edit Bug 11578: QA follow-up This patch removes the error raised by tt_valid FAIL koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt FAIL tt_valid lines 310 Actually, it fails because translate script does not match strings in attribute value. In this case, we don't want to translate. This fix is not necessary. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 --- Comment #29 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- I have started reviewing this, just a first note: 1) Add new library to about page + * jQuery treetable Plugin 3.1.0 + * http://ludo.cubicphuse.nl/jquery-treetable -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #27736|0 |1 is obsolete| | --- Comment #30 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 27754 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=27754&action=edit Bug 11578: QA follow-up This patch removes the error raised by tt_valid FAIL koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt FAIL tt_valid lines 310 Actually, it fails because translate script does not match strings in attribute value. In this case, we don't want to translate. This fix is not necessary. This patch also adds the licence for the new jQuery treetable plugin. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #27754|0 |1 is obsolete| | --- Comment #31 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 27755 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=27755&action=edit Bug 11578: QA follow-up This patch removes the error raised by tt_valid FAIL koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt FAIL tt_valid lines 310 Actually, it fails because translate script does not match strings in attribute value. In this case, we don't want to translate. This fix is not necessary. This patch also adds the licence for the new jQuery treetable plugin. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #26243|0 |1 is obsolete| | --- Comment #32 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 27763 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=27763&action=edit [PASSED QA] Bug 11578: Upgrade the treetable jquery plugin This patch upgrade the treetable jquery plugin to the last version (3.1.0). It is only used on the funds list view. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #27706|0 |1 is obsolete| | --- Comment #33 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 27764 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=27764&action=edit [PASSED QA] Bug 11578: Improve the funds list view The current funds list view does not allow to search in the table and the ergonomics of the page is quite bad. This patch add the datatables plugin combined to the treetable plugin in order to offer a better view of the budgets/funds. Test plan: - Verify there is no regression on this page: try to add/modify/delete a fund and a budget. - Verify the funds hierarchie is correctly displayed. - Filter the funds using the branch and the budget filters. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #27707|0 |1 is obsolete| | --- Comment #34 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 27765 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=27765&action=edit [PASSED QA] Bug 11578: Add some css Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #27708|0 |1 is obsolete| | --- Comment #35 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 27766 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=27766&action=edit [PASSED QA] Bug 11578: Hide inactive budgets by default This patch hides inactive budgets by default. They can be shown/hidden using 2 new links "Hide/Show inactive budgets". Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #27709|0 |1 is obsolete| | --- Comment #36 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 27767 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=27767&action=edit [PASSED QA] Bug 11578: Align budget names Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #27710|0 |1 is obsolete| | --- Comment #37 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 27768 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=27768&action=edit [PASSED QA] Bug 11578: Hide filters if a budget (budgetperiod) is chosen If a budget_period_id is given, the filters should not be displayed. Moreover, it does not make sense to display the links for displaying/hiding inactive budgets in this case. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #27755|0 |1 is obsolete| | --- Comment #38 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 27769 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=27769&action=edit [PASSED QA] Bug 11578: QA follow-up This patch removes the error raised by tt_valid FAIL koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt FAIL tt_valid lines 310 Actually, it fails because translate script does not match strings in attribute value. In this case, we don't want to translate. This fix is not necessary. This patch also adds the licence for the new jQuery treetable plugin. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA --- Comment #39 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- I'm happy with this patch series now. We're passing the qa script and all tests. It's a valuable enhancement to the ergonomics of the page. Note for RM, the QA follow-up adds the library to the about page, curretly the patch claims MIT licence for the libraries, but it's available as either MIT or GPLv2. I'm no license guru, so thought I'de leave any thoughts on which we should claim to you ;) -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Galen Charlton <gmcharlt@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Keywords| |rel_3_16_candidate -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 --- Comment #40 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 27813 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=27813&action=edit Bug 11578: FIX show inactive link Before this patch, the inactive funds were displayed by default. The active funds should be displayed by default. Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 --- Comment #41 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 27814 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=27814&action=edit Bug 11578: FIX funds grouping The datatables sort options were wrong. The funds for a budget could be ungrouped. To reproduce: - Create 3 budgets A, B, C. - Create 1 or more funds for A, B, C - Mark B and C as inactive. - Create another fund for A - Go on the fund list view, click on "show inactive funds" => The last fund is not grouped without other funds of budget A. Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 --- Comment #42 from Jonathan Druart <jonathan.druart@biblibre.com> --- I found 2 new (small but annoying) bugs. I fixed them in 2 last patches. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #27814|0 |1 is obsolete| | --- Comment #43 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 27815 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=27815&action=edit Bug 11578: FIX funds grouping The datatables sort options were wrong. The funds for a budget could be ungrouped. To reproduce: - Create 3 budgets A, B, C. - Create 1 or more funds for A, B, C - Mark B and C as inactive. - Create another fund for A - Go on the fund list view, click on "show inactive funds" => The last fund is not grouped without other funds of budget A. Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 --- Comment #44 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 27816 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=27816&action=edit Bug 11578: FIX budgets grouping If 2 budgets (budget periods) have the same description, the funds will be grouped into the same "block". This patch adds a distinction adding the id of the budget next to the description. Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Galen Charlton <gmcharlt@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to Master CC| |gmcharlt@gmail.com --- Comment #45 from Galen Charlton <gmcharlt@gmail.com> --- Pushed to master. Thanks, Jonathan! -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |12196 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |12955 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |http://bugs.koha-community. | |org/bugzilla3/show_bug.cgi? | |id=12984 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 --- Comment #46 from Jonathan Druart <jonathan.druart@biblibre.com> --- *** Bug 9492 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Mason James <mtj@kohaaloha.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to Master |Pushed to Stable CC| |mtj@kohaaloha.com Keywords|rel_3_16_candidate | -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 Marjorie Barry-Vila <marjorie.barry-vila@ccsr.qc.ca> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |marjorie.barry-vila@ccsr.qc | |.ca --- Comment #47 from Marjorie Barry-Vila <marjorie.barry-vila@ccsr.qc.ca> --- (In reply to Jonathan Druart from comment #44)
Created attachment 27816 [details] [review] Bug 11578: FIX budgets grouping
If 2 budgets (budget periods) have the same description, the funds will be grouped into the same "block". This patch adds a distinction adding the id of the budget next to the description.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Hi, I have a question about this patch: why column sorting was abandoned? Regards, Marjorie -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 --- Comment #48 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Hi Marjorie, I am not sure, it might have been by accident or because of the new grouping by budget, that makes sorting correctly too hard. If you look at the page with several active budgets you can see what I mean. Could you open a separate bug report please? -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 --- Comment #49 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to Marjorie Barry-Vila from comment #47)
Hi, I have a question about this patch: why column sorting was abandoned?
It is expected, the sort option would be quite difficult to implement on this new view I think. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11578 --- Comment #50 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to Jonathan Druart from comment #49)
(In reply to Marjorie Barry-Vila from comment #47)
Hi, I have a question about this patch: why column sorting was abandoned?
It is expected, the sort option would be quite difficult to implement on this new view I think.
... But not impossible ;) -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org