heboba/goodgarden
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Homepage 1 sensor doet eht met data

Browse Source
This commit is contained in:
Atilla
2024-03-27 12:06:46 +01:00
parent 59ffdbbc22
commit f599cb95d8
13 changed files with 326 additions and 673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
app.py
View File

@@ -3,8 +3,7 @@ import mysql.connector
app = Flask(__name__) app = Flask(__name__)
# Function to get data from the MySQL database def database_connect():
def get_database_data():
try: try:
connection = mysql.connector.connect( connection = mysql.connector.connect(
host='localhost', host='localhost',
@@ -12,19 +11,30 @@ def get_database_data():
password='', password='',
database='goodgarden' database='goodgarden'
) )
cursor = connection.cursor() return connection
except Exception as e:
print("Database connection failed:", e)
return None
# Function to get data from the MySQL database
def get_database_data():
mydb = database_connect()
if mydb and mydb.is_connected():
cursor = mydb.cursor()
# Query to retrieve the latest battery voltage data # Query to retrieve the latest battery voltage data
query = "SELECT id, timestamp, gateway_receive_time, device, value FROM battery_voltage_events ORDER BY timestamp DESC LIMIT 1" query = "SELECT label, last_seen, last_battery_voltage, device_id FROM devices ORDER BY device_id DESC LIMIT 1"
cursor.execute(query) cursor.execute(query)
battery_data = cursor.fetchone() battery_data = cursor.fetchone()
mydb.close()
connection.close()
return battery_data return battery_data
except Exception as e:
print("Error fetching data from database:", e) # def devices_data():
return None
@app.route('/', methods=['GET']) @app.route('/', methods=['GET'])
def get_data(): def get_data():
@@ -36,13 +46,14 @@ def get_data():
# Convert the fetched data into a dictionary # Convert the fetched data into a dictionary
data_dict = { data_dict = {
"id": battery_data[0], "label": battery_data[0],
"timestamp": str(battery_data[1]), # Convert timestamp to string for JSON serialization "last_seen": battery_data[1],
"gateway_receive_time": str(battery_data[2]), # Convert timestamp to string for JSON serialization "last_battery_voltage": battery_data[2],
"device": battery_data[3], "device_id": battery_data[3]
"value": battery_data[4]
} }
print(data_dict)
# Return the data as JSON # Return the data as JSON
return jsonify(data_dict) return jsonify(data_dict)

382
battery_voltage_events.py
View File

