diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 2dc054b..ca15b63 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -5,6 +5,9 @@ + + uses + diff --git a/pom.xml b/pom.xml index 38c9660..4c7e2a6 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.gcube.portlets.user reports war - 4.6.0-SNAPSHOT + 4.6.1-SNAPSHOT gCube Reports Portlet gCube Reports Portlet. @@ -142,7 +142,7 @@ org.gcube.portlets.widgets report-exporter-widget - [1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT) + [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) org.gcube.portal diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java index 02fd797..8374a59 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java @@ -7,12 +7,6 @@ import org.gcube.portlets.d4sreporting.common.client.uicomponents.richtext.RichT import org.gcube.portlets.d4sreporting.common.shared.ComponentType; import org.gcube.portlets.d4sreporting.common.shared.Metadata; import org.gcube.portlets.d4sreporting.common.shared.Model; -import org.gcube.portlets.widgets.exporter.client.ReportExporterPopup; -import org.gcube.portlets.widgets.exporter.client.event.ExportingCompletedEvent; -import org.gcube.portlets.widgets.exporter.client.event.ExportingCompletedEventHandler; -import org.gcube.portlets.widgets.exporter.client.event.ReportExporterEvent; -import org.gcube.portlets.widgets.exporter.client.event.ReportExporterEventHandler; -import org.gcube.portlets.widgets.exporter.shared.TypeExporter; import org.gcube.portlets.user.reportgenerator.client.Headerbar; import org.gcube.portlets.user.reportgenerator.client.ReportGenerator; import org.gcube.portlets.user.reportgenerator.client.ReportService; @@ -42,8 +36,8 @@ import org.gcube.portlets.user.reportgenerator.client.targets.AttributeMultiSele import org.gcube.portlets.user.reportgenerator.client.targets.AttributeSingleSelection; import org.gcube.portlets.user.reportgenerator.client.targets.BasicTextArea; import org.gcube.portlets.user.reportgenerator.client.targets.ClientImage; -import org.gcube.portlets.user.reportgenerator.client.targets.ClientTuple; import org.gcube.portlets.user.reportgenerator.client.targets.ClientRepeatableSequence; +import org.gcube.portlets.user.reportgenerator.client.targets.ClientTuple; import org.gcube.portlets.user.reportgenerator.client.targets.Coords; import org.gcube.portlets.user.reportgenerator.client.targets.D4sRichTextarea; import org.gcube.portlets.user.reportgenerator.client.targets.GenericTable; @@ -55,6 +49,12 @@ import org.gcube.portlets.user.reportgenerator.client.targets.TextTableImage; import org.gcube.portlets.user.reportgenerator.client.uibinder.ExportOptions; import org.gcube.portlets.user.reportgenerator.shared.SessionInfo; import org.gcube.portlets.user.reportgenerator.shared.UserBean; +import org.gcube.portlets.widgets.exporter.client.ReportExporterPopup; +import org.gcube.portlets.widgets.exporter.client.event.ExportingCompletedEvent; +import org.gcube.portlets.widgets.exporter.client.event.ExportingCompletedEventHandler; +import org.gcube.portlets.widgets.exporter.client.event.ReportExporterEvent; +import org.gcube.portlets.widgets.exporter.client.event.ReportExporterEventHandler; +import org.gcube.portlets.widgets.exporter.shared.TypeExporter; import com.extjs.gxt.ui.client.widget.MessageBox; import com.extjs.gxt.ui.client.widget.layout.FitLayout; @@ -326,7 +326,7 @@ public class Presenter { model.insertBiblioSection(); } model.addCitation(citekey, text); - titleBar.setPageDisplayer(model.getCurrentPage(), model.getTotalPages()); + titleBar.getSectionSwitchPanel().setPageDisplayer(model.getCurrentPage(), model.getTotalPages()); } public boolean removeCitation(String citekey) { @@ -469,10 +469,11 @@ public class Presenter { wp.setModel(model); cleanWorkspace(); - titleBar.hideNextButton(); - titleBar.hidePrevButton(); + titleBar.getSectionSwitchPanel().hideNextButton(); + titleBar.getSectionSwitchPanel().hidePrevButton(); titleBar.setTemplateName(model.getTemplateName()); - titleBar.setPageDisplayer(model.getCurrentPage(), model.getTotalPages()); + titleBar.getSectionSwitchPanel().setPageDisplayer(model.getCurrentPage(), model.getTotalPages()); + titleBar.getSectionSwitchPanel().setVisible(false); resizeWorkingArea(model.getPageWidth(), model.getPageHeight()); //persists the change in the session @@ -792,20 +793,20 @@ public class Presenter { model.setCurrentPage(model.getCurrentPage() + 1); //refresh the current page in the UI - titleBar.setPageDisplayer(model.getCurrentPage(), model.getTotalPages()); + titleBar.getSectionSwitchPanel().setPageDisplayer(model.getCurrentPage(), model.getTotalPages()); //read the previous user added elements to the template page from the model and place them back in the UI placeTemplatePageElements(model.getCurrentPage()); if (model.getCurrentPage() == model.getTotalPages()) - titleBar.hideNextButton(); + titleBar.getSectionSwitchPanel().hideNextButton(); else - titleBar.showNextButton(); + titleBar.getSectionSwitchPanel().showNextButton(); if (model.getCurrentPage() == 1) - titleBar.hidePrevButton(); + titleBar.getSectionSwitchPanel().hidePrevButton(); else - titleBar.showPrevButton(); + titleBar.getSectionSwitchPanel().showPrevButton(); } @@ -840,7 +841,8 @@ public class Presenter { wp.setModel(model); titleBar.setTemplateName(model.getTemplateName()); - titleBar.setPageDisplayer(model.getCurrentPage(), model.getTotalPages()); + titleBar.getSectionSwitchPanel().setPageDisplayer(model.getCurrentPage(), model.getTotalPages()); + titleBar.getSectionSwitchPanel().setVisible(true); resizeWorkingArea(model.getPageWidth(), model.getPageHeight()); addTextToolBar(); @@ -851,10 +853,10 @@ public class Presenter { //if there is more than one page place in the UI the next page button if (currPage < model.getTotalPages()) { - titleBar.showNextButton(); + titleBar.getSectionSwitchPanel().showNextButton(); } if (currPage > 1) - titleBar.showPrevButton(); + titleBar.getSectionSwitchPanel().showPrevButton(); } /** @@ -871,24 +873,25 @@ public class Presenter { wp.setModel(model); cleanWorkspace(); - titleBar.hideNextButton(); - titleBar.hidePrevButton(); + titleBar.getSectionSwitchPanel().hideNextButton(); + titleBar.getSectionSwitchPanel().hidePrevButton(); titleBar.setTemplateName(model.getTemplateName()); - titleBar.setPageDisplayer(model.getCurrentPage(), model.getTotalPages()); + titleBar.getSectionSwitchPanel().setPageDisplayer(model.getCurrentPage(), model.getTotalPages()); + titleBar.getSectionSwitchPanel().setVisible(false); resizeWorkingArea(model.getPageWidth(), model.getPageHeight()); } private void loadFirstSection() { //reset the UI cleanWorkspace(); - titleBar.hideNextButton(); - titleBar.hidePrevButton(); + titleBar.getSectionSwitchPanel().hideNextButton(); + titleBar.getSectionSwitchPanel().hidePrevButton(); model.setCurrentPage(1); titleBar.setTemplateName(model.getTemplateName()); - titleBar.setPageDisplayer(model.getCurrentPage(), model.getTotalPages()); - + titleBar.getSectionSwitchPanel().setPageDisplayer(model.getCurrentPage(), model.getTotalPages()); + titleBar.getSectionSwitchPanel().setVisible(true); addTextToolBar(); int currPage = model.getCurrentPage(); //load the UI components of the current page @@ -897,10 +900,10 @@ public class Presenter { //if there is more than one page place in the UI the next page button if (currPage < model.getTotalPages()) { - titleBar.showNextButton(); + titleBar.getSectionSwitchPanel().showNextButton(); } if (currPage > 1) - titleBar.showPrevButton(); + titleBar.getSectionSwitchPanel().showPrevButton(); } @@ -1057,20 +1060,20 @@ public class Presenter { model.setCurrentPage(model.getCurrentPage() - 1); //refresh the current page in the UI - titleBar.setPageDisplayer(model.getCurrentPage(), model.getTotalPages()); + titleBar.getSectionSwitchPanel().setPageDisplayer(model.getCurrentPage(), model.getTotalPages()); //read the previous user added elements to the template page from the model and place them back in the UI placeTemplatePageElements(model.getCurrentPage()); if (model.getCurrentPage() == model.getTotalPages()) - titleBar.hideNextButton(); + titleBar.getSectionSwitchPanel().hideNextButton(); else - titleBar.showNextButton(); + titleBar.getSectionSwitchPanel().showNextButton(); if (model.getCurrentPage() == 1) - titleBar.hidePrevButton(); + titleBar.getSectionSwitchPanel().hidePrevButton(); else - titleBar.showPrevButton(); + titleBar.getSectionSwitchPanel().showPrevButton(); } /** diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/ReportGenerator.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/ReportGenerator.java index d4dd800..70fa853 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/ReportGenerator.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/ReportGenerator.java @@ -1,22 +1,20 @@ package org.gcube.portlets.user.reportgenerator.client; +import org.gcube.portlets.user.reportgenerator.client.Presenter.Presenter; +import org.gcube.portlets.user.reportgenerator.client.toursteps.Intro; +import org.gcube.portlets.user.workspace.client.AppControllerExplorer; +import org.gcube.portlets.user.workspace.client.rpc.GWTWorkspaceServiceAsync; import org.gcube.portlets.widgets.guidedtour.client.GCUBEGuidedTour; import org.gcube.portlets.widgets.guidedtour.client.steps.GCUBETemplate1Text1Image; import org.gcube.portlets.widgets.guidedtour.client.steps.GCUBETemplate2Text2Image; import org.gcube.portlets.widgets.guidedtour.client.steps.TourStep; import org.gcube.portlets.widgets.guidedtour.client.types.VerticalAlignment; -import org.gcube.portlets.user.reportgenerator.client.Presenter.Presenter; -import org.gcube.portlets.user.reportgenerator.client.toursteps.Intro; -import org.gcube.portlets.user.workspace.client.AppControllerExplorer; -import org.gcube.portlets.user.workspace.client.rpc.GWTWorkspaceServiceAsync; -import org.gcube.portlets.widgets.lighttree.client.ItemType; import com.google.gwt.core.client.EntryPoint; import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.RunAsyncCallback; import com.google.gwt.event.logical.shared.ResizeEvent; import com.google.gwt.event.logical.shared.ResizeHandler; -import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.CellPanel; import com.google.gwt.user.client.ui.HTML; diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/TitleBar.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/TitleBar.java index c5156a8..8e68eaa 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/TitleBar.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/TitleBar.java @@ -4,6 +4,7 @@ import java.util.Date; 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.uibinder.SectionSwitchPanel; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; @@ -24,7 +25,6 @@ import com.google.gwt.user.client.ui.HorizontalPanel; * * @author Massimiliano Assante, ISTI-CNR - massimiliano.assante@isti.cnr.it * - * @version July 2011 (3.0) */ public class TitleBar extends Composite{ @@ -53,12 +53,7 @@ import com.google.gwt.user.client.ui.HorizontalPanel; /** * contains the page displayer */ - private HTML pageDisplayer = new HTML(); - - - private HTML prevButton = new HTML(" ", true); - private HTML nextButton = new HTML("    ", true); - + private SectionSwitchPanel sectionSwitchPanel; private HorizontalPanel captionPanel = new HorizontalPanel(); /** @@ -72,32 +67,19 @@ import com.google.gwt.user.client.ui.HorizontalPanel; //initialize the template setTemplateName(templateModel.getTemplateName()); - - setPageDisplayer(1, 1); - + + sectionSwitchPanel = new SectionSwitchPanel(presenter); + sectionSwitchPanel.setPageDisplayer(1, 1); - mainLayout.setSize("90%", "24px"); -// mainLayout.setStyleName("newresultset-header"); - - - //design the part for the template name and the pages handling HorizontalPanel innerCaptionPanel = new HorizontalPanel(); captionPanel.setWidth("100%"); //hide the buttons at the beginning - nextButton.addStyleName("setVisibilityOff"); - prevButton.addStyleName("setVisibilityOff"); - - HorizontalPanel pageHandlerPanel = new HorizontalPanel(); - pageHandlerPanel.setHeight("24"); - pageHandlerPanel.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE); - - pageHandlerPanel.add(prevButton); - pageHandlerPanel.add(pageDisplayer); - pageHandlerPanel.add(nextButton); - pageHandlerPanel.setWidth("100%"); + sectionSwitchPanel.hideNextButton(); + sectionSwitchPanel.hidePrevButton(); + sectionSwitchPanel.setVisible(false); templateNameBox.setStyleName("menubar-font"); @@ -109,22 +91,16 @@ import com.google.gwt.user.client.ui.HorizontalPanel; captionPanel.setVerticalAlignment(HasAlignment.ALIGN_MIDDLE); captionPanel.add(innerCaptionPanel); mainLayout.add(captionPanel); - mainLayout.add(pageHandlerPanel); + mainLayout.add(sectionSwitchPanel); editedOn.setStyleName("docEditedBy"); mainLayout.setCellHorizontalAlignment(captionPanel, HasHorizontalAlignment.ALIGN_LEFT); mainLayout.setCellVerticalAlignment(captionPanel, HasVerticalAlignment.ALIGN_MIDDLE); - mainLayout.setCellWidth(pageHandlerPanel, "200"); + mainLayout.setCellWidth(sectionSwitchPanel, "250px"); initWidget(mainLayout); + mainLayout.setStyleName("titleBar"); - nextButton.addClickHandler(new ClickHandler() { - public void onClick(ClickEvent event) { presenter.nextPageButtonClicked(); - } - }); - - prevButton.addClickHandler(new ClickHandler() { - public void onClick(ClickEvent event) { presenter.prevPageButtonClicked(); } - }); + } /** * add the buttons well visible on the top @@ -151,20 +127,14 @@ import com.google.gwt.user.client.ui.HorizontalPanel; captionPanel.add(back); } - /** - * changes the pages label in the UI : e.g. Page x of y - * @param currentPage . - * @param totalPages . - */ - public void setPageDisplayer(int currentPage, int totalPages) { - pageDisplayer.setHTML("Section "+ currentPage + " of " + totalPages); - } - + /** * changes the template name label in the UI * @param name . */ public void setTemplateName(String name) { + if (name.endsWith(".d4sR")) + name = name.replaceAll(".d4sR", ""); templateNameBox.setHTML("  " + name); } @@ -178,35 +148,7 @@ import com.google.gwt.user.client.ui.HorizontalPanel; editedOn.setHTML("  edited on " + dt + "  by " + username); } - /** - * Shows the previous botton in the UI - */ - public void showPrevButton() { - prevButton.removeStyleName("setVisibilityOff"); - prevButton.addStyleName("setVisibilityOn"); - } - /** - * Shows the next botton in the UI - */ - public void showNextButton() { - nextButton.removeStyleName("setVisibilityOff"); - nextButton.addStyleName("setVisibilityOn"); - } - - /** - * Hide the previous botton in the UI - */ - public void hidePrevButton() { - prevButton.removeStyleName("setVisibilityOn"); - prevButton.addStyleName("setVisibilityOff"); - } - /** - * Hide the next botton in the UI - */ - public void hideNextButton() { - nextButton.removeStyleName("setVisibilityOn"); - nextButton.addStyleName("setVisibilityOff"); - } + /** * temporary command * @return the command instance @@ -222,8 +164,13 @@ import com.google.gwt.user.client.ui.HorizontalPanel; return openNothing; } - - - } + /** + * + * @return SectionSwitchPanel + */ + public SectionSwitchPanel getSectionSwitchPanel() { + return sectionSwitchPanel; + } +} diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/ToolboxPanel.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/ToolboxPanel.java index 7336717..a688deb 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/ToolboxPanel.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/ToolboxPanel.java @@ -29,10 +29,10 @@ public class ToolboxPanel extends SimplePanel { public ToolboxPanel(AppControllerExplorer appController) { this.appController = appController; -// AsyncTreePanel tp = appController.getTree(TOOLBOX_WIDTH, TOOLBOX_HEIGHT); -// this.tp = tp; -// add(tp); -// this.appController.hideSharingFacilities(); //sharing disabled we have problems from Reports + AsyncTreePanel tp = appController.getTree(TOOLBOX_WIDTH, TOOLBOX_HEIGHT); + this.tp = tp; + add(tp); + this.appController.hideSharingFacilities(); //sharing disabled we have problems from Reports } public void showExportedVersion(String id, String fileName) { diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateModel.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateModel.java index 1b0532d..6a52971 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateModel.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateModel.java @@ -4,20 +4,19 @@ import java.util.Date; import java.util.HashMap; import java.util.LinkedList; import java.util.List; -import java.util.Vector; import java.util.Map.Entry; +import java.util.Vector; +import org.gcube.portlets.d4sreporting.common.shared.BasicComponent; +import org.gcube.portlets.d4sreporting.common.shared.BasicSection; import org.gcube.portlets.d4sreporting.common.shared.ComponentType; import org.gcube.portlets.d4sreporting.common.shared.Metadata; -import org.gcube.portlets.d4sreporting.common.shared.BasicComponent; import org.gcube.portlets.d4sreporting.common.shared.Model; -import org.gcube.portlets.d4sreporting.common.shared.BasicSection; import org.gcube.portlets.d4sreporting.common.shared.RepTimeSeries; import org.gcube.portlets.user.reportgenerator.client.ReportService; import org.gcube.portlets.user.reportgenerator.client.ReportServiceAsync; import org.gcube.portlets.user.reportgenerator.client.Presenter.Presenter; -import com.extjs.gxt.ui.client.widget.MessageBox; import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.Window; @@ -49,7 +48,7 @@ public class TemplateModel { /** * DEFAULT_NAME */ - public static final String DEFAULT_NAME = "No template loaded"; + public static final String DEFAULT_NAME = "No reports/templates loaded"; public static final String BIBLIO_SECTION = "isBibliography"; public static final String USER_COMMENT = "isComment"; public static final String USER_COMMENT_HEIGHT = "isCommentHeight"; diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/uibinder/SectionSwitchPanel.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/uibinder/SectionSwitchPanel.java new file mode 100644 index 0000000..01ec638 --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/uibinder/SectionSwitchPanel.java @@ -0,0 +1,88 @@ +package org.gcube.portlets.user.reportgenerator.client.uibinder; + +import org.gcube.portlets.user.reportgenerator.client.Presenter.Presenter; + +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.ui.Composite; +import com.google.gwt.user.client.ui.HTML; +import com.google.gwt.user.client.ui.Image; +import com.google.gwt.user.client.ui.Widget; + +public class SectionSwitchPanel extends Composite { + + public static final String PREV = GWT.getModuleBaseURL() + "../images/prev.png"; + public static final String NEXT = GWT.getModuleBaseURL() + "../images/next.png"; + + private static SectionSwitchPanelUiBinder uiBinder = GWT + .create(SectionSwitchPanelUiBinder.class); + + interface SectionSwitchPanelUiBinder extends + UiBinder { + } + + private Presenter presenter; + public SectionSwitchPanel(Presenter presenter) { + initWidget(uiBinder.createAndBindUi(this)); + this.presenter = presenter; + nextButton.setUrl(NEXT); + prevButton.setUrl(PREV); + } + + @UiField + Image nextButton; + @UiField + Image prevButton; + @UiField + HTML display; + + @UiHandler("nextButton") + void onNextClick(ClickEvent e) { + presenter.nextPageButtonClicked(); + } + @UiHandler("prevButton") + void onPrevClick(ClickEvent e) { + presenter.prevPageButtonClicked(); + } + /** + * changes the pages label in the UI : e.g. Page x of y + * @param currentPage . + * @param totalPages . + */ + public void setPageDisplayer(int currentPage, int totalPages) { + display.setHTML("Section "+ currentPage + " of " + totalPages); + } + /** + * Shows the previous botton in the UI + */ + public void showPrevButton() { + prevButton.removeStyleName("setVisibilityOff"); + prevButton.addStyleName("setVisibilityOn"); + } + /** + * Shows the next botton in the UI + */ + public void showNextButton() { + nextButton.removeStyleName("setVisibilityOff"); + nextButton.addStyleName("setVisibilityOn"); + } + + /** + * Hide the previous botton in the UI + */ + public void hidePrevButton() { + prevButton.removeStyleName("setVisibilityOn"); + prevButton.addStyleName("setVisibilityOff"); + } + /** + * Hide the next botton in the UI + */ + public void hideNextButton() { + nextButton.removeStyleName("setVisibilityOn"); + nextButton.addStyleName("setVisibilityOff"); + } + +} diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/uibinder/SectionSwitchPanel.ui.xml b/src/main/java/org/gcube/portlets/user/reportgenerator/client/uibinder/SectionSwitchPanel.ui.xml new file mode 100644 index 0000000..a646c02 --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/uibinder/SectionSwitchPanel.ui.xml @@ -0,0 +1,12 @@ + + + + + + + + + +
+ + \ No newline at end of file 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 714c5ea..1b7b926 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 @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import java.util.List; +import java.util.UUID; import java.util.Vector; import javax.servlet.http.HttpServletRequest; @@ -1187,7 +1188,11 @@ public class ReportServiceImpl extends RemoteServiceServlet implements ReportSe Model toConvert = null; try { String path = myUtil.getTemplateFolder(getVreName(), getUsername()); - fis = new FileInputStream(path + "CURRENT_OPEN/CURRENT_OPEN.d4st"); + + String reportFileName = seekModel(templatePath, UUID.randomUUID().toString()); //random name just to make sure it look for the name + String pathToReport = path + "CURRENT_OPEN/"+reportFileName+".d4st"; + _log.trace("WF PathToReport = " + pathToReport); + fis = new FileInputStream(pathToReport); in = new ObjectInputStream(fis); toConvert = (Model) in.readObject(); in.close(); diff --git a/src/main/webapp/ReportGenerator.css b/src/main/webapp/ReportGenerator.css index 917ccdc..6c7c5d3 100644 --- a/src/main/webapp/ReportGenerator.css +++ b/src/main/webapp/ReportGenerator.css @@ -1,4 +1,24 @@ -@import url('reports/old-dialog.css'); +.gwt-Button { + text-decoration: none; + cursor: pointer; + cursor: hand; + background: url("gcube_images/hborder.png") repeat-x 0px -2077px + !important; + border: 1px solid #bbb !important; + border-bottom: 1px solid #a0a0a0 !important; + border-radius: 4px !important; + -moz-border-radius: 4px !important;; + -webkit-border-radius: 4px !important; + margin: 5px !important; +} + +.gwt-Button:active { + border: 1px inset #ccc !important; +} + +.gwt-Button:hover { + border-color: #939393 !important;; +} .openOptionsPanel { margin: 25px 5px 0px -45px; @@ -339,6 +359,22 @@ tableBorder td { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 10px; } +.sectionSwitch { + color: #91B2FF; + font-family: "HelveticaNeue-Light", "Helvetica Neue Light", + "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif; + font-weight: normal; + font-size: 16px; +} + +.sectionSwitch-button { + padding: 2px 6px; + opacity: 0.7; +} + +.sectionSwitch-button:hover { + opacity: 1.0; +} .docEditedBy { color: #666666; @@ -355,9 +391,11 @@ tableBorder td { } .menubar-font { - font-family: Arial, sans-serif; + color: #19326C; + font-family: "HelveticaNeue-Light", "Helvetica Neue Light", + "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif; + font-weight: normal; font-size: 16px; - font-weight: bold; } .reportHeader { @@ -500,6 +538,12 @@ tableBorder td { color: #336699; } +.titleBar { + width: 790px; + height: 35px; + margin: -3px 0px 3px; +} + .heading1 { background-image: url(images/heading_1.png); font-size: 16px; diff --git a/src/main/webapp/images/next.png b/src/main/webapp/images/next.png new file mode 100644 index 0000000..9ac6b86 Binary files /dev/null and b/src/main/webapp/images/next.png differ diff --git a/src/main/webapp/images/prev.png b/src/main/webapp/images/prev.png new file mode 100644 index 0000000..9cbb797 Binary files /dev/null and b/src/main/webapp/images/prev.png differ