commit cb09e627d1f7ad7679f24733bbbc18db313554c2
parent f85511950a31579cc5c4d8fd914566eb4a34c793
Author: Kninteman <[email protected]>
Date: Mon, 12 Jun 2023 23:58:05 +0200
Merge branch 'datatowebsite' of https://github.com/friedelschoen/iwa-panda into datatowebsite
Diffstat:
5 files changed, 139 insertions(+), 7 deletions(-)
diff --git a/Controller/hdata/hdata.php b/Controller/hdata/hdata.php
@@ -0,0 +1,10 @@
+<?php
+function make_table(){
+ $key = new Key();
+ if (isset($_GET['downloadXml'])) {
+ return $key->retrieveHData(['data' => ':3jvl7yb5sRr80s6lTdeOyxV9VTQZkCPRp7bKOWKFWxfL2vhsU4Hhpgcmz9qe0zEk'], true);
+ } else {
+ return $key->retrieveHData(['data' => ':3jvl7yb5sRr80s6lTdeOyxV9VTQZkCPRp7bKOWKFWxfL2vhsU4Hhpgcmz9qe0zEk']);
+ }
+}
+?>
diff --git a/Model/Key.php b/Model/Key.php
@@ -71,6 +71,92 @@ Class Key{
header('Content-Type: application/json');
echo json_encode($weather_data);
}
+
+ function retrieveHData($key, $generateXml = false) {
+ $html = '';
+ $db = new mysqli("86.92.67.21", "friedel", "hailiwa", "wap2");
+ $query = "SELECT distinct temperature, wind_speed, dew_point, DATE(date_time) AS date, nl.name as city
+ FROM weather_data wd
+ JOIN station s ON wd.station_name = s.name
+ JOIN contract_station cs ON cs.station_name = s.name
+ JOIN nearestlocation nl ON nl.station_name = s.name
+ JOIN country co ON co.country_code = nl.country_code
+ JOIN geolocation geo ON geo.country_code = co.country_code
+ JOIN contract c ON cs.contract_id = c.contract_id
+ WHERE c.token = '3jvl/yb?sRr80s6lTdeOyxV9VTQZkCPRp/bKOWKFWxfL2vhsU4Hhpgcmz9qe0zEk'
+ ORDER BY date DESC, temperature, wind_speed
+ ";
+
+ $stmt = mysqli_prepare($db, $query);
+ $stmt->execute();
+ $data = $stmt->get_result();
+
+ $results = array();
+ $locations = array();
+
+ while ($row = $data->fetch_assoc()) {
+ $humidity = humid($row["temperature"], $row["dew_point"]);
+ $wind_chill = windchill($row["temperature"], $row["wind_speed"]);
+ $current_date = $row['date'];
+ $city = $row['city'];
+
+ if (!isset($results[$current_date])) {
+ $results[$current_date] = array();
+ $locations[$current_date] = array();
+ }
+
+ if (!in_array($city, $locations[$current_date]) && count($results[$current_date]) < 5) {
+ $results[$current_date][] = array(
+ 'city' => $city,
+ 'windchill' => $wind_chill,
+ 'humidity' => $humidity
+ );
+
+ $locations[$current_date][] = $city;
+ }
+ }
+
+ $html .= '<table>';
+
+ foreach ($results as $date => $entries) {
+ $html .= '<tr><th id="tabledate" colspan="4">' . $date . '</th></tr>';
+ $html .= '<tr><th>Location</th><th>Windchill</th></tr>';
+
+ foreach ($entries as $entry) {
+ $html .= '<tr>';
+ $html .= '<td>'.$entry['city'].'</td>';
+ $html .= '<td>'.$entry['windchill'].'</td>';
+ $html .= '</tr>';
+ }
+ }
+
+ $html .= '</table>';
+
+ if ($generateXml) {
+ $xml = new SimpleXMLElement('<data></data>');
+
+ foreach ($results as $date => $entries) {
+ $dateElement = $xml->addChild('date', $date);
+
+ foreach ($entries as $entry) {
+ $locationElement = $dateElement->addChild('location');
+ $locationElement->addChild('city', $entry['city']);
+ $locationElement->addChild('windchill', $entry['windchill']);
+ }
+ }
+
+ $xmlString = $xml->asXML();
+
+ header('Content-Type: application/xml');
+ header('Content-Disposition: attachment; filename="data.xml"');
+
+ echo $xmlString;
+ exit();
+ }
+ $html .= '<a href="?downloadXml=true" class="download-button">Download XML</a>';
+
+ return $html;
+ }
}
function windchill($temp, $wind): float
diff --git a/css/dashboard.css b/css/dashboard.css
@@ -57,6 +57,15 @@ nav ul li:first-child {
vertical-align: middle;
}
+.download-button {
+ display: flex;
+ padding: 10px 20px;
+ background-color: #BC9999;
+ color: white;
+ text-decoration: none;
+ cursor: pointer;
+}
+
/* HEADER */
h1 {
text-align: center;
@@ -114,6 +123,31 @@ h1 {
font-weight: bold;
}
+table {
+ width: 100%;
+ border-collapse: collapse;
+}
+
+th, td {
+ padding: 8px;
+ text-align: left;
+ border-bottom: 1px solid #ddd;
+}
+
+th {
+ background-color: gray;
+ font-weight: bold;
+}
+
+tr:hover {
+ background-color: #444444;
+}
+
+#tabledate{
+ background-color: black;
+ color: #BCCFB0;
+}
+
#myChart {
display: inline !important;
width: 90% !important;
diff --git a/index.php b/index.php
@@ -44,12 +44,16 @@ $router->addRoute(["GET"], "/dashboard", function(&$vars){
return "views/dashboard.html";
});
-$router->addRoute(["GET"], "/hdata", "views/hdata.html");
+
$router->addRoute(["GET"], "/map", "views/map.html");
+$router->addRoute(["GET"], "/hdata", function(&$vars){
+ include"Controller/hdata/hdata.php";
+ $vars["table"] = make_table();
+ return "views/hdata.html";
+});
$router->addRoute(["GET"], "/api/:data", function($vars) {
$key = new Key;
$key->retrieveData($vars);
});
$router->addRoute(['GET'], '/css/dashboard.css', "css/dashboard.css");
-
$router->route();
\ No newline at end of file
diff --git a/views/hdata.html b/views/hdata.html
@@ -28,13 +28,11 @@
<div class="content-title">
<h2>Data past 4 weeks</h2>
</div>
- <ol class="fancy-list" id="weather-list"></ol>
+ <div>
+ {{$table}}
+ </div>
</div>
</div>
-
- <div class="block2">
- <button>Download</button>
- </div>
</div>
</body>
<script src="../js/panda.js"></script>
