Commit graph

45 commits

Author SHA1 Message Date
Galen Charlton
2e3c821564 Bug 10792: fix sorting of funds table on acquisitions home page
This patch introduces a DataTables sorting plugin, title-numeric,
for sorting cells based on a decimal number embedded in a span title
attribute.  This allows currency amounts to be formatted properly
for display without having to writing a sorting plugin that's
super-smart about removing the formatting, particularly for locales
that use a comma as the decimal mark.

The sorter plugin can be used like this:

- In the DataTables config:

"aoColumns": [
   { "sType": "title-numeric" },
]

- In the table data

<td><span title="[% decimal_number_that_JS_parseFloat_accepts %]">
    [% formatted currency %]
</span></td>

To test:

[1] Ensure that there is at least one active budget and at least
    one inactive one.
[2] Go to the acquisitions home page.  Note that changing the sort order
    on the amount, ordered, spent, or avail columns results in incorrect
    sorting that is either ASCII-betical or which ignores any component
    of large numbers that occur after the thousands separator.
[3] Apply the patch.
[4] Verify that the sorting now works correctly and that no JavaScript
    errors appear in the JS debug console of your choice.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Sorting now works correctly, for active and inactive funds.
Passes all tests and QA script.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-09-16 15:30:33 +00:00
ed8e506953 Bug 9744 - Add a column Fund name on the home page of acquisitions
This patch offers an alternative option to fix Bug 9744. In this version
the table of funds swaps positions with the suggestions block so that
the table has the whole width of the screen. This eliminates the need to
adjust its float property.

Other changes:

- Simplification of the column and row-hiding JavaScript
- The addition of an "Active" column to be shown when all funds
  are shown (this helps indicate to the user which rows were hidden)
- Linking the fund owner to their patron record
- Linking the fund id, given the correct permissions, to the view of all
  funds for that budget (the best alternative to linking to a view of
  the fund details, which we do not have).
- Correcting permission level required to add a budget

To test, view the acquisitions home page. The layout should feel
comfortable. The table of available funds should show the fund name.
The checkbox to show all funds should work correctly.

Signed-off-by: caroline very-mathieu <caroline.very-mathieu@nimes-ville.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2013-06-03 07:45:15 -07:00
Julian Maurice
203757e353 Bug 7304: More permissions for budgets
- Possibility to add users to a budget
- Restrictions changed to:
  - None
  - Owner
  - Owner and users
  - Owner, users and library
- Restricted users cannot spent on these budgets (they cannot modify them
  either)

Modified pages:
 - admin/aqbudgets.pl
 - admin/aqplan.pl
 - suggestion/suggestion.pl
 - acqui/acqui-home.pl
 - acqui/addorderiso2709.pl
 - acqui/basket.pl
 - acqui/neworderempty.pl

Unit tests in t/Budgets/CanUserUseBudget.t and t/Budgets/CanUserModifyBudget.t

Bug 7304 tmp

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-06-27 16:25:44 +02:00
Henri-Damien LAURENT
1ce78a0c22 bug 6834 followup removing param_map
param_map was still to be found in two files.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-03 06:39:24 +12:00
Alex Arnaud
7cc7fb8c99 bug #6054 - Add a filter by active budget on acqui-home
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 11:24:08 +12:00
d9de6ebab3 Fix for Bug 4498 - Acq always shows '1 suggestions waiting'
- Removing 'suggestions waiting' link from left-hand menu. A plain
  'suggestions' link is still shown if suggestions are enabled.
- Putting back the 'pending suggestions' box that used to appear
  on the Acquisitions home page. This will show, with a count
  of pending suggestions, only if suggestions are turned on and
  there are pending suggestions.

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-14 09:34:45 +13:00
Colin Campbell
70af459372 Bug 4331 Remove cruft from acqui-home script
Remove unnecessary db calls and processing from acqui-home.pl
Do not duplicate processing of fields
Declare variables closer to use
Remove unnecessary holding vars
Replace some anonymous var names by something more meaningful
Do not generate a toggle variable use Template's LOOP vars

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 11:15:07 -04:00
Lars Wirzenius
5f69c342de Fix FSF address in directory acqui/
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 20:17:51 -04:00
Paul Poulain
c26b6957b5 MT 2348 : acqui-home minor improvements
- moving some links to the left part of koha (currencies and suggestions)
- removed currency table
- changing supplier display

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-17 07:18:44 -05:00
Colin Campbell
e244e094c6 bugfix suppress warnings coming from acquisitions homepage
Before formatting and doing arithmetic with them we should
ensure undefined numeric elements are numbers
(This should be enforced in the db)

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-11 19:39:44 -05:00
b0f4d7104c removed unconditional warn
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-05 08:23:55 -05:00
Colin Campbell
e321fc9184 Bug 4108 Catch cases when GetMember is generating errors
Fixed two calls where new interface was not used
Arguably new syntax allows more options than we require but it was not catching
error cases (when 0 or undef is passed). It also can now be called in ways
which would validly return multiple hits but explicitly does not
(nor does calling code expect this)
This patch should quieten the flood of errors

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-05 07:57:26 -05:00
Jean-André Santoni
696a9cb601 [MT2593] Fixed budget amount computation in acqui-home 2010-01-28 15:11:53 +01:00
Jean-André Santoni
022978d4f4 [MT2593] Added "ordered" column in acqui-home budget display 2010-01-28 15:11:52 +01:00
231ea7c341 Bug 2505 enabling warnings 2009-12-20 14:31:35 +01:00
Paul Poulain
dc85da1830 suggestions improvements and fixes
- reindenting Suggestions.pm
- removing useless code in acqui-home.pl & fixing # of pending suggestion display
- add suggestion to order : displaying for selection suggestions accepted by the librarian (and reindenting)
- XHTMLing acqui-home (& removed useless parts)


