Commit graph

252 commits

Author SHA1 Message Date
Nahuel ANGELINETTI
67f9ea0264 (MT #3007) update hold transfer slip datas
This patch add information to hold transfer slip:
 * itemcallnumber
 * location
 * waiting date

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:42:43 -04:00
Srdjan Jankovic
7c6d572b4c catalyst-wr68479: Limit holds to the user branch, provide a link to
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:10:49 -04:00
Kyle M Hall
74f6e35c60 Replace branch codes in on returns screen with branch names.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-16 07:47:08 -04:00
a136920f30 Improve display of information on Transfers to your library report
- Use GetRecordValue() to show subtitle
- Show author
- Separate branch and call number display for better sorting
- Correct teriminology (reserve -> hold)

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 21:12:20 -04:00
d38a716fc1 Removing bogus style declaration
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-20 17:51:01 -05:00
5e83c889a7 bug 3825 followup: fix errors in template
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 16:35:32 -05:00
Nahuel ANGELINETTI
631a875de1 (bug #3825) improve waiting holds
[cherry-pick from 3.0.x]

This patch :
 * fix indentation
 * Separate waiting holds from holds over with tabs
 * Select only holds for librarian library

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 16:14:21 -05:00
Will Stokes
f27c5ae5a1 Display amount of credit patron has, not just that they have credit.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 12:18:03 -05:00
0bdba46f91 bug 1080: XHTML-ify audio tags
This doesn't actually do much, since the <audio> tag is still
not defined in XHTML1, but it makes it consistent with the rest of the
markup.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 09:25:16 -05:00
root
b4c887f2c4 Bugzilla 1080 to add enhancement for sound. Only changed circulation.tmpl/pl and returns.tmpl/pl and added a single syspref (set to off) along with very compressed OGG files for sound which are on the open source "artistic" licence.
Works for HTML5 because it loads smoothly and no plugins required but *at
  this time* this update will only work with staff clients which are Firefox
  version >=3.5 (std for Koha) but other browsers will soon be adding support.

  Additional sounds are included for people to modify and play with, but this
  is such a simple upgrade I doubt at this time Koha needs another complex
  selector so users can add their own sounds. It could be a nice enhancement
  later, of course.

  Suggest we stick with HTML5 <audio tag because it is a standard and no
  plug-ins.

  This simple update has been running live for SMFPL.org for almost 2 weeks

  -Darrell Ulm

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 08:12:25 -05:00
Will Stokes
7fc8025978 Bug #2162: Step 2, add pagination. Splits results into blocks of 250 results and adds Previous and Next buttons. Achieved using forms, hidden search variables and submit buttons.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-14 19:26:31 -05:00
Will Stokes
7de9a2128a Bug #2162: Step 1, prevent running of report upon entry to page. Add name run_report to submit button and checks in template.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-14 19:26:15 -05:00
Nicole Engard
96e4e27b42 bug 4129 fix display of html on the overdue report
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-08 07:39:57 -05:00
e1b19d70d0 Fix for Bug 4113, Failed renewal from circulation screen results in malformed table
Renewal failure message should appear in renewal checkbox column just
like it does in moremember.tmpl

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-05 19:00:27 -05:00
bad504cbe1 Style correction
- Use <div class="dialog alert"> for warnings, not "dialog error"

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-04 12:31:03 -05:00
2ce51846a0 More fixes for Bug 2600, HTML tags in titles not escaped in many places
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-03 16:52:31 -05:00
cd921163c0 Fixes for Bug 3089, Date entry fields should indicate required date format
- Added include, date-format.inc, which shows format, e.g. "(DD/MM/YYYY)"
- Hint shows expected date format based on system preference
- Removing calendar.inc include from templates which don't use it

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-03 15:12:18 -05:00
Kyle M Hall
844f63f1f8 Rotating Collections Fixes
This patch does the following:
  * Fixes the typos in updatedatabase.pl ( updates colBranchcode to varchar(10)
  * Adds the rotating_collections template files that somehow were not committed
  * Adds a missing sub from RotatingCollections.pm that must been deleted by accident
  * Adds the neccessary hooks in returns.pl to warn that and item needs to be returned
    to the branch that currently holds the collection.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-02 19:22:05 -05:00
Michael Hafen
616a5ff349 Change style of return errors to be more noticable.
Changed the class of the div from message to error.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-02 18:45:57 -05:00
f8c1ee66a3 Fix for Bug 3984, Confusing note on transfers to receive
- Changing 'check this transfer' message to more informative
   'Transfer is XX days late'
 - Adding note in the case of late transfers: 'Transfers are
   considered late after XX [TransfersMaxDaysWarning] days.'
2010-01-25 18:37:11 +01:00
7e94056989 Fix for Bug 4035: Today's checkouts grouped with previous checkouts
Creating separate variable to be output to the template so that
the original issuedate can be used in date comparison.
2010-01-15 10:22:04 +01:00
Liz Rea
7b8666e855 Adds auto print/auto close functionality to hold transit slip. 2009-12-20 14:27:12 +01:00
Matthias Meusburger
9f41fe64be MT 2050, Follow-up, Fast Cataloging
Adds granular permissions for cataloging
Also adds a link from the circulation home to fast cataloging when fast cataloging is active
2009-11-24 10:05:10 +01:00
75423b3010 Corrections to ensure message list appears in the proper box (Bug 3668).
The patch sets a "flagged" variable for displaying the messages correctly, bringing it in line with the way other messages are displayed. The patch also includes some markup tweaks and a change to make display of the "add message" link javascript-dependent.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-09-29 19:20:56 -04:00
Colin Campbell
6fb8ef0d79 New Messaging System.
This system is indended to replace the old opacnotes
  and borrowernotes fields in the borrowers table.
  This system allows an unlimited number of Libraran and OPAC notes to be
  attached to a borrower. Each note has a message, a message type,
  the data it was created, and which library created it.
  Each message can only be deleted by the library that created it unless the syspref
  AllowAllMessageDeletion has been set.

  This system may be used simultaneously with the old notes system and does not affect it in any way.

  A new database table (messages) was added for this feature.

  The System also allows for pre-defined notes for Borrower records

  To use these, just create authorised values with the category BOR_NOTES
  where the Authorized Value is the short description shown in the pulldown,
  and the description is the text that should be in the note.

  Original Author: PTFS Contractor <dbavousett@ptfs.com>

  This work co-sponsered by Middletown Township Public Library, Middletown, NJ, USA
     and East Brunswick Public Library, East Brunswick, NJ, USA

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2009-09-15 22:11:38 -04:00
e50bc421c4 Changes to make checkouts/holds display the same on circulation and patron detail screens (Bug 3106)
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-09-06 14:37:10 -04:00
PTFS Contractor
36ec435cd9 bug 3485: Clear Borrower record after checkout.
Button added to clear the last Borrower record after transaction is complete
To enable, turn on the syspref DisplayClearScreenButton.

This work was sponsored by Middletown Township Public Library, Middletown, NJ USA

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-08-23 13:21:21 -04:00
45f799a7de Minor change to fix Bug 3086, Can't close circulation date-picker popup in Internet Explorer
I don't know why this edit fixes the problem, but it does. Tested in IE6, IE7, and IE8 on Windows XP.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-08-01 08:27:23 -04:00
5a93f0b806 More changes to implement jQuery upgrade.
- Upgrading jquery checkboxes plugin
- Correcting references to checkboxes plugin
- Upgrading jquery hotkeys plugin
- Upgrading syntax for calls to hotkeys plugin
- Removing jquery dimensions plugin (functionality rolled into jQuery)

Signed-off-by: John Beppu <john.beppu@liblime.com>
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-07-14 07:08:18 -04:00
Darrell Ulm
62cf086ef1 Bug#: 3358 File 3 of 3 patch for reserve notes (show)
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-07-12 23:33:46 -04:00
Darrell Ulm
c943c9f39c Bug#: 3358 File 2 of 3 patch for reserve notes (show)
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-07-12 23:33:44 -04:00
471fe3927a Removing hard-coded $ symbols from the template, addressing Bug 2547
Pending a system for displaying the correct currency symbol based on the system's default currency all dollar-specific symbols should be removed in favor of no symbol.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-06-29 13:47:25 -05:00
Joe Atzberger
e8908c2f97 Returns reworking to handle empty GetItemIssue
Code cannot rely on issueinformation being populated.

Note there is room for better efficiency to have AddReturn also provide the
itemnumber (where existing) so that GetItemnumberFromBarcode is not called
at both levels.  Unfortunately there is discrepancy between this idea (for
efficiency) and the stated purpose of the $iteminformation object returned,
since $iteminformation is specifically the info from the issues table and
MUST be empty when the item was not in fact issued.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-06-24 09:44:39 -05:00
Jane Wagner
a13c0db0c9 Bug # 2368 Change holds to pull default date range
Delivered range was 10 years ago to yesterday; changed default
to be two days ago to today.  Also removed notes field from report
output; 5xx fields can be quite large and including them in the
display resulted in a very lengthy printout for staff.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-06-24 08:55:11 -05:00
Galen Charlton
b3fca95a7e bug 3259 part 3: changed last 'Too Many Renewals' to 'Not Renewable'
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-06-05 17:47:55 -05:00
Nicole Engard
7efd6b7b4d Fix Bug 3259 part 2 - fixed terminology on circulation.tmpl
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-06-05 17:44:16 -05:00
Joe Atzberger
5d15edd869 Standalone branch selection
selectbranchprinter now posts to itself to set the branch.  That also means that
other pages can set the branch by linking to selectbranchprinter like:
    /cgi-bin/koha/circ/selectbranchprinter.pl?branch=MAIN

We use HTTP_REFERER to allow the user to continue back to wherever they linked from,
defaulting to circulation.pl (the former POST target).

Note that all "branchprinter" functions are basically useless as the data is not
properly handled in the session storage.  Chris C. expects this to be addressed
with later patches for HLT.  There appear to be no 3.0 users of this intended
functionality yet.

Includes squashed patch to fix tmpl and to automatically redirect if there are no
POST params to be recycled.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-06-05 17:33:17 -05:00
Joe Atzberger
4677ae7390 Cleanup selectbranchprinter.pl and .tmpl
Use GetBranchesLoop and warnings.  Remove unused code.  Moved the Get's to after auth.
I begin to show how this script will use referer to redirect back to the sending
page upon successful change of branch or printer (see hidden div and recycle_loop).

Indicator for singleBranchMode added.
Also added another helper function for GetBranchesLoop, namely mybranch.  This
encapsulates the logic for finding an intelligent default selection, which is
almost always desirable.

This does not resolve bug 2426, but is work in that direction.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-06-05 17:30:52 -05:00
Garry Collum
a81e53df40 Bug 2624: Fix for non-persistent check boxes in check-in screen.
Found this bug when playing with AutomaticItemReturn. The "Forgive overdue charges" and "Dropbox mode" would lose their value the item was transfered (if automatic transfer was off), caught a hold, or caught a hold at another location.
This patch does not completely do away with the problem.  If an item is checked-in in simple mode, then one of the forms mentioned above opens, then the user checks one of the selection boxes, the value is not retained.  Javasript would have to be added to transfer the value to the confirmation form when the checkbox is clicked.

This patch also cleans up a few minor XHTML errors.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-06-04 09:03:44 -05:00
Galen Charlton
ab44e2986a bug 2866: Overdues Reports - Upgrading to filter by patron extended attributes
Patch by Rick Welykochy <rick@praxis.com.au> with some squashing
by me.

Bug Report: 2866 Filtering and sorting the overdue report using patron attributes

1. Create a new system preference ?FilterBeforeOverdueReport?
2. Option to filter *before* the overdue report runs, avoiding report slowness
3. Add searchable patron attributes to the list of overdue report filters
4. Add searchable patron attributes to the sort fields on the overdue report
5. add item call number and replacement price
6. the CSV download link now returns the same
   data as the web report, rather than (inconsistently)
   trying to run the overdue_notices.pl batch job
7. always run report if requesting CSV
8. barcodes are now links
9. use item-level item type for overdue itemtype filter

Included is a new callback for searching patron attributes, similar
to circ/ysearch.pl.

The following additional bugs are fixed:

2748: Nothing is output to the .csv file for the "Overdues" circulation report

This is fixed by having circ/overdues.pl produce the CSV output directly instead
of trying to call the overdues cronjob.  The CSV output includes all of the fields
that are displayed on the web table plus the item replacement price and any extended
patron attributes.

2836: overdues.csv may contain HTML
2837: Descending sort doesn't descend on the overdues report plus other probs with report

This enhancement was sponsored by the Plano Independent School District.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-28 19:20:36 -05:00
Joe Atzberger
8c0ac886bf Cleanup waitingreserves.pl and .tmpl
Use warnings and provide fallback values to avoid them.
Move waitingdate check up to top of loop.
Move $today creation outside loop (should be same for all).
Remove unused and unnecessary variables.
Add subtitle escaping to .tmpl and slightly standardize formatting.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-27 07:25:14 -05:00
Joe Atzberger
85b09f8d0e Cleanup view_holdsqueue.pl and .tmpl (minor)
Convert to GetBranchesLoop.
Insert template message to display for ALL libraries search, so that the
message is n0t truncated like "X items found for".

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-27 06:55:49 -05:00
Joe Atzberger
b83ee6b483 Cleanup branchtransfers
Remove unused sub and variables.
Convert to using GetBranchesLoop instead of local code.
Use elsif where appropriate.
Added fallback values and enabled warnings.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-27 06:46:52 -05:00
Joe Atzberger
3c9ed58cba Cleanup transferstoreceive.pl and .tmpl
Removed unused variables.  Replaced EXPR.
Inserted hidden span to correct tablesorter behavior on title field.  Without this patch
because of the link href in the cell, the sort would end up being effectively on
biblionumber, not title.

Mostly whitespace edits in template.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-27 06:43:17 -05:00
Nicole Engard
0d6e559c56 Fixed capitalization and standardized statements.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-26 08:51:51 -05:00
Joe Atzberger
26a18d3d0d Cleanup circ/overdue.pl
This also fixes a deficiency with overdue.tmpl not retaining the
user's selection of sort order when displaying results.
Removed 9 unused variables.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-22 13:55:45 -05:00
Joe Atzberger
3c76a8334f Cleanup and enhance bookcount.pl and .tmpl
Eliminated bug with date handling outputting an English string.
Row striping added.  Highlight for "my branch" row added.
GetBranchesLoop used instead of recreating data structure, so we get the
benefit of branches being sorted (by display name).

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-21 08:18:01 -05:00
Nicole Engard
3abb4ec5b7 Bug 3102 Fix Part 2: Fixed terminology on Transfers to Receive.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-18 16:22:29 -05:00
Galen Charlton
f9601413a4 bug 988 followup - tweak wording
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-11 14:26:56 -05:00
Paul Poulain
d496e3111a fix for #988
When a borrower can't issue any book (issuingrules=0), the message should be
"this user can't issue book" and not "too many books already issued"wrong message

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-11 14:24:47 -05:00