CHANGELOG.md

@@ -4,11 +4,7 @@
 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).
 
-## [v3.2.2] - 2024-01-11
-
-- Improved display of results on multiple fields (in the table) [#26372]
-
-## [v3.2.1] - 2023-06-16
+## [v3.2.1-SNAPSHOT] - 2023-06-16
 
 - Fixed issue in the Search facility [#25265]
 

README.md

@@ -1,6 +1,6 @@
 # GeoPortal Data Entry App
 
-Geoportal data-entry technology allows the actors who use it, the project management of spatio-temporal documents specified by meta-documents called "Use Case Descriptor" (UCD) which determine the document model, management, life cycle, etc. The system allows you to: (i) access and search for published projects by role for VRE, (ii) access the project publication report, view the publication status (SUCCESS, WARNING, ERROR), etc., (iii ) generate links for visualization on the map, (iv) update the contents of the registered projects through the workflow, (v) manage the relationships (quantity and quality temporal links) between the documents. In general, the technology allows the data entry of any document having spatio-temporal characteristics, whose metadata and payload are specified by one or more "gCube Profile" profiles which determine the structure of the resulting document (JSON).
+The GeoPortal Data Entry App is an application to build the web forms for data entries needed to create projects/documents (based on UCD) in the D4Science Geoportal service
 
 ## Built With
 
@@ -18,42 +18,14 @@ Geoportal data-entry technology allows the actors who use it, the project manage
 
 <img src="https://gcube.wiki.gcube-system.org/images_gcube/8/8e/GeoPortalDataEntry_Architecture.png" style="max-width:800px;" alt="GeoPortal Data-Entry - Architecture" />
 
-## Showcase
-
-##### D4GNA instance of Geoportal D4Science
-
-see at [Dataset per il Geoportale Nazionale per l’Archeologia (D4GNA)](https://gna.d4science.org/)
-
-**New Project facility**
-
-<img src="https://gcube.wiki.gcube-system.org/images_gcube/c/c0/D4GNA_New_Project.png" style="max-width:800px;" alt="Workspace Home" />
-
-**List of Projects facility**
-
-<img src="https://gcube.wiki.gcube-system.org/images_gcube/6/67/D4GNA_List_Of_Projects.png" style="max-width:800px;" alt="List of Projects" />
-
-
-**UnPublish facility**
-
-<img src="https://gcube.wiki.gcube-system.org/images_gcube/6/6a/D4GNA_Unpublish.png" style="max-width:800px;" alt="UnPublish" />
-
-
-**View Relations facility**
-
-<img src="https://gcube.wiki.gcube-system.org/images_gcube/7/76/D4GNA_ViewRelations.png" style="max-width:800px;" alt="View Relations" />
-
-
-
 ## Documentation
 
-Geoportal Service Documentation is available at [gCube CMS Suite](https://geoportal.d4science.org/geoportal-service/docs/index.html)
-
-User Guide (DRAFT ITA) is available at [Guida al Sistema D4GNA (DRAFT-ITA)](https://gcube.wiki.gcube-system.org/images_gcube/b/b7/D4science_Guida_al_Sistema_D4GNA_bozza.pdf)
-
 D4GNA Use Case -  3 Phase Lifecycle
 
 <img src="https://gcube.wiki.gcube-system.org/images_gcube/4/46/D4GNA_Workflow_Phases_and_Operations.png" style="max-width:800px;" alt="GeoPortal Data-Entry - Workflow & Phases & Operations" />
 
+Geoportal Service Documentation is available at [gCube CMS Suite](https://geoportal.d4science.org/geoportal-service/docs/index.html)
+
 ## Change log
 
 See the [Releases](https://code-repo.d4science.org/gCubeSystem/geoportal-data-entry-app/releases)

pom.xml

@@ -14,7 +14,7 @@
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>geoportal-data-entry-app</artifactId>
 	<packaging>war</packaging>
-	<version>3.2.2</version>
+	<version>3.2.1-SNAPSHOT</version>
 	<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 create projects/documents (based on UCD) in the D4Science Geoportal service</description>
 	<scm>
@@ -25,7 +25,7 @@
 
 	<properties>
 		<!-- Convenience property to set the GWT version -->
-		<gwt.version>2.9.0</gwt.version>
+		<gwt.version>2.10.0</gwt.version>
 		<!-- GWT needs at least java 1.6 -->
 		<webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -95,14 +95,14 @@
 		<dependency>
 			<groupId>org.gcube.portlets.widgets</groupId>
 			<artifactId>geoportal-data-viewer-widget</artifactId>
-			<version>[1.0.1, 2.0.0-SNAPSHOT)</version>
+			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 			<scope>compile</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.gcube.application</groupId>
 			<artifactId>geoportal-data-mapper</artifactId>
-			<version>[1.0.1, 2.0.0-SNAPSHOT)</version>
+			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 			<scope>compile</scope>
 		</dependency>
 

src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/GeonaRecordsPaginatedView.java

@@ -188,16 +188,6 @@ public class GeonaRecordsPaginatedView {
 		}
 		// initFirstRangeChanged = false;
 
-		//printData((List<DocumentDV>) result.getData());
-	}
-
-	private void printData(List<DocumentDV> data) {
-		GWT.log("printData");
-		int i = 0;
-		for (DocumentDV documentDV : data) {
-			GWT.log(++i + ") json: " + documentDV.getDocumentAsJSON());
-		}
-		
 	}
 
 	/**

src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/table/ItemsTable.java

@@ -27,7 +27,6 @@ import com.google.gwt.core.shared.GWT;
 import com.google.gwt.dom.client.Style.Unit;
 import com.google.gwt.event.shared.HandlerManager;
 import com.google.gwt.i18n.client.DateTimeFormat;
-import com.google.gwt.safehtml.client.SafeHtmlTemplates;
 import com.google.gwt.safehtml.shared.SafeHtml;
 import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
 import com.google.gwt.safehtml.shared.SafeHtmlUtils;
@@ -103,127 +102,6 @@ public class ItemsTable<T extends DocumentDV> extends AbstractItemsCellTable<T>
 		super.addItems(items);
 	}
 
-	class CellRender {
-
-		String tooltip;
-		String value;
-
-		public CellRender() {
-		}
-
-		public String getTooltip() {
-			return tooltip;
-		}
-
-		public String getValue() {
-			return value;
-		}
-
-		public void setTooltip(String tooltip) {
-			this.tooltip = tooltip;
-		}
-
-		public void setValue(String value) {
-			this.value = value;
-		}
-
-	}
-
-	public CellRender toCellRender(ItemFieldDV itemField, DocumentDV documentDV) {
-
-		StringBuilder tooltipBuilder = new StringBuilder();
-		StringBuilder valueBuilder = new StringBuilder();
-		String newLine = "<br>";
-		String newLineTxt = "\n";
-		String bullet = "&#8226; "; // it is the dot. As <li> rendered in the <ul> tag
-
-		String newBullet = newLine + bullet;
-
-		List<String> listJsonFields = itemField.getJsonFields();
-
-		int numberOfFields = listJsonFields.size();
-
-		if (numberOfFields > 1) {
-			valueBuilder.append(bullet);
-		}
-
-		for (String jsonKey : listJsonFields) {
-
-			try {
-				String objectToRender = "";
-				// removing the '_theDocument.' prefix for searching in the Document Map
-				String key = jsonKey.replace(ConstantsGeoPortalDataEntryApp.DEFAULT_DOCUMENT_PROJECTION_NAME + ".", "");
-				Object value = documentDV.getDocumentAsMap().get(key);
-				// GWT.log("key: "+key+" is instance of: "+value.getClass());
-
-				if (value == null)
-					continue;
-
-				GWT.log("value instance: " + value.getClass());
-
-				if (value instanceof ArrayList) {
-					ArrayList<Object> arrayValues = (ArrayList<Object>) value;
-					String toReturn = "<ul>";
-					for (Object arrayValue : arrayValues) {
-						toReturn += "<li>" + arrayValue + "</li>";
-					}
-					toReturn += "</ul>";
-					GWT.log("Array returning: " + key + " is instance of: " + value.getClass() + " to return: "
-							+ toReturn);
-					objectToRender = StringUtil.ellipsize(toReturn, MAX_TEXT_DIMENSION);
-				} else {
-					objectToRender = StringUtil.ellipsize(value.toString(), MAX_TEXT_DIMENSION);
-				}
-
-				valueBuilder.append(objectToRender);
-				valueBuilder.append(newBullet);
-
-				if (numberOfFields > 1) {
-					tooltipBuilder.append("* " + key + newLineTxt);
-				}else {
-					tooltipBuilder.append(key);
-				}
-					
-
-			} catch (Exception e) {
-				GWT.log("Error e: " + e);
-			}
-		}
-
-		CellRender cellRender = new CellRender();
-
-		String toRender = valueBuilder.toString();
-		cellRender.setValue(toRender.substring(0, toRender.length() - newBullet.length()));
-
-		String toTooltip = tooltipBuilder.toString();
-		toTooltip = numberOfFields > 1 ? toTooltip.substring(0, toTooltip.length() - newLineTxt.length())
-				: toTooltip;
-		cellRender.setTooltip(toTooltip);
-
-		return cellRender;
-
-	}
-
-	interface Templates extends SafeHtmlTemplates {
-
-		/**
-		 * Start tool tip.
-		 *
-		 * @param toolTipText the tool tip text
-		 * @return the safe html
-		 */
-		@Template("<span title=\"{0}\">")
-		SafeHtml startToolTip(String toolTipText);
-
-		/**
-		 * End tool tip.
-		 *
-		 * @return the safe html
-		 */
-		@Template("</span>")
-		SafeHtml endToolTip();
-	}
-
 	/**
 	 * Inits the table.
 	 *
@@ -252,10 +130,27 @@ public class ItemsTable<T extends DocumentDV> extends AbstractItemsCellTable<T>
 			String displayName = itemField.getDisplayName();
 
 			TextColumn<T> col = new TextColumn<T>() {
-
 				@Override
 				public String getValue(T object) {
 
+					if (object == null)
+						return "";
+
+					DocumentDV documentDV = (DocumentDV) object;
+
+					try {
+						// removing the '_theDocument.' prefix for searching in the Document Map
+						String key = itemField.getJsonFields().get(0)
+								.replace(ConstantsGeoPortalDataEntryApp.DEFAULT_DOCUMENT_PROJECTION_NAME + ".", "");
+						Object value = documentDV.getDocumentAsMap().get(key);
+						if(value==null)
+							return "";
+						
+						return value.toString();
+					} catch (Exception e) {
+						GWT.log("Error e: " + e);
+					}
+
 					return "";
 				}
 
@@ -263,12 +158,39 @@ public class ItemsTable<T extends DocumentDV> extends AbstractItemsCellTable<T>
 				public void render(com.google.gwt.cell.client.Cell.Context context, T object, SafeHtmlBuilder sb) {
 					if (object == null)
 						return;
-					Templates TEMPLATES = GWT.create(Templates.class);
 
-					CellRender cellRender = toCellRender(itemField, object);
-					sb.append(TEMPLATES.startToolTip(cellRender.getTooltip()));
-					sb.appendHtmlConstant(cellRender.getValue());
-					sb.append(TEMPLATES.endToolTip());
+					DocumentDV documentDV = (DocumentDV) object;
+					String objectToRender = "";
+					try {
+						// removing the '_theDocument.' prefix for searching in the Document Map
+						String key = itemField.getJsonFields().get(0)
+								.replace(ConstantsGeoPortalDataEntryApp.DEFAULT_DOCUMENT_PROJECTION_NAME + ".", "");
+						Object value = documentDV.getDocumentAsMap().get(key);
+						// GWT.log("key: "+key+" is instance of: "+value.getClass());
+						
+						if(value==null)
+							return;
+
+						if (value instanceof ArrayList) {
+							ArrayList<Object> arrayValues = (ArrayList<Object>) value;
+							String toReturn = "<ul>";
+							for (Object arrayValue : arrayValues) {
+								toReturn += "<li>" + arrayValue + "</li>";
+							}
+							toReturn += "</ul>";
+							GWT.log("Array returning: " + key + " is instance of: " + value.getClass() + " to return: "
+									+ toReturn);
+							objectToRender = StringUtil.ellipsize(toReturn, MAX_TEXT_DIMENSION);
+						} else {
+							objectToRender = StringUtil.ellipsize(value.toString(), MAX_TEXT_DIMENSION);
+						}
+
+					} catch (Exception e) {
+						GWT.log("Error e: " + e);
+					}
+					sb.appendHtmlConstant(objectToRender);
+//					super.render(context, object, sb);
+//					sb.appendHtmlConstant("</span>");
 
 				};
 
@@ -276,7 +198,7 @@ public class ItemsTable<T extends DocumentDV> extends AbstractItemsCellTable<T>
 			sortedCellTable.addColumn(col, displayName, true);
 			i++;
 		}
-
+		
 		// COL RELATIONS
 		TextColumn<T> colRelationship = new TextColumn<T>() {
 			@Override
@@ -309,7 +231,7 @@ public class ItemsTable<T extends DocumentDV> extends AbstractItemsCellTable<T>
 			};
 
 		};
-
+		
 		colRelationship.setCellStyleNames(CSS_CLASS_BACK_SYSTEM_CELL_B);
 		sortedCellTable.addColumn(colRelationship, DEFAULT_DISPLAYING_COLUMN_NAME.RELATIONSHIPS.getTitle(), true);
 		mapColumns.put(DEFAULT_DISPLAYING_COLUMN_NAME.RELATIONSHIPS, colRelationship);
@@ -336,7 +258,7 @@ public class ItemsTable<T extends DocumentDV> extends AbstractItemsCellTable<T>
 			}
 
 		};
-
+		
 		colCreated.setCellStyleNames(CSS_CLASS_BACK_SYSTEM_CELL_O);
 		sortedCellTable.addColumn(colCreated, DEFAULT_DISPLAYING_COLUMN_NAME.CREATED.getTitle(), true);
 		sortedCellTable.setColumnWidth(colCreated, 130, Unit.PX);
@@ -364,7 +286,7 @@ public class ItemsTable<T extends DocumentDV> extends AbstractItemsCellTable<T>
 			}
 
 		};
-
+		
 		colPublisher.setCellStyleNames(CSS_CLASS_BACK_SYSTEM_CELL_O);
 		sortedCellTable.addColumn(colPublisher, DEFAULT_DISPLAYING_COLUMN_NAME.CREATED_BY.getTitle(), true);
 		mapColumns.put(DEFAULT_DISPLAYING_COLUMN_NAME.CREATED_BY, colPublisher);
@@ -441,7 +363,7 @@ public class ItemsTable<T extends DocumentDV> extends AbstractItemsCellTable<T>
 			};
 
 		};
-
+		
 		colOperationStatus.setCellStyleNames(CSS_CLASS_BACK_SYSTEM_CELL_Y);
 		sortedCellTable.addColumn(colOperationStatus, DEFAULT_DISPLAYING_COLUMN_NAME.STATUS.getTitle(), true);
 		sortedCellTable.setColumnWidth(colOperationStatus, 120, Unit.PX);