@@ -1,239 +1,239 @@
import mysql.connector # import mysql.connector
import requests # import requests
from datetime import datetime, timezone, timedelta # from datetime import datetime, timezone, timedelta
import time # import time
# Functie om verbinding te maken met de database # # Functie om verbinding te maken met de database
def database_connect(): # def database_connect():
return mysql.connector.connect( # return mysql.connector.connect(
host="localhost", # host="localhost",
user="root", # user="root",
password="", # password="",
database="goodgarden" # database="goodgarden"
) # )
def calculate_timestamp(gateway_receive_time): # def calculate_timestamp(gateway_receive_time):
# Converteer de stringrepresentatie naar een datetime-object in UTC # # 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) # 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) # # Voeg het tijdsverschil van 1 uur toe voor de Nederlandse tijdzone (UTC+1)
datetime_obj_nl = datetime_obj_utc + timedelta(hours=1) # datetime_obj_nl = datetime_obj_utc + timedelta(hours=1)
# Formateer het datetime-object als een leesbare datumstring # # Formateer het datetime-object als een leesbare datumstring
formatted_date = datetime_obj_nl.strftime("%Y-%m-%d %H:%M:%S") # formatted_date = datetime_obj_nl.strftime("%Y-%m-%d %H:%M:%S")
return formatted_date # return formatted_date
# Functie voor het aanmaken van gegevens in de database # # Functie voor het aanmaken van gegevens in de database
def create_data(url, access_token, repeat_count=5): # def create_data(url, access_token, repeat_count=5):
for _ in range(repeat_count): # for _ in range(repeat_count):
try: # try:
headers = {"Authorization": f"Token {access_token}"} # headers = {"Authorization": f"Token {access_token}"}
response = requests.get(url, headers=headers) # response = requests.get(url, headers=headers)
response.raise_for_status() # response.raise_for_status()
data = response.json() # data = response.json()
print(f"Data from {url}:\n") # print(f"Data from {url}:\n")
# Check if data is a list (records directly under the root) # # Check if data is a list (records directly under the root)
if isinstance(data, list): # if isinstance(data, list):
records = data # records = data
elif isinstance(data, dict) and 'results' in data: # elif isinstance(data, dict) and 'results' in data:
records = data['results'] # records = data['results']
else: # else:
print(f"Unexpected data format received: {data}") # print(f"Unexpected data format received: {data}")
continue # continue
for record in records: # for record in records:
# Now, record is assumed to be a dictionary # # Now, record is assumed to be a dictionary
timestamp = record.get('timestamp', '') # timestamp = record.get('timestamp', '')
gateway_receive_time = record.get('gateway_receive_time', '') # gateway_receive_time = record.get('gateway_receive_time', '')
device = record.get('device', '') # device = record.get('device', '')
value = record.get('value', '') # value = record.get('value', '')
# Voeg de timestamp-berekening toe # # Voeg de timestamp-berekening toe
calculated_timestamp = calculate_timestamp(gateway_receive_time) # calculated_timestamp = calculate_timestamp(gateway_receive_time)
print(f"\nInserted data: Timestamp: {calculated_timestamp}, Device: {device}, Battery Voltage: {value}V") # print(f"\nInserted data: Timestamp: {calculated_timestamp}, Device: {device}, Battery Voltage: {value}V")
if float(value) < 3.0: # if float(value) < 3.0:
print("Waarschuwing: Batterijspanning is lager dan 3.0 volt. Opladen aanbevolen.\n") # print("Waarschuwing: Batterijspanning is lager dan 3.0 volt. Opladen aanbevolen.\n")
# Controleer of de batterijspanning hoger is dan 4.2 volt en geef een melding # # Controleer of de batterijspanning hoger is dan 4.2 volt en geef een melding
elif float(value) > 4.2: # elif float(value) > 4.2:
print("Melding: Batterijspanning is hoger dan 4.2 volt. Batterij is vol.\n") # print("Melding: Batterijspanning is hoger dan 4.2 volt. Batterij is vol.\n")
else: # else:
print("Melding: Batterijspanning is binnen het gewenste bereik.\n\n") # print("Melding: Batterijspanning is binnen het gewenste bereik.\n\n")
# Insert data into the database # # Insert data into the database
insert_data(record) # insert_data(record)
except requests.exceptions.RequestException as e: # except requests.exceptions.RequestException as e:
print(f"Error fetching data from {url}: {e}") # print(f"Error fetching data from {url}: {e}")
print("Waiting for the next create action...\n") # print("Waiting for the next create action...\n")
time.sleep(2) # time.sleep(2)
def insert_data(record): # def insert_data(record):
mydb = database_connect() # mydb = database_connect()
if mydb.is_connected(): # if mydb.is_connected():
mycursor = mydb.cursor() # mycursor = mydb.cursor()
# Hier moet je de juiste kolomnamen en gegevensindeling aanpassen op basis van de API-respons # # Hier moet je de juiste kolomnamen en gegevensindeling aanpassen op basis van de API-respons
insert_query = """ # insert_query = """
INSERT INTO goodgarden.battery_voltage_events (timestamp, gateway_receive_time, device, value) # INSERT INTO goodgarden.battery_voltage_events (timestamp, gateway_receive_time, device, value)
VALUES (%s, %s, %s, %s) # VALUES (%s, %s, %s, %s)
""" # """
try: # try:
# Voer de query uit zonder de timestamp te berekenen # # Voer de query uit zonder de timestamp te berekenen
timestamp = record.get('timestamp', '') # timestamp = record.get('timestamp', '')
gateway_receive_time = record.get('gateway_receive_time', '') # gateway_receive_time = record.get('gateway_receive_time', '')
device = record.get('device', '') # device = record.get('device', '')
value = record.get('value', '') # value = record.get('value', '')
print(f"Inserting data: timestamp={timestamp}, gateway_receive_time={gateway_receive_time}, device={device}, value={value}\n") # Print de ingevoerde gegevens # print(f"Inserting data: timestamp={timestamp}, gateway_receive_time={gateway_receive_time}, device={device}, value={value}\n") # Print de ingevoerde gegevens
mycursor.execute(insert_query, (timestamp, gateway_receive_time, device, value)) # mycursor.execute(insert_query, (timestamp, gateway_receive_time, device, value))
# Bevestig de wijzigingen # # Bevestig de wijzigingen
mydb.commit() # mydb.commit()
print("Data inserted into the database.") # print("Data inserted into the database.")
except mysql.connector.Error as err: # except mysql.connector.Error as err:
print(f"Error: {err}") # print(f"Error: {err}")
finally: # finally:
# Sluit cursor en verbinding # # Sluit cursor en verbinding
mycursor.close() # mycursor.close()
mydb.close() # mydb.close()
# Functie voor het lezen van gegevens uit de database # # Functie voor het lezen van gegevens uit de database
def read_data(url, access_token, repeat_count=5): # def read_data(url, access_token, repeat_count=5):
for _ in range(repeat_count): # for _ in range(repeat_count):
try: # try:
headers = {"Authorization": f"Token {access_token}"} # headers = {"Authorization": f"Token {access_token}"}
response = requests.get(url, headers=headers) # response = requests.get(url, headers=headers)
response.raise_for_status() # response.raise_for_status()
data = response.json() # data = response.json()
print(f"Data from {url}:\n") # print(f"Data from {url}:\n")
for record in data['results']: # for record in data['results']:
timestamp = record.get('timestamp', '') # timestamp = record.get('timestamp', '')
device = record.get('device', '') # device = record.get('device', '')
value = record.get('value', '') # value = record.get('value', '')
print(f"Timestamp: {timestamp}, Device: {device}, Battery Voltage: {value}V\n") # print(f"Timestamp: {timestamp}, Device: {device}, Battery Voltage: {value}V\n")
if float(value) < 3.0: # if float(value) < 3.0:
print("Waarschuwing: Batterijspanning is lager dan 3.0 volt. Opladen aanbevolen.\n") # print("Waarschuwing: Batterijspanning is lager dan 3.0 volt. Opladen aanbevolen.\n")
# Controleer of de batterijspanning hoger is dan 4.2 volt en geef een melding # # Controleer of de batterijspanning hoger is dan 4.2 volt en geef een melding
elif float(value) > 4.2: # elif float(value) > 4.2:
print("Melding: Batterijspanning is hoger dan 4.2 volt. Batterij is vol.\n") # print("Melding: Batterijspanning is hoger dan 4.2 volt. Batterij is vol.\n")
else: # else:
print("Melding: Batterijspanning is binnen het gewenste bereik.\n\n") # print("Melding: Batterijspanning is binnen het gewenste bereik.\n\n")
except requests.exceptions.RequestException as e: # except requests.exceptions.RequestException as e:
print(f"Error fetching data from {url}: {e}") # print(f"Error fetching data from {url}: {e}")
print("Waiting for the next read action...\n") # print("Waiting for the next read action...\n")
time.sleep(300) # time.sleep(300)
# Functie voor het bijwerken van gegevens in de database # # Functie voor het bijwerken van gegevens in de database
def update_data(record_id): # def update_data(record_id):
try: # try:
mydb = database_connect() # mydb = database_connect()
if mydb.is_connected(): # if mydb.is_connected():
mycursor = mydb.cursor() # mycursor = mydb.cursor()
# Controleer of het record bestaat voordat je het bijwerkt # # Controleer of het record bestaat voordat je het bijwerkt
mycursor.execute("SELECT * FROM goodgarden.battery_voltage_events WHERE id = %s", (record_id,)) # mycursor.execute("SELECT * FROM goodgarden.battery_voltage_events WHERE id = %s", (record_id,))
existing_record = mycursor.fetchone() # existing_record = mycursor.fetchone()
if not existing_record: # if not existing_record:
print(f"Record with ID {record_id} not found. Update operation aborted.") # print(f"Record with ID {record_id} not found. Update operation aborted.")
return # return
# Vraag de gebruiker om nieuwe waarden voor de andere velden # # Vraag de gebruiker om nieuwe waarden voor de andere velden
new_timestamp = input("Enter new timestamp: ") # new_timestamp = input("Enter new timestamp: ")
new_gateway_receive_time = input("Enter new gateway_receive_time: ") # new_gateway_receive_time = input("Enter new gateway_receive_time: ")
new_device = input("Enter new device: ") # new_device = input("Enter new device: ")
new_value = input("Enter new value: ") # new_value = input("Enter new value: ")
# Hier moet je de juiste kolomnamen aanpassen op basis van de structuur van je database # # Hier moet je de juiste kolomnamen aanpassen op basis van de structuur van je database
update_query = """ # update_query = """
UPDATE goodgarden.battery_voltage_events # UPDATE goodgarden.battery_voltage_events
SET timestamp = %s, gateway_receive_time = %s, device = %s, value = %s # SET timestamp = %s, gateway_receive_time = %s, device = %s, value = %s
WHERE id = %s # WHERE id = %s
""" # """
# Voer de query uit # # Voer de query uit
print(f"Executing update query: {update_query}") # print(f"Executing update query: {update_query}")
print(f"Updating record with ID {record_id} to new values - timestamp: {new_timestamp}, gateway_receive_time: {new_gateway_receive_time}, device: {new_device}, value: {new_value}") # print(f"Updating record with ID {record_id} to new values - timestamp: {new_timestamp}, gateway_receive_time: {new_gateway_receive_time}, device: {new_device}, value: {new_value}")
mycursor.execute(update_query, (new_timestamp, new_gateway_receive_time, new_device, new_value, record_id)) # mycursor.execute(update_query, (new_timestamp, new_gateway_receive_time, new_device, new_value, record_id))
# Bevestig de wijzigingen # # Bevestig de wijzigingen
mydb.commit() # mydb.commit()
print(f"Update executed. Rowcount: {mycursor.rowcount}") # print(f"Update executed. Rowcount: {mycursor.rowcount}")
except mysql.connector.Error as update_err: # except mysql.connector.Error as update_err:
print(f"Error updating data: {update_err}") # print(f"Error updating data: {update_err}")
finally: # finally:
# Zorg ervoor dat je altijd de cursor en de databaseverbinding sluit # # Zorg ervoor dat je altijd de cursor en de databaseverbinding sluit
if 'mycursor' in locals() and mycursor is not None: # if 'mycursor' in locals() and mycursor is not None:
mycursor.close() # mycursor.close()
if 'mydb' in locals() and mydb.is_connected(): # if 'mydb' in locals() and mydb.is_connected():
mydb.close() # mydb.close()
# Functie voor het verwijderen van gegevens uit de database # # Functie voor het verwijderen van gegevens uit de database
def delete_data(record_id): # def delete_data(record_id):
mydb = database_connect() # mydb = database_connect()
if mydb.is_connected(): # if mydb.is_connected():
mycursor = mydb.cursor() # mycursor = mydb.cursor()
# Hier moet je de juiste kolomnamen aanpassen op basis van de structuur van je database # # Hier moet je de juiste kolomnamen aanpassen op basis van de structuur van je database
delete_query = """ # delete_query = """
DELETE FROM goodgarden.battery_voltage_events # DELETE FROM goodgarden.battery_voltage_events
WHERE id = %s # WHERE id = %s
""" # """
# Voer de query uit # # Voer de query uit
mycursor.execute(delete_query, (record_id,)) # mycursor.execute(delete_query, (record_id,))
# Bevestig de wijzigingen # # Bevestig de wijzigingen
mydb.commit() # mydb.commit()
# Sluit cursor en verbinding # # Sluit cursor en verbinding
mycursor.close() # mycursor.close()
mydb.close() # mydb.close()
print(f"Data with ID {record_id} deleted.") # print(f"Data with ID {record_id} deleted.")
# Functie voor het aanmaken van gegevens in de database op basis van batterijspanningsinformatie # # Functie voor het aanmaken van gegevens in de database op basis van batterijspanningsinformatie
if __name__ == "__main__": # if __name__ == "__main__":
url = "https://garden.inajar.nl/api/battery_voltage_events/?format=json" # url = "https://garden.inajar.nl/api/battery_voltage_events/?format=json"
access_token = "33bb3b42452306c58ecedc3c86cfae28ba22329c" # Vervang dit door je werkelijke toegangstoken # access_token = "33bb3b42452306c58ecedc3c86cfae28ba22329c" # Vervang dit door je werkelijke toegangstoken
# Je kunt repeat_count wijzigen om te bepalen hoe vaak je de bewerking wilt herhalen # # Je kunt repeat_count wijzigen om te bepalen hoe vaak je de bewerking wilt herhalen
repeat_count = 10 # repeat_count = 10
# Keuze voor de bewerking # # Keuze voor de bewerking
operation_choice = input("Choose operation (C for Create, R for Read, U for Update, D for Delete): ").upper() # operation_choice = input("Choose operation (C for Create, R for Read, U for Update, D for Delete): ").upper()
if operation_choice == "C": # if operation_choice == "C":
# Maak gegevens aan # # Maak gegevens aan
create_data(url, access_token, repeat_count) # create_data(url, access_token, repeat_count)
elif operation_choice == "R": # elif operation_choice == "R":
# Lees gegevens # # Lees gegevens
read_data(url, access_token, repeat_count) # read_data(url, access_token, repeat_count)
elif operation_choice == "U": # elif operation_choice == "U":
# Update gegevens # # Update gegevens
record_id = int(input("Enter record ID to update: ")) # record_id = int(input("Enter record ID to update: "))
# Call the update_data function without additional arguments # # Call the update_data function without additional arguments
update_data(record_id) # update_data(record_id)
elif operation_choice == "D": # elif operation_choice == "D":
# Verwijder gegevens # # Verwijder gegevens
record_id = int(input("Enter record ID to delete: ")) # record_id = int(input("Enter record ID to delete: "))
delete_data(record_id) # delete_data(record_id)
else: # else:
print("Invalid operation choice. Please choose C, R, U, or D.") # print("Invalid operation choice. Please choose C, R, U, or D.")

