iwa-panda2

commit e0d1058350963ff6040c07599f039fc72006ffee
parent 7893f61398a5890a19a783510797b2093c8081d5
Author: MoiBaguette <[email protected]>
Date:   Mon, 19 Jun 2023 00:25:32 +0200

xml

Diffstat:
M
Controller/hdata/hdata.php
 | 
4
++--
M
Model/Key.php
 | 
28
++++++++--------------------

2 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/Controller/hdata/hdata.php b/Controller/hdata/hdata.php
@@ -9,11 +9,11 @@ function make_table() {
         header('Content-Disposition: attachment; filename="' . $filename . '"');
 
         // Retrieve the XML data
-        $humidityXml = $key->retrieveHumidityTable('ae9c50dc5cd58c538a0d6aedb17fffedcaffd568d22381dab3ae72baaeb24684', true);
+        var_dump($key->retrieveHumidityTable('ae9c50dc5cd58c538a0d6aedb17fffedcaffd568d22381dab3ae72baaeb24684', true));
         $hDataXml = $key->retrieveHData('ae9c50dc5cd58c538a0d6aedb17fffedcaffd568d22381dab3ae72baaeb24684', true);
 
         // Output the XML data directly to the browser
-        echo "<weather><humidity>$humidityXml</humidity><hdata>$hDataXml</hdata></weather>";
+        //echo "<weather><humidity>$humidityXml</humidity><hdata>$hDataXml</hdata></weather>";
 
         exit();
     } else {
diff --git a/Model/Key.php b/Model/Key.php
@@ -104,8 +104,8 @@ Class Key{
         $table1 .= '<tr><th>Date</th><th>Humidity</th></tr>';
         $table2 = '<tr><th id="tabledate" colspan="4">Kangding Humidity Data</th></tr>';
         $table2 .= '<tr><th>Date</th><th>Humidity</th></tr>';
-
-
+        $xml1 = '<location ="Chengdu">';
+        $xml2 = '<location ="Kangding">';
         while ($row = $data->fetch_assoc()) {
             $humidity = humid($row["temperature"], $row["dew_point"]);
             $current_date = $row['date_time'];
@@ -121,33 +121,21 @@ Class Key{
                 'humidity' => $humidity
             );
 
-
+            // Table and Generate XML
             if($city == 'Chengdu') {
                 $table1 .= '<tr><td>'.$correct_date.'</td><td>'.$humidity.'</td></tr>';
+                $xml1 .= '<date>'.$correct_date.'</date><humidity>'.$humidity.'</humidity>';
             }
             else{
                 $table2 .= '<tr><td>'.$correct_date.'</td><td>'.$humidity.'</td></tr>';
+                $xml2 .= '<date>'.$correct_date.'</date><humidity>'.$humidity.'</humidity>';
             }
-
         }
-
+        $xml1 = '</location>';
+        $xml2 = '</location>';
+        $xml = '<data>' . $xml1 . $xml2 . '</data>';
         $html .= $table1 . $table2;
         if ($generateXml) {
-            // Generate XML
-            $xml = '<data>';
-
-            foreach ($results as $city => $entries) {
-                foreach ($entries as $entry) {
-                    $xml .= '<location>';
-                    $xml .= "<city>$city</city>";
-                    $xml .= "<date>{$entry['date']}</date>";
-                    $xml .= "<humidity>{$entry['humidity']}</humidity>";
-                    $xml .= '</location>';
-                }
-            }
-            
-            $xml .= '</data>';
-
             return $xml; // Return SimpleXMLElement object
         }
         return $html;