gCubeSystem
/
geoportal-data-entry-app
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

task_20210 #1

Closed
francesco.mangiacrapa wants to merge 11 commits from task_20210 into master
pull from: task_20210
merge into: gCubeSystem:master
Conversation 0 Commits 11 Files Changed 17 +19 -3
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1aba0ad5c9 - Show all commits

5
CHANGELOG.md
View File

@ -4,12 +4,13 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [v1.0.3-SNAPSHOT] - 2020-11-30 ## [v1.1.0-SNAPSHOT] - 2020-12-1
#### Enhancements #### Enhancements
[#20210] Updating required for data entry facility after the first feedback by domain experts [#20210] Updating required for data entry facility after the first feedback by domain experts
Moved to 'geoportal-client'
## [v1.0.2-SNAPSHOT] - 2020-11-09 ## [v1.0.2-SNAPSHOT] - 2020-11-09

2
pom.xml
View File

@ -14,7 +14,7 @@
<groupId>org.gcube.portlets.user</groupId> <groupId>org.gcube.portlets.user</groupId>
<artifactId>geoportal-data-entry-app</artifactId> <artifactId>geoportal-data-entry-app</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<version>1.0.3-SNAPSHOT</version> <version>1.1.0-SNAPSHOT</version>
<name>GeoPortal Data Entry App</name> <name>GeoPortal Data Entry App</name>
<description>The GeoPortal Data Entry App is an application to build the web forms for data entries needed to GeoNa project</description> <description>The GeoPortal Data Entry App is an application to build the web forms for data entries needed to GeoNa project</description>
<scm> <scm>

15
src/main/java/org/gcube/portlets/user/geoportaldataentry/server/ConvertToServiceModel.java
View File

@ -256,6 +256,16 @@ public class ConvertToServiceModel {
//TODO //TODO
} }
List<String> politicaDiAccessoLst = mapFields.get("Politica di accesso");
if(politicaDiAccessoLst!=null && politicaDiAccessoLst.size()>0) {
try {
AccessPolicy ap = AccessPolicy.valueOf(politicaDiAccessoLst.get(0));
uplaodedImage.setPolicy(ap);
}catch (Exception e) {
LOG.warn("I cannot cast "+politicaDiAccessoLst.get(0) +" to "+AccessPolicy.values(),e);
}
}
List<String> licenzaIdList = mapFields.get("ID Licenza"); List<String> licenzaIdList = mapFields.get("ID Licenza");
if(licenzaIdList!=null && licenzaIdList.size()>0) { if(licenzaIdList!=null && licenzaIdList.size()>0) {
uplaodedImage.setLicenseID(licenzaIdList.get(0)); uplaodedImage.setLicenseID(licenzaIdList.get(0));
@ -312,6 +322,11 @@ public class ConvertToServiceModel {
layerConcessione.setScalaAcquisizione(scalaAcquisizioneLst.get(0)); layerConcessione.setScalaAcquisizione(scalaAcquisizioneLst.get(0));
} }
List<String> licenzaIdList = mapFields.get("ID Licenza");
if(licenzaIdList!=null && licenzaIdList.size()>0) {
layerConcessione.setLicenseID(licenzaIdList.get(0));
}
List<String> autoreLst = mapFields.get("Autore"); List<String> autoreLst = mapFields.get("Autore");
if(autoreLst!=null) { if(autoreLst!=null) {
layerConcessione.setAuthors(autoreLst); layerConcessione.setAuthors(autoreLst);