diff --git a/.settings/com.gwtplugins.gdt.eclipse.core.prefs b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
index ff5aa39..e75d335 100644
--- a/.settings/com.gwtplugins.gdt.eclipse.core.prefs
+++ b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
@@ -1,4 +1,4 @@
eclipse.preferences.version=1
-lastWarOutDir=/home/francesco/git/geoportal-data-viewer-app/target/geoportal-data-viewer-app-1.0.0-SNAPSHOT
+lastWarOutDir=/home/francescomangiacrapa/git/geoportal-data-viewer-app/target/geoportal-data-viewer-app-1.0.0-SNAPSHOT
warSrcDir=src/main/webapp
warSrcDirIsOutput=false
diff --git a/pom.xml b/pom.xml
index 96c7129..5dfde73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,18 +109,18 @@
geo-utility
[1.0.0,2.0.0-SNAPSHOT)
-
- org.gcube.common
- authorization-client
- [2.0.0, 3.0.0-SNAPSHOT)
- provided
-
-
- org.gcube.resources.discovery
- ic-client
- [1.0.0, 2.0.0-SNAPSHOT)
- provided
-
+
+
+
+
+
+
+
+
+
+
+
+
org.gcube.core
common-scope-maps
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/ConcessioneView.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/ConcessioneView.java
index 70f592c..599ce09 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/ConcessioneView.java
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/ConcessioneView.java
@@ -35,6 +35,9 @@ public class ConcessioneView extends Composite {
@UiField
Paragraph introduzione;
+ @UiField
+ HTMLPanel recordPanel;
+
@UiField
Column autori;
@@ -44,17 +47,23 @@ public class ConcessioneView extends Composite {
@UiField
HTMLPanel imagesPanel;
+ @UiField
+ HTMLPanel pageViewDetails;
+
private ConcessioneDV concessioneDV;
private Thumbnails thumbNails = new Thumbnails();
public ConcessioneView() {
initWidget(uiBinder.createAndBindUi(this));
+ pageViewDetails.getElement().setId("page-view-details");
}
public ConcessioneView(ConcessioneDV concessioneDV) {
this();
+ recordPanel.setVisible(true);
+ recordPanel.add(new RecordView(concessioneDV));
this.concessioneDV = concessioneDV;
titolo.setText(concessioneDV.getNome());
introduzione.setText(concessioneDV.getIntroduzione());
@@ -65,7 +74,6 @@ public class ConcessioneView extends Composite {
}
addLabel(contributore, concessioneDV.getContributore());
-
addImages();
}
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/ConcessioneView.ui.xml b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/ConcessioneView.ui.xml
index a5cb20b..9f311a4 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/ConcessioneView.ui.xml
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/ConcessioneView.ui.xml
@@ -2,6 +2,7 @@
+
.important {
font-weight: bold;
@@ -15,13 +16,15 @@
font-size: 22px;
}
-
+
- Hero Unit
- Some Text for the Hero Unit.
+
+
+
+
Autori
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/RecordView.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/RecordView.java
index 270f9f3..bf1e1c9 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/RecordView.java
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/RecordView.java
@@ -2,9 +2,11 @@ package org.gcube.portlets.user.geoportaldataviewer.client.ui.products;
import org.gcube.portlets.user.geoportaldataviewer.shared.products.model.RecordDV;
+import com.github.gwtbootstrap.client.ui.Column;
import com.google.gwt.core.client.GWT;
import com.google.gwt.dom.client.Style.Unit;
import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.FlowPanel;
import com.google.gwt.user.client.ui.Widget;
@@ -16,12 +18,24 @@ public class RecordView extends Composite {
interface RecordViewUiBinder extends UiBinder {
}
+ @UiField
+ Column creationTime;
+
+ @UiField
+ Column lastUpdateTime;
+
+ @UiField
+ Column updatedByUser;
+
public RecordView() {
initWidget(uiBinder.createAndBindUi(this));
}
public RecordView(RecordDV record) {
initWidget(uiBinder.createAndBindUi(this));
+ addLabel(creationTime, record.getCreationTime());
+ addLabel(lastUpdateTime, record.getLastUpdateTime());
+ addLabel(updatedByUser, record.getLastUpdateUser());
}
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/RecordView.ui.xml b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/RecordView.ui.xml
index b6900e9..406a0a6 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/RecordView.ui.xml
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/RecordView.ui.xml
@@ -7,8 +7,7 @@
margin-left: 10px;
}
-
+
Created
@@ -21,5 +20,11 @@
+
+
+ Updated By
+
+
+
\ No newline at end of file
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/TestModel.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/TestModel.java
index 0cbfd61..b224423 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/TestModel.java
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/TestModel.java
@@ -3,12 +3,15 @@ package org.gcube.portlets.user.geoportaldataviewer.server;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.List;
import org.gcube.application.geoportal.model.AccessPolicy;
import org.gcube.application.geoportal.model.concessioni.Concessione;
import org.gcube.application.geoportal.model.concessioni.LayerConcessione;
import org.gcube.application.geoportal.model.concessioni.RelazioneScavo;
+import org.gcube.application.geoportal.model.content.PersistedContent;
import org.gcube.application.geoportal.model.content.UploadedImage;
+import org.gcube.application.geoportal.model.content.WorkspaceContent;
public class TestModel {
@@ -47,7 +50,10 @@ public class TestModel {
concessione.setParoleChiaveLibere(Arrays.asList(new String[] {"Robba","Stuff"}));
concessione.setParoleChiaveICCD(Arrays.asList(new String[] {"vattelapesca","somthing something"}));
-
+
+ concessione.setLastUpdateTime(LocalDateTime.now());
+ concessione.setCreationTime(LocalDateTime.now());
+ concessione.setLastUpdateUser("fake user");
concessione.setCentroidLat(43.0); //N-S
concessione.setCentroidLong(9.0); //E-W
@@ -79,6 +85,11 @@ public class TestModel {
img.setFormat("TIFF");
img.setCreationTime(LocalDateTime.now());
img.setResponsabili(concessione.getAuthors());
+ List actualContentList = new ArrayList(1);
+ WorkspaceContent ws = new WorkspaceContent();
+ ws.setLink("https://data-dev.d4science.net/ie8Y");
+ actualContentList.add(ws);
+ img.setActualContent(actualContentList);
imgs.add(img);
}
concessione.setImmaginiRappresentative(imgs);
diff --git a/src/main/webapp/GeoportalDataViewer.css b/src/main/webapp/GeoportalDataViewer.css
index 8148609..4a5e0ba 100644
--- a/src/main/webapp/GeoportalDataViewer.css
+++ b/src/main/webapp/GeoportalDataViewer.css
@@ -67,4 +67,25 @@
.popup-table div:first-child {
font-weight: bold;
+}
+
+#page-view-details div {
+ font-family: Lato, 'Helvetica Neue', Arial, Helvetica, sans-serif;
+}
+
+#page-view-details .hero-unit h1, #page-view-details .hero-unit h2,
+ #page-view-details .hero-unit p {
+ font-family: Lato, -apple-system, BlinkMacSystemFont, system-ui,
+ Segoe UI, Roboto, Helvetica, Arial, sans-serif;
+}
+
+#page-view-details .hero-unit {
+ padding: 40px;
+ margin-left: 5px;
+ margin-right: 5px;
+}
+
+#page-view-details .span1 .gwt-Label, #page-view-details .span2 .gwt-Label {
+ color: gray;
+ font-weight: bold;
}
\ No newline at end of file
diff --git a/src/test/java/org/gcube/portlets/user/geoportaldataviewer/GetConcessione.java b/src/test/java/org/gcube/portlets/user/geoportaldataviewer/GetConcessione.java
index a056e42..33aabec 100644
--- a/src/test/java/org/gcube/portlets/user/geoportaldataviewer/GetConcessione.java
+++ b/src/test/java/org/gcube/portlets/user/geoportaldataviewer/GetConcessione.java
@@ -6,6 +6,8 @@ import org.gcube.application.geoportal.model.Record;
import org.gcube.application.geoportal.model.concessioni.Concessione;
import org.gcube.common.scope.api.ScopeProvider;
import org.gcube.portlets.user.geoportaldataviewer.server.ConvertToDataViewModel;
+import org.gcube.portlets.user.geoportaldataviewer.server.GeoportalDataViewerServiceImpl;
+import org.gcube.portlets.user.geoportaldataviewer.shared.products.ConcessioneDV;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -14,9 +16,9 @@ public class GetConcessione {
private static final Logger LOG = LoggerFactory.getLogger(GetConcessione.class);
public static String SCOPE = "/gcube/devNext/NextNext";
- public static long concessioneId = 48;
+ public static long concessioneId = 16;
- public static void main(String[] args) {
+ /*public static void main(String[] args) {
ScopeProvider.instance.set(SCOPE);
@@ -39,6 +41,14 @@ public class GetConcessione {
String erroMsg = Concessione.class.getSimpleName() +" with id "+concessioneId+" not available";
LOG.error(erroMsg,e);
}
+ }*/
+
+ public static void main(String[] args) throws Exception {
+ GeoportalDataViewerServiceImpl geonNaServiecImpl = new GeoportalDataViewerServiceImpl();
+ ScopeProvider.instance.set(SCOPE);
+ LOG.info("Trying to get record for id "+concessioneId);
+ ConcessioneDV concessione = geonNaServiecImpl.getConcessioneForId(concessioneId);
+ LOG.info("Got record for id "+concessione);
}