[koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-1297-g280b0df
Git repo owner
gitmaster at git.koha-community.org
Fri Oct 11 03:50:21 CEST 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, master has been updated
via 280b0df19da1270afdcf74a5c852221eec9b71c4 (commit)
via 57848b642bd60d9aade05d1c5b66784e9de28698 (commit)
via c1ec92f68572860e2c828083bd746c8d007280e7 (commit)
via b6ea9da689af22f6fce86fbc208fbdd1ba4611e5 (commit)
via 2c89aee3c88f34ee0b5026f2fc9b2e4a15523d0e (commit)
via 46190d5ac4b15dec992009968fdeae2f8495c008 (commit)
via 618ddd3490e180d3bc654e9ae5cc5b4f226121d5 (commit)
via cbf7e3b11bfe1f7ecdf49d71f0945163a441d9b3 (commit)
via 9db23b8483b0437ada73a9bbc33a4b304ab08484 (commit)
via 44d0ad451fe744b7aef11b3e176b2bf8a7f6d35b (commit)
from 015b9c660c55df84c4fcdfe12f3e89e73453eebb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 280b0df19da1270afdcf74a5c852221eec9b71c4
Author: Galen Charlton <gmc at esilibrary.com>
Date: Fri Oct 11 00:37:04 2013 +0000
Bug 10240: DBRev 3.13.00.027
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 57848b642bd60d9aade05d1c5b66784e9de28698
Author: Galen Charlton <gmc at esilibrary.com>
Date: Fri Oct 11 01:46:47 2013 +0000
Bug 10240: (follow-up) don't display patrons as lost or gone-no-address incorrectly
Because borrowers.lost and borrowers.gonenoaddress are nullable, when
downloading patron information for an offline patron sync, convert null
values to zero.
To test:
[1] Set borrowers.lost to NULL for a patron.
[2] Do an offline sync, then disconnect network access (or
stop the webserver) and enter the offline interface.
[3] Try checking out to the test patron. A warning will
(incorrectly) disply stating that the patron's card is lost.
[4] Apply the patch.
[5] Do steps 2 and 3 again. This time, there will be lost card
warning.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit c1ec92f68572860e2c828083bd746c8d007280e7
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Wed Oct 2 11:01:54 2013 -0400
Bug 10240: (follow-up) correctly record fines and fix label
At some point in rebasing I managed to remove the part of the code
that saved fine payments. This patch re-adds that feature. This patch
also corrects the label on the check out tab to not mention partial
names for checkouts when offline, and partial name searches are not
supported in offline circ.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit b6ea9da689af22f6fce86fbc208fbdd1ba4611e5
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Sat Sep 28 17:51:19 2013 -0400
Bug 10240: (follow-up) make sure datepicker icons are available offline
The next month/previous month icons for the datepicker were not available
offline. With this patch they are.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 2c89aee3c88f34ee0b5026f2fc9b2e4a15523d0e
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Thu Sep 26 13:52:25 2013 -0400
Bug 10240: (follow-up) warn when patron's card is expired
This patch improves the alert messages to be slightly better English
and warns the librarian if a patron's card has expired. Like all alerts,
this is non-fatal since in the case of network failure there is no
particular reason to expect that the offline database is current.
To test this particular patch you can try checking something out to an
expired patron, otherwise test plan remains the same as above.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 46190d5ac4b15dec992009968fdeae2f8495c008
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Wed Sep 11 18:14:30 2013 -0400
Bug 10240: (follow-up) disable logout/set library
Logging out/setting the library does not work while using offline
mode, so it makes no sense to present those options to the user.
Much better is some sort of explanatory message informing them that
those two links don't work.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 618ddd3490e180d3bc654e9ae5cc5b4f226121d5
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Mon Sep 2 21:26:14 2013 -0400
Bug 10240: (follow-up) fix display issues
Fix the following two issues:
1) After paying a fine when offline the fine amount becomes NaN.
2) For previous checkouts for a patron, the title and barcode
fields have the wrong infomation in them (i.e. they have been swapped)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit cbf7e3b11bfe1f7ecdf49d71f0945163a441d9b3
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Wed Jul 10 15:51:50 2013 -0400
Bug 10240: (follow-up) don't delete transactions if auth fails
When uploading transactions, we were not checking that authentication
had succeeded before deleting the transactions from the local database.
That was bad. With this patch, we check. That is good.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 9db23b8483b0437ada73a9bbc33a4b304ab08484
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Tue Jun 25 08:44:19 2013 -0400
Bug 10240: QA follow-up
Address the following issues:
1/ Address minor qa issues with the templates:
FAIL koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline-mf.tt
FAIL forbidden patterns
forbidden pattern: intranet-tmpl should certainly
replaced with [% interface %] (line 24)
[etc.]
OK tt_valid
OK valid_template
FAIL koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt
FAIL forbidden patterns
forbidden pattern: intranet-tmpl should certainly
replaced with [% interface %] (line 509)
[etc.]
FAIL tt_valid
lines 5, 5
2/ Run perltidy on new scripts
3/ download.pl returns data.finished = 1 if number of returned
data < 5000 (avoids 1 ajax call)
4/ Replace qq{} around sql queries with q{}
Also, a race condition existed that resulted in pending transactions
only getting deleted from the local database in certain circumstances
(fast connections under Chrome, mostly). This patch fixes that so that
successfully-uploaded transactions are always deleted.
This patch also addresses Jonathan's suggestion:
3/ add a message on check in (currently the input becomes empty but the
user is not informed).
... and Magnus's suggestion about moving the Synchronize link to the
right on the homepage.
Also, this addresses the further issues Jonathan noted:
- The tab of checkouts always shows "*0* Checkouts"
- If I am not well-educated, I click on the "Check out" link on the
offline home page, I enter a barcode, click on "Check out" and I get a
js error (without user message): "TypeError: curpatron is undefined"
(with chromium I get: Numeric transaction modes are deprecated in
IDBDatabase.transaction. Use "readonly" or "readwrite").
- There is a "border-right" css rule on the h5.patron-title. It is
display when there is no patron selected) [really minor!].
- tables are displayed even if there is no data
- The "Clear screen" link (X) points to an old script:
circ/offline-circulation.pl
- There is a warning when clicking on the "Synchronize" link when the
user is offline, but not for the "Pending offline circulation actions"
link.
- Still exists:
> The "Checked in item." message text never disappear (even if I go on the
> offline home page (circ/offline.pl#offline-home)).
Finally, this patch adds a link to the Pending offline operations page
on the synchronize page for easier navigation.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 44d0ad451fe744b7aef11b3e176b2bf8a7f6d35b
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Sat May 4 18:48:54 2013 -0400
Bug 10240: Offline circulation using HTML5 and IndexedDB
This patch adds an HTML5-based offline mode to Koha's existing
circulation module, allowing librarians to check out items using a
basically familiar interface. The feature will be implemented using
the Application Cache and IndexedDB features of the HTML5 specification,
both of which are fully supported on Firefox 10+ and Chrome 23+, with
limited support going back to Firefox 4 and Chrome 11. The basic
workflow enabled by this patch is as follows:
Part 1: While connected to the Internet
1. Enable offline functionality by turning on the
"AllowOfflineCirculation" system preference.
2. Sync the offline circulation database on the computer that will be
used for offline circulation by following the "Offline circulation
interface" link on the Circulation home page, choosing "Synchronize (must be online)",
and clicking the "Download records" button. This process may take a while.
3. Bookmark /cgi-bin/koha/circ/offline.pl (the page you are currently
on) for easy access when offline.
Part 2: While disconnected from the Internet
4. Navigate to /cgi-bin/koha/circ/offline.pl using the bookmark you
created while online.
5. Start checking books in by scanning the barcode of an item that has
been returned into the box in the "Check in" tab.
6. Scan the barcodes of any additional items that have been returned.
7. Start checking out books to a patron by scanning the patron's barcode
in the box in the "Check out" tab.
8. Set a due date (the "Remember for session" box will be checked by
default, since circulation rules are not computed during offline
transactions and therefore a due date must be specified by the
librarian).
9. Scan an item barcode (if you did not set a due date, it will prompt
you) to check the item out to the patron.
10. If a patron has a fine you can see the total amount (current to when
the offline module was synced), and record a payment. Unlike when in
online mode, there will be no breakdown of what item(s) fines are
for, and you will only be able to record the payment amount and not
associate it with a particular item.
Part 3: While connected to the Internet
11. Click the "Synchronize" link and choose "Upload transactions" to
upload the transactions recorded during the offline circulation
session.
12. Navigate to /cgi-bin/koha/offline_circ/list.pl (there will be a
link from the Offline circulation page) and review the
transactions, as described in the documentation for the Firefox
Offline circulation plugin:
http://wiki.koha-community.org/wiki/Offline_circulation_firefox_plugin
RM note: the IndexedDB jQuery plugin bundled with this patch is
copyright 2012 by Parashuram Narasimhan and other contributors and is
licensed under the MIT license. The home page for the plugin is
http://nparashuram.com/jquery-indexeddb/.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Comment: Works very well, no koha-qa errors
Test with Firefox 24.0
1) did some checkouts pre sync
2) synchronize database (Download)
3) go offline
4) Proceed to checkin some items from patron
5) Proceed to checkout items to patrons, setting date
6) Proceed to checkout to expired patron, warning appears
7) go online
8) Upload records
9) go to review transacctions and proceed
10) verified on patrons that checkin/out are done
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
-----------------------------------------------------------------------
Summary of changes:
circ/circulation-home.pl | 1 +
labels/spinelabel-home.pl => circ/offline-mf.pl | 23 +-
labels/spinelabel-home.pl => circ/offline.pl | 21 +-
installer/data/mysql/sysprefs.sql | 1 +
installer/data/mysql/updatedatabase.pl | 7 +
.../lib/jquery/plugins/jquery.indexeddb.js | 517 +++++++++++++
.../intranet-tmpl/prog/en/css/staff-global.css | 28 +
koha-tmpl/intranet-tmpl/prog/en/js/offlinecirc.js | 113 +++
.../en/modules/admin/preferences/circulation.pref | 6 +
.../prog/en/modules/circ/circulation-home.tt | 15 +-
.../prog/en/modules/circ/offline-mf.tt | 43 ++
.../intranet-tmpl/prog/en/modules/circ/offline.tt | 774 ++++++++++++++++++++
kohaversion.pl | 2 +-
offline_circ/download.pl | 109 +++
offline_circ/service.pl | 4 +
15 files changed, 1636 insertions(+), 28 deletions(-)
copy labels/spinelabel-home.pl => circ/offline-mf.pl (62%)
copy labels/spinelabel-home.pl => circ/offline.pl (63%)
create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.indexeddb.js
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/js/offlinecirc.js
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline-mf.tt
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt
create mode 100755 offline_circ/download.pl
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list