2.14

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/reports@74441 82a268e6-3cf1-43bd-a215-b396298e98cf

.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/reports-4.1.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/reports-4.2.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -30,5 +30,5 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/reports-4.1.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/reports-4.2.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>

.settings/com.google.gdt.eclipse.core.prefs

@@ -1,8 +1,8 @@
-#Mon Mar 18 11:42:27 CET 2013
+#Thu May 02 16:46:18 CEST 2013
 =\=\=\=\=\=\=
 <<<<<<<=.mine
 >>>>>>>=.r71295
 eclipse.preferences.version=1
-lastWarOutDir=/Users/massi/Documents/workspace/reports/target/reports-4.1.0-SNAPSHOT
+lastWarOutDir=/Users/massi/Documents/workspace/reports/target/reports-4.2.0-SNAPSHOT
 warSrcDir=src/main/webapp
 warSrcDirIsOutput=false

distro/changelog.xml

@@ -1,4 +1,8 @@
 <ReleaseNotes>
+<Changeset component="org.gcube.portlets-user.report-generator-portlet.4-2-0" date="2013-04-19">
+<Change>Lots of improvements in the UI</Change>
+<Change>Embedded images in reports</Change>
+</Changeset>
 <Changeset component="org.gcube.portlets-user.report-generator-portlet.3-4-0" date="2012-05-04">
 <Change>Top menu restyled</Change>
 <Change>adapted to new Workspace Tree</Change>

pom.xml

@@ -12,7 +12,7 @@
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>reports</artifactId>
 	<packaging>war</packaging>
-	<version>4.1.0-SNAPSHOT</version>
+	<version>4.2.0-SNAPSHOT</version>
 	<name>gCube Reports Portlet</name>
 	<description>
 		gCube Reports Portlet.

src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java

@@ -260,6 +260,35 @@ public class Presenter {
 	public void showOpenOptions() {
 		wp.showOpenOptions();
 	}
+	
+	public void showLoading() {
+		wp.showLoading();
+	}
+	
+	/**
+	 * load the template to edit in the MODEL and in the VIEW
+	 * @param templateToOpen the name of the template to open without extension nor path
+	 * @param templateObjectID the id in the folder of the template to open
+	 * @param isTemplate true if you are opening a template false if you are opening a report
+	 */
+	public void openTemplate(String templateToOpen, String templateObjectID, final boolean isTemplate) {
+		showLoading();
+		//will asyncrously return a Serializable Model instance read from disk
+		model.getModelService().readModel(templateToOpen, templateObjectID, isTemplate, false, new AsyncCallback<Model>() {
+			@Override
+			public void onSuccess(Model toLoad) {
+				if (toLoad != null)
+					loadModel(toLoad);
+				else
+					Window.alert("Could not Load template, error on server: ");
+			}
+			@Override
+			public void onFailure(Throwable caught) {
+				Window.alert("Could not Load template, please try again later: " + caught.getMessage());
+
+			}
+		});
+	}
 
 	public void showSectionUserCommentsTooltips() {
 		TemplateSection currSection = model.getSection(model.getCurrentPage());
@@ -712,29 +741,7 @@ public class Presenter {
 			titleBar.showPrevButton();
 	}
 
-	/**
+	
-	 * load the template to edit in the MODEL and in the VIEW
-	 * @param templateToOpen the name of the template to open without extension nor path
-	 * @param templateObjectID the id in the folder of the template to open
-	 * @param isTemplate true if you are opening a template false if you are opening a report
-	 */
-	public void openTemplate(String templateToOpen, String templateObjectID, final boolean isTemplate) {
-		//will asyncrously return a Serializable Model instance read from disk
-		model.getModelService().readModel(templateToOpen, templateObjectID, isTemplate, false, new AsyncCallback<Model>() {
-			@Override
-			public void onSuccess(Model toLoad) {
-				if (toLoad != null)
-					loadModel(toLoad);
-				else
-					Window.alert("Could not Load template, error on server: ");
-			}
-			@Override
-			public void onFailure(Throwable caught) {
-				Window.alert("Could not Load template, please try again later: " + caught.getMessage());
-
-			}
-		});
-	}
 	/**
 	 * load the template to edit in the MODEL and in the VIEW
 	 * @param serializedpath the temp file to open

src/main/java/org/gcube/portlets/user/reportgenerator/client/WorkspacePanel.java

@@ -6,10 +6,13 @@ import org.gcube.portlets.user.reportgenerator.client.Presenter.Presenter;
 import org.gcube.portlets.user.reportgenerator.client.model.TemplateModel;
 import org.gcube.portlets.user.reportgenerator.client.targets.DoubleColumnPanel;
 import org.gcube.portlets.user.reportgenerator.client.uibinder.OpenOptions;
+import org.gcube.portlets.user.reportgenerator.client.uibinder.ShowLoading;
 
+import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.HorizontalPanel;
+import com.google.gwt.user.client.ui.Image;
 import com.google.gwt.user.client.ui.Widget;
 
 
@@ -20,6 +23,7 @@ import com.google.gwt.user.client.ui.Widget;
  */
 
 public class WorkspacePanel extends Composite {
+
 	/**
 	 * the model
 	 */
@@ -77,6 +81,11 @@ public class WorkspacePanel extends Composite {
 		mainLayout.add(new OpenOptions(presenter));
 	}
 	
+	public void showLoading() {
+		mainLayout.clear();
+		mainLayout.add(new ShowLoading());
+	}
+	
 	/**
 	 * 
 	 * @param w .

src/main/java/org/gcube/portlets/user/reportgenerator/client/uibinder/OpenOptions.java

@@ -67,7 +67,7 @@ public class OpenOptions extends Composite {
 			cmd.openTemplate.execute();
 			break;
 		case UPLOAD:
-			 
+			p.showUploadFilePopup();
 			break;
 		default:
 			break;

src/main/java/org/gcube/portlets/user/reportgenerator/client/uibinder/ShowLoading.java

@@ -0,0 +1,27 @@
+package org.gcube.portlets.user.reportgenerator.client.uibinder;
+
+import com.google.gwt.core.client.GWT;
+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.Image;
+import com.google.gwt.user.client.ui.Widget;
+
+public class ShowLoading extends Composite {
+	public static final String LOADING = GWT.getModuleBaseURL() + "../images/reports-loader.gif";
+	
+	private static ShowoadingUiBinder uiBinder = GWT
+			.create(ShowoadingUiBinder.class);
+
+	interface ShowoadingUiBinder extends UiBinder<Widget, ShowLoading> {
+	}
+	
+	@UiField Image loadingReport;
+	
+	public ShowLoading() {
+		initWidget(uiBinder.createAndBindUi(this));
+		loadingReport.setUrl(LOADING);
+	}
+
+	
+}

src/main/java/org/gcube/portlets/user/reportgenerator/client/uibinder/ShowLoading.ui.xml

@@ -0,0 +1,13 @@
+<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
+<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
+	xmlns:g="urn:import:com.google.gwt.user.client.ui">
+	<g:HTMLPanel styleName="openOptionsPanel" ui:field="myPanel">
+		<table style="width: 790px; text-align: center;">
+			<tr>
+				<td>
+					<g:Image ui:field="loadingReport" />
+				</td>
+			</tr>		
+		</table>
+	</g:HTMLPanel>
+</ui:UiBinder>