From b2ad23bd9772ed162a4f9e70d0eb843ad2b84050 Mon Sep 17 00:00:00 2001
From: Walter Hupfeld <Walter.Hupfeld@gmx.de>
Date: Sun, 30 Jul 2023 16:58:10 +0200
Subject: [PATCH 1/2] filter_1

---
 css/style.css     |  4 ++-
 index.php         | 76 +++++++++++++++++------------------------------
 lib/functions.php | 34 +++++++++------------
 3 files changed, 45 insertions(+), 69 deletions(-)

diff --git a/css/style.css b/css/style.css
index 7baa7f9..e2b7d33 100644
--- a/css/style.css
+++ b/css/style.css
@@ -93,4 +93,6 @@ i.wa {
 
 h5 {margin-top:15px;}
 
-.statistik td, th {border: 1px solid grey; font-size: smaller;}
\ No newline at end of file
+.statistik td, th {border: 1px solid grey; font-size: smaller;}
+
+.radio_header {margin-right:7px;}
diff --git a/index.php b/index.php
index 7da5611..b576cd8 100644
--- a/index.php
+++ b/index.php
@@ -224,6 +224,7 @@
     <script>
     // Map ---------------------------------------------------------------------- 
 
+
     var mymap = L.map('mapid').setView([<?=$numInfoLat ?>, <?=$numInfoLng ?>], <?=$numZoom ?>);
 
     var mapLink = '<a href="http://openstreetmap.org">OpenStreetMap</a>';
@@ -306,8 +307,6 @@
 
     $('.check').click(function() {
         filter = this.name;
-        console.log(filter);
-
         if (jQuery(this).prop("checked")) {
             jQuery.each(marker, function(key, value) {
                 if (value) {
@@ -325,7 +324,6 @@
 
     function check_all(){
         jQuery.each(marker, function(key, value) {
-                console.log(value);
                 if (value) { value[0].addTo(mymap); }
             });
     };
@@ -333,56 +331,38 @@
     function uncheck_all()
     {
         jQuery.each(marker, function(key, value) {
-            console.log(value);
                 if (value) { value[0].remove(); }
             });
     };
-
-
-   $('#check_art').click(function(){
-      if (jQuery(this).prop("checked")) { 
-        $('.uart').prop( "checked", true );
-        check_all();
-      } else {
-        $('.uart').prop( "checked", false );
-        uncheck_all();
-      }
-   });
-
-   $('#check_kat').click(function(){
-    console.log("test");
-      if (jQuery(this).prop("checked")) { 
-        $('.ukat').prop( "checked", true );
-        check_all();
-      } else {
-        $('.ukat').prop( "checked", false );
-        uncheck_all();
-      }
-   });
-
-   $('#check_typ').click(function(){
-      if (jQuery(this).prop("checked")) { 
-        $('.utyp').prop( "checked", true );
-        check_all();
-      } else {
-        $('.utyp').prop( "checked", false );
-        uncheck_all();
-      }
-   });
-
-   $('#check_art').click(function(){
-      if (jQuery(this).prop("checked")) { 
-        $('.uart').prop( "checked", true );
-        check_all();
-      } else {
-        $('.uart').prop( "checked", false );
-        uncheck_all();
-      }
-   });
-   
- 
    
+   $('input[type=radio][name=kategorie]').on('change', function() {
+        $('.td_ubet').hide();
+        $('.td_utyp').hide();
+        $('.td_uart').hide();  
+        $('.td_ukat').hide(); 
+        check_all();    
+        $("input[type=checkbox]").prop('checked', $(this).prop('checked'));
+        switch ($(this).val()) {
+            case 'UART':
+                $('.td_uart').show();  
+            break;
+            case 'UKAT':
+                $('.td_ukat').show();  
+            break;
+            case 'UTYP':
+                $('.td_utyp').show();  
+            break;   
+            case 'UBET':
+                $('.td_ubet').show();  
+            break;     
+        }
+    });
 
+   $('.td_ubet').hide();
+   $('.td_utyp').hide();
+   $('.td_uart').hide();  
+   $('.td_ukat').show();
+   $('input:radio[name=kategorie]').val(['UKAT']);
     </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/lib/functions.php b/lib/functions.php
index e0500da..3d1e817 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -97,13 +97,13 @@ function nl2br2($string) {
     global $arrCategory;
     global $strLocation;
 
-    $strTable="<h5><input type='checkbox' id='check_kat' class='check_header' checked='checked'>Unfallkategorie</h5>";
+    $strTable="<h5><input type='radio' value='UKAT' name='kategorie' class='radio_header'  checked='checked'>Unfallkategorie</h5>";
     $strTable.="<table class='statistik'>";
     $strSQL="SELECT UKATEGORIE, count(UKATEGORIE) as anz FROM data WHERE ".$strWhere.$strYear.$strLocation." GROUP BY UKATEGORIE";
     $result = $db->query($strSQL);
    
     while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
-        $strTable.="<tr><td><input type='checkbox' name='UKATEGORIE_".$row['UKATEGORIE']."' id='UKATEGORIE_".$row['UKATEGORIE']."' class='check ukat' checked='checked' ></td>"
+        $strTable.="<tr><td class='td_ukat'><input type='checkbox' name='UKATEGORIE_".$row['UKATEGORIE']."' id='UKATEGORIE_".$row['UKATEGORIE']."' class='check ukat' checked='checked' ></td>"
                               ."<td>".$arrCategory[$row['UKATEGORIE']]."</td><td>".$row['anz']."</td></tr>\n";
     }
     $strTable.="</table>";
@@ -121,22 +121,16 @@ function nl2br2($string) {
             WHERE ".$strWhere.$strYear.$strLocation;
         
     $result = $db->query($strSQL);
-    $strTable.="<h5><input type='checkbox' id='check_beteiligt' class='check_header' checked='checked'>Unfallbeteiligte</h5>";
+    $strTable.="<h5><input type='radio' value='UBET' name='kategorie' class='radio_header'>Unfallbeteiligte</h5>";
     $strTable.="<table class='statistik'>";
-    //$strTable.="<tr><th>Unfallbeteiligte</th><th>Anzahl</th></tr>";
     while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
-       $strTable.="<tr><td><input type='checkbox' name='UBETEILIGT_RAD' id='BETEILIGT_RAD' class='check' checked='checked' ></td><td>Fahrräder</td><td>".$row['rad']."</td></tr>";
-       $strTable.="<tr><td><input type='checkbox' name='UBETEILIGT_PKW' id='BETEILIGT_PKW' class='check' checked='checked' ></td><td>PKWs</td><td>".$row['pkw']."</td></tr>";
-       $strTable.="<tr><td><input type='checkbox' name='UBETEILIGT_FUSS' id='BETEILIGT_FUSS' class='check' checked='checked' ></td><td>Fussgänger</td><td>".$row['fuss']."</td></tr>";
-       $strTable.="<tr><td><input type='checkbox' name='UBETEILIGT_KRAD' id='BETEILIGT_KRAD' class='check' checked='checked' ></td><td>Krafträder</td><td>".$row['krad']."</td></tr>";
-       $strTable.="<tr><td><input type='checkbox' name='UBETEILIGT_LKW' id='BETEILIGT_LKW' class='check' checked='checked' ></td><td>LKWs</td><td>".$row['lkw']."</td></tr>\n";
-       $strTable.="<tr><td><input type='checkbox' name='UBETEILIGT_SONSTIGES' id='BETEILIGT_SONSTIGES' class='check' checked='checked' ></td><td>Sonstiges</td><td>".$row['sonstiges']."</td></tr>\n";
+       $strTable.="<tr><td class='td_ubet'><input type='checkbox' name='UBETEILIGT_RAD' id='BETEILIGT_RAD' class='check' checked='checked' ></td><td>Fahrräder</td><td>".$row['rad']."</td></tr>";
+       $strTable.="<tr><td class='td_ubet'><input type='checkbox' name='UBETEILIGT_PKW' id='BETEILIGT_PKW' class='check' checked='checked' ></td><td>PKWs</td><td>".$row['pkw']."</td></tr>";
+       $strTable.="<tr><td class='td_ubet'><input type='checkbox' name='UBETEILIGT_FUSS' id='BETEILIGT_FUSS' class='check' checked='checked' ></td><td>Fussgänger</td><td>".$row['fuss']."</td></tr>";
+       $strTable.="<tr><td class='td_ubet'><input type='checkbox' name='UBETEILIGT_KRAD' id='BETEILIGT_KRAD' class='check' checked='checked' ></td><td>Krafträder</td><td>".$row['krad']."</td></tr>";
+       $strTable.="<tr><td class='td_ubet'><input type='checkbox' name='UBETEILIGT_LKW' id='BETEILIGT_LKW' class='check' checked='checked' ></td><td>LKWs</td><td>".$row['lkw']."</td></tr>\n";
+       $strTable.="<tr><td class='td_ubet'><input type='checkbox' name='UBETEILIGT_SONSTIGES' id='BETEILIGT_SONSTIGES' class='check' checked='checked' ></td><td>Sonstiges</td><td>".$row['sonstiges']."</td></tr>\n";
     }
-    /*
-    $strSQL="SELECT count(*) as count
-                FROM data 
-                WHERE IstRad=0 and IstPKW=0 and IstFuss=0 and IstKrad=0 and IstGkfz=0 and IstSonstige=0";
-    */
     switch ($numVehicle) {
         case 1: 
         case 0: 
@@ -167,7 +161,7 @@ function nl2br2($string) {
                       
     $result = $db->query($strSQL.$strYear);
     if ($row = $result->fetch(PDO::FETCH_ASSOC)) {
-        $strTable.="<tr><td></td><td>Alleinunfälle und Unfälle mit geicher Fahrzeugart</td><td>".$row['count']."</td></tr>";
+        $strTable.="<tr><td class='td_ubet'></td><td>Alleinunfälle und Unfälle mit geicher Fahrzeugart</td><td>".$row['count']."</td></tr>";
     }            
     $strTable.="</table>";
 
@@ -176,11 +170,11 @@ function nl2br2($string) {
     //Unfalltyp
 
     $strSQL="SELECT UTYP1, count(UTYP1) as anz FROM data WHERE ".$strWhere.$strYear.$strLocation." GROUP BY UTYP1";
-    $strTable.="<h5><input type='checkbox' id='check_typ' class='check_header' checked='checked'>Unfalltyp</h5>";
+    $strTable.="<h5><input type='radio' value='UTYP' name='kategorie' class='radio_header'>Unfalltyp</h5>";
     $strTable.="<table class='statistik'>";
     $result = $db->query($strSQL);
     while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
-        $strTable.="<tr><td><input type='checkbox' name='UTYP_".$row['UTYP1']."' id='UTYP_".$row['UTYP1']."' class='check utyp' checked='checked' ></td>"
+        $strTable.="<tr><td class='td_utyp'><input type='checkbox' name='UTYP_".$row['UTYP1']."' id='UTYP_".$row['UTYP1']."' class='check utyp' checked='checked' ></td>"
           ."<td>".$arrUnfalltyp[$row['UTYP1']]."</td><td>".$row['anz']."</td></tr>\n";
     }
     $strTable.="</table>";
@@ -188,11 +182,11 @@ function nl2br2($string) {
     //Unfallart
 
     $strSQL="SELECT UART, count(UART) as anz FROM data WHERE ".$strWhere.$strYear.$strLocation." GROUP BY UART";
-    $strTable.="<h5><input type='checkbox' id='check_art' class='check_header' checked='checked'>Unfallart</h5>";
+    $strTable.="<h5><input type='radio' value='UART' name='kategorie' class='radio_header'>Unfallart</h5>";
     $strTable.="<table class='statistik'>";
     $result = $db->query($strSQL);
     while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
-        $strTable.="<tr><td><input type='checkbox' name='UART_".$row['UART']."' id='UART_".$row['UART']."' class='check uart' checked='checked' ></td>"
+        $strTable.="<tr><td class='td_uart'><input type='checkbox' name='UART_".$row['UART']."' id='UART_".$row['UART']."' class='check uart' checked='checked' ></td>"
                 ."<td>".$arrUnfallart[$row['UART']]."</td><td>".$row['anz']."</td></tr>\n";
     }
     $strTable.="</table>";

From e09253a4341425fcadfda93a701ebd179436b68b Mon Sep 17 00:00:00 2001
From: Walter Hupfeld <Walter.Hupfeld@gmx.de>
Date: Sun, 30 Jul 2023 17:44:03 +0200
Subject: [PATCH 2/2] final

---
 css/style.css     |  3 +--
 index.php         |  3 ++-
 lib/functions.php | 35 +++++++++++++++++++----------------
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/css/style.css b/css/style.css
index e2b7d33..552f569 100644
--- a/css/style.css
+++ b/css/style.css
@@ -91,8 +91,7 @@ i.wa {
     display:none;
 }
 
-h5 {margin-top:15px;}
+h5 {margin-top:8px;}
 
 .statistik td, th {border: 1px solid grey; font-size: smaller;}
 
-.radio_header {margin-right:7px;}
diff --git a/index.php b/index.php
index b576cd8..d1a2dcf 100644
--- a/index.php
+++ b/index.php
@@ -353,7 +353,8 @@
                 $('.td_utyp').show();  
             break;   
             case 'UBET':
-                $('.td_ubet').show();  
+                $('.td_ubet').show(); 
+                $('.veh_<?=$numVehicle?>').hide(); 
             break;     
         }
     });
diff --git a/lib/functions.php b/lib/functions.php
index 3d1e817..2024ee5 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -39,6 +39,7 @@ function generate_category($row) {
     if ($row['IstKrad']) $strReturn .="|UBETEILIGT_KRAD";
     if ($row['IstGkfz']) $strReturn .="|UBETEILIGT_LKW";
     if ($row['IstSonstige']) $strReturn .="|UBETEILIGT_SONSTIGES";
+    if (substr_count($strReturn, '|')==3) $strReturn.="|UBETEILIGT_SELBST";
     return $strReturn;
 }
 
@@ -97,7 +98,10 @@ function nl2br2($string) {
     global $arrCategory;
     global $strLocation;
 
-    $strTable="<h5><input type='radio' value='UKAT' name='kategorie' class='radio_header'  checked='checked'>Unfallkategorie</h5>";
+    // Unfallkategorie
+
+    $strTable="<h5><input type='radio' value='UKAT' name='kategorie' id='kategorie1' class='radio_header'  checked='checked'>";
+    $strTable.="<label for='kategorie1'>Unfallkategorie</label></h5>";
     $strTable.="<table class='statistik'>";
     $strSQL="SELECT UKATEGORIE, count(UKATEGORIE) as anz FROM data WHERE ".$strWhere.$strYear.$strLocation." GROUP BY UKATEGORIE";
     $result = $db->query($strSQL);
@@ -108,6 +112,7 @@ function nl2br2($string) {
     }
     $strTable.="</table>";
 
+    //Unfallbeteilgte
 
     $strSQL="SELECT 
                 sum(IstRad) as rad,
@@ -121,15 +126,16 @@ function nl2br2($string) {
             WHERE ".$strWhere.$strYear.$strLocation;
         
     $result = $db->query($strSQL);
-    $strTable.="<h5><input type='radio' value='UBET' name='kategorie' class='radio_header'>Unfallbeteiligte</h5>";
+    $strTable.="<h5><input type='radio' value='UBET' name='kategorie' id='kategorie2' class='radio_header'>";
+    $strTable.="<label for='kategorie2'>Unfallbeteiligte</label></h5>";
     $strTable.="<table class='statistik'>";
     while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
-       $strTable.="<tr><td class='td_ubet'><input type='checkbox' name='UBETEILIGT_RAD' id='BETEILIGT_RAD' class='check' checked='checked' ></td><td>Fahrräder</td><td>".$row['rad']."</td></tr>";
-       $strTable.="<tr><td class='td_ubet'><input type='checkbox' name='UBETEILIGT_PKW' id='BETEILIGT_PKW' class='check' checked='checked' ></td><td>PKWs</td><td>".$row['pkw']."</td></tr>";
-       $strTable.="<tr><td class='td_ubet'><input type='checkbox' name='UBETEILIGT_FUSS' id='BETEILIGT_FUSS' class='check' checked='checked' ></td><td>Fussgänger</td><td>".$row['fuss']."</td></tr>";
-       $strTable.="<tr><td class='td_ubet'><input type='checkbox' name='UBETEILIGT_KRAD' id='BETEILIGT_KRAD' class='check' checked='checked' ></td><td>Krafträder</td><td>".$row['krad']."</td></tr>";
-       $strTable.="<tr><td class='td_ubet'><input type='checkbox' name='UBETEILIGT_LKW' id='BETEILIGT_LKW' class='check' checked='checked' ></td><td>LKWs</td><td>".$row['lkw']."</td></tr>\n";
-       $strTable.="<tr><td class='td_ubet'><input type='checkbox' name='UBETEILIGT_SONSTIGES' id='BETEILIGT_SONSTIGES' class='check' checked='checked' ></td><td>Sonstiges</td><td>".$row['sonstiges']."</td></tr>\n";
+       $strTable.="<tr><td class='td_ubet'><input type='checkbox' name='UBETEILIGT_RAD' id='BETEILIGT_RAD' class='check veh_1' checked='checked' ></td><td>Fahrräder</td><td>".$row['rad']."</td></tr>";
+       $strTable.="<tr><td class='td_ubet'><input type='checkbox' name='UBETEILIGT_PKW' id='BETEILIGT_PKW' class='check veh_2' checked='checked' ></td><td>PKWs</td><td>".$row['pkw']."</td></tr>";
+       $strTable.="<tr><td class='td_ubet'><input type='checkbox' name='UBETEILIGT_FUSS' id='BETEILIGT_FUSS' class='check veh_3' checked='checked' ></td><td>Fussgänger</td><td>".$row['fuss']."</td></tr>";
+       $strTable.="<tr><td class='td_ubet'><input type='checkbox' name='UBETEILIGT_KRAD' id='BETEILIGT_KRAD' class='check veh_4' checked='checked' ></td><td>Krafträder</td><td>".$row['krad']."</td></tr>";
+       $strTable.="<tr><td class='td_ubet'><input type='checkbox' name='UBETEILIGT_LKW' id='BETEILIGT_LKW' class='check veh_5' checked='checked' ></td><td>LKWs</td><td>".$row['lkw']."</td></tr>\n";
+       $strTable.="<tr><td class='td_ubet'><input type='checkbox' name='UBETEILIGT_SONSTIGES' id='BETEILIGT_SONSTIGES' class='check veh_6' checked='checked' ></td><td>Sonstiges</td><td>".$row['sonstiges']."</td></tr>\n";
     }
     switch ($numVehicle) {
         case 1: 
@@ -161,16 +167,15 @@ function nl2br2($string) {
                       
     $result = $db->query($strSQL.$strYear);
     if ($row = $result->fetch(PDO::FETCH_ASSOC)) {
-        $strTable.="<tr><td class='td_ubet'></td><td>Alleinunfälle und Unfälle mit geicher Fahrzeugart</td><td>".$row['count']."</td></tr>";
+        $strTable.="<tr><td class='td_ubet'><input type='checkbox' name='UBETEILIGT_SELBST' id='BETEILIGT_SELBST' class='check' checked='checked' ></td><td>Alleinunfälle und Unfälle mit geicher Fahrzeugart</td><td>".$row['count']."</td></tr>";
     }            
     $strTable.="</table>";
 
-    
-
     //Unfalltyp
 
     $strSQL="SELECT UTYP1, count(UTYP1) as anz FROM data WHERE ".$strWhere.$strYear.$strLocation." GROUP BY UTYP1";
-    $strTable.="<h5><input type='radio' value='UTYP' name='kategorie' class='radio_header'>Unfalltyp</h5>";
+    $strTable.="<h5><input type='radio' value='UTYP' name='kategorie' id='kategorie3' class='radio_header'>";
+    $strTable.="<label for='kategorie3'>Unfalltyp</label></h5>";
     $strTable.="<table class='statistik'>";
     $result = $db->query($strSQL);
     while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
@@ -182,7 +187,8 @@ function nl2br2($string) {
     //Unfallart
 
     $strSQL="SELECT UART, count(UART) as anz FROM data WHERE ".$strWhere.$strYear.$strLocation." GROUP BY UART";
-    $strTable.="<h5><input type='radio' value='UART' name='kategorie' class='radio_header'>Unfallart</h5>";
+    $strTable.="<h5><input type='radio' value='UART' name='kategorie' id='kategorie4' class='radio_header'>";
+    $strTable.="<label for='kategorie4'>Unfallart<label></h5>";
     $strTable.="<table class='statistik'>";
     $result = $db->query($strSQL);
     while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
@@ -195,8 +201,5 @@ function nl2br2($string) {
 
     $strTable.="<a href='https://recht.nrw.de/lmi/owa/br_vbl_show_pdf?p_id=12225' target='_blank'>Unfalltpyen</a><br>";
     $strTable.="<a href='https://www.destatis.de/DE/Themen/Gesellschaft-Umwelt/Verkehrsunfaelle/Methoden/verkehrsunfaelle-grundbegriffe.pdf?__blob=publicationFile' target='_blank'>Unfallbeschreibung</a><br>";
-    
-
-
     return $strTable;
  }
\ No newline at end of file