From 4441de32be4a0b59c2900d9a59927a9672e7335b Mon Sep 17 00:00:00 2001 From: Burak <6028083@mborijnland.nl> Date: Tue, 12 Mar 2024 12:01:42 +0100 Subject: [PATCH] update, duplicate --- .hintrc | 13 ++++++++++ battery_voltage_events.py | 37 ++++++++++++++++------------- src/get_data.php | 50 +++++++++++++++++++++++++++++++++++++++ src/kas_informatie.html | 15 ++++++++---- 4 files changed, 94 insertions(+), 21 deletions(-) create mode 100644 .hintrc create mode 100644 src/get_data.php diff --git a/.hintrc b/.hintrc new file mode 100644 index 0000000..ae62a1a --- /dev/null +++ b/.hintrc @@ -0,0 +1,13 @@ +{ + "extends": [ + "development" + ], + "hints": { + "axe/text-alternatives": [ + "default", + { + "image-alt": "off" + } + ] + } +} \ No newline at end of file diff --git a/battery_voltage_events.py b/battery_voltage_events.py index 63c890e..b0faac6 100644 --- a/battery_voltage_events.py +++ b/battery_voltage_events.py @@ -17,12 +17,11 @@ def calculate_timestamp(gateway_receive_time): datetime_obj_utc = datetime.strptime(gateway_receive_time, "%Y-%m-%dT%H:%M:%SZ").replace(tzinfo=timezone.utc) # Voeg het tijdsverschil van 1 uur toe voor de Nederlandse tijdzone (UTC+1) - datetime_obj_nl = datetime_obj_utc + timedelta(hours=0) + datetime_obj_nl = datetime_obj_utc + timedelta(hours=1) # Formateer het datetime-object als een leesbare datumstring formatted_date = datetime_obj_nl.strftime("%Y-%m-%d %H:%M:%S") return formatted_date - # Functie voor het aanmaken van gegevens in de database def create_data(url, access_token, repeat_count=5): for _ in range(repeat_count): @@ -71,7 +70,6 @@ def create_data(url, access_token, repeat_count=5): print("Waiting for the next create action...\n") time.sleep(2) -# Functie voor het invoegen van gegevens in de database def insert_data(record): mydb = database_connect() if mydb.is_connected(): @@ -82,25 +80,30 @@ def insert_data(record): INSERT INTO goodgarden.battery_voltage_events (timestamp, gateway_receive_time, device, value) VALUES (%s, %s, %s, %s) """ - # Pas dit aan op basis van de werkelijke structuur van de JSON - timestamp = calculate_timestamp(record.get('gateway_receive_time', '')) - gateway_receive_time = record.get('gateway_receive_time', '') - device = record.get('device', '') - value = record.get('value', '') - print(f"Inserting data: timestamp={timestamp}, gateway_receive_time={gateway_receive_time}, device={device}, value={value}\n\n") # Print de ingevoerde gegevens + try: + # Voer de query uit zonder de timestamp te berekenen + timestamp = record.get('timestamp', '') + gateway_receive_time = record.get('gateway_receive_time', '') + device = record.get('device', '') + value = record.get('value', '') - # Voer de query uit - mycursor.execute(insert_query, (timestamp, gateway_receive_time, device, value)) + print(f"Inserting data: timestamp={timestamp}, gateway_receive_time={gateway_receive_time}, device={device}, value={value}\n") # Print de ingevoerde gegevens - # Bevestig de wijzigingen - mydb.commit() + mycursor.execute(insert_query, (timestamp, gateway_receive_time, device, value)) - # Sluit cursor en verbinding - mycursor.close() - mydb.close() + # Bevestig de wijzigingen + mydb.commit() - print("Data inserted into the database.") + print("Data inserted into the database.") + + except mysql.connector.Error as err: + print(f"Error: {err}") + + finally: + # Sluit cursor en verbinding + mycursor.close() + mydb.close() # Functie voor het lezen van gegevens uit de database def read_data(url, access_token, repeat_count=5): diff --git a/src/get_data.php b/src/get_data.php new file mode 100644 index 0000000..77ba071 --- /dev/null +++ b/src/get_data.php @@ -0,0 +1,50 @@ +connect_error) { + die("Connection failed: " . $conn->connect_error); +} + +// Query om gegevens op te halen uit de tabel devices +$query_devices = "SELECT * FROM devices"; +$result_devices = $conn->query($query_devices); + +// Query om gegevens op te halen uit de tabel battery_voltage_events +$query_battery_voltage = "SELECT * FROM battery_voltage_events"; +$result_battery_voltage = $conn->query($query_battery_voltage); + +// Query om gegevens op te halen uit de tabel fetch +$query_fetch = "SELECT * FROM fetch"; +$result_fetch = $conn->query($query_fetch); + +// Array om resultaten op te slaan +$data = array(); + +// Controleren of er resultaten zijn van de tabel devices +if ($result_devices->num_rows > 0) { + $data['devices'] = $result_devices->fetch_all(MYSQLI_ASSOC); +} + +// Controleren of er resultaten zijn van de tabel battery_voltage_events +if ($result_battery_voltage->num_rows > 0) { + $data['battery_voltage_events'] = $result_battery_voltage->fetch_all(MYSQLI_ASSOC); +} + +// Controleren of er resultaten zijn van de tabel fetch +if ($result_fetch->num_rows > 0) { + $data['fetch'] = $result_fetch->fetch_all(MYSQLI_ASSOC); +} + +// Gegevens als JSON-uitvoer +echo json_encode($data); + +// Verbinding sluiten +$conn->close(); diff --git a/src/kas_informatie.html b/src/kas_informatie.html index 7018db9..c3d34b4 100644 --- a/src/kas_informatie.html +++ b/src/kas_informatie.html @@ -105,8 +105,15 @@ + - - - - + \ No newline at end of file