Mercurial > dive4elements > river
changeset 9124:3f619f8dfa8e
NEw export option for diagramms: with or without extra metadata subtitle
| author | gernotbelger |
|---|---|
| date | Tue, 05 Jun 2018 19:21:23 +0200 |
| parents | 1cc7653ca84f |
| children | 820ae41c81b6 |
| files | artifacts/src/main/java/org/dive4elements/river/exports/ChartSettings.java artifacts/src/main/resources/messages.properties artifacts/src/main/resources/messages_de.properties gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties |
| diffstat | 6 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/ChartSettings.java Tue Jun 05 19:21:16 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/ChartSettings.java Tue Jun 05 19:21:23 2018 +0200 @@ -314,6 +314,7 @@ String width = XMLUtils.xpathString(export, "export/width", null); String height = XMLUtils.xpathString(export, "export/height", null); + String metadata = XMLUtils.xpathString(export, "export/chart_settings_export_metadata", null); if (log.isDebugEnabled()) { log.debug("Found export width : '" + width + "'"); @@ -322,6 +323,7 @@ section.setWidth(Integer.valueOf(width.length() > 0 ? width : "-1")); section.setHeight(Integer.valueOf(height.length() > 0 ? height : "-1")); + section.setMetadata(metadata == null ? false : Boolean.valueOf(metadata)); target.setExportSection(section); }
--- a/artifacts/src/main/resources/messages.properties Tue Jun 05 19:21:16 2018 +0200 +++ b/artifacts/src/main/resources/messages.properties Tue Jun 05 19:21:23 2018 +0200 @@ -1137,4 +1137,4 @@ common.client.ui.from = from common.client.ui.to = to -chart.subtitle.metadata = FLYS-Version: {0} - Bearbeiter: {1} - Datum der Erstellung: {2} - Gew\u00e4sser: {3} \ No newline at end of file +chart.subtitle.metadata = FLYS-Version: {0} - Bearbeiter: {1} - Datum der Erstellung: {2} \ No newline at end of file
--- a/artifacts/src/main/resources/messages_de.properties Tue Jun 05 19:21:16 2018 +0200 +++ b/artifacts/src/main/resources/messages_de.properties Tue Jun 05 19:21:23 2018 +0200 @@ -1137,4 +1137,4 @@ common.client.ui.from = von common.client.ui.to = bis -chart.subtitle.metadata = FLYS-Version: {0} - Bearbeiter: {1} - Datum der Erstellung: {2} - Gew\u00e4sser: {3} \ No newline at end of file +chart.subtitle.metadata = FLYS-Version: {0} - Bearbeiter: {1} - Datum der Erstellung: {2} \ No newline at end of file
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java Tue Jun 05 19:21:16 2018 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java Tue Jun 05 19:21:23 2018 +0200 @@ -1530,4 +1530,6 @@ String uinfo_vegetation_zones_validation_from_greater_to(); String uinfo_vegetation_zones_invalid_integer(); + + String chart_settings_export_metadata(); } \ No newline at end of file
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties Tue Jun 05 19:21:16 2018 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties Tue Jun 05 19:21:23 2018 +0200 @@ -821,4 +821,6 @@ uinfo_vegetation_zones_validation_from_greater_to = Der Wert f\u00fcr "\u00dcfd von" muss kleiner als "\u00dcfd bis". uinfo_vegetation_zones_invalid_integer = Nur Ganzzahlen erlaubt. -bundu = Betrieb und Unterhaltung \ No newline at end of file +bundu = Betrieb und Unterhaltung + +chart_settings_export_metadata = Show Meta-Data \ No newline at end of file
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties Tue Jun 05 19:21:16 2018 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties Tue Jun 05 19:21:23 2018 +0200 @@ -821,4 +821,6 @@ uinfo_vegetation_zones_validation_from_greater_to = Der Wert f\u00fcr "\u00dcfd von" muss kleiner als "\u00dcfd bis". uinfo_vegetation_zones_invalid_integer = Nur Ganzzahlen erlaubt. -bundu = Betrieb und Unterhaltung \ No newline at end of file +bundu = Betrieb und Unterhaltung + +chart_settings_export_metadata = Metadaten anzeigen \ No newline at end of file