diff --git a/app.js b/app.js
index 6c0eae4..ef0679d 100644
--- a/app.js
+++ b/app.js
@@ -1,7 +1,7 @@
-const { app, BrowserWindow } = require('electron'); /* TYPE IN TERMINAL: "npm install electron" */
-const express = require('express'); /* TYPE IN TERMINAL: "npm install express" */
-const bodyParser = require('body-parser'); /* TYPE IN TERMINAL: "npm install body-parser" */
-const { PythonShell } = require('python-shell'); /* TYPE IN TERMINAL: "npm install python-shell" */
+const { app, BrowserWindow, ipcMain } = require('electron');
+const express = require('express');
+const bodyParser = require('body-parser');
+const { PythonShell } = require('python-shell');
const path = require('path');
const urlElectron = path.join(__dirname, "src/index.html");
@@ -42,6 +42,7 @@ function createWindow() {
const mainWindow = new BrowserWindow({
width: 1280,
height: 800,
+ frame: false,
webPreferences: {
nodeIntegration: true,
contextIsolation: false
diff --git a/package-lock.json b/package-lock.json
index 1b052bb..d36888a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
"dependencies": {
"body-parser": "^1.20.2",
"elctron": "^0.0.1-security",
- "express": "^4.18.2",
+ "express": "^4.18.3",
"mysql2": "^3.9.1",
"python-shell": "^5.0.0"
},
@@ -896,13 +896,13 @@
}
},
"node_modules/express": {
- "version": "4.18.2",
- "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
- "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+ "version": "4.18.3",
+ "resolved": "https://registry.npmjs.org/express/-/express-4.18.3.tgz",
+ "integrity": "sha512-6VyCijWQ+9O7WuVMTRBTl+cjNNIzD5cY5mQ1WM8r/LEkI2u8EYpOotESNwzNlyCn3g+dmjKYI6BmNneSr/FSRw==",
"dependencies": {
"accepts": "~1.3.8",
"array-flatten": "1.1.1",
- "body-parser": "1.20.1",
+ "body-parser": "1.20.2",
"content-disposition": "0.5.4",
"content-type": "~1.0.4",
"cookie": "0.5.0",
@@ -936,54 +936,6 @@
"node": ">= 0.10.0"
}
},
- "node_modules/express/node_modules/body-parser": {
- "version": "1.20.1",
- "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
- "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
- "dependencies": {
- "bytes": "3.1.2",
- "content-type": "~1.0.4",
- "debug": "2.6.9",
- "depd": "2.0.0",
- "destroy": "1.2.0",
- "http-errors": "2.0.0",
- "iconv-lite": "0.4.24",
- "on-finished": "2.4.1",
- "qs": "6.11.0",
- "raw-body": "2.5.1",
- "type-is": "~1.6.18",
- "unpipe": "1.0.0"
- },
- "engines": {
- "node": ">= 0.8",
- "npm": "1.2.8000 || >= 1.4.16"
- }
- },
- "node_modules/express/node_modules/iconv-lite": {
- "version": "0.4.24",
- "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
- "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
- "dependencies": {
- "safer-buffer": ">= 2.1.2 < 3"
- },
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/express/node_modules/raw-body": {
- "version": "2.5.1",
- "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
- "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
- "dependencies": {
- "bytes": "3.1.2",
- "http-errors": "2.0.0",
- "iconv-lite": "0.4.24",
- "unpipe": "1.0.0"
- },
- "engines": {
- "node": ">= 0.8"
- }
- },
"node_modules/extract-zip": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
@@ -2339,13 +2291,13 @@
"integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
},
"express": {
- "version": "4.18.2",
- "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
- "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+ "version": "4.18.3",
+ "resolved": "https://registry.npmjs.org/express/-/express-4.18.3.tgz",
+ "integrity": "sha512-6VyCijWQ+9O7WuVMTRBTl+cjNNIzD5cY5mQ1WM8r/LEkI2u8EYpOotESNwzNlyCn3g+dmjKYI6BmNneSr/FSRw==",
"requires": {
"accepts": "~1.3.8",
"array-flatten": "1.1.1",
- "body-parser": "1.20.1",
+ "body-parser": "1.20.2",
"content-disposition": "0.5.4",
"content-type": "~1.0.4",
"cookie": "0.5.0",
@@ -2374,46 +2326,6 @@
"type-is": "~1.6.18",
"utils-merge": "1.0.1",
"vary": "~1.1.2"
- },
- "dependencies": {
- "body-parser": {
- "version": "1.20.1",
- "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
- "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
- "requires": {
- "bytes": "3.1.2",
- "content-type": "~1.0.4",
- "debug": "2.6.9",
- "depd": "2.0.0",
- "destroy": "1.2.0",
- "http-errors": "2.0.0",
- "iconv-lite": "0.4.24",
- "on-finished": "2.4.1",
- "qs": "6.11.0",
- "raw-body": "2.5.1",
- "type-is": "~1.6.18",
- "unpipe": "1.0.0"
- }
- },
- "iconv-lite": {
- "version": "0.4.24",
- "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
- "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
- "requires": {
- "safer-buffer": ">= 2.1.2 < 3"
- }
- },
- "raw-body": {
- "version": "2.5.1",
- "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
- "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
- "requires": {
- "bytes": "3.1.2",
- "http-errors": "2.0.0",
- "iconv-lite": "0.4.24",
- "unpipe": "1.0.0"
- }
- }
}
},
"extract-zip": {
diff --git a/package.json b/package.json
index 9ad6306..900b13d 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
"dependencies": {
"body-parser": "^1.20.2",
"elctron": "^0.0.1-security",
- "express": "^4.18.2",
+ "express": "^4.18.3",
"mysql2": "^3.9.1",
"python-shell": "^5.0.0"
}
diff --git a/script/DUMMY.json b/script/DUMMY.json
new file mode 100644
index 0000000..98acdaf
--- /dev/null
+++ b/script/DUMMY.json
@@ -0,0 +1,123 @@
+
+ // Deze spanningswaarden zijn relatief hoog, wat suggereert dat de batterijen van de sensoren goed opgeladen zijn. De meeste sensorapparaten gebruiken batterijen die een nominale spanning van ongeveer 3,7 volt hebben (typisch voor lithium-ion batterijen) en kunnen worden beschouwd als "volledig opgeladen" wanneer ze een spanning dicht bij of iets boven 4,1 volt bereiken
+ "battery_voltage_events": [
+ {
+ "timestamp": 1707825721,
+ "gateway_receive_time": "2024-02-13T12:02:01Z",
+ "device": 256,
+ "value": 4.098901271820068
+ // Volledig opgeladen: Rond 4.2 volt.
+ // Nominale spanning: Ongeveer 3.7 volt.
+ // Kritiek laag: Minder dan 3.0 volt.
+ },
+ {
+ "timestamp": 1707837460,
+ "gateway_receive_time": "2024-02-13T15:17:40Z",
+ "device": 322,
+ "value": 4.105006217956543
+ }
+ ],
+
+
+
+
+ "devices": [
+ {
+ "id": 256,
+ "serial_number": "0033889B1BAB1169",
+ "name": "firefly2_0051",
+ "label": "The Field",
+ "last_seen": 1707765066,
+ "last_battery_voltage": 4.09768009185791
+ },
+ {
+ "id": 322,
+ "serial_number": "006FE1FC316ED7D8",
+ "name": "firefly2_0111",
+ "label": "The Field",
+ "last_seen": 1707764966,
+ "last_battery_voltage": 4.107448101043701
+ }
+ ],
+
+
+
+
+
+ // Fotosyntese??? (zonlicht)
+ "par_events": [
+ {
+ "timestamp": 1707844638,
+ "gateway_receive_time": "2024-02-13T17:17:18Z",
+ "device": 322,
+ "value": 0.0
+ },
+ {
+ "timestamp": 1707851099,
+ "gateway_receive_time": "2024-02-13T19:04:59Z",
+ "device": 256,
+ "value": 0.0
+ }
+ ],
+
+
+
+
+ // Luchtvochtigheid
+ "relative_humidity_events": [
+ {
+ "timestamp": 1707844638,
+ "gateway_receive_time": "2024-02-13T17:17:18Z",
+ "device": 322,
+ "value": 71.08984375
+ },
+ {
+ "timestamp": 1707851099,
+ "gateway_receive_time": "2024-02-13T19:04:59Z",
+ "device": 256,
+ "value": 66.7294921875
+ }
+ ],
+
+
+
+
+
+ // De "soil_electric_conductivity_events" gegevens wijzen op metingen van de elektrische geleidbaarheid (EC) van de bodem, een indicator van de hoeveelheid oplosbare zouten of voedingsstoffen in de bodem. EC wordt gemeten in Siemens per meter (S/m) of, voor bodemmetingen, vaak in milliSiemens per centimeter (mS/cm). Een hogere EC-waarde duidt op een hogere concentratie van opgeloste zouten, wat belangrijk is voor het bepalen van de voedingsstatus van de bodem en het beheren van de bemesting voor optimale plantengroei.
+ "soil_electric_conductivity_events": [
+ {
+ "timestamp": 1707851215,
+ "gateway_receive_time": "2024-02-13T19:06:55Z",
+ "device": 322,
+ "value": 0.0
+ }
+ ],
+
+
+
+
+
+ // In de context van bodemmetingen, geeft deze waarde inzicht in het vochtgehalte van de bodem, omdat water een relatief hoge diëlektrische constante heeft in vergelijking met droge bodem of lucht.
+ "soil_relative_permittivity_events": [
+ {
+ "timestamp": 1707851215,
+ "gateway_receive_time": "2024-02-13T19:06:55Z",
+ "device": 322,
+ "value": 1.52
+ // Een waarde van 1.52 is relatief laag en suggereert dat de bodem droog kan zijn op het moment van meting. Ter referentie, de diëlektrische constante van lucht is ongeveer 1, terwijl water een diëlektrische constante heeft van ongeveer 80 bij kamertemperatuur.
+ }
+ ],
+
+
+
+ //De "soil_temperature_events" gegevens bevatten informatie over de temperatuur van de bodem op een specifiek tijdstip. De waarde geeft de temperatuur van de bodem aan in graden Celsius (°C).
+ "soil_temperature_events": [
+ {
+ "timestamp": 1707851215,
+ "gateway_receive_time": "2024-02-13T19:06:55Z",
+ "device": 322,
+ "value": 12.06
+ }
+ ]
+ }
+
\ No newline at end of file
diff --git a/script/battery_voltage_events.py b/script/battery_voltage_events.py
index cc61544..5c777fe 100644
--- a/script/battery_voltage_events.py
+++ b/script/battery_voltage_events.py
@@ -1,178 +1,418 @@
-import requests #** TYPE IN TERMINAL: "pip install requests"
+# 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 mysql.connector #** TYPE IN TERMINAL: "pip install mysql-connector-python"
-
-# Import python db_connect.py script
-from db_connect import database_connect
-
+import os
+# 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)
+
+ # Voeg het tijdsverschil van 1 uur toe voor de Nederlandse tijdzone (UTC+1)
+ datetime_obj_nl = datetime_obj_utc + timedelta(hours=0)
+
+ # 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):
try:
- headers = {
- "Authorization": f"Token {access_token}"
- }
+ 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)
-
+ print(f"Data from {url}:\n")
+
+ # Check if data is a list (records directly under the root)
+ if isinstance(data, list):
+ records = data
+ elif isinstance(data, dict) and 'results' in data:
+ records = data['results']
+ else:
+ print(f"Unexpected data format received: {data}")
+ continue
+
+ for record in records:
+ # Now, record is assumed to be a dictionary
+ timestamp = record.get('timestamp', '')
+ gateway_receive_time = record.get('gateway_receive_time', '')
+ device = record.get('device', '')
+ value = record.get('value', '')
+
+ # Voeg de timestamp-berekening toe
+ calculated_timestamp = calculate_timestamp(gateway_receive_time)
+
+ print(f"\nInserted data: Timestamp: {calculated_timestamp}, Device: {device}, Battery Voltage: {value}V")
+ if float(value) < 3.0:
+ 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
+ elif float(value) > 4.2:
+ print("Melding: Batterijspanning is hoger dan 4.2 volt. Batterij is vol.\n")
+ else:
+ print("Melding: Batterijspanning is binnen het gewenste bereik.\n\n")
+
+ # Insert data into the database
+ insert_data(record)
+
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)
-
+
+ print("Waiting for the next create action...\n")
+ time.sleep(2)
+
# Functie voor het invoegen van gegevens in de database
-def insert_data(data):
+def insert_data(record):
mydb = database_connect()
if mydb.is_connected():
mycursor = mydb.cursor()
-
+
+ # Hier moet je de juiste kolomnamen en gegevensindeling aanpassen op basis van de API-respons
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))
-
+ # 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
+
+ # 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()
-
+
+ print("Data inserted into the database.")
+
# 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}"
- }
+ 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)
-
+ print(f"Data from {url}:\n")
+
+ for record in data['results']:
+ timestamp = record.get('timestamp', '')
+ device = record.get('device', '')
+ value = record.get('value', '')
+ print(f"Timestamp: {timestamp}, Device: {device}, Battery Voltage: {value}V\n")
+
+ if float(value) < 3.0:
+ 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
+ elif float(value) > 4.2:
+ print("Melding: Batterijspanning is hoger dan 4.2 volt. Batterij is vol.\n")
+ else:
+ print("Melding: Batterijspanning is binnen het gewenste bereik.\n\n")
+
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...")
+
+ print("Waiting for the next read action...\n")
time.sleep(300)
-
+
# Functie voor het bijwerken van gegevens in de database
-def update_data(record_id, new_value):
+def update_data(record_id):
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
-
+
+ # Vraag de gebruiker om nieuwe waarden voor de andere velden
+ new_timestamp = input("Enter new timestamp: ")
+ new_gateway_receive_time = input("Enter new gateway_receive_time: ")
+ new_device = input("Enter new device: ")
+ new_value = input("Enter new value: ")
+
# 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
+ SET timestamp = %s, gateway_receive_time = %s, device = %s, 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
-
+ 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))
+
# 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}")
+ 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.")
-
+
+# Functie voor het aanmaken van gegevens in de database op basis van batterijspanningsinformatie
if __name__ == "__main__":
url = "https://garden.inajar.nl/api/battery_voltage_events/?format=json"
- access_token = "33bb3b42452306c58ecedc3c86cfae28ba22329c"
-
+ access_token = "33bb3b42452306c58ecedc3c86cfae28ba22329c" # Vervang dit door je werkelijke toegangstoken
+
+ # Je kunt repeat_count wijzigen om te bepalen hoe vaak je de bewerking wilt herhalen
repeat_count = 10
-
+
+ # Keuze voor de bewerking
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":
+ # Maak gegevens aan
create_data(url, access_token, repeat_count)
-
- # Lees gegevens
elif operation_choice == "R":
+ # Lees gegevens
read_data(url, access_token, repeat_count)
-
- # Update gegevens
elif operation_choice == "U":
+ # Update gegevens
record_id = int(input("Enter record ID to update: "))
- new_value = input("Enter new value: ")
- update_data(record_id, new_value)
-
- # Verwijder gegevens
+ # Call the update_data function without additional arguments
+ update_data(record_id)
elif operation_choice == "D":
+ # Verwijder gegevens
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.")
\ No newline at end of file
diff --git a/script/main.js b/script/main.js
deleted file mode 100644
index 1717c8c..0000000
--- a/script/main.js
+++ /dev/null
@@ -1,27 +0,0 @@
-function openModal()
-{
- const modal = document.getElementById("myModal");
- const button = document.getElementById("modalButton");
- const close = document.getElementsByClassName("close")[0];
-
- // Toon de modal wanneer op de knop wordt geklikt
- button.onclick = function()
- {
- modal.style.display = "block";
- }
-
- // Sluit de modal wanneer op het 'sluiten' icoon wordt geklikt
- close.onclick = function()
- {
- modal.style.display = "none";
- }
-
- // Sluit de modal wanneer buiten de modal wordt geklikt
- window.onclick = function(event)
- {
- if (event.target == modal)
- {
- modal.style.display = "none";
- }
- }
-}
\ No newline at end of file
diff --git a/src/css/style.css b/src/css/style.css
index 725e7df..9695cf5 100644
--- a/src/css/style.css
+++ b/src/css/style.css
@@ -1,40 +1,123 @@
-/*default colors*/
@import url("https://fonts.googleapis.com/css2?family=Akaya+Kanadaka&display=swap");
@import url("https://fonts.googleapis.com/css2?family=Afacad:ital,wght@0,400..700;1,400..700&display=swap");
-/* The Main container and border*/
+h1, h2, h3, h4, h5 {
+ font-family: "Akaya Kanadaka", system-ui;
+ margin: 0;
+}
+
+p, td {
+ font-family: "Afacad", sans-serif;
+}
+
body {
background-image: url("../images/achtergrond.png");
background-repeat: no-repeat;
background-size: cover;
+ background-position: center;
font-family: "Afacad", sans-serif;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 100vh;
+ margin: 0;
}
-
-.mainContainer {
- margin: 2rem;
+body .mainContainer {
+ width: 85vw;
height: 38rem;
background-color: rgba(255, 255, 255, 0.95);
border-radius: 40px;
padding: 2rem;
}
-.mainContainer .mainBorder {
+body .mainContainer .goodgarden-logo {
+ position: absolute;
+ width: 10vw;
+ left: 50%;
+ top: 4.1rem;
+ transform: translateX(-50%);
+}
+body .mainContainer .informatie-kas-main-container {
+ display: grid;
+ grid-template-columns: 5fr 7fr;
+}
+body .mainContainer .mainBorder {
+ padding: 1.25rem 1.5rem;
padding: 1rem 0;
height: 35rem;
border: solid 5px rgb(171, 211, 174);
border-radius: 40px;
}
-.mainContainer .mainBorder .content {
+body .mainContainer .mainBorder .pagina-titel {
+ font-size: 2rem;
+ margin-left: 1.5rem;
+}
+body .mainContainer .mainBorder #sectie-1 {
+ display: flex;
+ flex-direction: column;
+ gap: 1rem;
+ padding: 0 2.5rem 0 1rem;
+ position: relative;
+}
+body .mainContainer .mainBorder #sectie-1 h1 {
+ background-color: green;
+}
+body .mainContainer .mainBorder #sectie-1 .parent-algemeen-overzicht {
+ box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5);
+ border-radius: 40px;
+ padding: 1rem;
+ margin-top: 1rem;
+}
+body .mainContainer .mainBorder #sectie-1 .parent-algemeen-overzicht .algemeen-overzicht {
+ border: solid 2px rgb(171, 211, 174);
+ border-radius: 35px;
+ font-size: 1.25rem;
+ padding: 0.5rem 1rem;
+}
+body .mainContainer .mainBorder #sectie-1 .parent-algemeen-overzicht .algemeen-overzicht .table-informatie-kas {
+ width: 100%;
+}
+body .mainContainer .mainBorder #sectie-1 .parent-algemeen-overzicht .algemeen-overzicht .table-informatie-kas .tr-informatie-kas {
+ display: flex;
+ justify-content: space-between;
+ text-align: left;
+}
+body .mainContainer .mainBorder #sectie-1 .grafiek {
+ box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5);
+ border-radius: 40px;
+ padding: 1rem;
+ position: relative;
+}
+body .mainContainer .mainBorder #sectie-1 .grafiek .grafiek-innerbox {
+ border: solid 2px rgb(171, 211, 174);
+ border-radius: 35px;
+ font-size: 1.25rem;
+ padding: 0 1rem 2.5rem;
+ height: 225px;
+ position: relative;
+}
+body .mainContainer .mainBorder #sectie-1 .grafiek .grafiek-innerbox h2 {
+ position: absolute;
+ left: 50%;
+ transform: translateX(-50%);
+}
+body .mainContainer .mainBorder #sectie-1 .grafiek .grafiek-innerbox canvas {
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+}
+body .mainContainer .mainBorder .content {
display: grid;
grid-template-columns: 3fr 1fr 3fr;
height: 100%;
}
-.mainContainer .mainBorder .content .kant-links {
+body .mainContainer .mainBorder .content .kant-links {
grid-column: 1;
}
-.mainContainer .mainBorder .content .kant-links #planten {
+body .mainContainer .mainBorder .content .kant-links #planten {
width: 100%;
border-collapse: collapse;
}
-.mainContainer .mainBorder .content .kant-links #planten td article {
+body .mainContainer .mainBorder .content .kant-links #planten td article {
height: 7rem;
width: 10rem;
padding: 0.6rem;
@@ -48,34 +131,71 @@ body {
border-radius: 40px;
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
}
-.mainContainer .mainBorder .content .kant-links #planten td article #toevoegen {
+body .mainContainer .mainBorder .content .kant-links #planten td article #toevoegen {
height: 5rem;
width: 5rem;
}
-.mainContainer .mainBorder .content .kant-links #planten td article h2 {
+body .mainContainer .mainBorder .content .kant-links #planten td article h2 {
color: gray;
}
-.mainContainer .mainBorder .content .kant-links #planten td article:hover {
+body .mainContainer .mainBorder .content .kant-links #planten td article:hover {
background-color: lightgray;
}
-.mainContainer .mainBorder .content .kant-rechts {
+body .mainContainer .mainBorder .content .kant-rechts {
grid-column: 3;
margin-right: 2rem;
}
-.mainContainer .mainBorder .content .kant-rechts #metingen {
+body .mainContainer .mainBorder .content .kant-rechts #metingen {
border: solid 3px rgb(171, 211, 174);
border-radius: 40px;
}
-.mainContainer .mainBorder .content .kant-rechts #metingen #main-waardes {
+body .mainContainer .mainBorder .content .kant-rechts #metingen #main-waardes {
display: flex;
- justify-content: space-evenly;
+ justify-content: space-between;
padding: 0.5rem;
padding-bottom: 0;
width: 100%;
}
-.mainContainer .mainBorder .content .kant-rechts #metingen #main-waardes table {
+body .mainContainer .mainBorder .content .kant-rechts #metingen #main-waardes table {
display: flex;
+ justify-content: space-between;
+ width: 100%;
+}
+body .mainContainer .mainBorder .grid-column-2 {
+ box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5);
+ border-radius: 40px;
+ padding: 1rem;
+ margin: 3.25rem 1rem 1.25rem 1rem;
+}
+body .mainContainer .mainBorder .grid-column-2 .grid-2-child {
+ border: solid 2px rgb(171, 211, 174);
+ border-radius: 35px;
+ height: 100%;
+}
+body .mainContainer .mainBorder .grid-column-2 .grid-2-child .parent-table {
+ padding: 1.5rem 2rem;
+ display: flex;
+ flex-direction: column;
justify-content: space-around;
+ height: 90%;
+}
+body .mainContainer .mainBorder .grid-column-2 .grid-2-child .parent-table .kas-table-2 {
+ position: relative;
+}
+body .mainContainer .mainBorder .grid-column-2 .grid-2-child .parent-table .kas-table-2::after, body .mainContainer .mainBorder .grid-column-2 .grid-2-child .parent-table .kas-table-2::before {
+ content: "";
+ position: absolute;
+ left: 0;
+ right: 0;
+ height: 1px;
+ width: 90%;
+ background: black;
+}
+body .mainContainer .mainBorder .grid-column-2 .grid-2-child .parent-table .kas-table-2::after {
+ bottom: -20px;
+}
+body .mainContainer .mainBorder .grid-column-2 .grid-2-child .parent-table .kas-table-2::before {
+ top: -20px;
}
/* Divider */
@@ -97,7 +217,7 @@ body {
top: 50%;
transform: translate(-50%, -50%);
background: white;
- padding: 20px;
+ padding: 1.25rem;
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
width: 30vw;
height: auto;
@@ -107,7 +227,7 @@ body {
.modal .close {
color: #aaa;
float: right;
- font-size: 28px;
+ font-size: 1.75rem;
font-weight: bold;
}
.modal .close:hover, .modal .close:active {
diff --git a/src/css/style.css.map b/src/css/style.css.map
index 2c7e3fc..b11fddc 100644
--- a/src/css/style.css.map
+++ b/src/css/style.css.map
@@ -1 +1 @@
-{"version":3,"sources":["style.scss","style.css"],"names":[],"mappings":"AAAA,iBAAA;AAKQ,mFAAA;AACA,2GAAA;AAMR,iCAAA;AACA;EAEI,kDAAA;EACA,4BAAA;EACA,sBAAA;EACA,iCARQ;ACDZ;;ADYA;EAEI,YAAA;EACA,aAAA;EACA,2CAAA;EACA,mBAAA;EACA,aAAA;ACVJ;ADYI;EAEI,eAAA;EACA,aAAA;EACA,oCAAA;EACA,mBAAA;ACXR;ADaQ;EAEI,aAAA;EACA,kCAAA;EACA,YAAA;ACZZ;ADgBgB;EAEI,cAAA;ACfpB;ADiBoB;EAEI,WAAA;EACA,yBAAA;AChBxB;ADoB4B;EAEI,YAAA;EACA,YAAA;EACA,eAAA;EACA,cAAA;EACA,iBAAA;EACA,aAAA;EACA,sBAAA;EACA,uBAAA;EACA,mBAAA;EACA,oCAAA;EACA,mBAAA;EACA,wCAAA;ACnBhC;ADqBgC;EAEI,YAAA;EACA,WAAA;ACpBpC;ADuBgC;EAEI,WAAA;ACtBpC;ADyBgC;EAEI,2BAAA;ACxBpC;AD+BgB;EAEI,cAAA;EACA,kBAAA;AC9BpB;ADgCoB;EAGI,oCAAA;EACA,mBAAA;AChCxB;ADkCwB;EAEA,aAAA;EACA,6BAAA;EACA,eAAA;EACA,iBAAA;EACA,WAAA;ACjCxB;ADmC4B;EAEI,aAAA;EACA,6BAAA;AClChC;;AD6CA,YAAA;AACA;EACI,aAAA;EACA,uBAAA;EACA,oCAAA;EACA,kBAAA;EACA,UAAA;EACA,cAAA;AC1CJ;;AD6CA,2BAAA;AAEA;EAEI,aAAA;EACA,eAAA;EACA,YAAA;EACA,SAAA;EACA,QAAA;EACA,gCAAA;EACA,iBAAA;EACA,aAAA;EACA,wCAAA;EACA,WAAA;EACA,YAAA;EACA,uBAAA;EACA,mBAAA;AC5CJ;AD8CI;EAEI,WAAA;EACA,YAAA;EACA,eAAA;EACA,iBAAA;AC7CR;AD+CQ;EAGI,YAAA;EACA,qBAAA;EACA,eAAA;AC/CZ","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 5ef7afe..f4e5e76 100644
--- a/src/css/style.scss
+++ b/src/css/style.scss
@@ -1,5 +1,3 @@
-/*default colors*/
-
$primary-color: rgb(171, 211, 174);
$secondary-color: rgb(143, 188, 143);
@@ -7,6 +5,7 @@ $secondary-color: rgb(143, 188, 143);
@import url('https://fonts.googleapis.com/css2?family=Afacad:ital,wght@0,400..700;1,400..700&display=swap');
$font-titels: "Akaya Kanadaka", system-ui;
+
$font-text: "Afacad", sans-serif;
@mixin flexbox
@@ -30,6 +29,11 @@ $font-text: "Afacad", sans-serif;
border-radius: 40px;
}
+@mixin inner-border-radius
+{
+ border-radius: 35px;
+}
+
h1, h2, h3, h4, h5
{
font-family: $font-titels;
@@ -47,7 +51,7 @@ body
background-repeat: no-repeat;
background-size: cover;
background-position: center;
- // font-family: $font-text;
+ font-family: $font-text;
display: flex;
justify-content: center;
align-items: center;
@@ -62,6 +66,15 @@ body
border-radius: 40px;
padding: 2rem;
+ .goodgarden-logo
+ {
+ position: absolute;
+ width: 10vw;
+ left: 50%;
+ top: 4.1rem;
+ transform: translateX(-50%);
+ }
+
.informatie-kas-main-container
{
display: grid;
@@ -70,13 +83,26 @@ body
.mainBorder
{
+ padding: 1.25rem 1.5rem;
padding: 1rem 0;
height: 35rem;
border: solid 5px $primary-color;
border-radius: 40px;
+ .pagina-titel
+ {
+ font-size: 2rem;
+ margin-left: 1.5rem;
+ }
+
#sectie-1
{
+ display: flex;
+ flex-direction: column;
+ gap: 1rem;
+ padding: 0 2.5rem 0 1rem;
+ position: relative;
+
h1
{
background-color: green;
@@ -87,14 +113,15 @@ body
@include box-shadow;
@include border-radius;
padding: 1rem;
+ margin-top: 1rem;
+
.algemeen-overzicht
{
@include groene-border;
- @include border-radius;
+ @include inner-border-radius;
font-size: 1.25rem;
- padding: 1rem;
- background-color: red;
+ padding: .5rem 1rem;
.table-informatie-kas
{
@@ -106,111 +133,211 @@ body
justify-content: space-between;
text-align: left;
}
-
- // .tr-informatie-kas > :last-child
- // {
- // text-align: center; /* Centers the numbers */
- // flex: 1; /* Allows it to expand to fill the space */
- // }
- // }
}
- }
-
- .grafiek
- {
- // background-color: blue;
- }
+ }
}
- .content
+ .grafiek
{
- display: grid;
- grid-template-columns: 3fr 1fr 3fr;
- height: 100%;
+ @include box-shadow;
+ @include border-radius;
+ padding: 1rem;
+ position: relative;
- .kant
+ .grafiek-innerbox
{
- &-links
+ @include groene-border;
+ @include inner-border-radius;
+ font-size: 1.25rem;
+ padding: 0 1rem 2.5rem;
+ height: 225px;
+ position: relative;
+
+ h2
{
- grid-column: 1;
+ position: absolute;
+ left: 50%;
+ transform: translateX(-50%);
+ }
- #planten
+ canvas
+ {
+ // Zorgt ervoor dat de grafiek precies in eht midden komt
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ }
+ }
+ }
+
+ }
+ .content
+ {
+ display: grid;
+ grid-template-columns: 3fr 1fr 3fr;
+ height: 100%;
+
+ .kant
+ {
+ &-links
+ {
+ grid-column: 1;
+
+ #planten
+ {
+ width: 100%;
+ border-collapse: collapse;
+
+ td
{
- width: 100%;
- border-collapse: collapse;
-
- td
+ article
{
- article
+ height: 7rem;
+ width: 10rem;
+ padding: .6rem;
+ margin: .1rem;
+ margin-left: 2rem;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ border: solid 3px $primary-color;
+ border-radius: 40px;
+ box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+
+ #toevoegen
{
- height: 7rem;
- width: 10rem;
- padding: .6rem;
- margin: .1rem;
- margin-left: 2rem;
- display: flex;
- flex-direction: column;
- justify-content: center;
- align-items: center;
- border: solid 3px $primary-color;
- border-radius: 40px;
- box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
-
- #toevoegen
- {
- height: 5rem;
- width: 5rem;
- }
-
- h2
- {
- color: gray;
- }
-
- &:hover
- {
- background-color: lightgray;
- }
-
-
+ height: 5rem;
+ width: 5rem;
}
+
+ h2
+ {
+ color: gray;
+ }
+
+ &:hover
+ {
+ background-color: lightgray;
+ }
+
+
}
}
}
-
- &-rechts
+ }
+
+ &-rechts
+ {
+ grid-column: 3;
+ margin-right: 2rem;
+
+ #metingen
{
- grid-column: 3;
- // margin-right: 2rem;
- #metingen
+ border: solid 3px $primary-color;
+ border-radius: 40px;
+
+ #main-waardes
{
+ display: flex;
+ justify-content: space-between;
+ padding: .5rem;
+ padding-bottom: 0;
+ width: 100%;
- border: solid 3px $primary-color;
- border-radius: 40px;
-
- #main-waardes
+ table
{
- display: flex;
- justify-content: space-between;
- padding: .5rem;
- padding-bottom: 0;
- width: 100%;
-
- table
- {
- display: flex;
- justify-content: space-between;
- width: 100%;
- }
+ display: flex;
+ justify-content: space-between;
+ width: 100%;
}
}
}
}
}
}
+
+ .grid-column-2
+ {
+ @include box-shadow;
+ @include border-radius;
+ padding: 1rem;
+ margin: 3.25rem 1rem 1.25rem 1rem;
+
+ .grid-2-child
+ {
+ @include groene-border;
+ @include inner-border-radius;
+ height: 100%;
+
+
+ .parent-table
+ {
+ padding: 1.5rem 2rem;
+ display: flex;
+ flex-direction: column;
+ // align-items: stretch;
+ // gap: 2.5rem;
+ justify-content: space-around;
+ height: 90%;
+
+ table
+ {
+ tr
+ {
+ td
+ {
+ // font-size: 1.05rem;
+ }
+ }
+ }
+
+ .kas-table-1
+ {
+ tr
+ {
+ td
+ {
+ // font-size: 1.25rem;
+ }
+ }
+ }
+
+ .kas-table-2
+ {
+ position: relative;
+
+ &::after,
+ &::before
+ {
+ content: "";
+ position: absolute;
+ left: 0;
+ right: 0;
+ height: 1px;
+ width: 90%;
+ background: black;
+ }
+
+ &::after
+ {
+ bottom: -20px;
+ }
+
+ &::before
+ {
+ top: -20px;
+ }
+ }
+
+ }
+ }
+ }
+
}
- }
+ }
}
/* Divider */
@@ -234,7 +361,7 @@ body
top: 50%;
transform: translate(-50%, -50%);
background: white;
- padding: 20px;
+ padding: 1.25rem;
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
width: 30vw;
height: auto;
@@ -245,7 +372,7 @@ body
{
color: #aaa;
float: right;
- font-size: 28px;
+ font-size: 1.75rem;
font-weight: bold;
&:hover,
diff --git a/src/images/logo.png b/src/images/logo.png
new file mode 100644
index 0000000..b46eaa6
Binary files /dev/null and b/src/images/logo.png differ
diff --git a/src/index.html b/src/index.html
index 13c0337..2f3aef1 100644
--- a/src/index.html
+++ b/src/index.html
@@ -4,22 +4,27 @@
Document
-
-
-
+
+
+
+
+
+
-
-
-
Plant Toevoegen
-
-
+
+ ×
+
+
@@ -108,28 +104,37 @@
-
-
-
-
- |
- Waardes
- |
-
- Huidig
- |
-
- 24u gemiddelde
- |
-
-
- |
- a
- |
-
-
-
-
+
+
+
+
+
+
+
+
+ Zonlicht
+
+
+
+
diff --git a/src/js/main.js b/src/js/main.js
new file mode 100644
index 0000000..a3e1eb4
--- /dev/null
+++ b/src/js/main.js
@@ -0,0 +1,115 @@
+const { ipcRenderer } = require("electron");
+
+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;
+ }
+ });
+
+});
+
+function openModal()
+{
+ const modal = document.getElementById("myModal");
+ const button = document.getElementById("modalButton");
+ const close = document.getElementsByClassName("close")[0];
+
+ // Toon de modal wanneer op de knop wordt geklikt
+ button.onclick = function()
+ {
+ modal.style.display = "block";
+ }
+
+ // Sluit de modal wanneer op het 'sluiten' icoon wordt geklikt
+ close.onclick = function()
+ {
+ modal.style.display = "none";
+ }
+
+ // Sluit de modal wanneer buiten de modal wordt geklikt
+ window.onclick = function(event)
+ {
+ if (event.target == modal)
+ {
+ modal.style.display = "none";
+ }
+ }
+}
+
+/**
+ * --- Functie om de grafiek te tekenen. Enigste belangrijke is de eerste 2 "const" arrays "data" & "xLabels".
+ */
+function drawLineChart()
+{
+ /*Dit is de data die getoond wordt als "punt" op de grafiek. 20 = y20 / x20, 50 = y50 / x50 enzovoort... De array "data" & "xLabels" moeten beide evenveel array items hebben!!*/
+ 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);
+ }
+ }
+}
+
+drawLineChart();
\ No newline at end of file
diff --git a/src/js/planten.class.js b/src/js/planten.class.js
new file mode 100644
index 0000000..db55ccc
--- /dev/null
+++ b/src/js/planten.class.js
@@ -0,0 +1,32 @@
+dataHardObject = {
+ "id": 1,
+ "plantnaam": "Tomaat",
+ "plantensoort": "Groente",
+ "plantGeteelt": 1
+}
+
+// Nieuwe planten aanmaken in de table
+// function hardcodeData(dataHardObject)
+// {
+// dataHardObject => "id"
+// }
+
+class Plant {
+ constructor(dataHardObject) {
+ this.id = dataHardObject.id;
+ this.plantNaam = dataHardObject.plantNaam;
+ this.plantensoort = dataHardObject.plantensoort;
+ this.plantGeteelt = dataHardObject.plantGeteelt;
+ }
+
+ htmlData(plantNaam) {
+ if (this.plantGeteelt)
+ {
+ const titel = document.querySelector(".plant-naam");
+ titel.textContent = this.plantNaam;
+ }
+ }
+}
+
+const tomaatPlant = new Plant(dataHardObject);
+tomaatPlant.htmlData();
\ No newline at end of file
diff --git a/src/kas_informatie.html b/src/kas_informatie.html
index e23678f..7809eec 100644
--- a/src/kas_informatie.html
+++ b/src/kas_informatie.html
@@ -1,25 +1,109 @@
-
-
-
+
+
+
+
+
Informatie Kas
-
-
-
+
+
+
+
+
+
+
-
-
+ Informatie Kas
+
-
-
-
+
+
+ Zonlicht
+
+
+
+
+
+
+
+
+ | Aantal geplant: |
+ 2 |
+
+
+ | Succesvolle Oogst: |
+ 2 |
+
+
+ | Gefaalde Oogst: |
+ 2 |
+
+
+
+
+ | Warmste Maand: |
+ n.v.t. |
+
+
+ | koudste Maand: |
+ December |
+
+
+ | Gemiddelde Bodemtemp.: |
+ 2˚C |
+
+
+ | Gemiddelde Uren Zonlicht: |
+ 2u |
+
+
+
+
+ | Laatste Irrigatie: |
+ 2u |
+
+
+ | Aankomende Irrigatie: |
+ 2u |
+
+
+ | Laatste Bemesting |
+ 2d |
+
+
+ | Aankomende Bemesting: |
+ 2w |
+
+
+
+
+
+
-
-
-
\ No newline at end of file
+
+