diff gwt-client/src/main/java/org/dive4elements/river/client/server/AbstractMainValuesServiceImpl.java @ 9404:bc9a45d2b1fa

common time range for gauges incl. error messages
author gernotbelger
date Wed, 15 Aug 2018 13:59:09 +0200
parents 82c67b859aa7
children 38201f5b0dd9
line wrap: on
line diff
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/AbstractMainValuesServiceImpl.java	Wed Aug 15 13:22:00 2018 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/AbstractMainValuesServiceImpl.java	Wed Aug 15 13:59:09 2018 +0200
@@ -66,7 +66,8 @@
 
     private static final long serialVersionUID = 1L;
 
-    protected final Document createInput(final String river, final double from, final double to, final Integer startYear, final Integer endYear) {
+    public static final Document createInput(final String river, final double from, final double to, final java.util.Date startDate,
+            final java.util.Date endDate) {
 
         final Document input = XMLUtils.newDocument();
 
@@ -87,16 +88,15 @@
         endEl.setTextContent(Double.valueOf(to).toString());
         mainvalues.appendChild(endEl);
 
-        if (startYear != null) {
-            final Element startYearElement = ec.create("startYear");
-            startYearElement.setTextContent(Integer.toString(startYear));
-            mainvalues.appendChild(startYearElement);
+        if (startDate != null) { // IMPORTANT, MainValueService and DynamicMainValueService share this method. MainvalueService does not have Dates
+            final Element startDateElement = ec.create("startDate");
+            startDateElement.setTextContent(String.valueOf(startDate.getTime()));
+            mainvalues.appendChild(startDateElement);
         }
-
-        if (endYear != null) {
-            final Element endYearElement = ec.create("endYear");
-            endYearElement.setTextContent(Integer.toString(endYear));
-            mainvalues.appendChild(endYearElement);
+        if (endDate != null) {// IMPORTANT, MainValueService and DynamicMainValueService share this method. MainvalueService does not have Dates
+            final Element endDateElement = ec.create("endDate");
+            endDateElement.setTextContent(String.valueOf(endDate.getTime()));
+            mainvalues.appendChild(endDateElement);
         }
 
         input.appendChild(mainvalues);

http://dive4elements.wald.intevation.org