changeset 7875:b320826b1183

Changed column names in sounding select state ui.
author Raimund Renkert <rrenkert@intevation.de>
date Fri, 16 May 2014 09:32:19 +0200
parents 58ba8fbe8070
children 5951d6430ade
files artifacts/src/main/java/org/dive4elements/river/artifacts/states/SoundingsSelect.java 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 gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties
diffstat 5 files changed, 17 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/SoundingsSelect.java	Wed May 14 10:11:16 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/SoundingsSelect.java	Fri May 16 09:32:19 2014 +0200
@@ -126,13 +126,13 @@
                 Element item = creator.create("item");
                 creator.addAttr(item, "label", value, true);
                 creator.addAttr(item, "value", id, true);
-                creator.addAttr(item, "year",
-                    year != null ? s.getYear().toString() : "");
-                creator.addAttr(item, "type", s.getType().getName());
-                creator.addAttr(item, "range",
+                creator.addAttr(item, "analyzed_range",
                     nf.format(s.getRange().getA()) +
                     " - " +
                     nf.format(s.getRange().getB()));
+                creator.addAttr(item, "year",
+                    year != null ? s.getYear().toString() : "");
+                creator.addAttr(item, "minfo_type", s.getType().getName());
                 select.appendChild(item);
             }
         }
@@ -167,11 +167,11 @@
                 Element item = creator.create("item");
                 creator.addAttr(item, "label", value, true);
                 creator.addAttr(item, "value", id, true);
-                creator.addAttr(item, "year", e.getTimeInterval().getStartTime().toString());
-                creator.addAttr(item, "range",
+                creator.addAttr(item, "analyzed_range",
                     nf.format(e.getRange().getA()) +
                     " - " +
                     nf.format(e.getRange().getB()));
+                creator.addAttr(item, "year", e.getTimeInterval().getStartTime().toString());
                 select.appendChild(item);
             }
         }
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java	Wed May 14 10:11:16 2014 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java	Fri May 16 09:32:19 2014 +0200
@@ -1371,5 +1371,9 @@
     String suggested_label();
 
     String negative_values_not_allowed_for_to();
+
+    String analyzed_range();
+
+    String minfo_type();
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties	Wed May 14 10:11:16 2014 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties	Fri May 16 09:32:19 2014 +0200
@@ -165,6 +165,8 @@
 wq_value_q = Q [m\u00b3/s]
 river_km = River-Km
 uesk_profile_distance = Distance [m]
+minfo_type = Type
+analyzed_range = Analyzed Range
 
 wqTitle = Input for W/Q Data
 wqadaptedTitle = Input for W/Q Data
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties	Wed May 14 10:11:16 2014 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties	Fri May 16 09:32:19 2014 +0200
@@ -81,6 +81,7 @@
 cancelCalculationLabel = Aktuelle Berechnung abbrechen.
 calculationCanceled = Die Berechnung wurde abgebrochen.
 range = Bereich
+analyzed_range = ausgewertete Strecke
 resultCount = Treffer
 bfg_id = BfG-ID
 start_year = Start
@@ -142,6 +143,7 @@
 riverside = Flussseite
 name = Name
 type = Typ
+minfo_type = Aufnahmeart
 starttime = Reihe von
 stoptime = Reihe bis
 wq_waterlevel_label = Kennzeichnender Wassterstand
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties	Wed May 14 10:11:16 2014 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties	Fri May 16 09:32:19 2014 +0200
@@ -166,6 +166,9 @@
 river_km = River-Km
 uesk_profile_distance = Distance [m]
 
+minfo_type = Type
+analyzed_range = Analyzed Range
+
 wqTitle = Input for W/Q Data
 wqadaptedTitle = Input for W/Q Data
 noMainValueAtGauge = Selected main value not present at all gauges

http://dive4elements.wald.intevation.org