diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs
index d28b472..f4ae421 100644
--- a/.settings/com.google.gdt.eclipse.core.prefs
+++ b/.settings/com.google.gdt.eclipse.core.prefs
@@ -1,7 +1,8 @@
+#Wed Mar 13 12:12:28 CET 2013
=\=\=\=\=\=\=
<<<<<<<=.mine
>>>>>>>=.r71295
eclipse.preferences.version=1
-lastWarOutDir=/home/gioia/workspace/reports/target/reports-4.0.5-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 9931094..623359e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,7 +134,11 @@
org.gcube.portlets.user
gcube-docx-generator
[1.2.0-SNAPSHOT, 2.0.0-SNAPSHOT)
- runtime
+
+
+ report-exporter-widget
+ report-exporter-widget
+ [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)
org.gcube.portal
@@ -152,7 +156,7 @@
org.gcube.portlets.user
workspace-application-handler
[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
- ${setScope}
+ ${setScope}
org.gcube.portlets.user
@@ -240,11 +244,6 @@
sources
test
-
- report-exporter-widget
- report-exporter-widget
- [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)
-
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 642a2ee..d428314 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
@@ -254,7 +254,7 @@ public class TemplateComponent {
AttributeArea sata = (AttributeArea) sc.getPossibleContent();
//in the metadata in this case there an attribute for diplayType
if (sc.getMetadata() != null && sc.getMetadata().size() > 0) {
-
+ GWT.log("attr:"+ sc.getMetadata().get(0).getAttribute());
}
ta = new AttributeMultiSelection(presenter, sc.getX(), sc.getY(), width, height, sata, false);
}
diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java
index 53d6d9c..5d04db0 100644
--- a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java
@@ -172,6 +172,7 @@ public class ReportServiceImpl extends RemoteServiceServlet implements ReportSe
*/
private ASLSession getASLSession() {
String sessionID = this.getThreadLocalRequest().getSession().getId();
+
String user = (String) this.getThreadLocalRequest().getSession().getAttribute(ScopeHelper.USERNAME_ATTRIBUTE);
if (user == null) {
user = "massimiliano.assante";
@@ -548,6 +549,7 @@ public class ReportServiceImpl extends RemoteServiceServlet implements ReportSe
*/
public String generateTempDocx(Model model) {
+
_log.info("Generating docx file");
DocxGenerator docxGenerator = new DocxGenerator(model);
_log.debug("DocxGenerator instanciated:");
@@ -920,10 +922,10 @@ public class ReportServiceImpl extends RemoteServiceServlet implements ReportSe
_log.trace("NEW setPossibleContent: " + component.getPossibleContent());
}
}
- if (component.getType() == ComponentType.REPEAT_SEQUENCE) {
+ if (component.getType() == ComponentType.REPEAT_SEQUENCE || component.getType() == ComponentType.BODY_TABLE_IMAGE) { //there could be images inside
RepeatableSequence res = (RepeatableSequence) component.getPossibleContent();
for (BasicComponent co : res.getGroupedComponents()) {
- _log.debug("Found DP IN SEQUENCE: " + component.getPossibleContent());
+ _log.debug("Found Image IN SEQUENCE, type is: " + component.getType());
if (co.getIdInBasket() != null) {
String imageID = co.getIdInBasket();
String imageNameFile = UUID.randomUUID().toString();