NOTE ABOUT XHTML (could be useful) : <tfoot> must be BEFORE <tbody> in a <table>, even if, of course, it is displayed after.
2009-10-29 17:56:44 +01:00
Henri-Damien LAURENT
d948e8ba42 Merge fixes and removing warnings 2009-09-30 11:30:40 +02:00
Henri-Damien LAURENT
38b61303bd Bug Fixing : 1st Step Bookfund has become Budgets
More bug fixing on Suggestions and Budgets
2009-09-30 11:30:29 +02:00
Paul Poulain
1894ea54b2 improvement/bugfix : search budget
* there can be more than 1 active period. This has been added to deal with temporary budgets (like "10000€ to spent in the next 3 months")
* all active budgets are retrieved
* budget available for everyone now displayed correctly

also :
* fixing some hardcoded values
* removing a warn
2009-09-30 11:30:24 +02:00
Paul Poulain
1dbd3ab96c links on acqui-home, deal with budgets, granular perms and API changes 2009-09-30 11:30:19 +02:00
Henri-Damien LAURENT
8802bbf5fe Editing C4::Suggestions.pm
Enhancing C4::SearchSuggestion
And changing its API
Changing C4::Suggestions API taking a hashref for NewSuggestion and ModSuggestion

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-09-30 11:29:23 +02:00
Henri-Damien LAURENT
4271bbb738 Modifying Members : Add Mod and GetMember
This update the way Member is added and editing so that import and Edition
 could be best automatized
GetMember evolves and allow ppl to serach on a hash of data

Adding SQLHelper A new package to deal with INSERT UPDATE and SELECT

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-09-30 11:29:23 +02:00
Chris Cormack
606ecb532a Patch from Joe Atzberger to remove $Id$ and $Log$ from scripts
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-10-18 16:27:04 -05:00
Chris Cormack
c2439d23fd Re-adding the link to the spent budget breakdown
Signed-off-by: Chris Cormack <crc@liblime.com>
2007-09-07 22:06:22 -05:00
hdl
a7301fdfc6 Adding startdate and enddate parameters to GetBookfundBreakdown call. 2007-05-28 15:28:28 +00:00
hdl
3bb7467df9 GetBorrower changed into GetMember 2007-04-25 08:40:51 +00:00
hdl
100e6a9808 functions that were in C4::Interface::CGI::Output are now in C4::Output.
So this implies quite a change for files.
Sorry about conflicts which will be caused.
directory Interface::CGI should now be dropped.
I noticed that many scripts (reports ones, but also some circ/stats.pl or opac-topissues) still use Date::Manip.
2007-04-24 13:54:28 +00:00
hdl
0b66bd800d Code Cleaning Members.
- checkaccount and getborraccountno => GetBorrowerAcctRecord

Many changes in names,
some changes in function signature.
Will be detailed in a mail to kohadevel.
2007-04-23 13:10:07 +00:00
tipaul
dde8417990 1st commit for rel_3_0 => HEAD branch move (to test) 2007-03-09 14:27:05 +00:00
tgarip1957
3818a8dc38 A new acquisition to handle different tax values to each item, receiving multiple baskets as one parcel, stricter rules for biblio and item creation 2006-09-20 21:44:36 +00:00
toins
1d11938205 fix minor bug in POD. 2006-07-31 15:59:03 +00:00
toins
6e0de1a68e syntax error fixed. 2006-07-27 13:29:51 +00:00
toins
02e37f2ee6 Call to Bookfund Added. 2006-07-25 12:41:55 +00:00
toins
514964c751 Code cleaning : POD added, GPL header added, SQL queries moved on modules. 2006-07-21 14:43:37 +00:00
toins
21a410129c Sub renamed according to the coding guidelines 2006-07-07 07:51:02 +00:00
toins
b4ce3dbfb7 Head & rel_2_2 merged 2006-07-04 13:35:29 +00:00
sushi
2ee33de5ef Merging Katipo changes.
Got acqui homepage actually displaying suggestions - only displayed count before - need to get the suggestedby diplaying borrowers name rather than id number.
Showing budget breakdowns.
Slight alteration - let $status be an input parameter.
2006-06-07 02:45:26 +00:00
sushi
9d1c8fa9d2 perltidy before next commit. 2006-06-07 02:36:24 +00:00
sushi
1574910cb7 Merging Katipo changes.
adding html highlight toggling.
2006-06-07 02:22:12 +00:00
tipaul
b38997925f big commit, still breaking things...
* synch with rel_2_2. Probably the last non manual synch, as rel_2_2 should not be modified deeply.
* code cleaning (cleaning warnings from perl -w) continued
2005-10-26 09:11:02 +00:00
hdl
2950574dd6 Adding branch specific display to budgets and selection.
Be warned that to be able to select a budget which is not from patron's Branch, you should have a '' Branch information.
2005-07-14 09:13:24 +00:00
tipaul
5e44e797eb synch'ing 2.2 and head 2005-06-20 13:15:46 +00:00
tipaul
6376aa4326 catalogue.pm deals only with acquisitions.
so, renaming it...
catalogue management is done in Biblio.pm package
2004-07-13 12:52:13 +00:00
tipaul
547c0daf6d *** empty log message *** 2003-03-19 21:02:24 +00:00
tipaul
c74a6a0009 templating normal acquisition before reordering acquisition and cataloguing.
supplier now works with currencies table, not hardcoded currencies
2003-02-10 13:38:44 +00:00