changes for 204
This commit is contained in:
Walter Hupfeld
parent
1a66405e4a
commit
713e83e89e
@ -63,7 +63,7 @@
|
||||
<div class="col-5">
|
||||
<h4>Unfallverlauf von <?=$numLatestYear?> bis <?=$numStartYear?></h4>
|
||||
<table class='table table-sm'>
|
||||
<tr><th></th><th>2023</th><th>2022</th><th>2021</th><th>2020</th><th>2019</th></tr>
|
||||
<tr><th></th><th>2024</th><th>2023</th><th>2022</th><th>2021</th><th>2020</th><th>2019</th></tr>
|
||||
<tr><td><?= $arrCategory[1]?></td><?= get_row($resultVerlauf,1) ?></tr>
|
||||
<tr><td><?= $arrCategory[2]?></td><?= get_row($resultVerlauf,2) ?></tr>
|
||||
<tr><td><?= $arrCategory[3]?></td><?= get_row($resultVerlauf,3) ?></tr>
|
||||
|
||||
@ -14,6 +14,15 @@
|
||||
<style>
|
||||
.rechts {text-align:right;background-color:#eee;}
|
||||
.l {border-left: 1px solid black; }
|
||||
/* Sehr kleine Schrift für Tabelle */
|
||||
#unfallzahlen {
|
||||
font-size: 11px;
|
||||
}
|
||||
|
||||
/* Optional: kleinere Schrift auch für Paginierung, Filter, usw. */
|
||||
.dataTables_wrapper {
|
||||
font-size: 11px;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
@ -26,20 +35,20 @@
|
||||
<table id="unfallzahlen" class="display">
|
||||
<thead>
|
||||
<tr><th></th>
|
||||
<th colspan="4">Fahrradunfälle</th>
|
||||
<th colspan="4">Todesfälle</th>
|
||||
<th colspan="4">Schwerverletzte</th>
|
||||
<th colspan="4">Leichtverletzte</th>
|
||||
<th colspan="6">Fahrradunfälle</th>
|
||||
<th colspan="6">Todesfälle</th>
|
||||
<th colspan="6">Schwerverletzte</th>
|
||||
<th colspan="6">Leichtverletzte</th>
|
||||
<th class='l'>Fäche</th>
|
||||
<th>Einw.</th>
|
||||
<th>Quote</th>
|
||||
|
||||
</tr>
|
||||
<tr><th>Name</th>
|
||||
<th class='l'>2022</th><th>2021</th><th>2020</th><th>2019</th>
|
||||
<th class='l'>2022</th><th>2021</th><th>2020</th><th>2019</th>
|
||||
<th class='l'>2022</th><th>2021</th><th>2020</th><th>2019</th>
|
||||
<th class='l'>2022</th><th>2021</th><th>2020</th><th>2019</th>
|
||||
<th class='l'>2024</th><th>2023</th><th>2022</th><th>2021</th><th>2020</th><th>2019</th>
|
||||
<th class='l'>2024</th><th>2023</th><th>2022</th><th>2021</th><th>2020</th><th>2019</th>
|
||||
<th class='l'>2024</th><th>2023</th><th>2022</th><th>2021</th><th>2020</th><th>2019</th>
|
||||
<th class='l'>2024</th><th>2023</th><th>2022</th><th>2021</th><th>2020</th><th>2019</th>
|
||||
<th class='l' colspan="2">in Tausend</th><th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
@ -49,27 +58,36 @@
|
||||
require("../config.php");
|
||||
|
||||
$strSQL="SELECT d.Name as Gemeinde,
|
||||
SUM(UJAHR=2024) as Jahr_2024,
|
||||
SUM(UJAHR=2023) as Jahr_2023,
|
||||
SUM(UJAHR=2022) as Jahr_2022,
|
||||
SUM(UJAHR=2021) as Jahr_2021,
|
||||
SUM(UJAHR=2020) as Jahr_2020,
|
||||
SUM(UJAHR=2019) as Jahr_2019,
|
||||
|
||||
SUM(UJAHR=2024 AND UKATEGORIE=1) as Tode_2024,
|
||||
SUM(UJAHR=2023 AND UKATEGORIE=1) as Tode_2023,
|
||||
SUM(UJAHR=2022 AND UKATEGORIE=1) as Tode_2022,
|
||||
SUM(UJAHR=2021 AND UKATEGORIE=1) as Tode_2021,
|
||||
SUM(UJAHR=2020 AND UKATEGORIE=1) as Tode_2020,
|
||||
SUM(UJAHR=2019 AND UKATEGORIE=1) as Tode_2019,
|
||||
|
||||
SUM(UJAHR=2024 AND UKATEGORIE=2) as Schwerverletzt_2024,
|
||||
SUM(UJAHR=2023 AND UKATEGORIE=2) as Schwerverletzt_2023,
|
||||
SUM(UJAHR=2022 AND UKATEGORIE=2) as Schwerverletzt_2022,
|
||||
SUM(UJAHR=2021 AND UKATEGORIE=2) as Schwerverletzt_2021,
|
||||
SUM(UJAHR=2020 AND UKATEGORIE=2) as Schwerverletzt_2020,
|
||||
SUM(UJAHR=2019 AND UKATEGORIE=2) as Schwerverletzt_2019,
|
||||
|
||||
|
||||
SUM(UJAHR=2024 AND UKATEGORIE=3) as Leichtverletzt_2024,
|
||||
SUM(UJAHR=2023 AND UKATEGORIE=3) as Leichtverletzt_2023,
|
||||
SUM(UJAHR=2022 AND UKATEGORIE=3) as Leichtverletzt_2022,
|
||||
SUM(UJAHR=2021 AND UKATEGORIE=3) as Leichtverletzt_2021,
|
||||
SUM(UJAHR=2020 AND UKATEGORIE=3) as Leichtverletzt_2020,
|
||||
SUM(UJAHR=2019 AND UKATEGORIE=3) as Leichtverletzt_2019,
|
||||
Flaeche, Einwohner,
|
||||
SUM(UJAHR=2022)/d.Einwohner*1000 as Quote_2022,
|
||||
SUM(UJAHR=2024)/d.Einwohner*1000 as Quote_2024,
|
||||
d.ULAND,
|
||||
d.UREGBEZ,
|
||||
d.UKREIS,
|
||||
@ -78,7 +96,7 @@ $strSQL="SELECT d.Name as Gemeinde,
|
||||
WHERE IstRad=1
|
||||
AND d.ULAND=s.ULAND AND d.UREGBEZ=s.UREGBEZ AND d.UKREIS=s.UKREIS AND d.UGEMEINDE=s.UGEMEINDE
|
||||
GROUP BY s.ULAND, s.UREGBEZ, s.UKREIS,s.UGEMEINDE
|
||||
ORDER BY Quote_2022 DESC
|
||||
ORDER BY Quote_2024 DESC
|
||||
";
|
||||
// --- ORDER BY s.ULAND, s.UREGBEZ, s.UKREIS,s.UGEMEINDE
|
||||
|
||||
@ -87,25 +105,33 @@ $result=$db->query($strSQL);
|
||||
while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
|
||||
echo "<tr>";
|
||||
echo "<td><a href='gemeinde_details.php?regbez=".$row['UREGBEZ']."&kreis=".$row['UKREIS']."&gemeinde=".$row['UGEMEINDE']."'>".$row['Gemeinde']."</a></td>";
|
||||
echo "<td class='l'>".$row['Jahr_2022']."</td>";
|
||||
echo "<td class='l'>".$row['Jahr_2024']."</td>";
|
||||
echo "<td>".$row['Jahr_2023']."</td>";
|
||||
echo "<td>".$row['Jahr_2022']."</td>";
|
||||
echo "<td>".$row['Jahr_2021']."</td>";
|
||||
echo "<td>".$row['Jahr_2020']."</td>";
|
||||
echo "<td>".$row['Jahr_2019']."</td>";
|
||||
echo "<td class='l'>".$row['Tode_2022']."</td>";
|
||||
echo "<td class='l'>".$row['Tode_2024']."</td>";
|
||||
echo "<td>".$row['Tode_2023']."</td>";
|
||||
echo "<td>".$row['Tode_2022']."</td>";
|
||||
echo "<td>".$row['Tode_2021']."</td>";
|
||||
echo "<td>".$row['Tode_2020']."</td>";
|
||||
echo "<td>".$row['Tode_2019']."</td>";
|
||||
echo "<td class='l'>".$row['Schwerverletzt_2022']."</td>";
|
||||
echo "<td class='l'>".$row['Schwerverletzt_2024']."</td>";
|
||||
echo "<td>".$row['Schwerverletzt_2023']."</td>";
|
||||
echo "<td>".$row['Schwerverletzt_2022']."</td>";
|
||||
echo "<td>".$row['Schwerverletzt_2021']."</td>";
|
||||
echo "<td>".$row['Schwerverletzt_2020']."</td>";
|
||||
echo "<td>".$row['Schwerverletzt_2019']."</td>";
|
||||
echo "<td class='l'>".$row['Leichtverletzt_2022']."</td>";
|
||||
echo "<td class='l'>".$row['Leichtverletzt_2024']."</td>";
|
||||
echo "<td>".$row['Leichtverletzt_2023']."</td>";
|
||||
echo "<td>".$row['Leichtverletzt_2022']."</td>";
|
||||
echo "<td>".$row['Leichtverletzt_2021']."</td>";
|
||||
echo "<td>".$row['Leichtverletzt_2020']."</td>";
|
||||
echo "<td>".$row['Leichtverletzt_2019']."</td>";
|
||||
echo "<td class='rechts l'>".$row['Flaeche']."</td>";
|
||||
echo "<td class='rechts'>".round($row['Einwohner']/1000,1)."</td>";
|
||||
echo "<td class='rechts'>".round($row['Quote_2022'],2)."</td>";
|
||||
echo "<td class='rechts'>".round($row['Quote_2024'],2)."</td>";
|
||||
echo "</tr>\n";
|
||||
}
|
||||
?>
|
||||
|
||||
@ -155,7 +155,7 @@ Highcharts.chart('c_unfallverlauf', {
|
||||
align: 'center'
|
||||
},
|
||||
xAxis: {
|
||||
categories: ['2023','2022','2021','2020','2019']
|
||||
categories: ['2024','2023','2022','2021','2020','2019']
|
||||
},
|
||||
yAxis: {
|
||||
min: 0,
|
||||
|
||||
@ -14,7 +14,18 @@
|
||||
<style>
|
||||
.rechts {text-align:right;}
|
||||
.l {border-left: 1px solid black; }
|
||||
</style>
|
||||
|
||||
/* Sehr kleine Schrift für Tabelle */
|
||||
#unfallzahlen {
|
||||
font-size: 11px;
|
||||
}
|
||||
|
||||
/* Optional: kleinere Schrift auch für Paginierung, Filter, usw. */
|
||||
.dataTables_wrapper {
|
||||
font-size: 11px;
|
||||
}
|
||||
</style>
|
||||
|
||||
</head>
|
||||
<body>
|
||||
|
||||
@ -35,10 +46,10 @@
|
||||
</tr>
|
||||
|
||||
<tr><th>Kreis</th>
|
||||
<th class="l">2023</th><th>2022</th><th>2021</th><th>2020</th><th>2019</th>
|
||||
<th class="l">2023</th><th>2022</th><th>2021</th><th>2020</th><th>2019</th>
|
||||
<th class="l">2023</th><th>2022</th><th>2021</th><th>2020</th><th>2019</th>
|
||||
<th class="l">2023</th><th>2022</th><th>2021</th><th>2020</th><th>2019</th>
|
||||
<th class="l">2024</th><th>2023</th><th>2022</th><th>2021</th><th>2020</th><th>2019</th>
|
||||
<th class="l">2024</th><th>2023</th><th>2022</th><th>2021</th><th>2020</th><th>2019</th>
|
||||
<th class="l">2024</th><th>2023</th><th>2022</th><th>2021</th><th>2020</th><th>2019</th>
|
||||
<th class="l">2024</th><th>2023</th><th>2022</th><th>2021</th><th>2020</th><th>2019</th>
|
||||
<th class="l">Einw. in Tausend</th><th>Quote</th>
|
||||
|
||||
</tr>
|
||||
@ -50,67 +61,75 @@ require("../config.php");
|
||||
|
||||
$strSQL="SELECT d.title as Kreis,
|
||||
district,
|
||||
SUM(UJAHR=2024) as Jahr_2024,
|
||||
SUM(UJAHR=2023) as Jahr_2023,
|
||||
SUM(UJAHR=2022) as Jahr_2022,
|
||||
SUM(UJAHR=2021) as Jahr_2021,
|
||||
SUM(UJAHR=2020) as Jahr_2020,
|
||||
SUM(UJAHR=2019) as Jahr_2019,
|
||||
|
||||
SUM(UJAHR=2024 AND UKATEGORIE=1) as Tode_2024,
|
||||
SUM(UJAHR=2023 AND UKATEGORIE=1) as Tode_2023,
|
||||
SUM(UJAHR=2022 AND UKATEGORIE=1) as Tode_2022,
|
||||
SUM(UJAHR=2021 AND UKATEGORIE=1) as Tode_2021,
|
||||
SUM(UJAHR=2020 AND UKATEGORIE=1) as Tode_2020,
|
||||
SUM(UJAHR=2019 AND UKATEGORIE=1) as Tode_2019,
|
||||
|
||||
SUM(UJAHR=2024 AND UKATEGORIE=2) as Schwerverletzt_2024,
|
||||
SUM(UJAHR=2023 AND UKATEGORIE=2) as Schwerverletzt_2023,
|
||||
SUM(UJAHR=2022 AND UKATEGORIE=2) as Schwerverletzt_2022,
|
||||
SUM(UJAHR=2021 AND UKATEGORIE=2) as Schwerverletzt_2021,
|
||||
SUM(UJAHR=2020 AND UKATEGORIE=2) as Schwerverletzt_2020,
|
||||
SUM(UJAHR=2019 AND UKATEGORIE=2) as Schwerverletzt_2019,
|
||||
|
||||
SUM(UJAHR=2024 AND UKATEGORIE=3) as Leichtverletzt_2024,
|
||||
SUM(UJAHR=2023 AND UKATEGORIE=3) as Leichtverletzt_2023,
|
||||
SUM(UJAHR=2022 AND UKATEGORIE=3) as Leichtverletzt_2022,
|
||||
SUM(UJAHR=2021 AND UKATEGORIE=3) as Leichtverletzt_2021,
|
||||
SUM(UJAHR=2020 AND UKATEGORIE=3) as Leichtverletzt_2020,
|
||||
SUM(UJAHR=2019 AND UKATEGORIE=3) as Leichtverletzt_2019,
|
||||
d.Population as Population,
|
||||
SUM(UJAHR=2023)/d.Population*1000 as Quote_2023,
|
||||
SUM(UJAHR=2024)/d.Population*1000 as Quote_2024,
|
||||
s.ULAND,
|
||||
s.UREGBEZ ,
|
||||
s.UREGBEZ,
|
||||
s.UKREIS
|
||||
FROM data s, district d
|
||||
WHERE IstRad=1
|
||||
AND d.ULAND=s.ULAND AND d.UREGBEZ=s.UREGBEZ AND d.UKREIS=s.UKREIS
|
||||
GROUP BY s.ULAND, s.UREGBEZ, s.UKREIS
|
||||
ORDER BY Quote_2023 DESC;";
|
||||
ORDER BY Quote_2024 DESC;";
|
||||
|
||||
$result=$db->query($strSQL);
|
||||
|
||||
while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
|
||||
echo "<tr>";
|
||||
echo "<td><a href='kreis_details.php?regbez=".$row['UREGBEZ']."&kreis=".$row['UKREIS']."'>".$row['Kreis']."</a></td>";
|
||||
echo "<td class='l'>".$row['Jahr_2023']."</td>";
|
||||
echo "<td class='l'>".$row['Jahr_2024']."</td>";
|
||||
echo "<td>".$row['Jahr_2023']."</td>";
|
||||
echo "<td>".$row['Jahr_2022']."</td>";
|
||||
echo "<td>".$row['Jahr_2021']."</td>";
|
||||
echo "<td>".$row['Jahr_2020']."</td>";
|
||||
echo "<td>".$row['Jahr_2019']."</td>";
|
||||
echo "<td class='l'>".$row['Tode_2023']."</td>";
|
||||
echo "<td class='l'>".$row['Tode_2024']."</td>";
|
||||
echo "<td>".$row['Tode_2023']."</td>";
|
||||
echo "<td>".$row['Tode_2022']."</td>";
|
||||
echo "<td>".$row['Tode_2021']."</td>";
|
||||
echo "<td>".$row['Tode_2020']."</td>";
|
||||
echo "<td>".$row['Tode_2019']."</td>";
|
||||
echo "<td class='l'>".$row['Schwerverletzt_2023']."</td>";
|
||||
echo "<td class='l'>".$row['Schwerverletzt_2024']."</td>";
|
||||
echo "<td>".$row['Schwerverletzt_2023']."</td>";
|
||||
echo "<td>".$row['Schwerverletzt_2022']."</td>";
|
||||
echo "<td>".$row['Schwerverletzt_2021']."</td>";
|
||||
echo "<td>".$row['Schwerverletzt_2020']."</td>";
|
||||
echo "<td>".$row['Schwerverletzt_2019']."</td>";
|
||||
echo "<td class='l'>".$row['Leichtverletzt_2023']."</td>";
|
||||
echo "<td class='l'>".$row['Leichtverletzt_2024']."</td>";
|
||||
echo "<td>".$row['Leichtverletzt_2024']."</td>";
|
||||
echo "<td>".$row['Leichtverletzt_2022']."</td>";
|
||||
echo "<td>".$row['Leichtverletzt_2021']."</td>";
|
||||
echo "<td>".$row['Leichtverletzt_2020']."</td>";
|
||||
echo "<td>".$row['Leichtverletzt_2019']."</td>";
|
||||
echo "<td class='l rechts'>".round($row['Population']/1000,0)."</td>";
|
||||
echo "<td class='rechts'>".round($row['Quote_2023'],2)."</td>";
|
||||
echo "<td class='rechts'>".round($row['Quote_2024'],2)."</td>";
|
||||
echo "</tr>\n";
|
||||
}
|
||||
?>
|
||||
|
||||
@ -55,7 +55,7 @@
|
||||
<div class="col-5">
|
||||
<h4>Unfallverlauf von <?=$numLatestYear?> bis <?=$numStartYear?></h4>
|
||||
<table class='table table-sm'>
|
||||
<tr><th></th><th>2023</th><th>2022</th><th>2021</th><th>2020</th><th>2019</th></tr>
|
||||
<tr><th></th><th>2024</th><th>2023</th><th>2022</th><th>2021</th><th>2020</th><th>2019</th></tr>
|
||||
<tr><td><?= $arrCategory[1]?></td><?= get_row($resultVerlauf,1) ?></tr>
|
||||
<tr><td><?= $arrCategory[2]?></td><?= get_row($resultVerlauf,2) ?></tr>
|
||||
<tr><td><?= $arrCategory[3]?></td><?= get_row($resultVerlauf,3) ?></tr>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user