Mercurial > dive4elements > river

comparison artifacts/doc/conf/meta-data.xml @ 9035:c16e90a0baf7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added datacage select and chart display for modelled flow depth series loaded from database
author mschaefer
date Mon, 30 Apr 2018 16:00:12 +0200
parents 384eee4b4135
children c49b95820d60
comparison
equal deleted inserted replaced
9034:8aa7d9eaaa21 9035:c16e90a0baf7
1634 1634
1635 <sinfo_predefined_depthevol> 1635 <sinfo_predefined_depthevol>
1636 <dc:call-macro name="sinfo_predefined_depthevol-aktuell"/> 1636 <dc:call-macro name="sinfo_predefined_depthevol-aktuell"/>
1637 <dc:call-macro name="sinfo_predefined_depthevol-etappe"/> 1637 <dc:call-macro name="sinfo_predefined_depthevol-etappe"/>
1638 </sinfo_predefined_depthevol> 1638 </sinfo_predefined_depthevol>
1639
1640 <sinfo_predefined_flowdepth>
1641 <dc:call-macro name="sinfo_predefined_flowdepth-m"/>
1642 </sinfo_predefined_flowdepth>
1639 </sinfo> 1643 </sinfo>
1640 </dc:macro> 1644 </dc:macro>
1641 1645
1642 <dc:macro name="longitudinal-section-user-prototype"> 1646 <dc:macro name="longitudinal-section-user-prototype">
1643 <dc:comment> WINFO/DIFF/FIX </dc:comment> 1647 <dc:comment> WINFO/DIFF/FIX </dc:comment>
3486 </dc:macro> 3490 </dc:macro>
3487 3491
3488 <dc:macro name="sinfo_predefined_tkh"> 3492 <dc:macro name="sinfo_predefined_tkh">
3489 <dc:context> 3493 <dc:context>
3490 <dc:statement> 3494 <dc:statement>
3491 SELECT tc.tkh_id AS tkh_id, tc.id AS tkh_col_id, tc.name AS tkh_col_name, 3495 SELECT sc.tkh_id AS tkh_id, sc.id AS tkh_col_id, sc.name AS tkh_col_name,
3492 MIN(t.filename) AS tkh_name, MIN(tv.station) AS km_min, MAX(tv.station) AS km_max, 3496 MIN(s.filename) AS tkh_name, MIN(v.station) AS km_min, MAX(v.station) AS km_max,
3493 MIN(t.filename) || '&lt;br /&gt;' || MIN(t.sounding_info) || '&lt;br /&gt;' || MIN(t.evaluation_by) AS info 3497 MIN(s.filename) || '&lt;br /&gt;'
3494 FROM tkh_column tc INNER JOIN tkh t ON tc.tkh_id=t.id 3498 || '[km ' || MIN(v.station) || ' - ' || MAX(v.station) || ']&lt;br /&gt;'
3495 INNER JOIN tkh_values tv ON tc.id=tv.tkh_column_id 3499 || MIN(s.sounding_info) || '&lt;br /&gt;'
3496 WHERE (t.river_id=${river_id}) 3500 || MIN(s.evaluation_by) AS info
3497 AND (lower(t.groupname)=${tkh_groupname}) 3501 FROM tkh_column sc INNER JOIN tkh s ON sc.tkh_id=s.id
3498 GROUP BY tc.tkh_id, tc.id 3502 INNER JOIN tkh_values v ON sc.id=v.tkh_column_id
3499 ORDER BY tc.id 3503 WHERE (s.river_id=${river_id})
3504 AND (lower(s.groupname)=${tkh_groupname})
3505 GROUP BY sc.tkh_id, sc.id
3506 ORDER BY sc.id
3500 </dc:statement> 3507 </dc:statement>
3501 <dc:if test="dc:has-result()"> 3508 <dc:if test="dc:has-result()">
3502 <dc:group expr="$tkh_name"> 3509 <dc:group expr="$tkh_name">
3503 <tkhx name="{dc:group-key()}"> 3510 <tkhx name="{dc:group-key()}">
3504 <dc:for-each> 3511 <dc:for-each>
3505 <tkhcolumn name="{$tkh_col_name}" ids="tkhx-{$tkh_col_id}-{$tkh_id}" factory="tkhxf" target_out="{$out}" info="{$tkh_name}&lt;br /&gt;[km {$km_min} - {$km_max}]"/> 3512 <tkhcolumn name="{$tkh_col_name}" ids="tkhx-{$tkh_col_id}-{$tkh_id}" factory="tkhxf" target_out="{$out}" info="{$info}"/>
3506 </dc:for-each> 3513 </dc:for-each>
3507 </tkhx> 3514 </tkhx>
3508 </dc:group> 3515 </dc:group>
3509 </dc:if> 3516 </dc:if>
3510 </dc:context> 3517 </dc:context>
3528 <dc:macro name="sinfo_predefined_depthevol"> 3535 <dc:macro name="sinfo_predefined_depthevol">
3529 <dc:context> 3536 <dc:context>
3530 <dc:statement> 3537 <dc:statement>
3531 SELECT s.id AS depthevol_id, s.filename AS depthevol_name, MIN(v.station) AS km_min, MAX(v.station) AS km_max, 3538 SELECT s.id AS depthevol_id, s.filename AS depthevol_name, MIN(v.station) AS km_min, MAX(v.station) AS km_max,
3532 s.filename || '&lt;br /&gt;' 3539 s.filename || '&lt;br /&gt;'
3540 || '[km ' || MIN(v.station) || ' - ' || MAX(v.station) || ']&lt;br /&gt;'
3533 || MIN(s.start_year) || ' - ' || MIN(s.reference_year) || '&lt;br /&gt;' 3541 || MIN(s.start_year) || ' - ' || MIN(s.reference_year) || '&lt;br /&gt;'
3534 || MIN(s.old_sounding) || ' - ' || MIN(s.curr_sounding) || '&lt;br /&gt;' 3542 || MIN(s.old_sounding) || ' - ' || MIN(s.curr_sounding) || '&lt;br /&gt;'
3535 || MIN(s.old_glw) || ' - ' || MIN(s.curr_glw) AS info 3543 || MIN(s.old_glw) || ' - ' || MIN(s.curr_glw) AS info
3536 FROM depth_evolution s INNER JOIN depth_evolution_values v ON s.id=v.depth_evolution_id 3544 FROM depth_evolution s INNER JOIN depth_evolution_values v ON s.id=v.depth_evolution_id
3537 WHERE (s.river_id=${river_id}) 3545 WHERE (s.river_id=${river_id})
3538 AND (lower(s.groupname)=${depthevol_groupname}) 3546 AND (lower(s.groupname)=${depthevol_groupname})
3539 GROUP BY s.id 3547 GROUP BY s.id
3540 ORDER BY s.id 3548 ORDER BY s.id
3541 </dc:statement> 3549 </dc:statement>
3542 <dc:for-each> 3550 <dc:for-each>
3543 <depth_evol name="{$depthevol_name}" ids="depthevolx-{$depthevol_id}-{$depthevol_name}" factory="depthevolxf" target_out="{$out}" info="{$depthevol_name}&lt;br /&gt;[km {$km_min} - {$km_max}]"/> 3551 <depth_evol name="{$depthevol_name}" ids="depthevolx-{$depthevol_id}-{$depthevol_name}" factory="depthevolxf" target_out="{$out}" info="{$info}"/>
3544 </dc:for-each> 3552 </dc:for-each>
3545 </dc:context> 3553 </dc:context>
3546 </dc:macro> 3554 </dc:macro>
3547 3555
3556 <!-- flow depth imported from CSV-files for S-INFO -->
3557 <dc:macro name="sinfo_predefined_flowdepth-m">
3558 <dc:call-macro name="sinfo_predefined_flowdepth-m1"/>
3559 </dc:macro>
3560
3561 <dc:macro name="sinfo_predefined_flowdepth-m1">
3562 <dc:context>
3563 <dc:statement>
3564 SELECT sc.flow_depth_id AS flowdepth_id, sc.id AS flowdepth_col_id, sc.name AS flowdepth_col_name,
3565 MIN(s.filename) AS flowdepth_name, MIN(v.station) AS km_min, MAX(v.station) AS km_max,
3566 MIN(s.filename) || '&lt;br /&gt;'
3567 || '[km ' || MIN(v.station) || ' - ' || MAX(v.station) || ']&lt;br /&gt;'
3568 || MIN(s.sounding_info) || '&lt;br /&gt;'
3569 || MIN(s.evaluation_by) AS info
3570 FROM flow_depth_column sc INNER JOIN flow_depth s ON sc.flow_depth_id=s.id
3571 INNER JOIN flow_depth_values v ON sc.id=v.flow_depth_column_id
3572 WHERE (s.river_id=${river_id})
3573 GROUP BY sc.flow_depth_id, sc.id
3574 ORDER BY sc.id
3575 </dc:statement>
3576 <dc:if test="dc:has-result()">
3577 <dc:group expr="$flowdepth_name">
3578 <flowdepthx name="{dc:group-key()}">
3579 <dc:for-each>
3580 <flowdepthcolumn name="{$flowdepth_col_name}" ids="flowdepthx-{$flowdepth_col_id}-{$flowdepth_id}" factory="flowdepthxf" target_out="{$out}" info="{$info}"/>
3581 </dc:for-each>
3582 </flowdepthx>
3583 </dc:group>
3584 </dc:if>
3585 </dc:context>
3586 </dc:macro>
3587
3548 </datacage> 3588 </datacage>
3549 </dc:template> 3589 </dc:template>
http://dive4elements.wald.intevation.org