From 2d24fa154ce04ac690b6d3e1511d65be840053bf Mon Sep 17 00:00:00 2001
From: mohammedcifci78 <mohammedcifci78@gmail.com>
Date: Wed, 6 Mar 2024 09:41:11 +0100
Subject: [PATCH] a

---
 ReadMe.md                                     |  12 +-
 battery_voltage_events.py                     | 246 ------------------
 DUMMY.json => src/DUMMY.json                  |   0
 app.js => src/app.js                          |   0
 package-lock.json => src/package-lock.json    |   0
 package.json => src/package.json              |   4 +-
 {script => src/py/script}/DUMMY.json          |   0
 script/main.py => src/py/script/__init__.py   |   0
 app.py => src/py/script/app.py                |   2 +-
 .../py/script}/battery_voltage_events.py      | 116 +++++----
 src/py/{ => script}/calculate.py              |   0
 {script => src/py/script}/db_connect.py       |   0
 {script => src/py/script}/db_connect_form.py  |   0
 {script => src/py/script}/devices.py          |   0
 {script => src/py/script}/fetch.py            |   0
 {script => src/py/script}/fetch_data.py       |   0
 src/py/script/main.py                         |   0
 {script => src/py/script}/par_events.py       |   0
 .../py/script}/relative_humidity_events.py    |   0
 servermqtt.py => src/py/script/servermqtt.py  |   0
 .../soil_electric_conductivity_events.py      |   0
 .../soil_relative_permittivity_events.py      |   0
 .../py/script}/soil_temperature_events.py     |   0
 src/{js => py/static}/main.js                 |   0
 src/{css => py/static}/style.css              |   0
 src/{css => py/static}/style.css.map          |   0
 src/{css => py/static}/style.scss             |   0
 src/py/templates/__init__.py                  |   0
 src/{ => py/templates}/index.html             |   0
 src/{ => py/templates}/kas_informatie.html    |   0
 static/index.js                               |  17 --
 templates/index.html                          |  15 --
 32 files changed, 72 insertions(+), 340 deletions(-)
 delete mode 100644 battery_voltage_events.py
 rename DUMMY.json => src/DUMMY.json (100%)
 rename app.js => src/app.js (100%)
 rename package-lock.json => src/package-lock.json (100%)
 rename package.json => src/package.json (93%)
 rename {script => src/py/script}/DUMMY.json (100%)
 rename script/main.py => src/py/script/__init__.py (100%)
 rename app.py => src/py/script/app.py (95%)
 rename {script => src/py/script}/battery_voltage_events.py (96%)
 rename src/py/{ => script}/calculate.py (100%)
 rename {script => src/py/script}/db_connect.py (100%)
 rename {script => src/py/script}/db_connect_form.py (100%)
 rename {script => src/py/script}/devices.py (100%)
 rename {script => src/py/script}/fetch.py (100%)
 rename {script => src/py/script}/fetch_data.py (100%)
 create mode 100644 src/py/script/main.py
 rename {script => src/py/script}/par_events.py (100%)
 rename {script => src/py/script}/relative_humidity_events.py (100%)
 rename servermqtt.py => src/py/script/servermqtt.py (100%)
 rename {script => src/py/script}/soil_electric_conductivity_events.py (100%)
 rename {script => src/py/script}/soil_relative_permittivity_events.py (100%)
 rename {script => src/py/script}/soil_temperature_events.py (100%)
 rename src/{js => py/static}/main.js (100%)
 rename src/{css => py/static}/style.css (100%)
 rename src/{css => py/static}/style.css.map (100%)
 rename src/{css => py/static}/style.scss (100%)
 create mode 100644 src/py/templates/__init__.py
 rename src/{ => py/templates}/index.html (100%)
 rename src/{ => py/templates}/kas_informatie.html (100%)
 delete mode 100644 static/index.js
 delete mode 100644 templates/index.html

diff --git a/ReadMe.md b/ReadMe.md
index 6e182a4..df71889 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -12,13 +12,13 @@ Welkom bij ons project genaamd "GoodGarden". Wij hebben besloten om er een monol
 
 Zorg dat je in de hoofdmap "GoodGarden" zit. Kijk in je path: "/GoodGarden". Als je in de correcte map zit moet je de volgende items installeren:
 
-    - npm install electron
-    - npm install express
-    - npm install body-parser
-    - npm install python-shell
+     npm install electron
+     npm install express
+     npm install body-parser
+     npm install python-shell
 
-    - pip install mysql-connector-python
-    - pip install requests
+     pip install mysql-connector-python
+     pip install requests
 
 ## Gebruik
 
