Author: sletellier Date: 2011-04-14 09:32:09 +0000 (Thu, 14 Apr 2011) New Revision: 1202 Log: Set file name to ical export Return empty file if no sampling plan found Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/RoadMap.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-04-14 09:23:52 UTC (rev 1201) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-04-14 09:32:09 UTC (rev 1202) @@ -1529,7 +1529,7 @@ // Obord no sampling plan are found if (samplingPlan.isEmpty()) { log.warn("No samplingPlan found for user " + connectedUser.getLogin() + ", abording"); - return null; + return IOUtils.toInputStream(""); } // Creating ical Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/RoadMap.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/RoadMap.java 2011-04-14 09:23:52 UTC (rev 1201) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/RoadMap.java 2011-04-14 09:32:09 UTC (rev 1202) @@ -1,5 +1,6 @@ package fr.ifremer.wao.ui.pages; +import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.service.ServiceSampling; import fr.ifremer.wao.service.ServiceUser; @@ -10,9 +11,11 @@ import org.apache.tapestry5.annotations.SessionState; import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.services.Response; +import org.nuiton.util.DateUtil; import java.io.IOException; import java.io.InputStream; +import java.util.Date; /** * Page to acces to ical export for SamplingPlan. The activate method @@ -41,6 +44,7 @@ protected class ICalStreamResponse implements StreamResponse { protected InputStream inputStream; + public ICalStreamResponse(InputStream inputStream) { this.inputStream = inputStream; } @@ -57,6 +61,9 @@ @Override public void prepareResponse(Response response) { + Date current = WaoUtils.getCurrentDate(); + response.setHeader("Content-Disposition", + "attachment; filename=\"observation_obsdeb_" + DateUtil.formatDate(current, "dd-MM-yyyy") + ".ical" +"\""); } } }