Mercurial > dive4elements > river
changeset 9088:7e60457f9d26
Changed order of SINFO results and fixed data in datacage.
Some minor name changes.
| author | gernotbelger |
|---|---|
| date | Fri, 25 May 2018 10:49:23 +0200 |
| parents | fb976ea01463 |
| children | 02e4a0d983c0 |
| files | artifacts/doc/conf/meta-data.xml 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 | 4 files changed, 72 insertions(+), 134 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/meta-data.xml Fri May 25 10:47:38 2018 +0200 +++ b/artifacts/doc/conf/meta-data.xml Fri May 25 10:49:23 2018 +0200 @@ -1617,58 +1617,56 @@ </minfo> <sinfo> + <sinfo_predefined_flowdepths> + <dc:call-macro name="sinfo_predefined_flowdepth-m"/> + </sinfo_predefined_flowdepths> + + <!-- Auf Wunsch BfG herausgenommen; erscheinen ebenfalls unter 'zusätzliche Längsschnitte' <sinfo_additional_ls> <dc:call-macro name="basedata_1_additionals-sinfo-with-q"/> <dc:call-macro name="basedata_1_additionals-sinfo-without-q"/> </sinfo_additional_ls> + --> + <!-- TODO: soll nach MINFO --> <bed_heights_minmax> <dc:call-macro name="minfo-heights-max"/> <dc:call-macro name="minfo-heights-min"/> </bed_heights_minmax> - + <sinfo_predefined_tkh> <dc:call-macro name="sinfo_predefined_tkh-berechnung"/> <dc:call-macro name="sinfo_predefined_tkh-messung"/> </sinfo_predefined_tkh> - + <sinfo_predefined_depthevol> <dc:call-macro name="sinfo_predefined_depthevol-aktuell"/> <dc:call-macro name="sinfo_predefined_depthevol-etappe"/> </sinfo_predefined_depthevol> - - <sinfo_predefined_flowdepth> - <dc:call-macro name="sinfo_predefined_flowdepth-m"/> - </sinfo_predefined_flowdepth> + </sinfo> </dc:macro> <dc:macro name="longitudinal-section-user-prototype"> + <dc:comment> SINFO </dc:comment> + <dc:call-macro name="sinfo_flowdepths"/> + <dc:call-macro name="sinfo_flowdepths_minmax"/> + <dc:call-macro name="sinfo_flow_depth_development"/> + <dc:call-macro name="sinfo_tkh"/> + <dc:comment> WINFO/DIFF/FIX </dc:comment> <dc:call-macro name="longitudinal"/> <dc:call-macro name="differences"/> <dc:call-macro name="waterlevels-discharge"/> <dc:call-macro name="longitudinal-section-fix"/> <dc:call-macro name="longitudinal-section-fix-vollmer"/> + <dc:comment> MINFO </dc:comment> <dc:call-macro name="middle_bedheights"/> <dc:call-macro name="bedheight_differences"/> <dc:call-macro name="bedquality"/> <dc:call-macro name="flow-velocity"/> <dc:call-macro name="sediment-load"/> - - <dc:comment> SINFO </dc:comment> - <dc:call-macro name="sinfo_flowdepths"/> - <dc:call-macro name="sinfo_flowdepths_minmax"/> - <dc:call-macro name="sinfo_flow_depth_development"/> - <dc:call-macro name="sinfo_tkh"/> - - <dc:call-macro name="sinfo_waterlevel_difference"/> - <dc:call-macro name="sinfo_bedheight_difference"/> - - <dc:call-macro name="sinfo_tkh_velocity"/> - <dc:call-macro name="sinfo_tkh_d50"/> - <dc:call-macro name="sinfo_tkh_tau"/> </dc:macro> <!-- porosities --> @@ -3253,14 +3251,10 @@ </dc:macro> <dc:macro name="sinfo_flowdepths"> - <dc:filter expr="( $facet_name = 'sinfo_facet_flow_depth' or - $facet_name = 'sinfo_facet_flow_depth.filtered' or - $facet_name = 'sinfo_facet_flow_depth_with_tkh' or - $facet_name = 'sinfo_facet_flow_depth_with_tkh.filtered' or - $facet_name = 'sinfo_facet_flow_depth_current' or - $facet_name = 'sinfo_facet_flow_depth_current.filtered' or - $facet_name = 'sinfo_facet_flow_depth_historical' or - $facet_name = 'sinfo_facet_flow_depth_historical.filtered' )"> + <dc:filter expr="$a_state = 'state.sinfo.flow_depth' and + ( $facet_name = 'sinfo_facet_flow_depth' or $facet_name = 'sinfo_facet_flow_depth.filtered' or + $facet_name = 'sinfo_facet_flow_depth_with_tkh' or $facet_name = 'sinfo_facet_flow_depth_with_tkh.filtered' or + $facet_name = 'sinfo_facet_tkh' )"> <dc:if test="dc:has-result()"> <sinfo_flow_depths> <dc:call-macro name="collection-group"> @@ -3283,10 +3277,9 @@ </dc:macro> <dc:macro name="sinfo_flowdepths_minmax"> - <dc:filter expr="$facet_name = 'sinfo_facet_flow_depth_min' or - $facet_name = 'sinfo_facet_flow_depth_min.filtered' or - $facet_name = 'sinfo_facet_flow_depth_max' or - $facet_name = 'sinfo_facet_flow_depth_max.filtered'"> + <dc:filter expr="$a_state = 'state.sinfo.flow_depth_minmax' and + ( $facet_name = 'sinfo_facet_flow_depth_min' or $facet_name = 'sinfo_facet_flow_depth_min.filtered' or + $facet_name = 'sinfo_facet_flow_depth_max' or $facet_name = 'sinfo_facet_flow_depth_max.filtered' )"> <dc:if test="dc:has-result()"> <sinfo_flow_depths_minmax> <dc:call-macro name="collection-group"> @@ -3309,10 +3302,13 @@ </dc:macro> <dc:macro name="sinfo_flow_depth_development"> - <dc:filter expr="$facet_name = 'sinfo_facet_flow_depth_development' or - $facet_name = 'sinfo_facet_flow_depth_development.filtered' or - $facet_name = 'sinfo_facet_flow_depth_development_per_year' or - $facet_name = 'sinfo_facet_flow_depth_development_per_year.filtered'"> + <dc:filter expr="$a_state = 'state.sinfo.flow_depth_development' and + ( $facet_name = 'sinfo_facet_flow_depth_development' or $facet_name = 'sinfo_facet_flow_depth_development.filtered' or + $facet_name = 'sinfo_facet_flow_depth_development_per_year' or $facet_name = 'sinfo_facet_flow_depth_development_per_year.filtered' or + $facet_name = 'sinfo_facet_flow_depth_current' or $facet_name = 'sinfo_facet_flow_depth_current.filtered' or + $facet_name = 'sinfo_facet_flow_depth_historical' or $facet_name = 'sinfo_facet_flow_depth_historical.filtered' or + $facet_name = 'sinfo_facet_waterlevel_difference' or $facet_name = 'sinfo_facet_waterlevel_difference.filtered' or + $facet_name = 'sinfo_facet_bedheight_difference' or $facet_name = 'sinfo_facet_bedheight_difference.filtered' )"> <dc:if test="dc:has-result()"> <sinfo_flow_depth_developments> <dc:call-macro name="collection-group"> @@ -3334,6 +3330,7 @@ </dc:filter> </dc:macro> +<!-- <dc:macro name="sinfo_waterlevel_difference"> <dc:filter expr="$facet_name = 'sinfo_facet_waterlevel_difference.filtered'"> <dc:if test="dc:has-result()"> @@ -3356,7 +3353,9 @@ </dc:if> </dc:filter> </dc:macro> + --> +<!-- <dc:macro name="sinfo_bedheight_difference"> <dc:filter expr="$facet_name = 'sinfo_facet_bedheight_difference.filtered'"> <dc:if test="dc:has-result()"> @@ -3379,9 +3378,15 @@ </dc:if> </dc:filter> </dc:macro> + --> <dc:macro name="sinfo_tkh"> - <dc:filter expr="$facet_name = 'sinfo_facet_tkh' or $facet_name = 'sinfo_facet_tkh'"> + <dc:filter expr="$a_state = 'state.sinfo.transport_bodies_heights' and + ( $facet_name = 'sinfo_facet_tkh' or + $facet_name = 'sinfo_facet_flow_depth' or $facet_name = 'sinfo_facet_flow_depth.filtered' or + $facet_name = 'sinfo_facet_velocity' or $facet_name = 'sinfo_facet_velocity.filtered' or + $facet_name = 'sinfo_facet_tau' or $facet_name = 'sinfo_facet_tau.filtered' or + $facet_name = 'sinfo_facet_d50' or $facet_name = 'sinfo_facet_d50.filtered' )"> <dc:if test="dc:has-result()"> <sinfo_tkhs> <dc:call-macro name="collection-group"> @@ -3403,77 +3408,6 @@ </dc:filter> </dc:macro> - <dc:macro name="sinfo_tkh_velocity"> - <dc:filter expr="starts-with( $facet_name , 'sinfo_facet_velocity' )"> - <dc:if test="dc:has-result()"> - <sinfo_velocities> - <dc:call-macro name="collection-group"> - <sinfo_velocity description="{dc:group-key()}"> - <dc:for-each> - <dc:element name="${facet_name}"> - <dc:attribute name="factory" value="sinfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="${out_name}"/> - </dc:element> - </dc:for-each> - </sinfo_velocity> - </dc:call-macro> - </sinfo_velocities> - </dc:if> - </dc:filter> - </dc:macro> - - <dc:macro name="sinfo_tkh_d50"> - <dc:filter expr="starts-with( $facet_name , 'sinfo_facet_d50' )"> - <dc:if test="dc:has-result()"> - <sinfo_bedqualities> - <sinfo_d50s> - <dc:call-macro name="collection-group"> - <sinfo_d50 description="{dc:group-key()}"> - <dc:for-each> - <dc:element name="${facet_name}"> - <dc:attribute name="factory" value="sinfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="${out_name}"/> - </dc:element> - </dc:for-each> - </sinfo_d50> - </dc:call-macro> - </sinfo_d50s> - </sinfo_bedqualities> - </dc:if> - </dc:filter> - </dc:macro> - - <dc:macro name="sinfo_tkh_tau"> - <dc:filter expr="starts-with( $facet_name , 'sinfo_facet_tau' )"> - <dc:if test="dc:has-result()"> - <sinfo_taus> - <dc:call-macro name="collection-group"> - <sinfo_tau description="{dc:group-key()}"> - <dc:for-each> - <dc:element name="${facet_name}"> - <dc:attribute name="factory" value="sinfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="${out_name}"/> - </dc:element> - </dc:for-each> - </sinfo_tau> - </dc:call-macro> - </sinfo_taus> - </dc:if> - </dc:filter> - </dc:macro> - <!-- tkh imported from CSV-files for S-INFO --> <dc:macro name="sinfo_predefined_tkh-berechnung"> <predefined_tkh_berechnung> @@ -3481,25 +3415,25 @@ <dc:call-macro name="sinfo_predefined_tkh"/> </predefined_tkh_berechnung> </dc:macro> - + <dc:macro name="sinfo_predefined_tkh-messung"> <predefined_tkh_messung> <dc:variable name="tkh_groupname" expr="'messung'"/> <dc:call-macro name="sinfo_predefined_tkh"/> </predefined_tkh_messung> </dc:macro> - + <dc:macro name="sinfo_predefined_tkh"> <dc:context> <dc:statement> SELECT sc.tkh_id AS tkh_id, sc.id AS tkh_col_id, MIN(sc.name) AS tkh_col_name, - MIN(s.filename) AS tkh_name, MIN(v.station) AS km_min, MAX(v.station) AS km_max, - MIN(s.filename) || '<br />' - || '[km ' || MIN(v.station) || ' - ' || MAX(v.station) || ']<br />' - || MIN(s.sounding_info) || '<br />' - || MIN(s.evaluation_by) AS info + MIN(s.filename) AS tkh_name, MIN(v.station) AS km_min, MAX(v.station) AS km_max, + MIN(s.filename) || '<br />' + || '[km ' || MIN(v.station) || ' - ' || MAX(v.station) || ']<br />' + || MIN(s.sounding_info) || '<br />' + || MIN(s.evaluation_by) AS info FROM tkh_column sc INNER JOIN tkh s ON sc.tkh_id=s.id - INNER JOIN tkh_values v ON sc.id=v.tkh_column_id + INNER JOIN tkh_values v ON sc.id=v.tkh_column_id WHERE (s.river_id=${river_id}) AND (lower(s.groupname)=${tkh_groupname}) GROUP BY sc.tkh_id, sc.id @@ -3524,23 +3458,23 @@ <dc:call-macro name="sinfo_predefined_depthevol"/> </predefined_depthevol_aktuell> </dc:macro> - + <dc:macro name="sinfo_predefined_depthevol-etappe"> <predefined_depthevol_etappe> <dc:variable name="depthevol_groupname" expr="'etappe'"/> <dc:call-macro name="sinfo_predefined_depthevol"/> </predefined_depthevol_etappe> </dc:macro> - + <dc:macro name="sinfo_predefined_depthevol"> <dc:context> <dc:statement> SELECT s.id AS depthevol_id, MIN(s.filename) AS depthevol_name, MIN(v.station) AS km_min, MAX(v.station) AS km_max, - MIN(s.filename) || '<br />' - || '[km ' || MIN(v.station) || ' - ' || MAX(v.station) || ']<br />' - || MIN(s.start_year) || ' - ' || MIN(s.reference_year) || '<br />' - || MIN(s.old_sounding) || ' - ' || MIN(s.curr_sounding) || '<br />' - || MIN(s.old_glw) || ' - ' || MIN(s.curr_glw) AS info + MIN(s.filename) || '<br />' + || '[km ' || MIN(v.station) || ' - ' || MAX(v.station) || ']<br />' + || MIN(s.start_year) || ' - ' || MIN(s.reference_year) || '<br />' + || MIN(s.old_sounding) || ' - ' || MIN(s.curr_sounding) || '<br />' + || MIN(s.old_glw) || ' - ' || MIN(s.curr_glw) AS info FROM depth_evolution s INNER JOIN depth_evolution_values v ON s.id=v.depth_evolution_id WHERE (s.river_id=${river_id}) AND (lower(s.groupname)=${depthevol_groupname}) @@ -3548,7 +3482,7 @@ ORDER BY s.id </dc:statement> <dc:for-each> - <depth_evol name="{$depthevol_name}" ids="depthevolx-{$depthevol_id}-{$depthevol_name}" factory="depthevolxf" target_out="{$out}" info="{$info}"/> + <depth_evol name="{$depthevol_name}" ids="depthevolx-{$depthevol_id}-{$depthevol_name}" factory="depthevolxf" target_out="{$out}" info="{$info}"/> </dc:for-each> </dc:context> </dc:macro> @@ -3557,29 +3491,29 @@ <dc:macro name="sinfo_predefined_flowdepth-m"> <dc:call-macro name="sinfo_predefined_flowdepth-m1"/> </dc:macro> - + <dc:macro name="sinfo_predefined_flowdepth-m1"> <dc:context> <dc:statement> SELECT sc.flow_depth_id AS flowdepth_id, sc.id AS flowdepth_col_id, MIN(sc.name) AS flowdepth_col_name, - MIN(s.filename) AS flowdepth_name, MIN(v.station) AS km_min, MAX(v.station) AS km_max, - MIN(s.filename) || '<br />' - || '[km ' || MIN(v.station) || ' - ' || MAX(v.station) || ']<br />' - || MIN(s.sounding_info) || '<br />' - || MIN(s.evaluation_by) AS info + MIN(s.filename) AS flowdepth_name, MIN(v.station) AS km_min, MAX(v.station) AS km_max, + MIN(s.filename) || '<br />' + || '[km ' || MIN(v.station) || ' - ' || MAX(v.station) || ']<br />' + || MIN(s.sounding_info) || '<br />' + || MIN(s.evaluation_by) AS info FROM flow_depth_column sc INNER JOIN flow_depth s ON sc.flow_depth_id=s.id - INNER JOIN flow_depth_values v ON sc.id=v.flow_depth_column_id + INNER JOIN flow_depth_values v ON sc.id=v.flow_depth_column_id WHERE (s.river_id=${river_id}) GROUP BY sc.flow_depth_id, sc.id ORDER BY sc.id </dc:statement> <dc:if test="dc:has-result()"> <dc:group expr="$flowdepth_name"> - <flowdepthx name="{dc:group-key()}"> + <sinfo_predefined_flowdepth> <dc:for-each> <flowdepthcolumn name="{$flowdepth_col_name}" ids="flowdepthx-{$flowdepth_col_id}-{$flowdepth_id}" factory="flowdepthxf" target_out="{$out}" info="{$info}"/> </dc:for-each> - </flowdepthx> + </sinfo_predefined_flowdepth> </dc:group> </dc:if> </dc:context>
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java Fri May 25 10:47:38 2018 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java Fri May 25 10:49:23 2018 +0200 @@ -1501,6 +1501,8 @@ String predefined_depthevol_etappe(); + String sinfo_predefined_flowdepths(); + String sinfo_predefined_flowdepth(); String uinfo();
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties Fri May 25 10:47:38 2018 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties Fri May 25 10:49:23 2018 +0200 @@ -802,7 +802,8 @@ predefined_depthevol_aktuell = Bezug aktueller GlW predefined_depthevol_etappe = GlW-Etappen -sinfo_predefined_flowdepth = Modellierte Flie\u00dftiefen +sinfo_predefined_flowdepths = Modellierte Datens\u00e4tze +sinfo_predefined_flowdepth = Flie\u00dftiefen uinfo = U-INFO uinfo_inundation_duration_export = \u00dcberflutungsdauern Export
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties Fri May 25 10:47:38 2018 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties Fri May 25 10:49:23 2018 +0200 @@ -802,7 +802,8 @@ predefined_depthevol_aktuell = Bezug aktueller GlW predefined_depthevol_etappe = GlW-Etappen -sinfo_predefined_flowdepth = Modellierte Flie\u00dftiefen +sinfo_predefined_flowdepths = Modellierte Datens\u00e4tze +sinfo_predefined_flowdepth = Flie\u00dftiefen uinfo = U-INFO uinfo_inundation_duration_export = \u00dcberflutungsdauern Export