[Devel] [GIT] OpenBioMaps GIT repository, branch nested-upload-fields updated:

git at vocs.unideb.hu git at vocs.unideb.hu
Mon Jun 11 11:20:22 CEST 2018


    The project "OpenBioMaps GIT repository":

    The branch, nested-upload-fields has been updated
       via  45b4af4fb17d921501de2a58f19a86065adfe51c (commit)
       via  abef549f10288e435b29fee02e3056944fd13179 (commit)
       via  014d672752152df7891c53c512e8adf96a2c690a (commit)
       via  7a7a7a698b24c2d72547acfb891041222f668db5 (commit)
       via  f890ddc46fe3564b42fb51c1d04e94074fe6645d (commit)
       via  67cda3d6b59ad1bbb3cb3fd9f3bcff1f12be7b21 (commit)
       via  5c9830754f1fb72caf565b37aa86e4c8e077fe27 (commit)
       via  5fdad3e31d278f558ae32b8091fbb4ee52541f12 (commit)
       via  650ab6d5ff8ce02bb99ecab9921c9b441b2a6868 (commit)
       via  c2e0dd400bc476e56cf512e9c88b978fbb330c7a (commit)
       via  36e9bae160c835b19f710c98a616f7cc770092f3 (commit)
       via  d6a641e19372207aa57a108a245256f53e2da166 (commit)
       via  39a13420ca0b1c65e70533ab8c988a06636e55ee (commit)
       via  652a70187fd5481a45aeba95cd289bf5ab47402a (commit)
       via  80a35d7d8da860c7df686ccd2de4b01503541059 (commit)
       via  f6b25bba865c8a51fc0534277d6800b4bfafb70b (commit)
      from  c37d535cc6f38fdeb77248fb3a42fddf7785173d (commit)


- Log -----------------------------------------------------------------
commit 45b4af4fb17d921501de2a58f19a86065adfe51c
Merge: abef549f c37d535c
Author: Bóné Gábor <gabor.bone at milvus.ro>
Date:   Mon Jun 11 12:19:00 2018 +0300

Merge branch 'nested-upload-fields' of vocs.unideb.hu:/home/git/openbiomaps into nested-upload-fields

commit abef549f10288e435b29fee02e3056944fd13179
Author: Bóné Gábor <gabor.bone at milvus.ro>
Date:   Mon Jun 11 12:01:54 2018 +0300

dynamic select improvement

- from default parent to child in table

commit 014d672752152df7891c53c512e8adf96a2c690a
Author: Bóné Gábor <gabor.bone at milvus.ro>
Date:   Fri Jun 8 11:56:42 2018 +0300

upload select list access check

working but not tested

commit 7a7a7a698b24c2d72547acfb891041222f668db5
Author: Bóné Gábor <gabor.bone at milvus.ro>
Date:   Thu Jun 7 18:29:26 2018 +0300

dynamic select

1. many to many relations with connecting tables:
connect_table has two columns: parent_id, child_id

list definition:
parent:
SELECT:table.value:name|target_column|
child:
SELECT:table.value:name||^connect_table_name

2. default value definition for dynamic select
_list:value

commit f890ddc46fe3564b42fb51c1d04e94074fe6645d
Author: Bóné Gábor <gabor.bone at milvus.ro>
Date:   Thu Jun 7 10:55:51 2018 +0300

Dynamic select works, but not perfect

unresolved issues at file upload:
- autofill child elements, the select is red, whereas the value is
present in the list
- after autofill the child-parent_of_next elements the select options
are missing, until a next refresh of the table

commit 67cda3d6b59ad1bbb3cb3fd9f3bcff1f12be7b21
Author: Bóné Gábor <gabor.bone at milvus.ro>
Date:   Wed Jun 6 17:22:18 2018 +0300

dynamic (nested) select lists

dynamic select works at web forms, but not fully functional at file
upload

new patterns at form definition>
parent:
SELECT:table.value:name|target_column|
eg: SELECT:milvus_program.obm_id:nev|gykod_id|

child:
SELECT:table.value:name||foreign_key
eg: SELECT:milvus_grouping_codes.obm_id:gykod||program

child and parent of the next:
SELECT:table.value:name|target_column|foreign_key
eg: SELECT:milvus_grouping_codes.obm_id:gykod|alapegyseg|program

commit 5c9830754f1fb72caf565b37aa86e4c8e077fe27
Author: Bóné Gábor <gabor.bone at milvus.ro>
Date:   Mon Jun 4 17:46:08 2018 +0300

nested dynamic select elements in upload table

inital commit, nested select works in web forms, main table
ATTENTION: ajax function not safe!

form list definitions:

parent: 'SELECT:table_name.value:name|nested'
eg: 'SELECT:milvus_program.obm_id:nev|nested'

child&parent: 'NESTED:parent_col|table_name.value:name|nested'
eg: 'NESTED:program|milvus_grouping_codes.obm_id:gykod|nested'

