From ebc7c60ccce498a56d7b8da735363429ab380f5a Mon Sep 17 00:00:00 2001 From: francesco Date: Thu, 5 Nov 2020 17:17:07 +0100 Subject: [PATCH] added recordview --- .../client/ui/images/ImageView.java | 4 -- .../client/ui/products/ConcessioneView.java | 1 - .../client/ui/products/ConcessioneView.ui.xml | 7 +++- .../client/ui/products/RecordView.java | 37 +++++++++++++++++++ .../client/ui/products/RecordView.ui.xml | 25 +++++++++++++ .../server/ConvertToDataViewModel.java | 4 +- .../shared/products/ConcessioneDV.java | 2 + .../{ => model}/LayerConcessioneDV.java | 3 +- .../{ => model}/RelazioneScavoDV.java | 2 +- 9 files changed, 74 insertions(+), 11 deletions(-) create mode 100644 src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/RecordView.java create mode 100644 src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/RecordView.ui.xml rename src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/products/{ => model}/LayerConcessioneDV.java (96%) rename src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/products/{ => model}/RelazioneScavoDV.java (99%) diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/images/ImageView.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/images/ImageView.java index e189420..5e408a8 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/images/ImageView.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/images/ImageView.java @@ -7,12 +7,8 @@ import com.github.gwtbootstrap.client.ui.Heading; import com.github.gwtbootstrap.client.ui.Image; import com.github.gwtbootstrap.client.ui.Paragraph; import com.google.gwt.core.client.GWT; -import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; -import com.google.gwt.uibinder.client.UiHandler; -import com.google.gwt.user.client.Window; -import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Widget; 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 53144cc..70f592c 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 @@ -22,7 +22,6 @@ import com.google.gwt.user.client.ui.HTMLPanel; import com.google.gwt.user.client.ui.Widget; - public class ConcessioneView extends Composite { private static ConcessioneViewUiBinder uiBinder = GWT.create(ConcessioneViewUiBinder.class); 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 3208f67..a5cb20b 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 @@ -10,7 +10,8 @@ .margin-left-10 { margin-left: 10px; } - .font-size-h1-22 h1{ + + .font-size-h1-22 h1 { font-size: 22px; } @@ -34,6 +35,10 @@ + + Relazione Scavo + Immagini Rappresentative 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 new file mode 100644 index 0000000..270f9f3 --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/RecordView.java @@ -0,0 +1,37 @@ +package org.gcube.portlets.user.geoportaldataviewer.client.ui.products; + +import org.gcube.portlets.user.geoportaldataviewer.shared.products.model.RecordDV; + +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.user.client.ui.Composite; +import com.google.gwt.user.client.ui.FlowPanel; +import com.google.gwt.user.client.ui.Widget; + +public class RecordView extends Composite { + + private static RecordViewUiBinder uiBinder = GWT.create(RecordViewUiBinder.class); + + interface RecordViewUiBinder extends UiBinder { + } + + public RecordView() { + initWidget(uiBinder.createAndBindUi(this)); + } + + public RecordView(RecordDV record) { + initWidget(uiBinder.createAndBindUi(this)); + + } + + public void addLabel(FlowPanel w, String labelValue){ + com.google.gwt.user.client.ui.Label label = new com.google.gwt.user.client.ui.Label(labelValue); + label.getElement().getStyle().setMarginRight(5, Unit.PX); + w.add(label); + } + + + + +} 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 new file mode 100644 index 0000000..b6900e9 --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/products/RecordView.ui.xml @@ -0,0 +1,25 @@ + + + + .margin-left-10 { + margin-left: 10px; + } + + + + + Created + + + + + + Last Update + + + + + \ No newline at end of file diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/ConvertToDataViewModel.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/ConvertToDataViewModel.java index 2ccb015..93b33fc 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/ConvertToDataViewModel.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/ConvertToDataViewModel.java @@ -16,10 +16,10 @@ import org.gcube.application.geoportal.model.content.WorkspaceContent; import org.gcube.application.geoportal.model.gis.BBOX; import org.gcube.portlets.user.geoportaldataviewer.shared.gis.BoundsMap; import org.gcube.portlets.user.geoportaldataviewer.shared.products.ConcessioneDV; -import org.gcube.portlets.user.geoportaldataviewer.shared.products.LayerConcessioneDV; -import org.gcube.portlets.user.geoportaldataviewer.shared.products.RelazioneScavoDV; import org.gcube.portlets.user.geoportaldataviewer.shared.products.content.OtherContentDV; import org.gcube.portlets.user.geoportaldataviewer.shared.products.content.WorkspaceContentDV; +import org.gcube.portlets.user.geoportaldataviewer.shared.products.model.LayerConcessioneDV; +import org.gcube.portlets.user.geoportaldataviewer.shared.products.model.RelazioneScavoDV; import org.gcube.portlets.user.geoportaldataviewer.shared.products.model.UploadedImageDV; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/products/ConcessioneDV.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/products/ConcessioneDV.java index 7a4e226..798b67e 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/products/ConcessioneDV.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/products/ConcessioneDV.java @@ -5,7 +5,9 @@ import java.util.ArrayList; import java.util.List; import org.gcube.portlets.user.geoportaldataviewer.shared.products.content.OtherContentDV; +import org.gcube.portlets.user.geoportaldataviewer.shared.products.model.LayerConcessioneDV; import org.gcube.portlets.user.geoportaldataviewer.shared.products.model.RecordDV; +import org.gcube.portlets.user.geoportaldataviewer.shared.products.model.RelazioneScavoDV; import org.gcube.portlets.user.geoportaldataviewer.shared.products.model.UploadedImageDV; import com.google.gwt.user.client.rpc.IsSerializable; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/products/LayerConcessioneDV.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/products/model/LayerConcessioneDV.java similarity index 96% rename from src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/products/LayerConcessioneDV.java rename to src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/products/model/LayerConcessioneDV.java index 6c39b66..db7e153 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/products/LayerConcessioneDV.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/products/model/LayerConcessioneDV.java @@ -1,9 +1,8 @@ -package org.gcube.portlets.user.geoportaldataviewer.shared.products; +package org.gcube.portlets.user.geoportaldataviewer.shared.products.model; import java.util.List; import org.gcube.portlets.user.geoportaldataviewer.shared.gis.BoundsMap; -import org.gcube.portlets.user.geoportaldataviewer.shared.products.model.SDILayerDescriptorDV; public class LayerConcessioneDV extends SDILayerDescriptorDV { diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/products/RelazioneScavoDV.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/products/model/RelazioneScavoDV.java similarity index 99% rename from src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/products/RelazioneScavoDV.java rename to src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/products/model/RelazioneScavoDV.java index 1f37cf1..4c44c0a 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/products/RelazioneScavoDV.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/shared/products/model/RelazioneScavoDV.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.geoportaldataviewer.shared.products; +package org.gcube.portlets.user.geoportaldataviewer.shared.products.model; import java.io.Serializable; import java.util.List;