[Devel] [GIT] OpenBioMaps GIT repository, branch blog-module updated:
git at vocs.unideb.hu
git at vocs.unideb.hu
Fri Apr 27 02:50:54 CEST 2018
The project "OpenBioMaps GIT repository":
The branch, blog-module has been updated
via 34baf99909e1b04996c4d3be3b9cbcadc5fe9ea1 (commit)
via a63e4e3280213395877e92f030666293f8321cb4 (commit)
via 499ab04ac8fde78da495de525c92ade4d09ceacc (commit)
via 950b975f3a4f19784cc0fc11f4025ebd466910c7 (commit)
via cc102f81d5be42aa0e0e1991ec45d163fce4a20e (commit)
via ba3905912ba2d1cebfe6337ce89cd730c600e023 (commit)
via 40cdc15ee2ce694a0d2cc42621f2538fef80a0c0 (commit)
via 2a058e12470e267441a0ec5116a3ec86268021f2 (commit)
via 1ea8eed82b9d03b737dbc9bf2badc09bf1a753fd (commit)
via 65aed65de81e67e2bb6145fa5c64098e66ccb800 (commit)
via 9f4f6d54405db0fc6cfb250defe67de72a18f9e1 (commit)
via e77cd5d7bc1764db8d53790be7c5344ef9ac79c6 (commit)
via e468fe11870cc4e53e1d8c52cf36cad167899df9 (commit)
via 789ceba52486da775173928ba0e54cddf04afdb6 (commit)
via ce64bc3262931ee76a3924c35a635be8041939d1 (commit)
via e25d546484dc89a8f07763aca6ef429ec6940ad4 (commit)
via 3519dde76d723ab700b4ce68111e685c8e638b27 (commit)
via 939794aceb778aa7468a5d8da14f81f49016b5c5 (commit)
via b116e948b797c090863f037cd6205e8ccd9eed9e (commit)
via f00280e9fd320b59476f42a1e3e616aeb9c406d6 (commit)
via 7229bc9627c977414b7ec80ad77f5c315e9eee4a (commit)
via 4eab384d2eeb96c46333802ed5a127410c76b478 (commit)
via 56f263d4d78af4eba926fea5f09f8f684570340b (commit)
via 27c8b5fb4b6c82161ba55eccc9897f3d208f857d (commit)
via bdd501e64704165196a3696b10963ac8dd2506bc (commit)
via 2252646b7fbdc79d6c5d74d82133e36fc7fff3cb (commit)
via 0c2d6dced45024f4a17316876ffd0d3303469d0c (commit)
via 103ea34014ea16cddf044d78f4e4c9d7106238df (commit)
via 7260facedf772197f227874e831b21f140bdb045 (commit)
via 3d64f73d1957b7179a3da0b4f940d83c0cea6c04 (commit)
via f051db9b135b53d74a1e7ab98bf23ef2ae0a9fe7 (commit)
via 740d8d77630a44a58c41044f0f7312411abe274c (commit)
via cb8004b398c7222756f4ddf13fb7f899c2a0bb7d (commit)
via a69daac6297b2e39aa4caa6e6b402ebe0a83126d (commit)
via dd846bebb676903f60dd3192533650441c9049b1 (commit)
via 004813ffc5694dfa6cf8e0c138379bb57ea6da63 (commit)
via b6bc308c487eee03e13a26b39b63d24c08adc0c8 (commit)
via 01a323413b2d50e85018c126f14ce7ced26ff3eb (commit)
via 31d22ab594063a8ceb6577abf0dad3c347136b4c (commit)
via 3526886d297353a6cb1f2657b4ec5698369ca316 (commit)
via 17822e9812441749c97973c9c496469db7994b9e (commit)
via 93695e51f372b16194790b76894d708992b09ead (commit)
via f285f268f99e9958d23f5b42b3a019097b28c39e (commit)
via f063075a187c8a422d1817b78cab70b5547a56f6 (commit)
via 4405205f5866fb637a5cf3656c65dd8c293aacf4 (commit)
via f304106f4e5b7feb036a19b2aa5138592c01f01b (commit)
from a7a6967a279fb6d72a1fc81500d59b7e6ffed4d3 (commit)
- Log -----------------------------------------------------------------
commit 34baf99909e1b04996c4d3be3b9cbcadc5fe9ea1
Merge: a63e4e32 a7a6967a
Author: Bóné Gábor <gabor.bone at milvus.ro>
Date: Fri Apr 27 03:50:44 2018 +0300
?2
commit a63e4e3280213395877e92f030666293f8321cb4
Author: Bóné Gábor <gabor.bone at milvus.ro>
Date: Fri Apr 27 03:36:34 2018 +0300
?
commit 499ab04ac8fde78da495de525c92ade4d09ceacc
Author: Bóné Gábor <gabor.bone at milvus.ro>
Date: Tue Apr 10 08:46:24 2018 +0300
blog .
commit 950b975f3a4f19784cc0fc11f4025ebd466910c7
Author: Bóné Gábor <gabor.bone at milvus.ro>
Date: Fri Apr 6 16:05:42 2018 +0300
Blog module - not ready
commit cc102f81d5be42aa0e0e1991ec45d163fce4a20e
Author: Bóné Gábor <gabor.bone at milvus.ro>
Date: Fri Apr 6 12:35:31 2018 +0300
gitignore
commit ba3905912ba2d1cebfe6337ce89cd730c600e023
Merge: 40cdc15e 2a058e12
Author: Bóné Gábor <gabor.bone at milvus.ro>
Date: Fri Apr 27 02:37:32 2018 +0300
Merge branch 'master' of vocs.unideb.hu:/home/git/openbiomaps
commit 40cdc15ee2ce694a0d2cc42621f2538fef80a0c0
Author: Bóné Gábor <gabor.bone at milvus.ro>
Date: Fri Apr 27 02:37:15 2018 +0300
translations
commit 2a058e12470e267441a0ec5116a3ec86268021f2
Author: Bán Miklós <banm at vocs.unideb.hu>
Date: Fri Apr 27 00:14:09 2018 +0200
date filter - missing exact date
commit 1ea8eed82b9d03b737dbc9bf2badc09bf1a753fd
Author: Bán Miklós <banm at vocs.unideb.hu>
Date: Thu Apr 26 23:43:12 2018 +0200
bug fix: date (without year) range filter
commit 65aed65de81e67e2bb6145fa5c64098e66ccb800
Author: Bán Miklós <banm at vocs.unideb.hu>
Date: Thu Apr 26 21:56:38 2018 +0200
.
commit 9f4f6d54405db0fc6cfb250defe67de72a18f9e1
Author: Bán Miklós <banm at vocs.unideb.hu>
Date: Thu Apr 26 21:44:09 2018 +0200
simplified qtable in query string
qtable in URL can be used without the PROJECTTABLE prefix
E.g.
long qtable:
http://openbiomaps.org/projects/public_nestbox_data/?report=15@cinke&qtable=public_nestbox_data_observations
valid, shorter url:
http://openbiomaps.org/projects/public_nestbox_data/?report=15@cinke&qtable=observations
commit e77cd5d7bc1764db8d53790be7c5344ef9ac79c6
Author: Bán Miklós <banm at vocs.unideb.hu>
Date: Thu Apr 26 21:18:51 2018 +0200
fixes and updates related to query api
ALTER TABLE custom_reports ADD COLUMN
project_table character varying(64);
commit e468fe11870cc4e53e1d8c52cf36cad167899df9
Author: Bán Miklós <banm at vocs.unideb.hu>
Date: Thu Apr 26 15:02:29 2018 +0200
query api as csv - file name of csv
commit 789ceba52486da775173928ba0e54cddf04afdb6
Author: Bán Miklós <banm at vocs.unideb.hu>
Date: Thu Apr 26 14:45:30 2018 +0200
new api function: results as csv
The three _GET api calls: ?query=, ?query_api=, ?report=
optionally can create csv output using
&output=csv
Examples:
http://localhost/biomaps/projects/dinpi/?report=2@szamossag&output=csv
resulting a csv file. It can be used programmatically, however in this
case query will be executed by a non-authenticated user.
wget
http://localhost/biomaps/projects/dinpi/?report=2@szamossag&output=csv
browser:
http://localhost/biomaps/projects/dinpi/?query=faj:Tringa%20totanus
wget
http://localhost/biomaps/projects/dinpi/?query=faj:Tringa%20totanus&output=csv
The query_api and the query basically the same thing, but in browser the
query_api hide the header,footer and the filter boxes - so, it is used
when some results loaded into pop-up window.
An other difference is query_api uses json string instead of plain text.
commit ce64bc3262931ee76a3924c35a635be8041939d1
Merge: e25d5464 3519dde7
Author: Bán Miklós <banm at vocs.unideb.hu>
Date: Thu Apr 26 11:01:33 2018 +0200
Merge branch 'master' of vocsi:/home/git/openbiomaps
commit e25d546484dc89a8f07763aca6ef429ec6940ad4
Author: Bán Miklós <banm at vocs.unideb.hu>
Date: Thu Apr 26 10:59:44 2018 +0200
New admin function: Create new table
It placed into the end of the administration menu
commit 3519dde76d723ab700b4ce68111e685c8e638b27
Merge: 939794ac f00280e9
Author: Bóné Gábor <gabor.bone at milvus.ro>
Date: Thu Apr 26 11:19:06 2018 +0300
Merge branch 'master' of vocs.unideb.hu:/home/git/openbiomaps
commit 939794aceb778aa7468a5d8da14f81f49016b5c5
Author: Bóné Gábor <gabor.bone at milvus.ro>
Date: Thu Apr 26 11:18:45 2018 +0300
translation fixes
commit b116e948b797c090863f037cd6205e8ccd9eed9e
Author: Bán Miklós <banm at vocs.unideb.hu>
Date: Wed Apr 25 19:30:03 2018 +0200
small things...
commit f00280e9fd320b59476f42a1e3e616aeb9c406d6
Author: Bán Miklós <banm at vocs.unideb.hu>
Date: Wed Apr 25 16:23:57 2018 +0200
custom reports as saved queries
I've added a new option - save queries and renamed the the existing
saved queries to saved results.
The saved query store the query string only, and can perform the query
as ?report=...
I've extended the custom_report table with 2 columns:
CREATE TABLE custom_reports (
id integer NOT NULL,
command text NOT NULL,
user_id integer NOT NULL,
key character varying(32),
project character varying(64),
query_string text
);
ALTER TABLE ONLY custom_reports
ADD CONSTRAINT custom_report_project_fkey FOREIGN KEY (project) REFERENCES projects(project_table) ON UPDATE CASCADE ON DELETE CASCADE;
commit 7229bc9627c977414b7ec80ad77f5c315e9eee4a
Author: Bán Miklós <banm at vocs.unideb.hu>
Date: Wed Apr 25 14:30:26 2018 +0200
query api improved
available URL commands are:
query
query_api
report
query example:
index.php?query=faj:Pica pica
query_api example:
index.php?query={"qids_...":"["..."]"}
report example:
index.php?report=cinke
where cinke is a label of a stroed query in the custom reports table
In this commit there some rows related to save_query improvements. There
will be an other commit with this new / old functions
In this commit there some rows related to save_query improvements. There
will be an other commit with this new / old functions
commit 4eab384d2eeb96c46333802ed5a127410c76b478
Author: Bán Miklós <banm at vocs.unideb.hu>
Date: Tue Apr 24 16:20:44 2018 +0200
sql_aliases function, query_api interface
%F%, %J% query string markers processing were used in several places. I
created a new function: sql_aliases which give an array when called with
these processed aliases.
On the upload history interface the number of uploded data rows called
the query_api to display data from the selected upload. I've
reconfigured this window to provide more shiny interface -> filter
boxes, header and footer not displayed here.
commit 56f263d4d78af4eba926fea5f09f8f684570340b
Author: Bán Miklós <banm at vocs.unideb.hu>
Date: Tue Apr 24 14:02:26 2018 +0200
Joined table supoort in identify point module
Using joined tables as defined in the central sql-query-settings in the
identify point was a missed functions. Now it works, however it is a bit
complicated. The %F% and %J% markers are fundamentally important in the
query string!
commit 27c8b5fb4b6c82161ba55eccc9897f3d208f857d
Author: Bán Miklós <banm at vocs.unideb.hu>
Date: Tue Apr 24 11:20:07 2018 +0200
distinct uploader names in box_filter
commit bdd501e64704165196a3696b10963ac8dd2506bc
Author: Bán Miklós <banm at vocs.unideb.hu>
Date: Tue Apr 24 08:51:38 2018 +0200
datum filter improvements
If date-to not given in date filter (only date-from given) system automatically add current date instead of creating broken query
commit 2252646b7fbdc79d6c5d74d82133e36fc7fff3cb
Author: Bán Miklós <banm at vocs.unideb.hu>
Date: Mon Apr 23 17:48:59 2018 +0200
Fixes: receive & visible mail profile settings
New settings options added to the profile page:
- receive mail from system
- visible mail address for project users
If receiving mails disabled users got personal messages in the news
stream instead of mails.
It is possible the set mail visibility for anyone, but no interface yet
to set it. (visible_mail==2)
It would be great if personal messages would create alerts on the profile
page...
commit 0c2d6dced45024f4a17316876ffd0d3303469d0c
Merge: 103ea340 7260face
Author: Bán Miklós <banm at vocs.unideb.hu>
Date: Mon Apr 23 13:10:24 2018 +0200
Merge branch 'master' of vocsi:/home/git/openbiomaps
commit 103ea34014ea16cddf044d78f4e4c9d7106238df
Author: Bán Miklós <banm at vocs.unideb.hu>
Date: Mon Apr 23 13:08:26 2018 +0200
fix ambiguous column
Fixing ambiguous column in temporary join query
commit 7260facedf772197f227874e831b21f140bdb045
Merge: f051db9b 3d64f73d
Author: Bóné Gábor <gabor.bone at milvus.ro>
Date: Mon Apr 23 13:54:12 2018 +0300
Merge branch 'translate-column-order'
commit 3d64f73d1957b7179a3da0b4f940d83c0cea6c04
Author: Bóné Gábor <gabor.bone at milvus.ro>
Date: Mon Apr 23 13:51:26 2018 +0300
translatable column order template names
commit f051db9b135b53d74a1e7ab98bf23ef2ae0a9fe7
Merge: 740d8d77 cb8004b3
Author: Bán Miklós <banm at vocs.unideb.hu>
Date: Mon Apr 23 12:27:56 2018 +0200
Merge branch 'master' of vocsi:/home/git/openbiomaps
commit 740d8d77630a44a58c41044f0f7312411abe274c
Author: Bán Miklós <banm at vocs.unideb.hu>
Date: Mon Apr 23 12:27:17 2018 +0200
devel_2.4 merged
commit cb8004b398c7222756f4ddf13fb7f899c2a0bb7d
Merge: a69daac6 93695e51
Author: Bóné Gábor <gabor.bone at milvus.ro>
Date: Fri Apr 20 15:38:47 2018 +0300
Merge branch 'foto-filter'
commit a69daac6297b2e39aa4caa6e6b402ebe0a83126d
Author: Bán Miklós <banm at vocs.unideb.hu>
Date: Fri Apr 20 11:24:42 2018 +0200
navigator styling
commit dd846bebb676903f60dd3192533650441c9049b1
Author: Bán Miklós <banm at vocs.unideb.hu>
Date: Fri Apr 20 10:34:07 2018 +0200
right-side navigator position
bottom 5% instead of center
commit 004813ffc5694dfa6cf8e0c138379bb57ea6da63
Author: Bán Miklós <banm at vocs.unideb.hu>
Date: Fri Apr 20 10:29:19 2018 +0200
disjoint relation added
commit b6bc308c487eee03e13a26b39b63d24c08adc0c8
Author: Bán Miklós <banm at vocs.unideb.hu>
Date: Fri Apr 20 10:09:45 2018 +0200
bug fixes, user defined spatial relationship
Bug fixes: Thanks to Söndör and Zsófi, some bugs reveald in profile page
In the shared geometries module's interface there is a new option: set the desired
spatial relationship for the query (contains,crosses,intersect). It was important to introduce,
because previously there were applied four different spatial function
which was unusable slow in larga databases.
commit 01a323413b2d50e85018c126f14ce7ced26ff3eb
Author: Bán Miklós <banm at vocs.unideb.hu>
Date: Thu Apr 19 18:21:53 2018 +0200
sidebar function results cached
commit 31d22ab594063a8ceb6577abf0dad3c347136b4c
Author: Bán Miklós <banm at vocs.unideb.hu>
Date: Thu Apr 19 15:43:20 2018 +0200
Form groupping as in openbirdmaps.ro, fixes
In the biomaps db create a new table:
CREATE TABLE project_forms_groups (
name character varying(128) NOT NULL,
form_id smallint[],
c_order smallint,
project_table character varying(64) NOT NULL
);
ALTER TABLE project_forms_groups OWNER TO biomapsadmin;
--
-- Name: project_forms_groups_pkey; Type: CONSTRAINT; Schema: public; Owner: biomapsadmin; Tablespace:
--
ALTER TABLE ONLY project_forms_groups
ADD CONSTRAINT project_forms_groups_pkey PRIMARY KEY (project_table, name);
--
-- Name: project_forms_groups_project_table_fkey; Type: FK CONSTRAINT; Schema: public; Owner: biomapsadmin
--
ALTER TABLE ONLY project_forms_groups
ADD CONSTRAINT project_forms_groups_project_table_fkey FOREIGN KEY (project_table) REFERENCES projects(project_table) ON UPDATE CASCADE ON DELETE CASCADE;
commit 3526886d297353a6cb1f2657b4ec5698369ca316
Author: Bán Miklós <banm at vocs.unideb.hu>
Date: Thu Apr 19 09:02:07 2018 +0200
change current_query_table bug fix, form groupping module from Milvus
.
commit 17822e9812441749c97973c9c496469db7994b9e
Author: Bán Miklós <banm at vocs.unideb.hu>
Date: Wed Apr 18 09:44:58 2018 +0200
GPX module updated, upload multilabel bugfix
Previously, the GPX module assumed "species names" and "number of individuals" columns are exists.
Now It can be optional if GPX_NAME_COLUMN, GPX_DESC_COLUMN variables are defined in the local_vars_php.inc.
commit 93695e51f372b16194790b76894d708992b09ead
Author: Bóné Gábor <gabor.bone at milvus.ro>
Date: Tue Apr 17 14:51:22 2018 +0300
Photo filter - clear filters btn
commit f285f268f99e9958d23f5b42b3a019097b28c39e
Author: Bán Miklós <banm at vocs.unideb.hu>
Date: Mon Apr 16 13:30:18 2018 +0200
Home page link
Database logo & name as "/" link
commit f063075a187c8a422d1817b78cab70b5547a56f6
Author: Bán Miklós <banm at vocs.unideb.hu>
Date: Mon Apr 16 09:07:09 2018 +0200
.
commit 4405205f5866fb637a5cf3656c65dd8c293aacf4
Author: Bán Miklós <banm at vocs.unideb.hu>
Date: Mon Apr 16 09:05:28 2018 +0200
cleaning
commit f304106f4e5b7feb036a19b2aa5138592c01f01b
Author: Bán Miklós <banm at vocs.unideb.hu>
Date: Mon Apr 16 09:01:32 2018 +0200
cleaning
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 1 +
index.php | 40 ++-
languages/UMS_REPOSITORY/repository.db | 2 +
languages/en.php | 1 +
languages/hu.php | 1 +
libs/afuncs.php | 137 ++++++++-
libs/common_pg_funcs.php | 231 +++++++++++---
libs/css/style.css | 90 ++++--
libs/default_modules.php | 2 +-
libs/evaluation.php | 34 ++-
libs/interface.php | 125 +++++---
libs/js/admin.js | 100 +++++-
libs/js/functions.js | 1 +
libs/js/main.js | 39 +--
libs/js/maps.js | 24 +-
libs/languages/en.php | 18 +-
libs/languages/hu.php | 20 +-
libs/languages/ro.php | 19 +-
libs/modules/.gitignore | 16 +-
libs/modules/box_filter.php | 60 ++--
libs/modules/box_load_selection.php | 3 +
libs/modules/form_choose.php | 90 +++++-
libs/modules/identify_point.php | 21 +-
libs/modules/project_blog.php | 9 +-
libs/modules/query_builder.php | 193 ------------
libs/modules/results_asCSV.php | 2 +-
libs/modules/results_asGPX.php | 46 ++-
libs/modules/results_buttons.php | 16 +-
libs/modules/results_listSlide.php | 340 ---------------------
libs/prepare_vars.php | 90 +++++-
libs/profile.php | 78 ++++-
libs/project_admin.php | 15 +
libs/query_builder.php | 99 +++---
libs/results_builder.php | 39 +--
libs/results_query.php | 8 +-
libs/upload.php | 9 +-
libs/upload_show-table-form.php | 2 +-
pds/constans.php | 11 -
templates/initial/includes/sidebar3.php | 15 +-
.../initial/root/UMS_REPOSITORY/repository.db | 5 +
templates/initial/root/header.php.inc | 2 +-
templates/initial/root/index.php | 50 ++-
templates/initial/shiny/server.R | 30 +-
templates/initial/shiny/ui.R | 17 +-
44 files changed, 1183 insertions(+), 968 deletions(-)
delete mode 100644 libs/modules/query_builder.php
delete mode 100644 libs/modules/results_listSlide.php
delete mode 100644 pds/constans.php
--
OpenBioMaps GIT repository
More information about the Devel
mailing list