3
src/css/style.css
View File

@@ -63,7 +63,7 @@ body .mainContainer .mainBorder .pagina-titel {
body .mainContainer .mainBorder #sectie-1 { body .mainContainer .mainBorder #sectie-1 {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
gap: 1rem; gap: 0;
padding: 0 2.5rem 0 1rem; padding: 0 2.5rem 0 1rem;
position: relative; position: relative;
} }
@@ -74,7 +74,6 @@ body .mainContainer .mainBorder #sectie-1 .parent-algemeen-overzicht {
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5);
border-radius: 40px; border-radius: 40px;
padding: 1rem; padding: 1rem;
margin-top: 1rem;
background-color: white; background-color: white;
} }
body .mainContainer .mainBorder #sectie-1 .parent-algemeen-overzicht .algemeen-overzicht { body .mainContainer .mainBorder #sectie-1 .parent-algemeen-overzicht .algemeen-overzicht {

2
src/css/style.css.map
View File

@@ -1 +1 @@
{"version":3,"sources":["style.scss","style.css"],"names":[],"mappings":"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","file":"style.css"} {"version":3,"sources":["style.scss","style.css"],"names":[],"mappings":"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","file":"style.css"}

5
src/css/style.scss
View File

@@ -110,7 +110,8 @@ body
{ {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
gap: 1rem; // gap: 1rem;
gap: 0;
padding: 0 2.5rem 0 1rem; padding: 0 2.5rem 0 1rem;
position: relative; position: relative;
@@ -124,7 +125,7 @@ body
@include box-shadow; @include box-shadow;
@include border-radius; @include border-radius;
padding: 1rem; padding: 1rem;
margin-top: 1rem; // margin-top: 1rem;
background-color: white; background-color: white;
.algemeen-overzicht .algemeen-overzicht

98
src/index.html
View File

@@ -1,98 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Homepage</title>
<link rel="stylesheet" href="../src/css/style.css">
<script src="../src/js/main.js" defer></script>
<script src="../src/js/planten.class.js"></script>
</head>
<body>
<section class="mainContainer">
<article>
<img src="../src/images/logo.png" class="goodgarden-logo">
</article>
<section class="mainBorder">
<section class="content">
<section class="kant-links">
<table id="planten">
<!-- <tr>
<td>
<article>
<img src="images/Icon awesome-apple-alt.png" alt="">
<h2>Tomaat</h2>
</article>
</td>
<td>
<article id="modalButton" onclick="openModal()">
<img id="toevoegen"src="images/Toevoegen.png" alt="">
</article>
</td>
</tr> -->
</table>
<div id="myModal" class="modal">
<span class="close">&times;</span>
<form action="http://localhost:3000/submit-form" method="post" onsubmit="return addplant()">
<input type="text" name="plant_naam" id="plantNaam">
<label for="plantNaam">Naam van de plant</label>
<input type="text" name="plantensoort" id="plantensoort">
<label for="plantensoort">Soort van de plant</label>
<input type="radio" name="plant_geteelt" id="aanwezig" value="true">
<label for="aanwezig">Aanwezig</label>
<input type="radio" name="plant_geteelt" id="afwezig" value="false">
<label for="afwezig">Afwezig</label>
<input type="submit" value="Submit">
</form>
</div>
<div id="overlay" onclick="closeOverlay"></div>
</section>
<!-- White space -->
<section>
</section>
<section class="kant-rechts">
<section id="sectie-1">
<article class="parent-algemeen-overzicht">
<article class="algemeen-overzicht">
<table class="table-informatie-kas">
<tr class="tr-informatie-kas">
<td>Dagen tot Oogst</td>
<td>12</td>
<a href="sensoren.html">sensoren</a>
</tr>
<tr class="tr-informatie-kas">
<td>Dagen in Kas</td>
<td>2</td>
</tr>
<tr class="tr-informatie-kas">
<td>Tevredenheid</td>
<td>80%</td>
</tr>
<tr class="tr-informatie-kas">
<td>Aandachtspunten</td>
<td>1</td>
</tr>
</table>
</article>
</article>
<article class="grafiek">
<article class="grafiek-innerbox">
<h2>Zonlicht</h2>
<canvas
id="myCanvas" class="canvas-informatie-kas" width="275" height="275"></canvas>
</article>
</article>
</section>
</section>
</section>
</section>
</section>
</body>
</html>

60
src/py/script/devices.py
View File

@@ -1,36 +1,54 @@
import json import json
from db_connect import database_connect
from paho.mqtt import subscribe from paho.mqtt import subscribe
def on_message(client, userdata, message): def on_message(client, userdata, message):
payload_str = message.payload.decode("utf-8") payload_str = message.payload.decode("utf-8")
data = json.loads(payload_str) data = json.loads(payload_str)
device_256 = None # Verbinding maken met de database
last_seen = None mydb = database_connect()
last_battery_voltage = None
device_322 = None if mydb.is_connected():
last_seen = None
last_battery_voltage = None # Creëren van een cursor object
mycursor = mydb.cursor()
for key in data["results"]: # SQL query voor het invoegen van de gegevens
if int(key["id"]) == 256: insert_query = """
device_256 = int(key["id"]) INSERT INTO goodgarden.devices
last_seen = int(key["last_seen"]) (serial_number, name, label, last_seen, last_battery_voltage, device_id)
last_battery_voltage = float(key["last_battery_voltage"]) VALUES (%s, %s, %s, %s, %s, %s)
# print(f"{device_256}") """
print(f"Het device {device_256} is voor het laatst geien op: {last_seen} met de voltage als {last_battery_voltage}")
elif int(key["id"]) == 322: # Verwerken van de gegevens uit het bericht
device_322 = int(key["id"]) for record in data['results']:
last_seen = int(key["last_seen"]) serial_number = record.get('serial_number', '')
last_battery_voltage = float(key["last_battery_voltage"]) name = record.get('name', '')
# print(f"{device_256}") label = record.get('label', '')
print(f"Het device {device_322} is voor het laatst gezien op: {last_seen} met de voltage als {last_battery_voltage}") last_seen = record.get('last_seen', '')
last_battery_voltage = record.get('last_battery_voltage', '')
device_id = record.get("id", "")
print(f"Inserting data: serial_number={serial_number}, name={name}, label={label}, last_seen={last_seen}, last_battery_voltage={last_battery_voltage}, device_id={device_id}")
# Uitvoeren van de SQL query
mycursor.execute(insert_query, (serial_number, name, label, last_seen, last_battery_voltage, device_id))
# Commit de transacties naar de database
mydb.commit()
# Sluiten van de cursor en de databaseconnectie
mycursor.close()
mydb.close()
print("Data inserted into the database.")
else:
print("Failed to connect to the database.")
print(f"\033[92mMessage received on topic\033[0m {message.topic}: {data}") print(f"\033[92mMessage received on topic\033[0m {message.topic}: {data}")
if __name__ == "__main__": if __name__ == "__main__":
topic = "goodgarden/devices" topic = "goodgarden/devices"
subscribe.callback(on_message, topic) subscribe.callback(on_message, topic)

2
src/py/script/planten.py
View File

@@ -47,3 +47,5 @@ def fetch_plant_and_write_to_json():
# Call the function to fetch data and write to JSON # Call the function to fetch data and write to JSON
fetch_plant_and_write_to_json() fetch_plant_and_write_to_json()
# if __name__ == "__main__":
# fetch_plant_and_write_to_json()

14
src/py/script/plants.json
View File

@@ -15,31 +15,25 @@
"id": 50, "id": 50,
"plant_naam": "Appel", "plant_naam": "Appel",
"plantensoort": "Fruit", "plantensoort": "Fruit",
"plant_geteelt": 1 "plant_geteelt": 0
}, },
{ {
"id": 51, "id": 51,
"plant_naam": "Sla", "plant_naam": "Sla",
"plantensoort": "Groente", "plantensoort": "Groente",
"plant_geteelt": 1 "plant_geteelt": 0
},
{
"id": 52,
"plant_naam": "Wietplant",
"plantensoort": "Onkruid",
"plant_geteelt": 1
}, },
{ {
"id": 53, "id": 53,
"plant_naam": "Patat", "plant_naam": "Patat",
"plantensoort": "Aarde", "plantensoort": "Aarde",
"plant_geteelt": 1 "plant_geteelt": 0
}, },
{ {
"id": 54, "id": 54,
"plant_naam": "asfasfas", "plant_naam": "asfasfas",
"plantensoort": "fasfasfsaf", "plantensoort": "fasfasfsaf",
"plant_geteelt": 1 "plant_geteelt": 0
}, },
{ {
"id": 55, "id": 55,

74
src/py/script/servermqtt.py
View File

@@ -1,74 +0,0 @@
import os
import time
import requests
import paho.mqtt.client as mqtt
from dotenv import load_dotenv
load_dotenv()
API_URL = os.getenv("API_URL")
MQTT_HOST = os.getenv("MQTT_HOST")
MQTT_PORT = int(os.getenv("MQTT_PORT", 1883))
def get_data_from_api(request):
links = {
'battery': '/battery_voltage_events/',
'devices': '/devices/',
'parEvents': '/par_events/',
'humidity': '/relative_humidity_events/',
'soilConductifity': '/soil_electric_conductivity_events/',
'soilPermittivity' : '/soil_relative_permittivity_events/',
'soilTemperature': '/soil_temperature_events/'
}
headers = {
'accept': 'application/json',
'Authorization': f'Token {os.getenv("API_TOKEN")}'
}
url = API_URL + links[request]
try:
response = requests.get(url, headers=headers)
response.raise_for_status()
except requests.exceptions.HTTPError as errh:
print ("HTTP Error:",errh)
return None
except requests.exceptions.ConnectionError as errc:
print ("Error Connecting:",errc)
return None
except requests.exceptions.Timeout as errt:
print ("Timeout Error:",errt)
return None
except requests.exceptions.RequestException as err:
print ("Something went wrong",err)
return None
data = response.json()
return data['results']
def publish_to_mqtt(topic, message):
client = mqtt.Client()
client.connect(MQTT_HOST, MQTT_PORT, 60)
try:
client.publish(topic, message)
except mqtt.MQTTException as e:
print(f"Failed to publish message: {e}")
finally:
client.disconnect()
def process_results(link, results):
for result in results:
if 'timestamp' in result and 'gateway_receive_time' in result and 'device' in result and 'value' in result:
message = f"Timestamp: {result['timestamp']}, Gateway Receive Time: {result['gateway_receive_time']}, Device: {result['device']}, Value: {result['value']}"
print(message)
publish_to_mqtt(link, message)
def main():
links = ['battery', 'devices', 'parEvents', 'humidity', 'soilConductifity', 'soilPermittivity', 'soilTemperature']
while True:
for link in links:
results = get_data_from_api(link)
if results is not None:
process_results(link, results)
time.sleep(5)
if __name__ == "__main__":
main()

166
src/py/static/js/main.js
View File

@@ -1,160 +1,3 @@
// const { ipcRenderer } = require("electron");
// const axios = require('axios');
// // document.addEventListener('DOMContentLoaded', () => {
// ipcRenderer.send('request-update-temp', ['some', 'arguments']);
// ipcRenderer.on('update-temp-result', (event, newTemperature) => {
// if (newTemperature === 'error') {
// console.error('Er is een fout opgetreden bij het ophalen van de nieuwe temperatuur');
// } else {
// document.getElementById('bodem-temperatuur').textContent = newTemperature;
// }
// });
// // Send a message to the main process to execute the Python script
// ipcRenderer.send('run-python-script', ['some', 'arguments']);
// ipcRenderer.on('python-script-response', (event, pythonData) => {
// if (pythonData === 'error') {
// console.error('An error occurred while retrieving data from Python');
// } else {
// // Update HTML elements with data received from Python
// document.getElementById('bodem-temperatuur').textContent = pythonData.bodemTemperatuur; // Adjust the property based on your actual Python response
// }
// });
// // Listen for updates to HTML data from the main process
// ipcRenderer.on('update-html-data', (event, data) => {
// // Update the HTML with the received data
// document.getElementById('batteryVoltage').innerText = data.batteryVoltage;
// // Add similar lines for other data fields
// });
// // Trigger an event to request data update
// ipcRenderer.send('request-update-data');
// // Function to open the modal
// function openModal() {
// const modal = document.getElementById("myModal");
// const button = document.getElementById("modalButton");
// const close = document.getElementsByClassName("close")[0];
// // Check if elements are found before attaching events
// if (modal && button && close) {
// // Show the modal when the button is clicked
// button.onclick = function () {
// modal.style.display = "block";
// }
// // Close the modal when the 'close' icon is clicked
// close.onclick = function () {
// modal.style.display = "none";
// }
// // Close the modal when clicked outside the modal
// window.onclick = function (event) {
// if (event.target == modal) {
// modal.style.display = "none";
// }
// }
// }
// }
// // Call the function to open the modal
// openModal();
// /**
// * --- Function to draw the chart. The important arrays are "data" & "xLabels".
// */
// function drawLineChart() {
// const data = [20, 50, 60, 45, 50, 100, 70, 60, 65, 0, 85, 0];
// const xLabels = ["", "", "", "", "", 6, "", "", "", "", "", 12];
// const yLabels = ["", 20, "", 40, "", 60, "", 80, "", 100]; /*NIET VERANDEREN!!!*/
// const canvas = document.getElementById("myCanvas");
// const ctx = canvas.getContext("2d");
// ctx.clearRect(0, 0, canvas.width, canvas.height);
// const padding = 35; // Increased padding for Y labels
// const graphWidth = canvas.width - padding * 2;
// const graphHeight = canvas.height - padding * 2;
// ctx.beginPath();
// ctx.moveTo(padding, padding);
// ctx.lineTo(padding, canvas.height - padding);
// ctx.lineTo(canvas.width - padding, canvas.height - padding);
// ctx.stroke();
// // Set the color of the line
// ctx.strokeStyle = "rgb(143, 188, 143)";
// const xIncrement = graphWidth / (xLabels.length - 1);
// const yIncrement = graphHeight / (yLabels.length - 1);
// // Plot the data
// ctx.beginPath();
// ctx.moveTo(padding, canvas.height - padding - (data[0] / 100) * graphHeight);
// for (let i = 1; i < data.length; i++) {
// const xPos = padding + i * xIncrement;
// const yPos = canvas.height - padding - (data[i] / 100) * graphHeight;
// ctx.lineTo(xPos, yPos);
// }
// ctx.stroke();
// // Draw Y labels
// ctx.fillStyle = "black";
// ctx.textAlign = "right"; // Align text to the right
// ctx.textBaseline = "middle"; // Center vertically
// for (let i = 0; i < yLabels.length; i++) {
// if (yLabels[i] !== "") {
// const yPos = canvas.height - padding - i * yIncrement;
// ctx.fillText(yLabels[i], padding - 10, yPos);
// }
// }
// // Draw X labels
// ctx.textAlign = "center"; // Center horizontally for X labels
// for (let i = 0; i < xLabels.length; i++) {
// if (xLabels[i] !== "") {
// const xPos = padding + i * xIncrement;
// ctx.fillText(xLabels[i], xPos, canvas.height - padding + 20);
// }
// }
// }
// // Call the function to draw the line chart
// drawLineChart();
// // Function to fetch battery data from Flask API
// function fetchBatteryData() {
// axios.get('http://127.0.0.1:5000')
// .then(response => {
// const batteryData = response.data;
// updateBatteryData(batteryData);
// })
// .catch(error => {
// console.error('Error fetching battery data:', error);
// });
// }
// // Function to update HTML content with battery data
// function updateBatteryData(batteryData) {
// document.getElementById('deviceNumber').innerText = batteryData.device;
// document.getElementById('voltage').innerText = batteryData.value;
// document.getElementById('time').innerText = batteryData.gateway_receive_time;
// document.getElementById('zulu').innerText = batteryData.timestamp;
// // Voeg andere eigenschappen toe zoals nodig
// }
// // Fetch battery data when the page loads
// fetchBatteryData();
// // });
const { ipcRenderer } = require("electron"); const { ipcRenderer } = require("electron");
const axios = require('axios'); const axios = require('axios');
@@ -297,10 +140,11 @@ function fetchBatteryData() {
// Function to update HTML content with battery data // Function to update HTML content with battery data
function updateBatteryData(batteryData) { function updateBatteryData(batteryData) {
document.getElementById('deviceNumber').innerText = batteryData.device; document.getElementById('deviceNumber-322').innerHTML = batteryData.device_id;
document.getElementById('voltage').innerText = batteryData.value; document.getElementById('voltage').innerHTML = batteryData.label;
document.getElementById('time').innerText = batteryData.gateway_receive_time; document.getElementById('time').innerHTML = batteryData.last_seen;
document.getElementById('tevredenheid').innerText = batteryData.timestamp; document.getElementById('tevredenheid').innerHTML = batteryData.last_battery_voltage;
// Voeg andere eigenschappen toe zoals nodig // Voeg andere eigenschappen toe zoals nodig
console.log(batteryData);
} }

98
src/py/templates/index.html
View File

@@ -31,36 +31,6 @@
</td> </td>
</tr> --> </tr> -->
</table> </table>
<!-- <div class="formulier">
<div id="myModal" class="modal" style="display: none;">
<h1 id="plant-id">Plant Toevoegen</h1>
<form action="http://localhost:3000/submit-form" method="post"onsubmit="return addplant()">
<label for="plantNaam">Naam van de plant</label><br>
<input type="text" name="plant_naam" id="plantNaam"><br>
<label for="plantensoort">Soort van de plant</label><br>
<input type="text" name="plantensoort" id="plantensoort"><br>
<label for="aanwezig">Aanwezig in de kas</label><br>
<select name="aanwezig_in_kas">
<option value="true">Ja</option>
<option value="false">Nee</option>
</select><br>
<label for="ontvangenMeldingen">Meldingen ontvangen</label><br>
<select name="ontvangen_meldingen">
<option value="true">Ja</option>
<option value="false">Nee</option>
</select><br>
<section class="knop-container">
<br><button class="annulatie-knop" type="button" onclick="closeOverlay()">Annuleren</button>
<input type="submit" value="Submit">
</section>
</form>
</div>
</div>
<div id="overlay" onclick="closeOverlay()"></div> -->
<div id="myModal" class="modal"> <div id="myModal" class="modal">
<span class="close">&times;</span> <span class="close">&times;</span>
<form action="http://localhost:3000/submit-form" method="post" onsubmit="return addplant()"> <form action="http://localhost:3000/submit-form" method="post" onsubmit="return addplant()">
@@ -82,18 +52,15 @@
</div> </div>
<div id="overlay" onclick="closeOverlay"></div> <div id="overlay" onclick="closeOverlay"></div>
</section> </section>
<!-- White space --> <section class="kant-rechts">
<section> <section id="sectie-1">
</section> <!-- <article class="parent-algemeen-overzicht">
<section class="kant-rechts">
<section id="sectie-1">
<article class="parent-algemeen-overzicht">
<article class="algemeen-overzicht"> <article class="algemeen-overzicht">
<a href="kas_informatie.html"> <a href="kas_informatie.html">
<table class="table-informatie-kas"> <table class="table-informatie-kas">
<tr class="tr-informatie-kas"> <tr class="tr-informatie-kas">
<td>Dagen tot Oogst</td> <td>Planten aanwezig in kas:</td>
<td>12</td> <td>12</td>
</tr> </tr>
<tr class="tr-informatie-kas"> <tr class="tr-informatie-kas">
@@ -111,16 +78,59 @@
</table> </table>
<a/> <a/>
</article> </article>
</article> -->
<!-- SENSOR 1 -->
<article class="parent-algemeen-overzicht">
<article class="algemeen-overzicht">
<a href="sensoren.html">
<table class="table-informatie-kas">
<tr class="tr-informatie-kas">
<td>Sensor:</td>
<td id="deviceNumber-322">12</td>
</tr>
<tr class="tr-informatie-kas">
<td>Locatie:</td>
<td id="voltage">2</td>
</tr>
<tr class="tr-informatie-kas">
<td>Batterijvoltage:</td>
<td id="time">80%</td>
</tr>
<tr class="tr-informatie-kas">
<td>Dagen resterend:</td>
<td id="tevredenheid">1</td>
</tr>
</table>
<a/>
</article>
</article> </article>
<article class="grafiek"> <!-- SENSOR 2 -->
<article class="grafiek-innerbox"> <article class="parent-algemeen-overzicht">
<h2>Zonlicht</h2> <article class="algemeen-overzicht">
<canvas <a href="sensoren.html">
id="myCanvas" class="canvas-informatie-kas" width="275" height="275"></canvas> <table class="table-informatie-kas">
<tr class="tr-informatie-kas">
<td>Sensor:</td>
<td>12</td>
</tr>
<tr class="tr-informatie-kas">
<td>Locatie:</td>
<td>2</td>
</tr>
<tr class="tr-informatie-kas">
<td>Batterijvoltage:</td>
<td>80%</td>
</tr>
<tr class="tr-informatie-kas">
<td>Dagen resterend:</td>
<td>1</td>
</tr>
</table>
<a/>
</article> </article>
</article> </article>
</section> </section>
</section> </section>
</section> </section>
</section> </section>
</section> </section>

54
src/sensoren.html
View File

@@ -1,54 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Sensoren</title>
<link rel="stylesheet" href="../src/css/style.css">
<script src="../src/js/main.js" defer></script>
<script src="../src/js/planten.class.js"></script>
</head>
<body>
<section class="mainContainer">
<article>
<img src="../src/images/logo.png" class="goodgarden-logo">
</article>
<section class="mainBorder">
<section class="content">
<section class="kant-links">
<section class="border-sensor">
<article id="sensor-1">
<table>
<tr>
<td>1</td>
<td>2</td>
</tr>
<tr>
<td>3</td>
<td>4</td>
</tr>
</table>
</article>
</section>
<section>
<article id="grafiek-1">
</article>
</section>
</section>
<section>
</section>
<section class="kant-rechts">
<article id="sensor-2">
</article>
<article id="grafiek-2">
</article>
</section>
</section>
</section>
</section>
</body>
</html>