From 5c5d12e76ec1e6cf56787870a96819fc2cec1040 Mon Sep 17 00:00:00 2001 From: Atilla Date: Wed, 6 Mar 2024 11:15:20 +0100 Subject: [PATCH] Geen idee --- script/battery_voltage_events.py | 190 +----------------------------- script/db_connect.py | 2 +- script/main.py | 0 script/soil_temperature_events.py | 1 - src/css/style.css | 8 ++ src/css/style.css.map | 2 +- src/css/style.scss | 12 +- 7 files changed, 18 insertions(+), 197 deletions(-) delete mode 100644 script/main.py diff --git a/script/battery_voltage_events.py b/script/battery_voltage_events.py index 5c777fe..755a1fc 100644 --- a/script/battery_voltage_events.py +++ b/script/battery_voltage_events.py @@ -1,199 +1,13 @@ -# import requests #** TYPE IN TERMINAL: "pip install requests" -# import time -# import mysql.connector #** TYPE IN TERMINAL: "pip install mysql-connector-python" - -# # Import python db_connect.py script -# from db_connect import database_connect - -# # Functie voor het aanmaken van gegevens in de database -# def create_data(url, access_token, repeat_count=5): -# for _ in range(repeat_count): -# try: -# headers = { -# "Authorization": f"Token {access_token}" -# } -# response = requests.get(url, headers=headers) -# response.raise_for_status() - -# data = response.json() - -# # print(f"Data from {url}:") -# print(data) -# insert_data(data) - -# except requests.exceptions.RequestException as e: -# print(f"Error fetching data from {url}: {e}") - -# print("Waiting for the next create action...") -# time.sleep(10) -# # time.sleep(300) - -# # Functie voor het invoegen van gegevens in de database -# def insert_data(data): -# mydb = database_connect() -# if mydb.is_connected(): -# mycursor = mydb.cursor() - -# insert_query = """ -# INSERT INTO goodgarden.battery_voltage_events (timestamp, gateway_receive_time, device, value) -# VALUES (%s, %s, %s, %s) -# """ - -# for record in data['results']: # Pas dit aan op basis van de werkelijke structuur van de JSON - -# timestamp = record.get('timestamp', '') -# 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}") - -# # Voer de query uit -# mycursor.execute(insert_query, (timestamp, gateway_receive_time, device, value)) - -# # Bevestig de wijzigingen -# mydb.commit() - -# # 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): -# for _ in range(repeat_count): -# try: -# headers = { -# "Authorization": f"Token {access_token}" -# } -# response = requests.get(url, headers=headers) -# response.raise_for_status() - -# data = response.json() -# print(f"Data from {url}:") -# print(data) - -# except requests.exceptions.RequestException as e: -# print(f"Error fetching data from {url}: {e}") - -# # Wacht een bepaalde tijd in secondes -# print("Waiting for the next read action...") -# time.sleep(300) - -# # Functie voor het bijwerken van gegevens in de database -# def update_data(record_id, new_value): -# try: -# mydb = database_connect() - -# if mydb.is_connected(): -# mycursor = mydb.cursor() - -# # Controleer of het record bestaat voordat je het bijwerkt -# mycursor.execute("SELECT * FROM goodgarden.battery_voltage_events WHERE id = %s", (record_id,)) -# existing_record = mycursor.fetchone() - -# if not existing_record: -# print(f"Record with ID {record_id} not found. Update operation aborted.") -# return - -# # Hier moet je de juiste kolomnamen aanpassen op basis van de structuur van je database -# update_query = """ -# UPDATE goodgarden.battery_voltage_events -# SET value = %s -# WHERE id = %s -# """ - -# # Voer de query uit -# print(f"Executing update query: {update_query}") -# print(f"Updating record with ID {record_id} to new value: {new_value}") - -# mycursor.execute(update_query, (new_value, record_id)) # Provide the tuple with values here - -# # Bevestig de wijzigingen -# mydb.commit() - -# print(f"Update executed. Rowcount: {mycursor.rowcount}") - -# except mysql.connector.Error as update_err: -# print(f"Error updating data: {update_err}") -# finally: -# # Zorg ervoor dat je altijd de cursor en de databaseverbinding sluit -# if 'mycursor' in locals() and mycursor is not None: -# mycursor.close() -# if 'mydb' in locals() and mydb.is_connected(): -# mydb.close() - - -# # Functie voor het verwijderen van gegevens uit de database -# def delete_data(record_id): -# mydb = database_connect() -# if mydb.is_connected(): -# mycursor = mydb.cursor() - -# # Hier moet je de juiste kolomnamen aanpassen op basis van de structuur van je database -# delete_query = """ -# DELETE FROM goodgarden.battery_voltage_events -# WHERE id = %s -# """ - -# # Voer de query uit -# mycursor.execute(delete_query, (record_id,)) - -# # Bevestig de wijzigingen -# mydb.commit() - -# # Sluit cursor en verbinding -# mycursor.close() -# mydb.close() - -# print(f"Data with ID {record_id} deleted.") - -# if __name__ == "__main__": -# url = "https://garden.inajar.nl/api/battery_voltage_events/?format=json" -# access_token = "33bb3b42452306c58ecedc3c86cfae28ba22329c" - -# repeat_count = 10 - -# operation_choice = input("Choose operation (C for Create, R for Read, U for Update, D for Delete): ").upper() - -# # Maak gegevens aan -# if operation_choice == "C": -# create_data(url, access_token, repeat_count) - -# # Lees gegevens -# elif operation_choice == "R": -# read_data(url, access_token, repeat_count) - -# # Update gegevens -# elif operation_choice == "U": -# record_id = int(input("Enter record ID to update: ")) -# new_value = input("Enter new value: ") -# update_data(record_id, new_value) - -# # Verwijder gegevens -# elif operation_choice == "D": -# record_id = int(input("Enter record ID to delete: ")) -# delete_data(record_id) - -# else: -# print("Invalid operation choice. Please choose C, R, U, or D.") - import mysql.connector import requests from datetime import datetime, timezone, timedelta import time import os +from db_connect import database_connect + # import paho.mqtt.client as mqtt # from dotenv import load_dotenv -# Functie om verbinding te maken met de database -def database_connect(): - return mysql.connector.connect( - host="localhost", - user="root", - password="", - database="goodgarden" - ) - def calculate_timestamp(gateway_receive_time): # Converteer de stringrepresentatie naar een datetime-object in UTC datetime_obj_utc = datetime.strptime(gateway_receive_time, "%Y-%m-%dT%H:%M:%SZ").replace(tzinfo=timezone.utc) diff --git a/script/db_connect.py b/script/db_connect.py index fbed212..8d61b95 100644 --- a/script/db_connect.py +++ b/script/db_connect.py @@ -1,4 +1,4 @@ -import mysql.connector #** TYPE IN TERMINAL: "pip install mysql-connector-python" +import mysql.connector from mysql.connector import Error def database_connect(): diff --git a/script/main.py b/script/main.py deleted file mode 100644 index e69de29..0000000 diff --git a/script/soil_temperature_events.py b/script/soil_temperature_events.py index 2cd9750..4660862 100644 --- a/script/soil_temperature_events.py +++ b/script/soil_temperature_events.py @@ -1,7 +1,6 @@ import requests import time - from db_connect import database_connect def fetch_and_display_all(url, access_token, repeat_count=5): diff --git a/src/css/style.css b/src/css/style.css index 1770397..294a339 100644 --- a/src/css/style.css +++ b/src/css/style.css @@ -176,9 +176,17 @@ body .mainContainer .mainBorder .grid-column-2 .grid-2-child .parent-table { padding: 1.5rem 2rem; display: flex; flex-direction: column; + align-items: stretch; + gap: 2.5rem; justify-content: space-around; height: 90%; } +body .mainContainer .mainBorder .grid-column-2 .grid-2-child .parent-table table tr td { + font-size: 1.05rem; +} +body .mainContainer .mainBorder .grid-column-2 .grid-2-child .parent-table .kas-table-1 tr td { + font-size: 1.25rem; +} body .mainContainer .mainBorder .grid-column-2 .grid-2-child .parent-table .kas-table-2 { position: relative; } diff --git a/src/css/style.css.map b/src/css/style.css.map index b11fddc..43ebafd 100644 --- a/src/css/style.css.map +++ b/src/css/style.css.map @@ -1 +1 @@ -{"version":3,"sources":["style.scss","style.css"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file +{"version":3,"sources":["style.scss","style.css"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file diff --git a/src/css/style.scss b/src/css/style.scss index 28c57eb..59e5c56 100644 --- a/src/css/style.scss +++ b/src/css/style.scss @@ -8,10 +8,10 @@ $font-titels: "Akaya Kanadaka", system-ui; $font-text: "Afacad", sans-serif; -@mixin flexbox +@mixin flexbox-center { display: flex; - justify-content: space-around; + justify-content: center; } @mixin groene-border @@ -278,8 +278,8 @@ body padding: 1.5rem 2rem; display: flex; flex-direction: column; - // align-items: stretch; - // gap: 2.5rem; + align-items: stretch; + gap: 2.5rem; justify-content: space-around; height: 90%; @@ -289,7 +289,7 @@ body { td { - // font-size: 1.05rem; + font-size: 1.05rem; } } } @@ -300,7 +300,7 @@ body { td { - // font-size: 1.25rem; + font-size: 1.25rem; } } }