Merge branch 'devbackend' of...

Merge branch 'devbackend' of https://transfer.hft-stuttgart.de/gitlab/22kaen1bdi/swp_ss24_wetterdaten_sammeln into devbackend

frontend/src/components/weather/currentData.js

@@ -42,16 +42,28 @@ const Currentdata = (props) => {
             <input type="checkbox" id="tz_id" className="checkBoxFilter" />
             <label> Timezone Id</label>
             <br />
-                <input type="checkbox" id="localtime_epoch" className="checkBoxFilter" />
+            <input
+              type="checkbox"
+              id="localtime_epoch"
+              className="checkBoxFilter"
+            />
             <label> Localtime Epoch</label>
             <br />
             <input type="checkbox" id="localtime" className="checkBoxFilter" />
             <label> Localtime</label>
             <br />
-                <input type="checkbox" id="last_updated_epoch" className="checkBoxFilter" />
+            <input
+              type="checkbox"
+              id="last_updated_epoch"
+              className="checkBoxFilter"
+            />
             <label> Last Updated Epoch</label>
             <br />
-                <input type="checkbox" id="last_updated" className="checkBoxFilter" />
+            <input
+              type="checkbox"
+              id="last_updated"
+              className="checkBoxFilter"
+            />
             <label> Last Updated</label>
             <br />
             <input type="checkbox" id="temp_c" className="checkBoxFilter" />
@@ -63,18 +75,34 @@ const Currentdata = (props) => {
             <input type="checkbox" id="id_day" className="checkBoxFilter" />
             <label for="id_day">ID Day</label>
             <br />
-                <input type="checkbox" id="condition_text" className="checkBoxFilter" />
+            <input
+              type="checkbox"
+              id="condition_text"
+              className="checkBoxFilter"
+            />
             <label for="condition_text">Condition Text</label>
             <br />
-                <input type="checkbox" id="condition_icon" className="checkBoxFilter" />
+            <input
+              type="checkbox"
+              id="condition_icon"
+              className="checkBoxFilter"
+            />
             <label for="condition_icon">Condition Icon</label>
             <br />
-                <input type="checkbox" id="condition_code" className="checkBoxFilter" />
+            <input
+              type="checkbox"
+              id="condition_code"
+              className="checkBoxFilter"
+            />
             <label for="condition_code">Condition Code</label>
             <input type="checkbox" id="wind" className="checkBoxFilter" />
             <label for="wind">Wind </label>
             <br />
-                <input type="checkbox" id="wind_degree" className="checkBoxFilter" />
+            <input
+              type="checkbox"
+              id="wind_degree"
+              className="checkBoxFilter"
+            />
             <label for="wind_degree">Wind Degree</label>
             <br />
             <input type="checkbox" id="wind_dir" className="checkBoxFilter" />
@@ -113,28 +141,60 @@ const Currentdata = (props) => {
             <input type="checkbox" id="gust" className="checkBoxFilter" />
             <label for="gust">Gust </label>
             <br />
-                <input type="checkbox" id="air_quality_co" className="checkBoxFilter" />
+            <input
+              type="checkbox"
+              id="air_quality_co"
+              className="checkBoxFilter"
+            />
             <label for="air_quality_co">Air Quality CO</label>
             <br />
-                <input type="checkbox" id="air_quality_no2" className="checkBoxFilter" />
+            <input
+              type="checkbox"
+              id="air_quality_no2"
+              className="checkBoxFilter"
+            />
             <label for="air_quality_no2">Air Quality NO2</label>
             <br />
-                <input type="checkbox" id="air_quality_o3" className="checkBoxFilter" />
+            <input
+              type="checkbox"
+              id="air_quality_o3"
+              className="checkBoxFilter"
+            />
             <label for="air_quality_o3">Air Quality O3</label>
             <br />
-                <input type="checkbox" id="air_quality_so2" className="checkBoxFilter" />
+            <input
+              type="checkbox"
+              id="air_quality_so2"
+              className="checkBoxFilter"
+            />
             <label for="air_quality_so2">Air Quality SO2</label>
             <br />
-                <input type="checkbox" id="air_quality_pm2_5" className="checkBoxFilter" />
+            <input
+              type="checkbox"
+              id="air_quality_pm2_5"
+              className="checkBoxFilter"
+            />
             <label for="air_quality_pm2_5">Air Quality PM2.5</label>
             <br />
-                <input type="checkbox" id="air_quality_pm10" className="checkBoxFilter" />
+            <input
+              type="checkbox"
+              id="air_quality_pm10"
+              className="checkBoxFilter"
+            />
             <label for="air_quality_pm10">Air Quality PM10</label>
             <br />
-                <input type="checkbox" id="air_quality_us_epa_index" className="checkBoxFilter" />
+            <input
+              type="checkbox"
+              id="air_quality_us_epa_index"
+              className="checkBoxFilter"
+            />
             <label for="air_quality_us_epa_index">US EPA Index</label>
             <br />
-                <input type="checkbox" id="air_quality_gb_defra_index" className="checkBoxFilter" />
+            <input
+              type="checkbox"
+              id="air_quality_gb_defra_index"
+              className="checkBoxFilter"
+            />
             <label for="air_quality_gb_defra_index">GB DEFRA Index</label>
             <br />
             <br />
@@ -147,11 +207,23 @@ const Currentdata = (props) => {
   );
 
   function getData() {
-    const city = document.getElementById("city").value;
-    const region = document.getElementById("region").value;
-    const country = document.getElementById("country").value;
-    const latitude = document.getElementById("latitude").value;
-    const longitude = document.getElementById("longitude").value;
+    const city_text = document.getElementById("city_text").value;
+    const region_text = document.getElementById("region_text").value;
+    const country_text = document.getElementById("country_text").value;
+    const latitude_text = document.getElementById("latitude_text").value;
+    const longitude_text = document.getElementById("longitude_text").value;
+
+    //Checkboxes
+    //location
+    const name = document.getElementById("name").checked;
+    const region = document.getElementById("region").checked;
+    const country = document.getElementById("country").checked;
+    const lon = document.getElementById("lon").checked;
+    const lat = document.getElementById("lat").checked;
+    const tz_id = document.getElementById("tz_id").checked;
+    const localtime_epoch = document.getElementById("localtime_epoch").checked;
+    const localtime = document.getElementById("localtime").checked;
+    //current
     const temperature = document.getElementById("temperature").checked;
     const isDay = document.getElementById("isDay").checked;
     const condition = document.getElementById("condition").checked;
@@ -174,8 +246,37 @@ const Currentdata = (props) => {
     const output = document.getElementById("output").value;
     const format = document.getElementById("format").value;
 
-    const apiKey = "1244099aeaee4b179e6111803241304";
-    const apiUrl = `https://api.weatherapi.com/v1/current.${format}?key=${apiKey}&q=${city}&aqi=${airquality}`;
+    let filterArray = [];
+
+    if (name) {
+      filterArray.push("name");
+    }
+    if (region) {
+      filterArray.push("region");
+    }
+    if (country) {
+      filterArray.push("country");
+    }
+    if (lon) {
+      filterArray.push("lon");
+    }
+    if (lat) {
+      filterArray.push("lat");
+    }
+    if (tz_id) {
+      filterArray.push("tz_id");
+    }
+    if (localtime_epoch) {
+      filterArray.push("localtime_epoch");
+    }
+    if (localtime) {
+      filterArray.push("localtime");
+    }
+    let filterString = filterArray.join(",");
+
+    console.log(filterString);
+
+    const apiUrl = `localhost:8080/currentwaether?q=${city_text}&filter=${filterString}`;
 
     fetch(apiUrl)
       .then((response) => {
@@ -227,7 +328,6 @@ const Currentdata = (props) => {
   function boolToWord(bool) {
     return bool ? "yes" : "no";
   }
-
 };
 
 export default Currentdata;