changeset 8259:1fc453fbc5df

Measurement stations without range should not be used in calculation and we assume the beginning of the range is the station.
author Tom Gottfried <tom@intevation.de>
date Thu, 11 Sep 2014 16:12:39 +0200 (2014-09-11)
parents 155a886ab19b
children 48d4921665e3
files artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataFactory.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, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataFactory.java	Thu Sep 11 14:45:17 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataFactory.java	Thu Sep 11 16:12:39 2014 +0200
@@ -55,10 +55,11 @@
           "slv.value AS slv_value, " +
           "gf.name AS gf_name, " +
           "ms.id AS ms_id, " +
-          "ms.station AS ms_station, " +
+          "rs.a AS ms_station, " +
           "ms.measurement_type AS ms_type " +
         "FROM load_at_river sl " +
           "CROSS JOIN measurement_station ms " +
+          "JOIN ranges rs ON ms.range_id = rs.id " +
           "JOIN time_intervals ti ON sl.time_interval_id = ti.id " +
           "LEFT JOIN time_intervals sqti ON sl.sq_time_interval_id = sqti.id " +
           "JOIN grain_fraction gf ON sl.grain_fraction_id = gf.id " +
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java	Thu Sep 11 14:45:17 2014 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java	Thu Sep 11 16:12:39 2014 +0200
@@ -762,6 +762,8 @@
 
     String error_values_needed();
 
+    String error_no_sedimentloadinfo_found();
+
     // MAP RELATED STRINGS
 
     String digitize();
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties	Thu Sep 11 14:45:17 2014 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties	Thu Sep 11 16:12:39 2014 +0200
@@ -387,6 +387,7 @@
 error_update_collection_attribute = Error while updating the collection attribut
 error_values_needed = You must provide values.
 error_no_module_found = No modules found
+error_no_sedimentloadinfo_found = No sediment load data in given range
 
 warning_use_first_feature = You have more that one object selected. The first one is used.
 warning_no_wsp_selected = No waterlevel selected!
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties	Thu Sep 11 14:45:17 2014 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties	Thu Sep 11 16:12:39 2014 +0200
@@ -387,6 +387,7 @@
 error_update_collection_attribute = Fehler beim Aktualisieren des Collection-Attributs.
 error_values_needed = Es muss mindestens ein Wert selektiert sein.
 error_no_module_found = Keine nutzbaren Module gefunden.
+error_no_sedimentloadinfo_found = Keine Fracht Daten im gegebenen Bereich
 
 warning_use_first_feature = Sie haben mehr als ein Objekt ausgew\u00e4hlt. Das erste Objekt wird benutzt.
 warning_no_wsp_selected = Kein Wasserstand ausgew\u00e4hlt!
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties	Thu Sep 11 14:45:17 2014 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties	Thu Sep 11 16:12:39 2014 +0200
@@ -386,6 +386,7 @@
 error_update_collection_attribute = Error while updating the collection attribut
 error_values_needed = You must provide values.
 error_no_module_found = No modules found
+error_no_sedimentloadinfo_found = No sediment load data in given range
 
 warning_use_first_feature = You have more that one object selected. The first one is used.
 warning_no_wsp_selected = No waterlevel selected!

http://dive4elements.wald.intevation.org