child: 'NESTED:parent_col|table_name.value:name'
eg: 'NESTED:gykod_id|milvus_sampling_units.obm_id:alapegyseg'

commit 5fdad3e31d278f558ae32b8091fbb4ee52541f12
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Sun Jun 10 23:56:36 2018 +0200

Updates: upload web forms, upload data

Local work memory extended for upload process transactions. I hope it
can help to increase upload process speed if there are lots of
data.

Improvement: label based value setting for select menu in web forms (Invalid values resulting empty option elements in web forms, however the labels and the values can be different. )

commit 650ab6d5ff8ce02bb99ecab9921c9b441b2a6868
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Fri Jun 8 16:24:31 2018 +0200

memcached usage updated

In several places I could improve the memcache usage which resulting
better performance

commit c2e0dd400bc476e56cf512e9c88b978fbb330c7a
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Fri Jun 8 11:48:03 2018 +0200

R Shiny server integration, small fixes

First example of dynamic R-shiny integration.

PDS API call improvements

box_load_last_data module  - php warning - fixed

commit 36e9bae160c835b19f710c98a616f7cc770092f3
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Wed Jun 6 19:28:44 2018 +0200

pds bulk upload

Example:
curl         -F "access_token=$t"         -F 'scope=put_data'         -F 'form_id=58'         -F 'header=["faj","obm_geometry","obm_files_id"]'         -F 'batch=[
{"data":[{"faj":"Sylvia curruca","obm_geometry":"POINT(22.0 46.3)"}],"attached_files":"file1,file2"},
{"data":[{"faj":"Lanius Collurio","obm_geometry":"POINT(21.5 47.1)"}],"attached_files":"file3"}]'         -F 'file1=@file1'         -F 'file2=@file2'         -F 'file3=@file3'         http://localhost/biomaps/projects/dinpi/pds.php

commit d6a641e19372207aa57a108a245256f53e2da166
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Tue Jun 5 02:33:06 2018 +0200

autocomplete list elements as static list

in get_form_data query
List length limit? 2000?

commit 39a13420ca0b1c65e70533ab8c988a06636e55ee
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Tue Jun 5 01:27:12 2018 +0200

autocomplete list, simple list array filtering

commit 652a70187fd5481a45aeba95cd289bf5ab47402a
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Tue Jun 5 01:11:35 2018 +0200

autocomplete list in upload table updated

Previouslyi, only the 'table.column' format was supported, which is
not compatible with normal list generation.

Now, the supported formats are the follwing:
SELECT:table.column
SELECT:table.column:label_column
table.column
label0:value0,label1:value1,...
value0,value1,value2....

Currently, the labels are not handled in the list gen JS!

commit 80a35d7d8da860c7df686ccd2de4b01503541059
Merge: f6b25bba 346a0801
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Mon Jun 4 10:33:41 2018 +0200

Merge branch 'master' of vocsi:/home/git/openbiomaps

commit f6b25bba865c8a51fc0534277d6800b4bfafb70b
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Mon Jun 4 10:20:29 2018 +0200

Bug fix, new pds functions, module updates

In wfs_processing.php there was an interesting bug related with 'load saved
results' query - which caused empty results table. It was the postgres
geometry string which was copied into the temporary table in the
following format: xxxxx::geometry I'm sure it worked previously...

last_data module extended with two new features.
1) my last upload option
2) custom reports
The Custom Reports was previously available only from the profile menu.

New PDS options were developed according to the needs of mobile application development.
See the documents/api section for more details.
The pds.php which placed in the project directories has been changed:

define('PROJECT_DIR',basename(__DIR__));
define('CALL',dirname(__DIR__,2)); # php5 !!!
require_once(CALL."/oauth/resource.php");
require_once(CALL."/pds/service.php");

-----------------------------------------------------------------------

Summary of changes:
 docs                                               |   2 +-
 libs/afuncs.php                                    |  76 ++++-
 libs/common_pg_funcs.php                           |  73 +++--
 libs/db_funcs.php                                  | 102 +++---
 libs/js/functions.js                               |  12 +-
 libs/languages/en.php                              |   3 +-
 libs/languages/hu.php                              |   3 +-
 libs/languages/ro.php                              |  40 +--
 libs/mod_project.php                               |  10 +-
 libs/modules/box_filter.php                        |  18 +-
 libs/modules/box_load_last_data.php                |  18 +-
 libs/query_builder.php                             |  48 +--
 libs/upload_funcs.php                              |   4 +-
 libs/wfs_processing.php                            |   4 +-
 oauth/resource.php                                 |  30 +-
 pds/pds_class.php                                  | 345 +++++++++++++++++----
 pds/service.php                                    |  11 +
 .../initial/root/UMS_REPOSITORY/repository.db      |   5 +
 templates/initial/shiny/run_server.R               |   9 +-
 templates/initial/shiny/server.R                   |  86 +++--
 templates/initial/shiny/ui.R                       |  41 ++-
 21 files changed, 696 insertions(+), 244 deletions(-)

-- 
OpenBioMaps GIT repository


More information about the Devel mailing list