diff --git a/battery_voltage_events.py b/battery_voltage_events.py
deleted file mode 100644
index 342ad47..0000000
--- a/battery_voltage_events.py
+++ /dev/null
@@ -1,246 +0,0 @@
-import mysql.connector
-import requests
-from datetime import datetime, timezone, timedelta
-import time
-import GoodGarden.servermqtt as servermqtt
-
-# Function to make a connection to the 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=1)
-
-    # Formateer het datetime-object als een leesbare datumstring
-    formatted_date = datetime_obj_nl.strftime("%Y-%m-%d %H:%M:%S")
-    return formatted_date
-
-# Functie voor het aanmaken van gegevens in de database
-# ...
-
-# 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):
-    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}:\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\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")
-
-                # 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...\n")
-        time.sleep(1)
-
-
-# Functie voor het invoegen van gegevens in de database
-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)
-        """
-        # 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}")  # 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}"}
-            response = requests.get(url, headers=headers)
-            response.raise_for_status()
-            
-            data = response.json()
-            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}")
-
-        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):
-    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 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 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}")
-    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"  # 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()
-
-    if operation_choice == "C":
-        # Maak gegevens aan
-        create_data(url, access_token, repeat_count)
-    elif operation_choice == "R":
-        # Lees gegevens
-        read_data(url, access_token, repeat_count)
-    elif operation_choice == "U":
-        # Update gegevens
-        record_id = int(input("Enter record ID to update: "))
-        # 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.")
-
diff --git a/DUMMY.json b/src/DUMMY.json
similarity index 100%
rename from DUMMY.json
rename to src/DUMMY.json
diff --git a/app.js b/src/app.js
similarity index 100%
rename from app.js
rename to src/app.js
diff --git a/package-lock.json b/src/package-lock.json
similarity index 100%
rename from package-lock.json
rename to src/package-lock.json
diff --git a/package.json b/src/package.json
similarity index 93%
rename from package.json
rename to src/package.json
index 9ad6306..8161a02 100644
--- a/package.json
+++ b/src/package.json
@@ -14,8 +14,8 @@
   "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"
   }
-}
+}
\ No newline at end of file
diff --git a/script/DUMMY.json b/src/py/script/DUMMY.json
similarity index 100%
rename from script/DUMMY.json
rename to src/py/script/DUMMY.json
diff --git a/script/main.py b/src/py/script/__init__.py
similarity index 100%
rename from script/main.py
rename to src/py/script/__init__.py
diff --git a/app.py b/src/py/script/app.py
similarity index 95%
rename from app.py
rename to src/py/script/app.py
index 64a39d8..7cad7ea 100644
--- a/app.py
+++ b/src/py/script/app.py
@@ -19,7 +19,7 @@ def get_api_data():
 
 @app.route('/')
 def index():
-    return render_template('index.html')
+    return render_template('kas_informatie.html')
 
 @app.route('/battery_voltage_events')
 def battery_voltage_events():
diff --git a/script/battery_voltage_events.py b/src/py/script/battery_voltage_events.py
similarity index 96%
rename from script/battery_voltage_events.py
rename to src/py/script/battery_voltage_events.py
index ee63266..148ddb4 100644
--- a/script/battery_voltage_events.py
+++ b/src/py/script/battery_voltage_events.py
@@ -181,8 +181,9 @@ import mysql.connector
 import requests
 from datetime import datetime, timezone, timedelta
 import time
- 
-# Functie om verbinding te maken met de database
+import GoodGarden.src.py.servermqtt as servermqtt
+
+# Function to make a connection to the database
 def database_connect():
     return mysql.connector.connect(
         host="localhost",
@@ -190,18 +191,22 @@ def database_connect():
         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)
- 
+    datetime_obj_nl = datetime_obj_utc + timedelta(hours=1)
+
     # Formateer het datetime-object als een leesbare datumstring
     formatted_date = datetime_obj_nl.strftime("%Y-%m-%d %H:%M:%S")
     return formatted_date
- 
+
+# Functie voor het aanmaken van gegevens in de database
+# ...
+
+# 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):
     for _ in range(repeat_count):
@@ -209,10 +214,10 @@ def create_data(url, access_token, repeat_count=5):
             headers = {"Authorization": f"Token {access_token}"}
             response = requests.get(url, headers=headers)
             response.raise_for_status()
- 
+
             data = response.json()
             print(f"Data from {url}:\n")
- 
+
             # Check if data is a list (records directly under the root)
             if isinstance(data, list):
                 records = data
@@ -221,18 +226,18 @@ def create_data(url, access_token, repeat_count=5):
             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")
+
+                print(f"\nInserted data: Timestamp: {calculated_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
@@ -240,22 +245,23 @@ def create_data(url, access_token, repeat_count=5):
                     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...\n")
-        time.sleep(2)
- 
+        time.sleep(1)
+
+
 # Functie voor het invoegen van gegevens in de database
 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)
@@ -266,21 +272,23 @@ def insert_data(record):
         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
- 
+
+        print(f"Inserting data: timestamp={timestamp}, gateway_receive_time={gateway_receive_time}, device={device}, value={value}")  # 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):
@@ -288,16 +296,16 @@ def read_data(url, access_token, repeat_count=5):
             headers = {"Authorization": f"Token {access_token}"}
             response = requests.get(url, headers=headers)
             response.raise_for_status()
-           
+            
             data = response.json()
             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
@@ -305,53 +313,53 @@ def read_data(url, access_token, repeat_count=5):
                     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}")
- 
+
         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):
     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 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 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}")
     finally:
@@ -360,42 +368,43 @@ def update_data(record_id):
             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"  # 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()
- 
+
     if operation_choice == "C":
         # Maak gegevens aan
         create_data(url, access_token, repeat_count)
@@ -412,4 +421,5 @@ if __name__ == "__main__":
         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
+        print("Invalid operation choice. Please choose C, R, U, or D.")
+
diff --git a/src/py/calculate.py b/src/py/script/calculate.py
similarity index 100%
rename from src/py/calculate.py
rename to src/py/script/calculate.py
diff --git a/script/db_connect.py b/src/py/script/db_connect.py
similarity index 100%
rename from script/db_connect.py
rename to src/py/script/db_connect.py
diff --git a/script/db_connect_form.py b/src/py/script/db_connect_form.py
similarity index 100%
rename from script/db_connect_form.py
rename to src/py/script/db_connect_form.py
diff --git a/script/devices.py b/src/py/script/devices.py
similarity index 100%
rename from script/devices.py
rename to src/py/script/devices.py
diff --git a/script/fetch.py b/src/py/script/fetch.py
similarity index 100%
rename from script/fetch.py
rename to src/py/script/fetch.py
diff --git a/script/fetch_data.py b/src/py/script/fetch_data.py
similarity index 100%
rename from script/fetch_data.py
rename to src/py/script/fetch_data.py
diff --git a/src/py/script/main.py b/src/py/script/main.py
new file mode 100644
index 0000000..e69de29
diff --git a/script/par_events.py b/src/py/script/par_events.py
similarity index 100%
rename from script/par_events.py
rename to src/py/script/par_events.py
diff --git a/script/relative_humidity_events.py b/src/py/script/relative_humidity_events.py
similarity index 100%
rename from script/relative_humidity_events.py
rename to src/py/script/relative_humidity_events.py
diff --git a/servermqtt.py b/src/py/script/servermqtt.py
similarity index 100%
rename from servermqtt.py
rename to src/py/script/servermqtt.py
diff --git a/script/soil_electric_conductivity_events.py b/src/py/script/soil_electric_conductivity_events.py
similarity index 100%
rename from script/soil_electric_conductivity_events.py
rename to src/py/script/soil_electric_conductivity_events.py
diff --git a/script/soil_relative_permittivity_events.py b/src/py/script/soil_relative_permittivity_events.py
similarity index 100%
rename from script/soil_relative_permittivity_events.py
rename to src/py/script/soil_relative_permittivity_events.py
diff --git a/script/soil_temperature_events.py b/src/py/script/soil_temperature_events.py
similarity index 100%
rename from script/soil_temperature_events.py
rename to src/py/script/soil_temperature_events.py
diff --git a/src/js/main.js b/src/py/static/main.js
similarity index 100%
rename from src/js/main.js
rename to src/py/static/main.js
diff --git a/src/css/style.css b/src/py/static/style.css
similarity index 100%
rename from src/css/style.css
rename to src/py/static/style.css
diff --git a/src/css/style.css.map b/src/py/static/style.css.map
similarity index 100%
rename from src/css/style.css.map
rename to src/py/static/style.css.map
diff --git a/src/css/style.scss b/src/py/static/style.scss
similarity index 100%
rename from src/css/style.scss
rename to src/py/static/style.scss
diff --git a/src/py/templates/__init__.py b/src/py/templates/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/index.html b/src/py/templates/index.html
similarity index 100%
rename from src/index.html
rename to src/py/templates/index.html
diff --git a/src/kas_informatie.html b/src/py/templates/kas_informatie.html
similarity index 100%
rename from src/kas_informatie.html
rename to src/py/templates/kas_informatie.html
diff --git a/static/index.js b/static/index.js
deleted file mode 100644
index b26fcb4..0000000
--- a/static/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-function executeOperation(operationChoice) {
-    fetch(`/battery_voltage_events?operation=${operationChoice}`)
-        .then(response => {
-            if (!response.ok) {
-                throw new Error(`HTTP error! Status: ${response.status}`);
-            }
-            return response.json();  // Gebruik response.json() om JSON-gegevens te parsen
-        })
-        .then(data => {
-            // Verwerk de gegevens zoals nodig
-            console.log(data);  // Bekijk de gegevens in de console
-        })
-        .catch(error => {
-            console.error('Error:', error);
-            alert(`An error occurred: ${error.message}`);
-        });
-}
diff --git a/templates/index.html b/templates/index.html
deleted file mode 100644
index 9b5a071..0000000
--- a/templates/index.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Python Script Interaction</title>
-    <script src="{{ url_for('static', filename='index.js') }}"></script>
-</head>
-<body>
-    <h1>Choose Operation</h1>
-    <label for="operation_choice">Choose operation (C for Create, R for Read, U for Update, D for Delete): </label>
-    <input type="text" id="operation_choice" name="operation_choice" required>
-    <button onclick="executeOperation(document.getElementById('operation_choice').value)">Submit</button>
-</body>
-</html>