[koha-commits] main Koha release repository branch master updated. v16.11.00-603-geee0020
Git repo owner
gitmaster at git.koha-community.org
Thu Mar 23 16:30:16 CET 2017
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 eee0020f4a1eaea3acf5fd53ea0a3d2e98b3ba35 (commit)
via c3db243ad459782362c7051a648730bc51fda83d (commit)
via 7aff8696614604960b7244fac798a28c4438fc36 (commit)
via c302fd2bea710c960db7bc14aeac762c865f677a (commit)
via 0d479976af81df3a66024e4ffc18ecc2038c0103 (commit)
via f3c4c7016128e6550230cd44f8efedf0374db25e (commit)
via 63a1adff9097493be0329aebab5fb3bf8a627b80 (commit)
from 6b626b64944dff0ba0adff99da26e3bbe8eb7544 (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 eee0020f4a1eaea3acf5fd53ea0a3d2e98b3ba35
Author: Brendan A Gallagher <brendan at bywatersolutions.com>
Date: Thu Mar 23 00:18:10 2017 +0000
DBREV for Bug 18066 - Hea - Version 2
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
commit c3db243ad459782362c7051a648730bc51fda83d
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Tue Mar 21 12:01:45 2017 +0100
Bug 18066: Fix map positioning in admin/usage_statistics.pl
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
commit 7aff8696614604960b7244fac798a28c4438fc36
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Mar 21 07:21:38 2017 -0300
Bug 18066: Fix tests
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
commit c302fd2bea710c960db7bc14aeac762c865f677a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Feb 28 17:13:07 2017 +0000
Bug 18066: Use https for ws
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
commit 0d479976af81df3a66024e4ffc18ecc2038c0103
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Feb 28 11:16:56 2017 +0000
Bug 18066: Do not use token for OSM tiles
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
commit f3c4c7016128e6550230cd44f8efedf0374db25e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Feb 7 09:31:28 2017 +0100
Bug 18066: Add the leaflet library
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
commit 63a1adff9097493be0329aebab5fb3bf8a627b80
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Feb 2 16:53:58 2017 +0100
Bug 18066: Hea V2
This patch is the Koha part of the Hea v2 project.
You can find the (testing) code for the server at
hea-ws - https://github.com/joubu/hea-ws/commits/v2
hea-app - https://github.com/joubu/hea-app/commits/v2
They contain the different pull requests made over the last 6 months.
More information on Hea at https://wiki.koha-community.org/wiki/KohaUsageStat_RFC
The goal of this commit message is to provide an overview of what could
be a new version of Hea.
Prior to these changes, the Hea database was filled with 1 line per Koha
installation. System preferences were filled by the libraries and a
cronjob (share_usage_with_koha_community.pl) collected these values to send
them to a webservice (hea-ws/upload.pl).
With the need to collect more data we would want to collect data at the library
level (branch) and not at the installation level.
For instance the geolocation, the url or the country can be different from one
library to another, even if managed from the same Koha installation.
The Hea DB has been upgraded to reflect that change (see hea-app/sql/schema.sql).
The hidden goal of this patch is to make Hea sexier and explain
better to libraries how it can be useful to share their information
with the Koha community. I guess the main problem is the lack of
communication and explanations about what we are doing we these data.
To fill this gap I'd like to (TODO)
1. Communicate on the ML about this new version of Hea (once it got
pushed and backported)
2. Link the Privacy_Policy.md from the Hea interface
3. Get help from a native English speaker to add
popup/help/info/whatever on "Home › Administration › Usage statistics",
to clearly explain what happens (and what will not happen!) when an option or
another is set.
You can find screenshot of this whole enhancement on bug 18066, comment 2.
What this patch does:
- Create a new branches.geolocation DB field
- Add 3 new sysprefs:
* UsageStatsGeolocation
* UsageStatsLibrariesInfo
* UsageStatsPublicID
- Integrate the Leaflet JS library to get a fancy map to pick
geolocations
How does it works:
On the new administration page where statistics to share are configured,
there are several new things. It is now possible to share information either
per Koha installation or libraries. If UsageStatsLibrariesInfo is set,
the info at library level (url, name, country, geolocation) will be
sent to the Hea webservice. If it is not set, you can decide to fill
UsageStatsLibraryUrl, UsageStatsLibraryName, UsageStatsCountry,
UsageStatsGeolocation to share these information. Note that even if the
data are retrieved at installation level, it's better to fill the prefs
as well: On the Hea website the different libraries defined for a given
Koha installation could be displayed on the same page.
This page is a public page which will be attributed to every
installation (with the pref UsageStatsPublicID). On this page all the
info available publicly will be displayed.
TODO later:
- Add a button on the administration page to delete the info shared
publicly. It will be easy to show that the info are no longer displayed
on the public page.
- Add an icon per Koha installation to get a better "public page"
- Any suggestions?
Test plan:
We will need to test hea-ws, hea-app and the Koha-side code to test the
whole enhancement.
1/ To start, clone the hea-ws and hea-app project and checkout the
'master' branch (*not* 'v2')
2/ Create the hea database and user
CREATE DATABASE hea
CREATE USER 'hea'@'localhost' IDENTIFIED BY 'hea';
GRANT ALL PRIVILEGES ON hea.* TO 'hea'@'localhost';
FLUSH PRIVILEGES;
3/ Fill the DB with some data
mysql hea < hea-app/sql/schema.sql
mysql hea < hea-app/sql/sql/mock-data.sql
4/ Checkout the 'v2' branch for both hea-ws and hea-app
5/ Execute the upgrade DB script
% cd hea-app
% perl -p -i -e 's/REPLACE_ME/hea/' sql/upgrade.pl # Fill the DB info
% perl sql/upgrade.pl
Now the DB is using the v2 structure. That means we have 1 installation
row per library previously defined. 1 library row has also been created.
5/ Configure hea-ws
% echo '192.168.50.1 hea.koha-community.org' >> /etc/hosts
<VirtualHost *:80>
DocumentRoot "/path/to/hea-ws"
ServerName "hea.koha-community.org"
<Directory "/">
Options +ExecCGI
Require all granted
AddHandler cgi-script .pl
</Directory>
</VirtualHost>
And enable it with a2ensite, then restart apache.
The copy the database.yml.sample to database.yml and edit it to fill the
DB info.
6/ Launch the hea-app
% cd hea-app
% edit README.md # to install the missing modules
% cp environments/config.yml environments/development.yml
% edit environments/development.yml # to fill the DB info
% perl bin/app.pl
Then hit localhost:3000
You should see a local version of Hea with sample data
7/ Back to Koha side
A. We will test that the webservice still works with previous version of Koha (without v2)
a. Do not configure Hea
% perl misc/cronjobs/share_usage_with_koha_community.pl -f -v
Then hit localhost:3000
=> Nothing added
b. Configure Hea on admin/usage_statistics.pl
perl misc/cronjobs/share_usage_with_koha_community.pl -f -v
=> New library added
c. Modify the Hea configuration
perl misc/cronjobs/share_usage_with_koha_community.pl -f -v
=> Info are modified
B. Not we will test that it works with the new version (much more fun ;))
% git checkout hea-v2 # koha
a. Configure Hea using /admin/usage_statistics.pl
perl misc/cronjobs/share_usage_with_koha_community.pl -f -v
=> Check the result on localhost:3000
b. Share libraries's info
perl misc/cronjobs/share_usage_with_koha_community.pl -f -v
c. Continue to play a bit and share the info.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/UsageStats.pm | 28 +-
Koha.pm | 2 +-
Koha/Schema/Result/Branch.pm | 12 +-
admin/usage_statistics.pl | 17 +-
installer/data/mysql/sysprefs.sql | 3 +
installer/data/mysql/updatedatabase.pl | 22 +
.../intranet-tmpl/lib/leaflet/images/layers-2x.png | Bin 0 -> 1259 bytes
.../intranet-tmpl/lib/leaflet/images/layers.png | Bin 0 -> 696 bytes
.../lib/leaflet/images/marker-icon-2x.png | Bin 0 -> 2586 bytes
.../lib/leaflet/images/marker-icon.png | Bin 0 -> 1466 bytes
.../lib/leaflet/images/marker-shadow.png | Bin 0 -> 618 bytes
koha-tmpl/intranet-tmpl/lib/leaflet/leaflet-src.js |13251 ++++++++++++++++++++
.../intranet-tmpl/lib/leaflet/leaflet-src.map | 1 +
koha-tmpl/intranet-tmpl/lib/leaflet/leaflet.css | 624 +
koha-tmpl/intranet-tmpl/lib/leaflet/leaflet.js | 9 +
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 3 +
.../prog/en/modules/admin/preferences/admin.pref | 11 +
.../prog/en/modules/admin/usage_statistics.tt | 167 +-
misc/cronjobs/share_usage_with_koha_community.pl | 2 +-
t/db_dependent/UsageStats.t | 43 +-
20 files changed, 14164 insertions(+), 31 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/lib/leaflet/images/layers-2x.png
create mode 100644 koha-tmpl/intranet-tmpl/lib/leaflet/images/layers.png
create mode 100644 koha-tmpl/intranet-tmpl/lib/leaflet/images/marker-icon-2x.png
create mode 100644 koha-tmpl/intranet-tmpl/lib/leaflet/images/marker-icon.png
create mode 100644 koha-tmpl/intranet-tmpl/lib/leaflet/images/marker-shadow.png
create mode 100644 koha-tmpl/intranet-tmpl/lib/leaflet/leaflet-src.js
create mode 100644 koha-tmpl/intranet-tmpl/lib/leaflet/leaflet-src.map
create mode 100644 koha-tmpl/intranet-tmpl/lib/leaflet/leaflet.css
create mode 100644 koha-tmpl/intranet-tmpl/lib/leaflet/leaflet.js
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list