From 4f258ce4ec29b64b3f203fa84b452a392e4c7a7f Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Wed, 13 Mar 2013 11:06:23 +0000 Subject: [PATCH] ready for testing git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/reports@71299 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 4 ++-- .settings/com.google.gdt.eclipse.core.prefs | 6 +++++- .settings/org.eclipse.wst.common.component | 6 ------ pom.xml | 2 +- .../portlets/user/reportgenerator/client/Headerbar.java | 2 +- .../reportgenerator/client/model/TemplateComponent.java | 8 ++++++-- .../client/targets/AttributeMultiSelection.java | 2 +- src/main/webapp/ReportGenerator.css | 2 ++ 8 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.classpath b/.classpath index d9b801a..2ee66db 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,6 @@ - + @@ -30,5 +30,5 @@ - + diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs index 7acee53..9d51945 100644 --- a/.settings/com.google.gdt.eclipse.core.prefs +++ b/.settings/com.google.gdt.eclipse.core.prefs @@ -1,4 +1,8 @@ +#Wed Mar 13 11:54:06 CET 2013 +=\=\=\=\=\=\= +<<<<<<<=.mine +>>>>>>>=.r71295 eclipse.preferences.version=1 -lastWarOutDir=/home/gioia/workspace/reports/target/reports-4.0.4-SNAPSHOT +lastWarOutDir=/Users/massi/Documents/workspace/reports/target/reports-4.0.5-SNAPSHOT warSrcDir=src/main/webapp warSrcDirIsOutput=false diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 7cfe79f..2dc054b 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -5,12 +5,6 @@ - - uses - - - uses - diff --git a/pom.xml b/pom.xml index 92e713e..9931094 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.gcube.portlets.user reports war - 4.0.4-SNAPSHOT + 4.0.5-SNAPSHOT gCube Reports Portlet gCube Reports Portlet. diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Headerbar.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Headerbar.java index 8157f96..fab8f60 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Headerbar.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Headerbar.java @@ -53,7 +53,7 @@ public class Headerbar extends Composite{ private static final String EXPORT_OPENXML = "Export to OpenXML (docx)"; private static final String EXPORT_HTML = "Export to HTML"; private static final String EXPORT_FIMES = "Export to FiMES XML"; - private static final String EXPORT_ENCRYPTED_REPORT = "Export crypted Reports"; + private static final String EXPORT_ENCRYPTED_REPORT = "Save Encrypted Version to Desktop"; private static final String VIEW_USER_COMMENTS = "View user comments"; diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateComponent.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateComponent.java index c1e8075..642a2ee 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateComponent.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateComponent.java @@ -251,8 +251,12 @@ public class TemplateComponent { case ATTRIBUTE_MULTI: AttributeMultiSelection ta = null; if (sc.getPossibleContent() instanceof AttributeArea) { - AttributeArea sata = (AttributeArea) sc.getPossibleContent(); - ta = new AttributeMultiSelection(presenter, sc.getX(), sc.getY(), width, height, sata); + AttributeArea sata = (AttributeArea) sc.getPossibleContent(); + //in the metadata in this case there an attribute for diplayType + if (sc.getMetadata() != null && sc.getMetadata().size() > 0) { + + } + ta = new AttributeMultiSelection(presenter, sc.getX(), sc.getY(), width, height, sata, false); } else { ta = new AttributeMultiSelection(presenter, sc.getX(), sc.getY(), width, height, sc.getPossibleContent().toString()); diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/AttributeMultiSelection.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/AttributeMultiSelection.java index 5d87486..3b07cba 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/AttributeMultiSelection.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/AttributeMultiSelection.java @@ -51,7 +51,7 @@ public class AttributeMultiSelection extends Composite { /** * Coming form a report constructor */ - public AttributeMultiSelection(final Presenter presenter, int left, int top, int width, final int height, AttributeArea sata) { + public AttributeMultiSelection(final Presenter presenter, int left, int top, int width, final int height, AttributeArea sata, boolean displayBlock) { myPanel = new HorizontalPanel(); myPanel.setTitle("Attribute Area"); myPanel.setVerticalAlignment(HasVerticalAlignment.ALIGN_BOTTOM); diff --git a/src/main/webapp/ReportGenerator.css b/src/main/webapp/ReportGenerator.css index c0b3057..f3ff41f 100644 --- a/src/main/webapp/ReportGenerator.css +++ b/src/main/webapp/ReportGenerator.css @@ -482,6 +482,8 @@ tableBorder td { .setVisibilityOn { margin-top: 1px; visibility: visible; + cursor: pointer; + cursor: hand; } .templateFrame {