Mercurial > dive4elements > river
comparison artifacts/doc/conf/meta-data.xml @ 9117:623b51bf03d7
Added datacage select and chart display for river bed collision counts loaded from database
| author | mschaefer |
|---|---|
| date | Mon, 04 Jun 2018 17:31:51 +0200 |
| parents | edc3958b3ed2 |
| children | dbb26bc81843 |
comparison
equal
deleted
inserted
replaced
| 9116:edc3958b3ed2 | 9117:623b51bf03d7 |
|---|---|
| 1611 | 1611 |
| 1612 <sinfo> | 1612 <sinfo> |
| 1613 <sinfo_predefined_flowdepths> | 1613 <sinfo_predefined_flowdepths> |
| 1614 <dc:call-macro name="sinfo_predefined_flowdepth-m"/> | 1614 <dc:call-macro name="sinfo_predefined_flowdepth-m"/> |
| 1615 </sinfo_predefined_flowdepths> | 1615 </sinfo_predefined_flowdepths> |
| 1616 | |
| 1617 <sinfo_collisions> | |
| 1618 <dc:call-macro name="sinfo_collisions"/> | |
| 1619 </sinfo_collisions> | |
| 1616 | 1620 |
| 1617 <sinfo_predefined_channel> | 1621 <sinfo_predefined_channel> |
| 1618 <dc:call-macro name="sinfo_predefined_channel"/> | 1622 <dc:call-macro name="sinfo_predefined_channel"/> |
| 1619 </sinfo_predefined_channel> | 1623 </sinfo_predefined_channel> |
| 1620 | 1624 |
| 3577 </dc:for-each> | 3581 </dc:for-each> |
| 3578 </dc:if> | 3582 </dc:if> |
| 3579 </dc:context> | 3583 </dc:context> |
| 3580 </dc:macro> | 3584 </dc:macro> |
| 3581 | 3585 |
| 3586 <!-- collisions imported from CSV-files for S-INFO --> | |
| 3587 <dc:macro name="sinfo_collisions"> | |
| 3588 <dc:context> | |
| 3589 <dc:statement> | |
| 3590 SELECT s.id AS id, MIN(s.filename) AS seriesname, MIN(v.station) AS km_min, MAX(v.station) AS km_max, MIN(s.year) AS year, | |
| 3591 MIN(s.filename) || '<br />' | |
| 3592 || MIN(s.kmrange_info) || '<br />' | |
| 3593 || MIN(s.year) || '<br />' AS info | |
| 3594 FROM collision s INNER JOIN collision_values v ON s.id=v.collision_id | |
| 3595 WHERE (s.river_id=${river_id}) | |
| 3596 AND (v.station BETWEEN ${fromkm}-0.0001 AND ${tokm}+0.0001) | |
| 3597 GROUP BY s.id | |
| 3598 ORDER BY MIN(s.year) ASC; | |
| 3599 </dc:statement> | |
| 3600 <dc:if test="dc:has-result()"> | |
| 3601 <dc:for-each> | |
| 3602 <collisionseries name="{$seriesname}" ids="collisionx-{$id}-{$year}-{${$seriesname}" factory="collisionf" target_out="{$out}" info="{$info}"/> | |
| 3603 </dc:for-each> | |
| 3604 </dc:if> | |
| 3605 </dc:context> | |
| 3606 </dc:macro> | |
| 3607 | |
| 3582 </datacage> | 3608 </datacage> |
| 3583 </dc:template> | 3609 </dc:template> |