Mercurial > dive4elements > river
comparison artifacts/doc/conf/meta-data.xml @ 9033:384eee4b4135
Added datacage select and chart display for flow depth evolution series loaded from database, and a correction for the tkh data
| author | mschaefer |
|---|---|
| date | Fri, 27 Apr 2018 17:41:59 +0200 |
| parents | 6e5ff436febe |
| children | c16e90a0baf7 |
comparison
equal
deleted
inserted
replaced
| 9032:1f63e9d3b0ec | 9033:384eee4b4135 |
|---|---|
| 1626 <dc:call-macro name="minfo-heights-max"/> | 1626 <dc:call-macro name="minfo-heights-max"/> |
| 1627 <dc:call-macro name="minfo-heights-min"/> | 1627 <dc:call-macro name="minfo-heights-min"/> |
| 1628 </bed_heights_minmax> | 1628 </bed_heights_minmax> |
| 1629 | 1629 |
| 1630 <sinfo_predefined_tkh> | 1630 <sinfo_predefined_tkh> |
| 1631 <dc:call-macro name="sinfo_predefined_tkh"/> | 1631 <dc:call-macro name="sinfo_predefined_tkh-berechnung"/> |
| 1632 <dc:call-macro name="sinfo_predefined_tkh-messung"/> | |
| 1632 </sinfo_predefined_tkh> | 1633 </sinfo_predefined_tkh> |
| 1634 | |
| 1635 <sinfo_predefined_depthevol> | |
| 1636 <dc:call-macro name="sinfo_predefined_depthevol-aktuell"/> | |
| 1637 <dc:call-macro name="sinfo_predefined_depthevol-etappe"/> | |
| 1638 </sinfo_predefined_depthevol> | |
| 1633 </sinfo> | 1639 </sinfo> |
| 1634 </dc:macro> | 1640 </dc:macro> |
| 1635 | 1641 |
| 1636 <dc:macro name="longitudinal-section-user-prototype"> | 1642 <dc:macro name="longitudinal-section-user-prototype"> |
| 1637 <dc:comment> WINFO/DIFF/FIX </dc:comment> | 1643 <dc:comment> WINFO/DIFF/FIX </dc:comment> |
| 3462 </sinfo_taus> | 3468 </sinfo_taus> |
| 3463 </dc:if> | 3469 </dc:if> |
| 3464 </dc:filter> | 3470 </dc:filter> |
| 3465 </dc:macro> | 3471 </dc:macro> |
| 3466 | 3472 |
| 3467 <!-- tkh imported from CSV-files for S-INFO --> | 3473 <!-- tkh imported from CSV-files for S-INFO --> |
| 3474 <dc:macro name="sinfo_predefined_tkh-berechnung"> | |
| 3475 <predefined_tkh_berechnung> | |
| 3476 <dc:variable name="tkh_groupname" expr="'berechnung'"/> | |
| 3477 <dc:call-macro name="sinfo_predefined_tkh"/> | |
| 3478 </predefined_tkh_berechnung> | |
| 3479 </dc:macro> | |
| 3480 | |
| 3481 <dc:macro name="sinfo_predefined_tkh-messung"> | |
| 3482 <predefined_tkh_messung> | |
| 3483 <dc:variable name="tkh_groupname" expr="'messung'"/> | |
| 3484 <dc:call-macro name="sinfo_predefined_tkh"/> | |
| 3485 </predefined_tkh_messung> | |
| 3486 </dc:macro> | |
| 3487 | |
| 3468 <dc:macro name="sinfo_predefined_tkh"> | 3488 <dc:macro name="sinfo_predefined_tkh"> |
| 3469 <dc:context> | 3489 <dc:context> |
| 3470 <dc:statement> | 3490 <dc:statement> |
| 3471 SELECT tc.tkh_id AS tkh_id, tc.id AS tkh_col_id, tc.name AS tkh_col_name, | 3491 SELECT tc.tkh_id AS tkh_id, tc.id AS tkh_col_id, tc.name AS tkh_col_name, |
| 3472 MIN(t.filename) AS tkh_name, MIN(tv.station) AS km_min, MAX(tv.station) AS km_max, | 3492 MIN(t.filename) AS tkh_name, MIN(tv.station) AS km_min, MAX(tv.station) AS km_max, |
| 3473 MIN(t.filename) || '<br />' || MIN(t.sounding_info) || '<br />' || MIN(t.evaluation_by) AS info | 3493 MIN(t.filename) || '<br />' || MIN(t.sounding_info) || '<br />' || MIN(t.evaluation_by) AS info |
| 3474 FROM tkh_column tc INNER JOIN tkh t ON tc.tkh_id=t.id | 3494 FROM tkh_column tc INNER JOIN tkh t ON tc.tkh_id=t.id |
| 3475 INNER JOIN tkh_values tv ON tc.id=tv.tkh_column_id | 3495 INNER JOIN tkh_values tv ON tc.id=tv.tkh_column_id |
| 3476 WHERE t.river_id=${river_id} | 3496 WHERE (t.river_id=${river_id}) |
| 3497 AND (lower(t.groupname)=${tkh_groupname}) | |
| 3477 GROUP BY tc.tkh_id, tc.id | 3498 GROUP BY tc.tkh_id, tc.id |
| 3478 ORDER BY tc.id | 3499 ORDER BY tc.id |
| 3479 </dc:statement> | 3500 </dc:statement> |
| 3480 <dc:if test="dc:has-result()"> | 3501 <dc:if test="dc:has-result()"> |
| 3481 <dc:group expr="$tkh_name"> | 3502 <dc:group expr="$tkh_name"> |
| 3487 </dc:group> | 3508 </dc:group> |
| 3488 </dc:if> | 3509 </dc:if> |
| 3489 </dc:context> | 3510 </dc:context> |
| 3490 </dc:macro> | 3511 </dc:macro> |
| 3491 | 3512 |
| 3513 <!-- depth_evolution imported from CSV-files for S-INFO --> | |
| 3514 <dc:macro name="sinfo_predefined_depthevol-aktuell"> | |
| 3515 <predefined_depthevol_aktuell> | |
| 3516 <dc:variable name="depthevol_groupname" expr="'aktuell'"/> | |
| 3517 <dc:call-macro name="sinfo_predefined_depthevol"/> | |
| 3518 </predefined_depthevol_aktuell> | |
| 3519 </dc:macro> | |
| 3520 | |
| 3521 <dc:macro name="sinfo_predefined_depthevol-etappe"> | |
| 3522 <predefined_depthevol_etappe> | |
| 3523 <dc:variable name="depthevol_groupname" expr="'etappe'"/> | |
| 3524 <dc:call-macro name="sinfo_predefined_depthevol"/> | |
| 3525 </predefined_depthevol_etappe> | |
| 3526 </dc:macro> | |
| 3527 | |
| 3528 <dc:macro name="sinfo_predefined_depthevol"> | |
| 3529 <dc:context> | |
| 3530 <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, | |
| 3532 s.filename || '<br />' | |
| 3533 || MIN(s.start_year) || ' - ' || MIN(s.reference_year) || '<br />' | |
| 3534 || MIN(s.old_sounding) || ' - ' || MIN(s.curr_sounding) || '<br />' | |
| 3535 || 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 | |
| 3537 WHERE (s.river_id=${river_id}) | |
| 3538 AND (lower(s.groupname)=${depthevol_groupname}) | |
| 3539 GROUP BY s.id | |
| 3540 ORDER BY s.id | |
| 3541 </dc:statement> | |
| 3542 <dc:for-each> | |
| 3543 <depth_evol name="{$depthevol_name}" ids="depthevolx-{$depthevol_id}-{$depthevol_name}" factory="depthevolxf" target_out="{$out}" info="{$depthevol_name}<br />[km {$km_min} - {$km_max}]"/> | |
| 3544 </dc:for-each> | |
| 3545 </dc:context> | |
| 3546 </dc:macro> | |
| 3547 | |
| 3492 </datacage> | 3548 </datacage> |
| 3493 </dc:template> | 3549 </dc:template> |