diff --git a/projectbrowser-portlet/src/main/java/life/qbic/portal/portlet/ProjectBrowserPortlet.java b/projectbrowser-portlet/src/main/java/life/qbic/portal/portlet/ProjectBrowserPortlet.java index efaa28b..4a19781 100644 --- a/projectbrowser-portlet/src/main/java/life/qbic/portal/portlet/ProjectBrowserPortlet.java +++ b/projectbrowser-portlet/src/main/java/life/qbic/portal/portlet/ProjectBrowserPortlet.java @@ -384,7 +384,7 @@ public void buttonClick(ClickEvent event) { Button header = new Button(String.format("Total number of projects: %s", numberOfProjects)); header.setIcon(FontAwesome.HAND_O_RIGHT); header.setStyleName(ValoTheme.BUTTON_LARGE); - header.addStyleName(ValoTheme.BUTTON_BORDERLESS); +// header.addStyleName(ValoTheme.BUTTON_BORDERLESS); ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //EINGEFÜGT VON MARC @@ -393,16 +393,17 @@ public void buttonClick(ClickEvent event) { Button infoButton = new Button("URL"); infoButton.setStyleName(ValoTheme.BUTTON_LARGE); infoButton.addStyleName(ValoTheme.BUTTON_BORDERLESS); -// -// infoButton.addClickListener(new ClickListener() { -// @Override -// public void buttonClick(ClickEvent event) { + + infoButton.addClickListener(new ClickListener() { + @Override + public void buttonClick(ClickEvent event) { // VaadinRequest vaadinRequest = VaadinService.getCurrentRequest(); // HttpServletRequest httpServletRequest = ((VaadinServletRequest)vaadinRequest).getHttpServletRequest(); // String requestUrl = httpServletRequest.getRequestURL().toString(); // LOG.info(requestUrl); -// } -// }); + LOG.info("URL Button"); + } + }); // if() diff --git a/projectbrowser-portlet/src/main/java/life/qbic/projectbrowser/components/DatasetComponent.java b/projectbrowser-portlet/src/main/java/life/qbic/projectbrowser/components/DatasetComponent.java index 83efd0b..aa4a692 100644 --- a/projectbrowser-portlet/src/main/java/life/qbic/projectbrowser/components/DatasetComponent.java +++ b/projectbrowser-portlet/src/main/java/life/qbic/projectbrowser/components/DatasetComponent.java @@ -560,6 +560,16 @@ public void itemClick(ItemClickEvent event) { res = streamres; visualize = true; } + ////////////////////////////////////////////////////////////////////////////////////////// + // Von Marc eingefügt + + if (datasetFileName.endsWith(".csv")) { + QcMlOpenbisSource re = new QcMlOpenbisSource(url); + StreamResource streamres = new StreamResource(re, datasetFileName); + streamres.setMIMEType("text/plain"); + res = streamres; + visualize = true; + } if (visualize) { // LOG.debug("Is resource null?: " + String.valueOf(res == null)); @@ -607,7 +617,7 @@ private URL testDataSetURL(String dataSetCode, String openbisFilename) throws Ma //String serverURL = config.getOpenbisURL() //(oder sowas) String base = "http://127.0.0.1"; - String downloadURL = base + ":444"; + String downloadURL = base + ":8081"; downloadURL += "/datastore_server/"; downloadURL += dataSetCode;