Mercurial > dive4elements > gnv-client
changeset 283:ef10bf497a16
Added link in gui to export charts to pdf.
gnv/trunk@382 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Mon, 30 Nov 2009 09:57:12 +0000 |
| parents | d6c0d426e38a |
| children | 47e3647af88f |
| files | gnv/ChangeLog gnv/src/main/java/de/intevation/gnv/action/DoExportAction.java gnv/src/main/resources/applicationMessages.properties gnv/src/main/resources/applicationMessages_en.properties gnv/src/main/webapp/WEB-INF/jsp/includes/display_diagramm_inc.jsp |
| diffstat | 5 files changed, 33 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/gnv/ChangeLog Mon Nov 23 16:30:33 2009 +0000 +++ b/gnv/ChangeLog Mon Nov 30 09:57:12 2009 +0000 @@ -1,3 +1,17 @@ +2009-12-30 Ingo Weinzierl <ingo.weinzierl@intevation.de> + + * src/main/webapp/WEB-INF/jsp/includes/display_diagramm_inc.jsp: Added + link for pdf export in html gui. + + * src/main/resources/applicationMessages.properties, + src/main/resources/applicationMessages_en.properties: Added label for pdf + export link. + + * src/main/java/de/intevation/gnv/action/DoExportAction.java: Added pdf + extension to file when exporting charts as pdf. + + NOTE: Update gnv-artifacts to rev381 which supports pdf export. + 2009-11-23 Tim Englich <tim.englich@intevation.de> * src/main/resources/applicationMessages*.properties:
--- a/gnv/src/main/java/de/intevation/gnv/action/DoExportAction.java Mon Nov 23 16:30:33 2009 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/DoExportAction.java Mon Nov 30 09:57:12 2009 +0000 @@ -38,6 +38,9 @@ if (target.equalsIgnoreCase("chart")) { fileName = fileName + mimeType.substring(mimeType.indexOf("/") + 1); + } + else if (target.equalsIgnoreCase("pdf")) { + fileName = fileName + "pdf"; } else if (target.equalsIgnoreCase("CSV")) { fileName = fileName + "csv"; } else {
--- a/gnv/src/main/resources/applicationMessages.properties Mon Nov 23 16:30:33 2009 +0000 +++ b/gnv/src/main/resources/applicationMessages.properties Mon Nov 30 09:57:12 2009 +0000 @@ -62,6 +62,7 @@ gnviewer.output.options.save.title=Diagramm speichern gnviewer.output.options.export.csv.title=Daten als CSV exportieren gnviewer.output.options.export.odv.title=Daten als ODV exportieren +gnviewer.output.options.export.pdf.title=Diagramm als PDF exportieren height=H\u00f6he width=Breite
--- a/gnv/src/main/resources/applicationMessages_en.properties Mon Nov 23 16:30:33 2009 +0000 +++ b/gnv/src/main/resources/applicationMessages_en.properties Mon Nov 30 09:57:12 2009 +0000 @@ -62,6 +62,7 @@ gnviewer.output.options.save.title=Save Diagram gnviewer.output.options.export.csv.title=Export Data as CSV gnviewer.output.options.export.odv.title=Export Data as ODV +gnviewer.output.options.export.pdf.title=Export chart as PDF height=Height width=Width @@ -71,4 +72,4 @@ no.inputdata.given..please.select.at.least.one.entry = No Entry was chosen. Please select at least one entry. de.intevation.gnv.geobackend.base.query.exception.queryexception..java.sql.sqlexception: A internal Server error has occurred. Please contact the Support. java.io.ioexception..the.server.encountered.an.unexpected.condition.which.prevented.it.from.fulfilling.the.request = A internal Server error has occurred. Please contact the Support. -java.lang.illegalargumentexception..inputstream.cannot.be.null = A internal Server error has occurred. Please contact the Support. \ No newline at end of file +java.lang.illegalargumentexception..inputstream.cannot.be.null = A internal Server error has occurred. Please contact the Support.
--- a/gnv/src/main/webapp/WEB-INF/jsp/includes/display_diagramm_inc.jsp Mon Nov 23 16:30:33 2009 +0000 +++ b/gnv/src/main/webapp/WEB-INF/jsp/includes/display_diagramm_inc.jsp Mon Nov 30 09:57:12 2009 +0000 @@ -11,9 +11,11 @@ String target = "chart"; String targetCSV = "csv"; String targetODV = "odv"; + String targetPDF = "pdf"; boolean supportChart = sm.getOutputMode(target) != null; - boolean supportCSV = sm.getOutputMode(targetCSV) != null; - boolean supportODV = sm.getOutputMode(targetODV) != null; + boolean supportCSV = sm.getOutputMode(targetCSV) != null; + boolean supportODV = sm.getOutputMode(targetODV) != null; + boolean supportPDF = sm.getOutputMode(targetPDF) != null; String mimeType = null; String parameterString = ""; if (supportChart){ @@ -28,6 +30,10 @@ } } } + String mimeTypePDF = null; + if (supportPDF) { + mimeTypePDF = sm.getOutputMode(targetPDF).getMimeType(); + } String mimeTypeCSV = null; if (supportCSV){ mimeTypeCSV = sm.getOutputMode(targetCSV).getMimeType(); @@ -45,6 +51,11 @@ <a href="<%=response.encodeURL("export.do?mimetype="+mimeType+"&target="+target+parameterString+"&uid="+System.currentTimeMillis())%>" title="<bean:message key="gnviewer.output.options.save.title"/>"> <img src="images/diagram_export.png" border="0"/> </a> + <%if (supportPDF) { %> + <a href="<%=response.encodeURL("export.do?mimetype="+mimeTypePDF+"&target="+targetPDF+"&uid="+System.currentTimeMillis())%>" title="<bean:message key="gnviewer.output.options.export.pdf.title"/>"> + <img src="images/diagram_export.png" border="0"/> + </a> + <%}%> <%if (supportCSV) { %> <a href="<%=response.encodeURL("export.do?mimetype="+mimeTypeCSV+"&target="+targetCSV+"&uid="+System.currentTimeMillis())%>" title="<bean:message key="gnviewer.output.options.export.csv.title"/>"> <img src="images/data_export.png" border="0"/>