# HG changeset patch # User Tom Gottfried # Date 1386334707 -3600 # Node ID 6d39b4066c918ea2d3d4ecec267c69d0ef0c1232 # Parent 877d558747c65589be7f02cf3635468d228c8ab0 Add sources/sinks to sediment yield datacage. diff -r 877d558747c6 -r 6d39b4066c91 artifacts/doc/conf/meta-data.xml --- a/artifacts/doc/conf/meta-data.xml Fri Dec 06 13:17:05 2013 +0100 +++ b/artifacts/doc/conf/meta-data.xml Fri Dec 06 13:58:27 2013 +0100 @@ -1434,6 +1434,7 @@ + @@ -1522,6 +1523,24 @@ + + + + + SELECT id AS anno_id, + name AS anno_description + FROM annotation_types + WHERE name IN ('Quelle', 'Senke') + + + + + + + + diff -r 877d558747c6 -r 6d39b4066c91 gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java --- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java Fri Dec 06 13:17:05 2013 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java Fri Dec 06 13:58:27 2013 +0100 @@ -962,6 +962,8 @@ String yields(); + String sources_sinks(); + String years(); String epochs(); diff -r 877d558747c6 -r 6d39b4066c91 gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties --- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties Fri Dec 06 13:17:05 2013 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties Fri Dec 06 13:58:27 2013 +0100 @@ -510,6 +510,7 @@ delta_w_cma = cm/a wlevel = Waterlevels yields = sedimentyields +sources_sinks = sources_sinks years = years epochs = epochs densities = Sediment Densities diff -r 877d558747c6 -r 6d39b4066c91 gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties --- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties Fri Dec 06 13:17:05 2013 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties Fri Dec 06 13:58:27 2013 +0100 @@ -515,6 +515,7 @@ delta_w_cma = cm/a wlevel = Wasserspiegellagen yields = Frachten +sources_sinks = Quellen_Senken years = Einzeljahre epochs = Epochen densities = Sedimentdichte diff -r 877d558747c6 -r 6d39b4066c91 gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties --- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties Fri Dec 06 13:17:05 2013 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties Fri Dec 06 13:58:27 2013 +0100 @@ -494,6 +494,7 @@ delta_w_cma = cm/a wlevel = Waterlevels yields = sedimentyields +sources_sinks = sources_sinks years = years epochs = epochs densities = Sediment Densities