From bcebce2a6a44c5d3b3ae0a1deb03680831ddf8c9 Mon Sep 17 00:00:00 2001
From: sageTheDM <info@photofuel.tech>
Date: Tue, 19 Nov 2024 16:10:44 +0100
Subject: [PATCH 1/3] total pain

---
 .../CO2-Daten-Projekt-V2/src/FillTable.java   | 219 +++++++++---------
 .../classes/com/example/SystemInfo.class      | Bin 561 -> 0 bytes
 Code/ost/_10_steuerrechner/pom.xml            |  51 ++++
 .../src/main/java/com/example/App.java        |  38 +++
 .../java/com/example/PrimaryController.java   |  12 +
 .../java/com/example/SecondaryController.java |  12 +
 .../src/main/java/module-info.java            |   7 +
 .../main/resources/com/example/primary.fxml   |  69 ++++++
 .../main/resources/com/example/secondary.fxml |  16 ++
 .../target/classes/com/example/App.class      | Bin 0 -> 1946 bytes
 .../com/example/PrimaryController.class       | Bin 0 -> 575 bytes
 .../com/example/SecondaryController.class     | Bin 0 -> 577 bytes
 .../target/classes/com/example/primary.fxml   |  69 ++++++
 .../target/classes/com/example/secondary.fxml |  16 ++
 .../target/classes/module-info.class          | Bin 0 -> 231 bytes
 15 files changed, 402 insertions(+), 107 deletions(-)
 delete mode 100644 Code/ost/_05_layouts/target/classes/com/example/SystemInfo.class
 create mode 100644 Code/ost/_10_steuerrechner/pom.xml
 create mode 100644 Code/ost/_10_steuerrechner/src/main/java/com/example/App.java
 create mode 100644 Code/ost/_10_steuerrechner/src/main/java/com/example/PrimaryController.java
 create mode 100644 Code/ost/_10_steuerrechner/src/main/java/com/example/SecondaryController.java
 create mode 100644 Code/ost/_10_steuerrechner/src/main/java/module-info.java
 create mode 100644 Code/ost/_10_steuerrechner/src/main/resources/com/example/primary.fxml
 create mode 100644 Code/ost/_10_steuerrechner/src/main/resources/com/example/secondary.fxml
 create mode 100644 Code/ost/_10_steuerrechner/target/classes/com/example/App.class
 create mode 100644 Code/ost/_10_steuerrechner/target/classes/com/example/PrimaryController.class
 create mode 100644 Code/ost/_10_steuerrechner/target/classes/com/example/SecondaryController.class
 create mode 100644 Code/ost/_10_steuerrechner/target/classes/com/example/primary.fxml
 create mode 100644 Code/ost/_10_steuerrechner/target/classes/com/example/secondary.fxml
 create mode 100644 Code/ost/_10_steuerrechner/target/classes/module-info.class

diff --git a/Code/Steiner/CO2-Daten-Projekt-V2/src/FillTable.java b/Code/Steiner/CO2-Daten-Projekt-V2/src/FillTable.java
index 5dfd4b4..6b2fc05 100644
--- a/Code/Steiner/CO2-Daten-Projekt-V2/src/FillTable.java
+++ b/Code/Steiner/CO2-Daten-Projekt-V2/src/FillTable.java
@@ -1,115 +1,120 @@
 public class FillTable {
-    // #region Constants
-    private static final String[] START_TIMES = {
-            "7:45", "8:35", "9:40", "10:30", "11:20", "12:10", "12:50",
-            "13:35", "14:25", "15:15", "16:15", "17:05"
-    };
+        // #region Constants
+        private static final String[] START_TIMES = {
+                        "7:45", "8:35", "9:40", "10:30", "11:20", "12:10", "12:50",
+                        "13:35", "14:25", "15:15", "16:15", "17:05"
+        };
 
-    private static final String[] END_TIMES = {
-            "8:30", "9:20", "10:25", "11:15", "12:05", "12:50", "13:30",
-            "14:20", "15:10", "16:10", "17:00", "17:50"
-    };
+        private static final String[] END_TIMES = {
+                        "8:30", "9:20", "10:25", "11:15", "12:05", "12:50", "13:30",
+                        "14:20", "15:10", "16:10", "17:00", "17:50"
+        };
 
-    // #region Helper Methods
-    private static void fillTable(String[] teacherShortNames, String day, String[] startTime, String[] endTime,
-            int roomIndex) {
-        int dayIndex = getDayIndex(day);
-        for (int i = 0; i < teacherShortNames.length && i < startTime.length && i < endTime.length; i++) {
-            Teacher teacher = new Teacher(teacherShortNames[i]); // Initialize Teacher with shortform
-            App.timeTable[roomIndex][dayIndex][i] = new Lesson(roomIndex, teacher.getName(), startTime[i], endTime[i],
-                    day);
-        }
-    }
-
-    private static int getDayIndex(String day) {
-        switch (day) {
-            case "Monday":
-                return 0;
-            case "Tuesday":
-                return 1;
-            case "Wednesday":
-                return 2;
-            case "Thursday":
-                return 3;
-            case "Friday":
-                return 4;
-            default:
-                return -1;
-        }
-    }
-
-    // #region Fill 37
-    static void fill37TimeTable() {
-        int roomIndex = 0;
-        fillTable(new String[] { "Hm", "Hm", "Hi", "Hm", "Hm", "Lunch", "Bd", "Gi", "Gi", "Ts", "Ts", "" },
-                "Monday", START_TIMES, END_TIMES, roomIndex);
-        fillTable(new String[] { "Ts", "Ts", "Ts", "Ts", "Le", "Lunch", "Lunch", "Fh", "Fh", "Fh", "Fh", "" },
-                "Tuesday", START_TIMES, END_TIMES, roomIndex);
-        fillTable(new String[] { "Lu", "Lu", "Lu", "Lu", "Cg", "Cg", "Lunch", "Se", "Se", "Se", "Se", "" },
-                "Wednesday", START_TIMES, END_TIMES, roomIndex);
-        fillTable(new String[] { "Gi", "Gi", "Ba", "Ba", "Ba", "Lunch", "Bd", "Du", "Lz", "Lz" },
-                "Thursday", START_TIMES, END_TIMES, roomIndex);
-        fillTable(new String[] { "Kp", "KP", "Or", "Vt", "Vt", "Lunch", "Lunch", "Du", "Du", "Du", "", "" },
-                "Friday", START_TIMES, END_TIMES, roomIndex);
-    }
-
-    // #region Fill 38
-    static void fill38TimeTable() {
-        int roomIndex = 1;
-        fillTable(new String[] { "Bz", "Bz", "Bz", "Bz", "Bz", "Lunch", "Lunch", "Hn", "Hn", "Bu", "Hn", "Hn" },
-                "Monday", START_TIMES, END_TIMES, roomIndex);
-        fillTable(new String[] { "Kg", "Kg", "Eh", "Re", "Re", "Lunch", "Lunch", "Bt", "Kh", "Kh", "", "" },
-                "Tuesday", START_TIMES, END_TIMES, roomIndex);
-        fillTable(new String[] { "Cg", "Cg", "Cg", "Cg", "Es", "Lunch", "Lunch", "Cg", "Cg", "", "", "" },
-                "Wednesday", START_TIMES, END_TIMES, roomIndex);
-        fillTable(new String[] { "Do", "Do", "Gr", "Gr", "Or", "Lunch", "Lunch", "Bu", "Bu", "Zu", "", "" },
-                "Thursday", START_TIMES, END_TIMES, roomIndex);
-        fillTable(new String[] { "", "Hu", "Ge", "Eh", "Eh", "Bu", "Lunch", "Eh", "Eh", "", "", "" },
-                "Friday", START_TIMES, END_TIMES, roomIndex);
-    }
-
-    // #region Fill 39
-    static void fill39TimeTable() {
-        int roomIndex = 2;
-        fillTable(new String[] { "Bd", "Bd", "Bd", "Bd", "Bd", "Lunch", "Lunch", "Lu", "Lu", "Lu", "Lu", "" },
-                "Monday", START_TIMES, END_TIMES, roomIndex);
-        fillTable(new String[] { "Do", "Do", "Zu", "Zu", "Zu", "Lunch", "Lunch", "Se", "Se", "Se", "Se", "" },
-                "Tuesday", START_TIMES, END_TIMES, roomIndex);
-        fillTable(new String[] { "Cg", "Cg", "Cg", "Cg", "Bu", "Lunch", "Lunch", "Gi", "Gi", "Gi", "Gi", "" },
-                "Wednesday", START_TIMES, END_TIMES, roomIndex);
-        fillTable(new String[] { "Bd", "Bd", "Bd", "Bd", "Or", "Lunch", "Lunch", "Le", "Le", "Le", "", "" },
-                "Thursday", START_TIMES, END_TIMES, roomIndex);
-        fillTable(new String[] { "Gi", "Gi", "Gr", "Gr", "Gi", "Lunch", "Lunch", "Hi", "Hi", "Hi", "", "" },
-                "Friday", START_TIMES, END_TIMES, roomIndex);
-    }
-
-    static boolean isBreak(int intHour, int intMinute) {
-        // Check if the time is between 7 AM and 5 PM
-        if (intHour >= 7 && intHour <= 17) {
-            // Check if the time falls between any lesson start and end times
-            for (int i = 0; i < START_TIMES.length; i++) {
-                // Split the start and end times into hours and minutes
-                String[] startTime = START_TIMES[i].split(":");
-                String[] endTime = END_TIMES[i].split(":");
-
-                int startHour = Integer.parseInt(startTime[0]);
-                int startMinute = Integer.parseInt(startTime[1]);
-                int endHour = Integer.parseInt(endTime[0]);
-                int endMinute = Integer.parseInt(endTime[1]);
-
-                // Check if the given time is during the current lesson
-                if ((intHour > startHour || (intHour == startHour && intMinute >= startMinute)) &&
-                        (intHour < endHour || (intHour == endHour && intMinute < endMinute))) {
-                    return false; // It's not a break, it's during a lesson
+        // #region Helper Methods
+        private static void fillTable(String[] teacherShortNames, String day, String[] startTime, String[] endTime,
+                        int roomIndex) {
+                int dayIndex = getDayIndex(day);
+                for (int i = 0; i < teacherShortNames.length && i < startTime.length && i < endTime.length; i++) {
+                        Teacher teacher = new Teacher(teacherShortNames[i]); // Initialize Teacher with shortform
+                        App.timeTable[roomIndex][dayIndex][i] = new Lesson(roomIndex, teacher.getName(), startTime[i],
+                                        endTime[i],
+                                        day);
                 }
-            }
-            return true; // If no lessons match, it must be a break
         }
 
-        return false; // Time is outside of the school hours (7 AM to 6 PM roughly)
-    }
+        private static int getDayIndex(String day) {
+                switch (day) {
+                        case "Monday":
+                                return 0;
+                        case "Tuesday":
+                                return 1;
+                        case "Wednesday":
+                                return 2;
+                        case "Thursday":
+                                return 3;
+                        case "Friday":
+                                return 4;
+                        default:
+                                return -1;
+                }
+        }
 
-    static String whatBreakIsIt(int intHour, int intMinute, int intDay) {
-        return "No Break"; // If no break is found, return "No Break"
-    }
+        // #region Fill 37
+        static void fill37TimeTable() {
+                int roomIndex = 0;
+                fillTable(new String[] { "Hm", "Hm", "Hi", "Hm", "Hm", "Lunch", "Bd", "Gi", "Gi", "Ts", "Ts", "" },
+                                "Monday", START_TIMES, END_TIMES, roomIndex);
+                fillTable(new String[] { "Ts", "Ts", "Ts", "Ts", "Le", "Lunch", "Lunch", "Fh", "Fh", "Fh", "Fh", "" },
+                                "Tuesday", START_TIMES, END_TIMES, roomIndex);
+                fillTable(new String[] { "Lu", "Lu", "Lu", "Lu", "Cg", "Cg", "Lunch", "Se", "Se", "Se", "Se", "" },
+                                "Wednesday", START_TIMES, END_TIMES, roomIndex);
+                fillTable(new String[] { "Gi", "Gi", "Ba", "Ba", "Ba", "Lunch", "Bd", "Du", "Lz", "Lz" },
+                                "Thursday", START_TIMES, END_TIMES, roomIndex);
+                fillTable(new String[] { "Kp", "KP", "Or", "Vt", "Vt", "Lunch", "Lunch", "Du", "Du", "Du", "", "" },
+                                "Friday", START_TIMES, END_TIMES, roomIndex);
+        }
+
+        // #region Fill 38
+        static void fill38TimeTable() {
+                int roomIndex = 1;
+                fillTable(new String[] { "Bz", "Bz", "Bz", "Bz", "Bz", "Lunch", "Lunch", "Hn", "Hn", "Bu", "Hn", "Hn" },
+                                "Monday", START_TIMES, END_TIMES, roomIndex);
+                fillTable(new String[] { "Kg", "Kg", "Eh", "Re", "Re", "Lunch", "Lunch", "Bt", "Kh", "Kh", "", "" },
+                                "Tuesday", START_TIMES, END_TIMES, roomIndex);
+                fillTable(new String[] { "Cg", "Cg", "Cg", "Cg", "Es", "Lunch", "Lunch", "Cg", "Cg", "", "", "" },
+                                "Wednesday", START_TIMES, END_TIMES, roomIndex);
+                fillTable(new String[] { "Do", "Do", "Gr", "Gr", "Or", "Lunch", "Lunch", "Bu", "Bu", "Zu", "", "" },
+                                "Thursday", START_TIMES, END_TIMES, roomIndex);
+                fillTable(new String[] { "", "Hu", "Ge", "Eh", "Eh", "Bu", "Lunch", "Eh", "Eh", "", "", "" },
+                                "Friday", START_TIMES, END_TIMES, roomIndex);
+        }
+
+        // #region Fill 39
+        static void fill39TimeTable() {
+                int roomIndex = 2;
+                fillTable(new String[] { "Bd", "Bd", "Bd", "Bd", "Bd", "Lunch", "Lunch", "Lu", "Lu", "Lu", "Lu", "" },
+                                "Monday", START_TIMES, END_TIMES, roomIndex);
+                fillTable(new String[] { "Do", "Do", "Zu", "Zu", "Zu", "Lunch", "Lunch", "Se", "Se", "Se", "Se", "" },
+                                "Tuesday", START_TIMES, END_TIMES, roomIndex);
+                fillTable(new String[] { "Cg", "Cg", "Cg", "Cg", "Bu", "Lunch", "Lunch", "Gi", "Gi", "Gi", "Gi", "" },
+                                "Wednesday", START_TIMES, END_TIMES, roomIndex);
+                fillTable(new String[] { "Bd", "Bd", "Bd", "Bd", "Or", "Lunch", "Lunch", "Le", "Le", "Le", "", "" },
+                                "Thursday", START_TIMES, END_TIMES, roomIndex);
+                fillTable(new String[] { "Gi", "Gi", "Gr", "Gr", "Gi", "Lunch", "Lunch", "Hi", "Hi", "Hi", "", "" },
+                                "Friday", START_TIMES, END_TIMES, roomIndex);
+        }
+
+        static boolean isBreak(int intHour, int intMinute) {
+                // Check if the time is between 7 AM and 5 PM
+                if (intHour >= 7 && intHour <= 17) {
+                        // Check if the time falls between any lesson start and end times
+                        for (int i = 0; i < START_TIMES.length; i++) {
+                                // Split the start and end times into hours and minutes
+                                String[] startTime = START_TIMES[i].split(":");
+                                String[] endTime = END_TIMES[i].split(":");
+
+                                int startHour = Integer.parseInt(startTime[0]);
+                                int startMinute = Integer.parseInt(startTime[1]);
+                                int endHour = Integer.parseInt(endTime[0]);
+                                int endMinute = Integer.parseInt(endTime[1]);
+
+                                // Check if the given time is during the current lesson
+                                if ((intHour > startHour || (intHour == startHour && intMinute >= startMinute)) &&
+                                                (intHour < endHour || (intHour == endHour && intMinute < endMinute))) {
+                                        return false; // It's not a break, it's during a lesson
+                                }
+                        }
+                        return true; // If no lessons match, it must be a break
+                }
+
+                return false; // Time is outside of the school hours (7 AM to 6 PM roughly)
+        }
+
+        static String whatBreakIsIt(int intHour, int intMinute, int intDay) {
+                boolean isABreak = false;
+                for (int i = 0; i < END_TIMES.length; i++) {
+
+                }
+                return "No Break"; // If no break is found, return "No Break"
+        }
 }
diff --git a/Code/ost/_05_layouts/target/classes/com/example/SystemInfo.class b/Code/ost/_05_layouts/target/classes/com/example/SystemInfo.class
deleted file mode 100644
index 487f8e1ef68812d4c9105ba77a7d5fed29e78421..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 561
zcmZut%TB^j5Iw`IP>LWT;%niCfD5{GfpKGEV$!GyhJC3Qyo9!-6as&xD~$_3z>hM{
zZBaCKGjr$MbLPy<$LHHSfHNFxND=Ce@0wz1yVHp<d#hO}+-q;>Yse5PV|!tn6Wbe^
zw}Y{8LPG9bdNRBqq+9JiA#>?J2pwq@3}lfblr8Cro4Gp>!M#102tw8J9edKZ1F7mY
zm<b={jL@)>-MfUM^6raZCVh`kYqhP-FugF4-l&_$Ho;JEXAu*1>|j?z?a%1(QU>bS
z<F+Fa-Ua?t1mTL%Z2j+=U_>Y>m*H|fPaX$^tr+^YCg?qX9ysDks;$eLQ+5;)C*Yg$
z-NBL6tvG62nVgAp_Vfk$XMUuhb5!4oTI6WN1kNR{3fMxK5hZR$Kg_OHUQvBw<hME(
VsZ)`rk)YX6(C9xJ!eP|!=nG?1bi)7u

diff --git a/Code/ost/_10_steuerrechner/pom.xml b/Code/ost/_10_steuerrechner/pom.xml
new file mode 100644
index 0000000..2ca11ac
--- /dev/null
+++ b/Code/ost/_10_steuerrechner/pom.xml
@@ -0,0 +1,51 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.example</groupId>
+    <artifactId>_10_steuerrechner</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-controls</artifactId>
+            <version>13</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-fxml</artifactId>
+            <version>13</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.0</version>
+                <configuration>
+                    <release>11</release>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.openjfx</groupId>
+                <artifactId>javafx-maven-plugin</artifactId>
+                <version>0.0.6</version>
+                <executions>
+                    <execution>
+                        <!-- Default configuration for running -->
+                        <!-- Usage: mvn clean javafx:run -->
+                        <id>default-cli</id>
+                        <configuration>
+                            <mainClass>com.example.App</mainClass>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/Code/ost/_10_steuerrechner/src/main/java/com/example/App.java b/Code/ost/_10_steuerrechner/src/main/java/com/example/App.java
new file mode 100644
index 0000000..339c80c
--- /dev/null
+++ b/Code/ost/_10_steuerrechner/src/main/java/com/example/App.java
@@ -0,0 +1,38 @@
+package com.example;
+
+import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
+import java.io.IOException;
+
+/**
+ * JavaFX App
+ */
+public class App extends Application {
+
+    private static Scene scene;
+
+    @Override
+    public void start(Stage stage) throws IOException {
+        scene = new Scene(loadFXML("primary"), 640, 480);
+        stage.setScene(scene);
+        stage.show();
+    }
+
+    static void setRoot(String fxml) throws IOException {
+        scene.setRoot(loadFXML(fxml));
+    }
+
+    private static Parent loadFXML(String fxml) throws IOException {
+        FXMLLoader fxmlLoader = new FXMLLoader(App.class.getResource(fxml + ".fxml"));
+        return fxmlLoader.load();
+    }
+
+    public static void main(String[] args) {
+        launch();
+    }
+
+}
\ No newline at end of file
diff --git a/Code/ost/_10_steuerrechner/src/main/java/com/example/PrimaryController.java b/Code/ost/_10_steuerrechner/src/main/java/com/example/PrimaryController.java
new file mode 100644
index 0000000..a23d23c
--- /dev/null
+++ b/Code/ost/_10_steuerrechner/src/main/java/com/example/PrimaryController.java
@@ -0,0 +1,12 @@
+package com.example;
+
+import java.io.IOException;
+import javafx.fxml.FXML;
+
+public class PrimaryController {
+
+    @FXML
+    private void switchToSecondary() throws IOException {
+        App.setRoot("secondary");
+    }
+}
diff --git a/Code/ost/_10_steuerrechner/src/main/java/com/example/SecondaryController.java b/Code/ost/_10_steuerrechner/src/main/java/com/example/SecondaryController.java
new file mode 100644
index 0000000..4cbf23d
--- /dev/null
+++ b/Code/ost/_10_steuerrechner/src/main/java/com/example/SecondaryController.java
@@ -0,0 +1,12 @@
+package com.example;
+
+import java.io.IOException;
+import javafx.fxml.FXML;
+
+public class SecondaryController {
+
+    @FXML
+    private void switchToPrimary() throws IOException {
+        App.setRoot("primary");
+    }
+}
\ No newline at end of file
diff --git a/Code/ost/_10_steuerrechner/src/main/java/module-info.java b/Code/ost/_10_steuerrechner/src/main/java/module-info.java
new file mode 100644
index 0000000..aab90f4
--- /dev/null
+++ b/Code/ost/_10_steuerrechner/src/main/java/module-info.java
@@ -0,0 +1,7 @@
+module com.example {
+    requires javafx.controls;
+    requires javafx.fxml;
+
+    opens com.example to javafx.fxml;
+    exports com.example;
+}
diff --git a/Code/ost/_10_steuerrechner/src/main/resources/com/example/primary.fxml b/Code/ost/_10_steuerrechner/src/main/resources/com/example/primary.fxml
new file mode 100644
index 0000000..fb7fa3d
--- /dev/null
+++ b/Code/ost/_10_steuerrechner/src/main/resources/com/example/primary.fxml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Text?>
+
+<GridPane alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/23.0.1" fx:controller="com.example.PrimaryController">
+  <columnConstraints>
+    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+  </columnConstraints>
+  <rowConstraints>
+    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+  </rowConstraints>
+   <children>
+      <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Netto" wrappingWidth="90.13000106811523">
+         <GridPane.margin>
+            <Insets left="20.0" />
+         </GridPane.margin>
+      </Text>
+      <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Umsatzsteuer" GridPane.rowIndex="1">
+         <GridPane.margin>
+            <Insets left="20.0" />
+         </GridPane.margin>
+      </Text>
+      <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Brutto" GridPane.rowIndex="2">
+         <GridPane.margin>
+            <Insets left="20.0" />
+         </GridPane.margin>
+      </Text>
+      <TextField fx:id="inpNetto" promptText="Wert eingeben" GridPane.columnIndex="1">
+         <GridPane.margin>
+            <Insets right="20.0" />
+         </GridPane.margin>
+      </TextField>
+      <HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="1">
+         <children>
+            <TextField fx:id="inpTax" promptText="Wert eingeben">
+               <HBox.margin>
+                  <Insets right="20.0" />
+               </HBox.margin>
+            </TextField>
+            <Text strokeType="OUTSIDE" strokeWidth="0.0" text="\%" />
+         </children>
+      </HBox>
+      <VBox alignment="CENTER_LEFT" prefHeight="200.0" prefWidth="100.0" GridPane.columnIndex="1" GridPane.rowIndex="2">
+         <children>
+            <TextField fx:id="outBrutto">
+               <VBox.margin>
+                  <Insets right="20.0" top="20.0" />
+               </VBox.margin>
+            </TextField>
+            <Button mnemonicParsing="false" text="Berechnen">
+               <VBox.margin>
+                  <Insets top="20.0" />
+               </VBox.margin>
+            </Button>
+         </children>
+      </VBox>
+   </children>
+</GridPane>
diff --git a/Code/ost/_10_steuerrechner/src/main/resources/com/example/secondary.fxml b/Code/ost/_10_steuerrechner/src/main/resources/com/example/secondary.fxml
new file mode 100644
index 0000000..402e529
--- /dev/null
+++ b/Code/ost/_10_steuerrechner/src/main/resources/com/example/secondary.fxml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.Button?>
+<?import javafx.geometry.Insets?>
+
+<VBox alignment="CENTER" spacing="20.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.SecondaryController">
+    <children>
+        <Label text="Secondary View" />
+        <Button fx:id="secondaryButton" text="Switch to Primary View" onAction="#switchToPrimary" />
+    </children>
+    <padding>
+        <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
+    </padding>
+</VBox>
diff --git a/Code/ost/_10_steuerrechner/target/classes/com/example/App.class b/Code/ost/_10_steuerrechner/target/classes/com/example/App.class
new file mode 100644
index 0000000000000000000000000000000000000000..c909d9c7b096b0aed444d874d6c2e544775df8b0
GIT binary patch
literal 1946
zcmZ`)ZBrXn7(Ew4HiWfUUfY7Lv}q-vtnX4&D{Uwi4Fw5Ji}mdiF3Fb7Zf19>@WoI5
z2!Dp!8R)d5<7a=A<GH&F2_!PZ?tR;H&U2pUx%ubcmwy5H1h#=5fx)WRu++Y6G#zE#
zX*La{1TH_7&*aX&C7VshuFBB%T)lTZ7U&DA%2fg*rQ~EZx5|38AdtRgyLNb6pm#c7
z5l9uiZIwkY222>pkhEmG>cL)POZgje%OTKE$*W4IB7IxWlf_h6w*!Imr864I&=-W#
z4+X}jPZWf*rmV7l7Bp%0-hNdzwe-Nih`_K`YT2H(yn3=@V2sqAA!Kktz-an*L;43<
z2wXBTfk}ak<H_x%$15d)e9UY)(yfu!x7}JHe<DU3VXaADxnUu_@Cyy+UwYx^c#y>?
zu4*r?5xNyY`$vn5`AR>Tubb#YI*YfEH!$6%wiT|48O%~!pu#8tr(B6J<Gkc68s;4n
zb2<m9pzi$?8(BM*$rdnuHVC@zd31WTTf9UZ#fK)|!$$%ax<?XKz|MZd(OHg?&~BN5
zn*w7=3iK&U+gqZ|${(Uz1rxXM8AEEwT~+j4R^uZ(taHQ)a6^{Ijc&p^iL&?{cML4B
z`dT82jtl}5cTp4=s4-L(czb@8eq8;3R9A)8!}U@ji+SABSzKa`CdZHWwAb^vZ(<o=
z(raBd?3U@cK;oKN-Fm93VZi{4DJo7jT--)+-LQnUAF&m5_qevsn8YNd8q#*@;`Ecw
zu=5oI>jJO0VvcK7SM`R8hgf5~I&#mg)(Is28XX<(f<ras$eJZv_iKjN!JNh<^j+3R
z5c;yYqQbhj9c1w>zBlllK(57VyU)B`-JiNq;yf<NYUud~I>A2({Mv4KaykaQFWqfN
z1-X*v?d~-ToiVnpoceI%psBhXZ;viXLVI2kh@y0yvK^|zU>Z*{*rH8hE-qtp*>#m4
z)sEujLOZT^1lmoyfm(96#uac%Y!W4D;y5wI4E3@D=)ArHIO^k=_a~qIoLPJey*hJ*
z?C%`(z~nO>EuO<`9Gme0oWmezOcl=aly0jOXTuSUBxDa)re0xmb7=epE{@=h5nMUK
z)N|x!|3K~#H)ap<c8g+&p93Ro{ZUL}3~ypQq8p2W5;{Us<GUov@P2r|gZL&_wEh87
z%#ijFAG9d45!5AyKG7D*06yjq7oye44!|;H=}0DCVSaN+%)G>>z#(oQVX?#jzW5to
z{l@LsrkLO|O}NsgeIg+krsfqqpuT>rVl8@ud$Hr0-aqm63zW~w%~8O$Hn|y8@Q94P
bcpUL=;v2qo{(j`YM3pn$huhde9T)!tAh*i0

literal 0
HcmV?d00001

diff --git a/Code/ost/_10_steuerrechner/target/classes/com/example/PrimaryController.class b/Code/ost/_10_steuerrechner/target/classes/com/example/PrimaryController.class
new file mode 100644
index 0000000000000000000000000000000000000000..d81945d545c56a2a16b78ed7a4ee84f86dcdd5f6
GIT binary patch
literal 575
zcmaJ;O-lnY5PfOau5RmB)%vY?QxEP%@K6y%EC{QWwiK`FnrdV>DZ8oGpXEvM;1BRe
ziIZ*p0Kv;lW?tsa%gg)6>l=UrY`DlVtcN=G#em1XNcfkDjCt~SqLoQ>6p6%z!!UEl
z@3|jwb>r7NcOo<lg+r;NIbz6f@3a}56MZc_<S|jg7zzy2fmGt6A9qC3;+;q^lmi{|
zsLc~;>rvA&w=!ke4E_~SWtdGLqzP|Zx+y}fu1O<<cRC0~&q%FO7qbj=nM|quv-&r}
zu-xb?BV*B)sieinN@>HhA*;!bbO(NS5J!IP>O829V}W5J{o3MT5z8)?=taLJ9`|}B
ztYDSFO@(P_O_nTdXKX{CnkJFzrfR+Mn!2Baq9&~il|K&eSqazzSxLVF<mf~eQgo^E
zDKpAryU!SZ%3zP8g>5WSEDbMEp3Lwm>gO>{XNQm(l(U;;4`oZaPu*;~JpY2q52r_~
T0gsj!fAJPZybNoE=CJ+=-3Wg4

literal 0
HcmV?d00001

diff --git a/Code/ost/_10_steuerrechner/target/classes/com/example/SecondaryController.class b/Code/ost/_10_steuerrechner/target/classes/com/example/SecondaryController.class
new file mode 100644
index 0000000000000000000000000000000000000000..30c3cb08202be51cec8f05920b0e407e49cf0f4e
GIT binary patch
literal 577
zcmah`%Sr=55Uj~-;~F(aqsAw>MGx*p@DLG#C<yU^k>GW*PRxYenPqpP@v}TB9{d15
zO6=K)dJw#HPj_`!7d7u6uWtbMvFRYgu;uH}6Js7mf$%!Q*XowXk4IXWSO<ZK9po6w
zLw?V_fU7(2qBj)2VJI9(CCwp2wz1u1$Q|ih;UbHv67nc8%(bNw=cBME;%nXu1Vg2*
zeI9gqEN%VO%$b2q80zhRWHgB}d632*T<gnNhNO|fJs$faGE%F=!92r4DpP9j^x_*~
zs9lYek)i0yMAG4wQrhrz$!fAI{jt{{hk<u;bJlJaQDtzV$qg6Fs5w}n>%RrIqNs#b
ztkGa1%$3$;NVSo2O<d}jSgO0Gb;j-JQS6HoX+2o^!{J>k0d<g-^e;e$USuIfhboUU
zqnzJ)M)4_yU5XaAahhUjGC+AI#b>FX#T>nJgp^T9C&?blmU54}>2_uD1xr7iE}aHk
RIzIi2xA4Wwuuf<O8=rz%f4Tqw

literal 0
HcmV?d00001

diff --git a/Code/ost/_10_steuerrechner/target/classes/com/example/primary.fxml b/Code/ost/_10_steuerrechner/target/classes/com/example/primary.fxml
new file mode 100644
index 0000000..fb7fa3d
--- /dev/null
+++ b/Code/ost/_10_steuerrechner/target/classes/com/example/primary.fxml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Text?>
+
+<GridPane alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/23.0.1" fx:controller="com.example.PrimaryController">
+  <columnConstraints>
+    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+  </columnConstraints>
+  <rowConstraints>
+    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+  </rowConstraints>
+   <children>
+      <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Netto" wrappingWidth="90.13000106811523">
+         <GridPane.margin>
+            <Insets left="20.0" />
+         </GridPane.margin>
+      </Text>
+      <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Umsatzsteuer" GridPane.rowIndex="1">
+         <GridPane.margin>
+            <Insets left="20.0" />
+         </GridPane.margin>
+      </Text>
+      <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Brutto" GridPane.rowIndex="2">
+         <GridPane.margin>
+            <Insets left="20.0" />
+         </GridPane.margin>
+      </Text>
+      <TextField fx:id="inpNetto" promptText="Wert eingeben" GridPane.columnIndex="1">
+         <GridPane.margin>
+            <Insets right="20.0" />
+         </GridPane.margin>
+      </TextField>
+      <HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="1">
+         <children>
+            <TextField fx:id="inpTax" promptText="Wert eingeben">
+               <HBox.margin>
+                  <Insets right="20.0" />
+               </HBox.margin>
+            </TextField>
+            <Text strokeType="OUTSIDE" strokeWidth="0.0" text="\%" />
+         </children>
+      </HBox>
+      <VBox alignment="CENTER_LEFT" prefHeight="200.0" prefWidth="100.0" GridPane.columnIndex="1" GridPane.rowIndex="2">
+         <children>
+            <TextField fx:id="outBrutto">
+               <VBox.margin>
+                  <Insets right="20.0" top="20.0" />
+               </VBox.margin>
+            </TextField>
+            <Button mnemonicParsing="false" text="Berechnen">
+               <VBox.margin>
+                  <Insets top="20.0" />
+               </VBox.margin>
+            </Button>
+         </children>
+      </VBox>
+   </children>
+</GridPane>
diff --git a/Code/ost/_10_steuerrechner/target/classes/com/example/secondary.fxml b/Code/ost/_10_steuerrechner/target/classes/com/example/secondary.fxml
new file mode 100644
index 0000000..402e529
--- /dev/null
+++ b/Code/ost/_10_steuerrechner/target/classes/com/example/secondary.fxml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.Button?>
+<?import javafx.geometry.Insets?>
+
+<VBox alignment="CENTER" spacing="20.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.SecondaryController">
+    <children>
+        <Label text="Secondary View" />
+        <Button fx:id="secondaryButton" text="Switch to Primary View" onAction="#switchToPrimary" />
+    </children>
+    <padding>
+        <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
+    </padding>
+</VBox>
diff --git a/Code/ost/_10_steuerrechner/target/classes/module-info.class b/Code/ost/_10_steuerrechner/target/classes/module-info.class
new file mode 100644
index 0000000000000000000000000000000000000000..e4a6fa4c2dc6f36b203a82f2dc1cda3789bf182c
GIT binary patch
literal 231
zcmYjMK@Ng25S#@C0Tq(^4XZbQ;LVdSKr9KSr3S=s<Xs+ofR8e^g@b$8*`1x8?0&wl
zH-H1O5FQ~>`r1jct?E(};<N6WLL4h82-)9=-|}Zp2u@DT5Sq<GD=zw6-KAiN2&vVS
zJuh_qXtZn@5~G^PvR9H}MTjiHFL^6ANJp35<T3zcP8-96Zwe1H%nj}lINHa;VeIm9
Nus~S5Zbb8h?SA;sEwBIp

literal 0
HcmV?d00001


From a3f6e8c4dcd50cf5fa2061c2cc2ee0904b77e896 Mon Sep 17 00:00:00 2001
From: sageTheDM <info@photofuel.tech>
Date: Tue, 19 Nov 2024 16:10:52 +0100
Subject: [PATCH 2/3] total pain

---
 .../CO2-Daten-Projekt-V2/bin/App.class        | Bin 7223 -> 9439 bytes
 .../CO2-Daten-Projekt-V2/bin/Co2Data.class    | Bin 4432 -> 4432 bytes
 .../CO2-Daten-Projekt-V2/bin/Date.class       | Bin 2152 -> 1568 bytes
 .../CO2-Daten-Projekt-V2/bin/FillTable.class  | Bin 4623 -> 5391 bytes
 .../CO2-Daten-Projekt-V2/bin/Lesson.class     | Bin 1013 -> 1013 bytes
 .../CO2-Daten-Projekt-V2/bin/Points.class     | Bin 969 -> 969 bytes
 .../CO2-Daten-Projekt-V2/bin/Teacher.class    | Bin 1710 -> 1710 bytes
 .../Steiner/CO2-Daten-Projekt-V2/src/App.java | 171 +++++++++---
 .../CO2-Daten-Projekt-V2/src/Date.java        |  30 +-
 .../CO2-Daten-Projekt-V2/src/FillTable.java   | 261 ++++++++++--------
 10 files changed, 294 insertions(+), 168 deletions(-)

diff --git a/Code/Steiner/CO2-Daten-Projekt-V2/bin/App.class b/Code/Steiner/CO2-Daten-Projekt-V2/bin/App.class
index d32077e6087db2f09836c3b5423f03a817741143..d4d89f4c2446cbc08dcd594a9dc08d6e42c34515 100644
GIT binary patch
literal 9439
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
E-_T-UtpET3

literal 7223
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

diff --git a/Code/Steiner/CO2-Daten-Projekt-V2/bin/Co2Data.class b/Code/Steiner/CO2-Daten-Projekt-V2/bin/Co2Data.class
index 2fbf11af4036dea7277f4d3493b56279942e6ee7..16088b71ef0c85f40d249a499009d4958cb8dd1a 100644
GIT binary patch
delta 17
ZcmcbhbU}&Z)W2Q({{Lri-pJu02mn-u2!H?p

delta 17
ZcmcbhbU}&Z)W2Q(7#J9AH*$Cg0suvK27CYj

diff --git a/Code/Steiner/CO2-Daten-Projekt-V2/bin/Date.class b/Code/Steiner/CO2-Daten-Projekt-V2/bin/Date.class
index 39bf06bff68e2c11ecdde3fd119cff76bc3a7cc2..f7892e52a39ec976f2fd7f23a59610063e876c82 100644
GIT binary patch
delta 450
zcmYk&NiRcD7{>Acx%alEic%#aHKe45R?TBg5t2q&s0Fcc35}@{gr&8moP{kbY=lHY
zB-q>e7UC;N@H(-uIB$Mue4m{6;90=``t|ty{mnRoxBg*ORG8U!S2m~JojG@TYgHdx
z^(wBft%$dkHXlj-W|iCRbm$MOp}LD6AKi-JhI`;9x7=Jdnc3f6&t(Jj(x(&liOSP2
zb~@t6p@4h>6j4Y>Y9+<gP)d}LZg6s{Lccj-edWYdl_;fZ%slFesi@JCC?*PpEg}R_
z@(wD2ErLsZ@4Y>mrA!>hPf~icQB6CIbV%)_hb~6xCM}wgbn^_b%plvOIAn+;hB;=0
z6FGIt80YdK7feb<B(>>5Ep;+$l#!49$>Jvy9@%Q5*~Hm{HGUT$RoasGguP%l-w}Qw
rky&s=AtR5d#K<eEF!G5ifAv7;joh~+J9y1oQ~xrg{xT@~&8dMODkoAQ

delta 1039
zcmYk3-*1yu9L7JVZ-1@4h3*#%n01Q4)^1&KfPkwLH|8j;>!4%O0qSYjm16Bo_p)R$
zrtw;D%zL#92{*<IxsV7Q5%mx7|1j~=cn2iJ?|HiglJ`A%&Uv2i_dMV8+_(RUMgDsE
z+n>Pu+;|w7Qmww)#s$4quT^h51-)5oRF`UBR20@oVkN|=;*C3cQ>X7bwR(E4S*fl!
zYq~L`>y^f;ZbnFQAi_8&LZlTvucUhln|GLyZW|Rx5gf^8vx#L>b;@QR6H?mZU86ap
z2ncJ)an9MiXHG1=x@z_rTii~GLa#ZMrlNmj-n*%;8`X5abf;2wCKD@0dEVwjqYRcR
zYwJxJBV69Ks_5$!d6Vqfn^ZG&*Y$=|xGVE)Wg9u&EZ<i2zJ8W3JL@HLZ?xd(^5;4I
z<&rMdD-jeIZAM7A%j&3_cfV4D!37pW<lTGfpml|-?v6SZUt&4LHAU=|=YrFehqn2c
z>+W;)z3Otm^JNF4_}Nbv2V{-WOE-t;VTgX-=AiqZub~dR+RCW7to`n<*04I_p??J(
z_fX0|tdfFyTR!7U3`QmCzX?cZs68cF++l2fH2H{r`Fs7VvUayg8O9t2VnaKe%#FoD
z{x+w_!m(#<&hC-1E{|PEb=Xvg9UW^kxlMF5)#ih30{#cq16p7amphNkJdh^L2@Z2o
zJe?ABnlqebj&m$X($^&2AyFkeE_su;WEVy=&5X>D;5-)u`K00qvw|!>62*ShOR6Ep
zJD>1_@^0SDag`U564CF;Hgns=lEp_11U`Grz)wWoul)~OpD-Z&G$Co;Ep7XxeVoe-
zGtUG$GGcC)JeOExi7VXVDkTckS!PqB`-ba$OA(h9e&7Z_a+9A$^_Wk2DoQhw-SMzH
zk}<uHKwsAj7GJcO4G5c+{+*cCBqrlH({nle2UgKCfjl8sDEduS9txPeJQNf(;GvM9
eLk2ye@Qc*@yoV2Zy{fOd$n3gM;#pKaR{jSO1kZ*5

diff --git a/Code/Steiner/CO2-Daten-Projekt-V2/bin/FillTable.class b/Code/Steiner/CO2-Daten-Projekt-V2/bin/FillTable.class
index ed665e75b9be72b92720ac62310b68d6f070ed1c..538aa18dbae24db8c874e22d79acc7d626e721e0 100644
GIT binary patch
delta 1262
zcmZ9LYiv_x7{`C_X;05-#j(v*Y-e>bFsCVkn{<mCgKa=EW>;Xtgn*afHfCTQb_J#=
zjR{^RV>4C~O#rFW%#X?vqsH*nNa7do#;ABfyvA?FOXmEauIggjoaZ_3<@dhN?|nP9
zeCo!~`M=&cH$P7YKfe;13RqXx<xd8pIeT<yB$IXd+~D6glHTKT!Qgg})U;;?`t}-v
zhlcvHrQFF54Da8V?pLdq^<?`pSq=6^^xiu>U<lN8cHXeFQ%PoE^uRuKTHc#GknZ22
zv7?62s5hzj;&923KObl`p;^mWY0R(r)$ZW+wFH530#vYsN+MiA164E<rdfH5+Iv|x
z`?_0ZB2ltj%|WhVj2a%`Iv!*>N2r~>5WHyG;#jPtlbhJ4xSds;WHm1;zQoP^LOs7J
z{z-#LaEn=|*v=X=PQpB;c!I{+z>-f)TeC1N!mJghMVMA$)(O)p%z9zkgjp|4yQX)T
zF2!y(X!=HTTCu>U*_tw8HVe}w%x%JS36m72TbQIUDPgt<lM-gDFx!OLDol?sy~6Ye
zvpru^7S5;23u|`B%uac@L&e`o9e1m$KAPCAt=z+A2HC|P(hRX*;|{Zzhe+pFRGiAG
zNT1ZgWaY7>uXTppS=PqtE8lvRw{P{IWyL?a9gWz&`qy};z>a9dUreXzu8!FLh1QPh
zh`*Rl(^Sezef{nkf|Z{pXSnwN9l00O^O<@Am0u)}`b<o#pDWDg;xB7UK1oGVm+G0(
z+bFJ%w~7Ng+JhuGr0T|G?|$ymQSVk=V><4`s_lrr4{Q7cM|BV$qgW#E%7pis<UM5u
zUyfsZsi_t=k4ev<mZ@TxuQb80W%~G9nJr<k40{gO;W9JFE{BixyXto=OS}4pi=u_V
zJSu=9<Mx}OWZY+^;(jaTdA)D3*OI@4ohu1R1Qw}wB2H0n!i_jZqlsWNY)`XP&of+J
z9S#(5;=Wia8g>g_tNfN%hl9@(iu+@!8Or`Md3=${O}ZiQxC$HBo}bX2naHVWk{DCe
z@}&L-dHtoHW&<a537?VHXLWr}N%(0=eok^HWNEsnba0`}f0d4xl=^vuZ@DC+Wty{K
zG$zt_MWeOc&WEyWYpo<7(Lbo>W}V~rijEd;;(c|y>RiPK%7R7p4LEaDIQ(Gd)e|zt
bOXc57^w3qQnD_V#9bo+-nBhm2Yw^?H!j=p*

delta 483
zcmXBQ$xB;N7{=k>$%Pn$h^EpK2eewLICOB<n8rk1#NleAg;JC@1r@c`R)RQo-%SI(
zbW;a#A-Gg7bm783z@@H495$|nt_lV54c^6lzkAR59?tpF)#)exquYZ+Ak5XiKkc<1
zRmGikZ(+b^&y~gI$CEP#@6>FnJGtc4XSJDZ_fuA#F@K%kzKM!*eCo`@OFlUS2=agy
z3J57X^lyZR?$hjC6AY4~hy_Ymq?BbIvq}ZusB~@rwTaf?p_VvxB$RJ>#s<&XQSS1B
z8(#8H`JZ~zOoNFiV>FuYG?|~uUo^X^oKq8R7ZVcGAtodyEasJ%u$YLLPB9TNQMJcR
zpVFpF?cHWexlNDzBUemZOs|+eF}-5?#SDn)7h{VV6l04S67yQjkeGy+VKE6YBhGH#
zpQg8($UDtolw!uH;=OM0fmV`4`6zc>D-+Bz$rtTgVVX5QJ5K)QfHoK`4b}>r?I}Du
iG@7x|`>QSiW%tV*OUOJHC#o{*7U!xwsxS2A;qne4B3wrR

diff --git a/Code/Steiner/CO2-Daten-Projekt-V2/bin/Lesson.class b/Code/Steiner/CO2-Daten-Projekt-V2/bin/Lesson.class
index 51ac342989c807a4a4e34719f634e8d23c622dc0..44b19f700eaa307e1ae7f9fccfce7d068d54caef 100644
GIT binary patch
delta 17
Zcmey${*|5M)W2Q({{Lri-pKKm830!}2`c~q

delta 17
Zcmey${*|5M)W2Q(7#J9AH*&mX1^`GY2PXgk

diff --git a/Code/Steiner/CO2-Daten-Projekt-V2/bin/Points.class b/Code/Steiner/CO2-Daten-Projekt-V2/bin/Points.class
index 7bdc7b645e1e76c29d2b1297432f0c8b21ac9598..c9f8daa3cd34430c38abe69d4ba21e1f97b05aa0 100644
GIT binary patch
delta 17
ZcmX@fev+Nz)W2Q({{Lri-pFx~830jW2&Vu5

delta 17
ZcmX@fev+Nz)W2Q(7#J9AH*y?g1^_})2BQD~

diff --git a/Code/Steiner/CO2-Daten-Projekt-V2/bin/Teacher.class b/Code/Steiner/CO2-Daten-Projekt-V2/bin/Teacher.class
index 7db2754722218fe6a88a5599cf809dfa0b8d435e..f01531c910fa21376cb6da66b2244da88ebcf19e 100644
GIT binary patch
delta 17
ZcmZ3-yN;LR)W2Q({{Lri-pH|x4FFDo2xR~O

delta 17
ZcmZ3-yN;LR)W2Q(7#J9AH*zdv0{}mA24MgI

diff --git a/Code/Steiner/CO2-Daten-Projekt-V2/src/App.java b/Code/Steiner/CO2-Daten-Projekt-V2/src/App.java
index 5222634..e440e0f 100644
--- a/Code/Steiner/CO2-Daten-Projekt-V2/src/App.java
+++ b/Code/Steiner/CO2-Daten-Projekt-V2/src/App.java
@@ -12,14 +12,37 @@ public class App {
     public static final Lesson[][][] timeTable = new Lesson[ROOM_COUNT][DAY_COUNT][LESSON_COUNT];
     private static final Teacher[] teachers = new Teacher[Teacher.nameMap.size()];
 
-    // URLs for fetching CO2 data
-    private static final String ROOM_39_URL = "https://api.thingspeak.com/channels/1521262/feeds.csv?results=8000";
-    private static final String ROOM_38_URL = "https://api.thingspeak.com/channels/1364580/feeds.csv?results=8000";
-    private static final String ROOM_37_URL = "https://api.thingspeak.com/channels/1521263/feeds.csv?results=8000";
+    // Date constants
+    private static final int START_YEAR = 2024;
+    private static final int START_MONTH = 11; // November
+    private static final int START_DAY = 4;
+    private static final String START_DATE = String.format("%d-%02d-%02d%%2000:00:00", START_YEAR, START_MONTH,
+            START_DAY);
 
-    private static final List<Co2Data> room39Data = Co2Data.getData(ROOM_39_URL, 39);
-    private static final List<Co2Data> room38Data = Co2Data.getData(ROOM_38_URL, 38);
-    private static final List<Co2Data> room37Data = Co2Data.getData(ROOM_37_URL, 37);
+    private static final int END_YEAR = 2024;
+    private static final int END_MONTH = 11; // November
+    private static final int END_DAY = 8;
+    private static final String END_DATE = String.format("%d-%02d-%02d%%2000:00:00", END_YEAR, END_MONTH, END_DAY);
+
+    // Room channel numbers
+    private static final int ROOM_39_NUMBER = 1521262;
+    private static final int ROOM_38_NUMBER = 1364580;
+    private static final int ROOM_37_NUMBER = 1521263;
+
+    // Room URLs
+    private static final String ROOM_39_URL = createUrl(ROOM_39_NUMBER);
+    private static final String ROOM_38_URL = createUrl(ROOM_38_NUMBER);
+    private static final String ROOM_37_URL = createUrl(ROOM_37_NUMBER);
+
+    // Room data
+    private static final List<Co2Data> ROOM_39_DATA = Co2Data.getData(ROOM_39_URL, 39);
+    private static final List<Co2Data> ROOM_38_DATA = Co2Data.getData(ROOM_38_URL, 38);
+    private static final List<Co2Data> ROOM_37_DATA = Co2Data.getData(ROOM_37_URL, 37);
+
+    private static String createUrl(int channelNumber) {
+        return String.format("https://api.thingspeak.com/channels/%d/feeds.csv?start=%s&end=%s", channelNumber,
+                START_DATE, END_DATE);
+    }
 
     // #region Initialization
     private static void initializeTeachers() {
@@ -36,21 +59,21 @@ public class App {
     }
 
     // #region Calculation
-    private static void calculatePoints(List<Co2Data> data) {
+    private static void calculatePoints(List<Co2Data> data, int roomNumber) {
         for (Co2Data co2Data : data) {
             Date temp = co2Data.getDate();
             int intHour = temp.getHour();
             int intMinute = temp.getMinute();
-            int intDay = temp.getDay();
             if (FillTable.isBreak(intHour, intMinute)) {
-                String whatBreak = FillTable.whatBreakIsIt(intHour, intMinute, intDay);
+                String whatBreak = FillTable.whatBreakIsIt(intHour, intMinute);
+                int[] time = FillTable.whatTime(intHour, intMinute);
 
                 switch (whatBreak) {
                     case "short":
-                        calculateFiveMinuteBreakPoints(co2Data);
+                        calculateFiveMinuteBreakPoints(data, time, roomNumber);
                         break;
                     case "long":
-                        calculateLongerBreakPoints(co2Data);
+                        calculateLongerBreakPoints(data, time, roomNumber);
                         break;
 
                     default:
@@ -60,18 +83,106 @@ public class App {
         }
     }
 
-    private static int calculateFiveMinuteBreakPoints(Co2Data data) {
-        calculateBonusPoints(data);
-        return 5;
+    private static int calculateFiveMinuteBreakPoints(List<Co2Data> data, int[] time, int roomNumber) {
+        // Calculate the time range for the break (e.g., a 5-minute break)
+        int startMinute = time[0];
+        int endMinute = time[1];
+
+        int points = 5; // Start with maximum points
+
+        // Loop over each minute in the break and check the CO2 level
+        for (int i = startMinute; i < endMinute; i++) {
+            // Get the CO2 data for the current minute (using the data list)
+            Co2Data minuteData = getCo2DataForMinute(data, i); // data is already a List<Co2Data>
+
+            if (minuteData != null) {
+                int currentCo2 = minuteData.getCo2Level();
+                Co2Data previousMinuteData = getCo2DataForMinute(data, i - 1); // data is a List<Co2Data>
+
+                if (previousMinuteData != null) {
+                    int previousCo2 = previousMinuteData.getCo2Level();
+
+                    // If CO2 level doesn't decrease, subtract points
+                    if (currentCo2 >= previousCo2) {
+                        points--;
+                    }
+                }
+            }
+        }
+
+        // After calculating the points, consider any bonus points for teacher switch or
+        // other criteria
+        points += calculateBonusPoints(data, time, roomNumber);
+
+        return Math.max(points, 0); // Ensure that points don't go below zero
     }
 
-    private static int calculateLongerBreakPoints(Co2Data data) {
-        calculateBonusPoints(data);
-        return 10;
+    private static int calculateLongerBreakPoints(List<Co2Data> data, int[] time, int roomNumber) {
+        // Take the time for the entire break
+        int startMinute = time[0];
+        int endMinute = time[1];
+
+        int points = 10; // Start with maximum points for longer break
+
+        // Loop over each minute in the break and check the CO2 level
+        for (int i = startMinute; i < endMinute; i++) {
+            // Get the CO2 data for the current minute (using the data list)
+            Co2Data minuteData = getCo2DataForMinute(data, i); // data is already a List<Co2Data>
+
+            if (minuteData != null) {
+                int currentCo2 = minuteData.getCo2Level();
+                Co2Data previousMinuteData = getCo2DataForMinute(data, i - 1); // data is a List<Co2Data>
+
+                if (previousMinuteData != null) {
+                    int previousCo2 = previousMinuteData.getCo2Level();
+
+                    // If CO2 level doesn't decrease, subtract points
+                    if (currentCo2 >= previousCo2) {
+                        points--;
+                    }
+                }
+            }
+        }
+
+        // After calculating the points, consider any bonus points for teacher switch or
+        // other criteria
+        points += calculateBonusPoints(data, time, roomNumber);
+
+        return Math.max(points, 0); // Ensure that points don't go below zero
     }
 
-    private static int calculateBonusPoints(Co2Data data) {
-        return 5;
+    private static int calculateBonusPoints(List<Co2Data> data, int[] time, int roomNumber) {
+        // Check if the next lesson isn't lunch or the same teacher (if the next lesson
+        // is lunch, no bonus points possible)
+        boolean isTeacherChange = isTeacherChange(data, roomNumber); // Check if the teacher is changing
+        boolean isNextLessonLunch = isNextLessonLunch(data, roomNumber);
+
+        if (!isNextLessonLunch && isTeacherChange) {
+            return 5; // Bonus points for teacher switch
+        } else {
+            return 0; // No bonus points
+        }
+    }
+
+    private static boolean isTeacherChange(List<Co2Data> data, int roomNumber) {
+
+        return false; // Placeholder logic
+    }
+
+    private static boolean isNextLessonLunch(List<Co2Data> data, int roomNumber) {
+        // Logic to check if the next lesson is lunch (can be based on time and lesson
+        // schedule)
+        return false; // Placeholder logic
+    }
+
+    private static Co2Data getCo2DataForMinute(List<Co2Data> data, int minute) {
+        // Logic to get the CO2 data for a specific minute in the break
+        for (Co2Data co2Data : data) {
+            if (co2Data.getDate().getMinute() == minute) {
+                return co2Data;
+            }
+        }
+        return null; // Return null if no data matches
     }
 
     // #region Sorting Printing
@@ -109,10 +220,8 @@ public class App {
         while (true) {
             if (scanner.hasNextInt()) {
                 return scanner.nextInt();
-            } else {
-                System.out.println("Invalid input. Please enter a number.");
-                scanner.next();
             }
+            scanner.next(); // Clear invalid input
         }
     }
 
@@ -120,7 +229,8 @@ public class App {
         System.out.println("Point calculation explanation:");
         System.out.println("1. Up to 5 points for keeping the window open during a small pause.");
         System.out.println("2. Up to 10 points for long pauses, depending on window usage.");
-        System.out.println("3. 5 bonus points for teacher switches in the room.");
+        System.out.println("3. 5 bonus points for teacher switches in classrooms.");
+        System.out.println("4. Deduct points if CO2 levels are too high.");
     }
 
     private static void printShutDown() {
@@ -130,17 +240,16 @@ public class App {
             try {
                 Thread.sleep(1000);
             } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
+                e.printStackTrace();
             }
         }
-        System.out.println("Goodbye!");
     }
 
     // @TODO: remove this before hand-in deadline
     public static void debbugingValueLists(List<Co2Data> data) {
         // Debugging co2Data
         int index = 0;
-        for (Co2Data a : room37Data) {
+        for (Co2Data a : data) {
             System.out.println(a.toString());
             index++;
         }
@@ -153,16 +262,16 @@ public class App {
     public static void main(String[] args) {
         boolean debbugingList = false;
         if (debbugingList) {
-            debbugingValueLists(room37Data);
+            debbugingValueLists(ROOM_37_DATA);
             // debbugingValueLists(room38Data);
             // debbugingValueLists(room39Data);
         } else {
             System.out.println("Calculations in process please do not shut off...");
             fillInTimeTable();
             initializeTeachers();
-            calculatePoints(room37Data);
-            calculatePoints(room38Data);
-            calculatePoints(room39Data);
+            calculatePoints(ROOM_37_DATA, 37);
+            calculatePoints(ROOM_38_DATA, 38);
+            calculatePoints(ROOM_39_DATA, 39);
             sortTeachers();
             printTeachers();
             while (true) {
diff --git a/Code/Steiner/CO2-Daten-Projekt-V2/src/Date.java b/Code/Steiner/CO2-Daten-Projekt-V2/src/Date.java
index e37fcc5..4c16b0b 100644
--- a/Code/Steiner/CO2-Daten-Projekt-V2/src/Date.java
+++ b/Code/Steiner/CO2-Daten-Projekt-V2/src/Date.java
@@ -1,6 +1,3 @@
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-
 public class Date {
     // #region Fields
     private int day;
@@ -42,34 +39,9 @@ public class Date {
         return minute;
     }
 
-    // #region Helper Method to Check Daylight Saving Time
-    private boolean isDaylightSavingTime() {
-        Calendar calendar = new GregorianCalendar();
-        calendar.set(year, month - 1, day); // Month is 0-based in Calendar
-
-        // Last Sunday in March (DST starts)
-        Calendar lastSundayInMarch = new GregorianCalendar(year, Calendar.MARCH, 31);
-        lastSundayInMarch.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY);
-        lastSundayInMarch.add(Calendar.DATE, -7); // Go back to last Sunday of March
-
-        // Last Sunday in October (DST ends)
-        Calendar lastSundayInOctober = new GregorianCalendar(year, Calendar.OCTOBER, 31);
-        lastSundayInOctober.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY);
-        lastSundayInOctober.add(Calendar.DATE, -7); // Go back to last Sunday of October
-
-        // Check if the current date is within the DST period
-        return calendar.after(lastSundayInMarch) && calendar.before(lastSundayInOctober);
-    }
-
     // #region Adjust UTC to Switzerland Time
     private void adjustForSwitzerlandTime() {
-        if (isDaylightSavingTime()) {
-            // Switzerland is UTC +2 during DST (CEST)
-            hour += 2;
-        } else {
-            // Switzerland is UTC +1 during Standard Time (CET)
-            hour += 1;
-        }
+        hour += 1;
 
         // Adjust if the hour exceeds 24 or falls below 0
         if (hour >= 24) {
diff --git a/Code/Steiner/CO2-Daten-Projekt-V2/src/FillTable.java b/Code/Steiner/CO2-Daten-Projekt-V2/src/FillTable.java
index 6b2fc05..594f5b0 100644
--- a/Code/Steiner/CO2-Daten-Projekt-V2/src/FillTable.java
+++ b/Code/Steiner/CO2-Daten-Projekt-V2/src/FillTable.java
@@ -1,120 +1,165 @@
 public class FillTable {
-        // #region Constants
-        private static final String[] START_TIMES = {
-                        "7:45", "8:35", "9:40", "10:30", "11:20", "12:10", "12:50",
-                        "13:35", "14:25", "15:15", "16:15", "17:05"
-        };
+    // #region Constants
+    private static final String[] START_TIMES = {
+            "7:45", "8:35", "9:40", "10:30", "11:20", "12:10", "12:50",
+            "13:35", "14:25", "15:15", "16:15", "17:05"
+    };
 
-        private static final String[] END_TIMES = {
-                        "8:30", "9:20", "10:25", "11:15", "12:05", "12:50", "13:30",
-                        "14:20", "15:10", "16:10", "17:00", "17:50"
-        };
+    private static final String[] END_TIMES = {
+            "8:30", "9:20", "10:25", "11:15", "12:05", "12:50", "13:30",
+            "14:20", "15:10", "16:10", "17:00", "17:50"
+    };
 
-        // #region Helper Methods
-        private static void fillTable(String[] teacherShortNames, String day, String[] startTime, String[] endTime,
-                        int roomIndex) {
-                int dayIndex = getDayIndex(day);
-                for (int i = 0; i < teacherShortNames.length && i < startTime.length && i < endTime.length; i++) {
-                        Teacher teacher = new Teacher(teacherShortNames[i]); // Initialize Teacher with shortform
-                        App.timeTable[roomIndex][dayIndex][i] = new Lesson(roomIndex, teacher.getName(), startTime[i],
-                                        endTime[i],
-                                        day);
+    // #region Helper Methods
+    private static void fillTable(String[] teacherShortNames, String day, String[] startTime, String[] endTime,
+            int roomIndex) {
+        int dayIndex = getDayIndex(day);
+        for (int i = 0; i < teacherShortNames.length && i < startTime.length && i < endTime.length; i++) {
+            Teacher teacher = new Teacher(teacherShortNames[i]); // Initialize Teacher with shortform
+            App.timeTable[roomIndex][dayIndex][i] = new Lesson(roomIndex, teacher.getName(), startTime[i],
+                    endTime[i],
+                    day);
+        }
+    }
+
+    private static int getDayIndex(String day) {
+        switch (day) {
+            case "Monday":
+                return 0;
+            case "Tuesday":
+                return 1;
+            case "Wednesday":
+                return 2;
+            case "Thursday":
+                return 3;
+            case "Friday":
+                return 4;
+            default:
+                return -1;
+        }
+    }
+
+    // #region Fill 37
+    static void fill37TimeTable() {
+        int roomIndex = 0;
+        fillTable(new String[] { "Hm", "Hm", "Hi", "Hm", "Hm", "Lunch", "Bd", "Gi", "Gi", "Ts", "Ts", "" },
+                "Monday", START_TIMES, END_TIMES, roomIndex);
+        fillTable(new String[] { "Ts", "Ts", "Ts", "Ts", "Le", "Lunch", "Lunch", "Fh", "Fh", "Fh", "Fh", "" },
+                "Tuesday", START_TIMES, END_TIMES, roomIndex);
+        fillTable(new String[] { "Lu", "Lu", "Lu", "Lu", "Cg", "Cg", "Lunch", "Se", "Se", "Se", "Se", "" },
+                "Wednesday", START_TIMES, END_TIMES, roomIndex);
+        fillTable(new String[] { "Gi", "Gi", "Ba", "Ba", "Ba", "Lunch", "Bd", "Du", "Lz", "Lz" },
+                "Thursday", START_TIMES, END_TIMES, roomIndex);
+        fillTable(new String[] { "Kp", "KP", "Or", "Vt", "Vt", "Lunch", "Lunch", "Du", "Du", "Du", "", "" },
+                "Friday", START_TIMES, END_TIMES, roomIndex);
+    }
+
+    // #region Fill 38
+    static void fill38TimeTable() {
+        int roomIndex = 1;
+        fillTable(new String[] { "Bz", "Bz", "Bz", "Bz", "Bz", "Lunch", "Lunch", "Hn", "Hn", "Bu", "Hn", "Hn" },
+                "Monday", START_TIMES, END_TIMES, roomIndex);
+        fillTable(new String[] { "Kg", "Kg", "Eh", "Re", "Re", "Lunch", "Lunch", "Bt", "Kh", "Kh", "", "" },
+                "Tuesday", START_TIMES, END_TIMES, roomIndex);
+        fillTable(new String[] { "Cg", "Cg", "Cg", "Cg", "Es", "Lunch", "Lunch", "Cg", "Cg", "", "", "" },
+                "Wednesday", START_TIMES, END_TIMES, roomIndex);
+        fillTable(new String[] { "Do", "Do", "Gr", "Gr", "Or", "Lunch", "Lunch", "Bu", "Bu", "Zu", "", "" },
+                "Thursday", START_TIMES, END_TIMES, roomIndex);
+        fillTable(new String[] { "", "Hu", "Ge", "Eh", "Eh", "Bu", "Lunch", "Eh", "Eh", "", "", "" },
+                "Friday", START_TIMES, END_TIMES, roomIndex);
+    }
+
+    // #region Fill 39
+    static void fill39TimeTable() {
+        int roomIndex = 2;
+        fillTable(new String[] { "Bd", "Bd", "Bd", "Bd", "Bd", "Lunch", "Lunch", "Lu", "Lu", "Lu", "Lu", "" },
+                "Monday", START_TIMES, END_TIMES, roomIndex);
+        fillTable(new String[] { "Do", "Do", "Zu", "Zu", "Zu", "Lunch", "Lunch", "Se", "Se", "Se", "Se", "" },
+                "Tuesday", START_TIMES, END_TIMES, roomIndex);
+        fillTable(new String[] { "Cg", "Cg", "Cg", "Cg", "Bu", "Lunch", "Lunch", "Gi", "Gi", "Gi", "Gi", "" },
+                "Wednesday", START_TIMES, END_TIMES, roomIndex);
+        fillTable(new String[] { "Bd", "Bd", "Bd", "Bd", "Or", "Lunch", "Lunch", "Le", "Le", "Le", "", "" },
+                "Thursday", START_TIMES, END_TIMES, roomIndex);
+        fillTable(new String[] { "Gi", "Gi", "Gr", "Gr", "Gi", "Lunch", "Lunch", "Hi", "Hi", "Hi", "", "" },
+                "Friday", START_TIMES, END_TIMES, roomIndex);
+    }
+
+    static boolean isBreak(int intHour, int intMinute) {
+        // Check if the time is between 7 AM and 5 PM
+        if (intHour >= 7 && intHour <= 17) {
+            // Check if the time falls between any lesson start and end times
+            for (int i = 0; i < START_TIMES.length; i++) {
+                // Split the start and end times into hours and minutes
+                String[] startTime = START_TIMES[i].split(":");
+                String[] endTime = END_TIMES[i].split(":");
+
+                int startHour = Integer.parseInt(startTime[0]);
+                int startMinute = Integer.parseInt(startTime[1]);
+                int endHour = Integer.parseInt(endTime[0]);
+                int endMinute = Integer.parseInt(endTime[1]);
+
+                // Check if the given time is during the current lesson
+                if ((intHour > startHour || (intHour == startHour && intMinute >= startMinute)) &&
+                        (intHour < endHour || (intHour == endHour && intMinute < endMinute))) {
+                    return false; // It's not a break, it's during a lesson
                 }
+            }
+            return true; // If no lessons match, it must be a break
         }
 
-        private static int getDayIndex(String day) {
-                switch (day) {
-                        case "Monday":
-                                return 0;
-                        case "Tuesday":
-                                return 1;
-                        case "Wednesday":
-                                return 2;
-                        case "Thursday":
-                                return 3;
-                        case "Friday":
-                                return 4;
-                        default:
-                                return -1;
-                }
-        }
+        return false; // Time is outside of the school hours (7 AM to 6 PM roughly)
+    }
 
-        // #region Fill 37
-        static void fill37TimeTable() {
-                int roomIndex = 0;
-                fillTable(new String[] { "Hm", "Hm", "Hi", "Hm", "Hm", "Lunch", "Bd", "Gi", "Gi", "Ts", "Ts", "" },
-                                "Monday", START_TIMES, END_TIMES, roomIndex);
-                fillTable(new String[] { "Ts", "Ts", "Ts", "Ts", "Le", "Lunch", "Lunch", "Fh", "Fh", "Fh", "Fh", "" },
-                                "Tuesday", START_TIMES, END_TIMES, roomIndex);
-                fillTable(new String[] { "Lu", "Lu", "Lu", "Lu", "Cg", "Cg", "Lunch", "Se", "Se", "Se", "Se", "" },
-                                "Wednesday", START_TIMES, END_TIMES, roomIndex);
-                fillTable(new String[] { "Gi", "Gi", "Ba", "Ba", "Ba", "Lunch", "Bd", "Du", "Lz", "Lz" },
-                                "Thursday", START_TIMES, END_TIMES, roomIndex);
-                fillTable(new String[] { "Kp", "KP", "Or", "Vt", "Vt", "Lunch", "Lunch", "Du", "Du", "Du", "", "" },
-                                "Friday", START_TIMES, END_TIMES, roomIndex);
-        }
-
-        // #region Fill 38
-        static void fill38TimeTable() {
-                int roomIndex = 1;
-                fillTable(new String[] { "Bz", "Bz", "Bz", "Bz", "Bz", "Lunch", "Lunch", "Hn", "Hn", "Bu", "Hn", "Hn" },
-                                "Monday", START_TIMES, END_TIMES, roomIndex);
-                fillTable(new String[] { "Kg", "Kg", "Eh", "Re", "Re", "Lunch", "Lunch", "Bt", "Kh", "Kh", "", "" },
-                                "Tuesday", START_TIMES, END_TIMES, roomIndex);
-                fillTable(new String[] { "Cg", "Cg", "Cg", "Cg", "Es", "Lunch", "Lunch", "Cg", "Cg", "", "", "" },
-                                "Wednesday", START_TIMES, END_TIMES, roomIndex);
-                fillTable(new String[] { "Do", "Do", "Gr", "Gr", "Or", "Lunch", "Lunch", "Bu", "Bu", "Zu", "", "" },
-                                "Thursday", START_TIMES, END_TIMES, roomIndex);
-                fillTable(new String[] { "", "Hu", "Ge", "Eh", "Eh", "Bu", "Lunch", "Eh", "Eh", "", "", "" },
-                                "Friday", START_TIMES, END_TIMES, roomIndex);
-        }
-
-        // #region Fill 39
-        static void fill39TimeTable() {
-                int roomIndex = 2;
-                fillTable(new String[] { "Bd", "Bd", "Bd", "Bd", "Bd", "Lunch", "Lunch", "Lu", "Lu", "Lu", "Lu", "" },
-                                "Monday", START_TIMES, END_TIMES, roomIndex);
-                fillTable(new String[] { "Do", "Do", "Zu", "Zu", "Zu", "Lunch", "Lunch", "Se", "Se", "Se", "Se", "" },
-                                "Tuesday", START_TIMES, END_TIMES, roomIndex);
-                fillTable(new String[] { "Cg", "Cg", "Cg", "Cg", "Bu", "Lunch", "Lunch", "Gi", "Gi", "Gi", "Gi", "" },
-                                "Wednesday", START_TIMES, END_TIMES, roomIndex);
-                fillTable(new String[] { "Bd", "Bd", "Bd", "Bd", "Or", "Lunch", "Lunch", "Le", "Le", "Le", "", "" },
-                                "Thursday", START_TIMES, END_TIMES, roomIndex);
-                fillTable(new String[] { "Gi", "Gi", "Gr", "Gr", "Gi", "Lunch", "Lunch", "Hi", "Hi", "Hi", "", "" },
-                                "Friday", START_TIMES, END_TIMES, roomIndex);
-        }
-
-        static boolean isBreak(int intHour, int intMinute) {
-                // Check if the time is between 7 AM and 5 PM
-                if (intHour >= 7 && intHour <= 17) {
-                        // Check if the time falls between any lesson start and end times
-                        for (int i = 0; i < START_TIMES.length; i++) {
-                                // Split the start and end times into hours and minutes
-                                String[] startTime = START_TIMES[i].split(":");
-                                String[] endTime = END_TIMES[i].split(":");
-
-                                int startHour = Integer.parseInt(startTime[0]);
-                                int startMinute = Integer.parseInt(startTime[1]);
-                                int endHour = Integer.parseInt(endTime[0]);
-                                int endMinute = Integer.parseInt(endTime[1]);
-
-                                // Check if the given time is during the current lesson
-                                if ((intHour > startHour || (intHour == startHour && intMinute >= startMinute)) &&
-                                                (intHour < endHour || (intHour == endHour && intMinute < endMinute))) {
-                                        return false; // It's not a break, it's during a lesson
-                                }
-                        }
-                        return true; // If no lessons match, it must be a break
+    static String whatBreakIsIt(int intHour, int intMinute) {
+        String whatBreak = "";
+        for (int i = 0; i < END_TIMES.length; i++) {
+            String[] tempEnd = END_TIMES[i].split(":");
+            String[] tempStart = START_TIMES[i].split(":");
+            if (intHour >= Integer.parseInt(tempStart[0]) && intHour <= Integer.parseInt(tempEnd[0])) {
+                if (intMinute >= Integer.parseInt(tempStart[1])
+                        && intMinute <= Integer.parseInt(tempEnd[1])) {
+                    if (Integer.parseInt(tempEnd[1]) - Integer.parseInt(tempStart[1]) == 5) {
+                        whatBreak = "short";
+                    } else if (Integer.parseInt(tempEnd[1]) - Integer.parseInt(tempStart[1]) > 5) {
+                        whatBreak = "long";
+                    } else {
+                        whatBreak = "No Break";
+                    }
                 }
 
-                return false; // Time is outside of the school hours (7 AM to 6 PM roughly)
+            }
+        }
+        return whatBreak; // If no break is found, return "No Break"
+    }
+
+    static int[] whatTime(int intHour, int intMinute) {
+        int[] result = new int[2]; // [most recent end time, next start time]
+        result[0] = -1; // Initialize to -1 (no previous end time found)
+        result[1] = -1; // Initialize to -1 (no next start time found)
+
+        for (int i = 0; i < END_TIMES.length; i++) {
+            // Parse END_TIMES[i]
+            String[] endParts = END_TIMES[i].split(":");
+            int endHour = Integer.parseInt(endParts[0]);
+            int endMinute = Integer.parseInt(endParts[1]);
+
+            // Parse START_TIMES[i]
+            String[] startParts = START_TIMES[i].split(":");
+            int startHour = Integer.parseInt(startParts[0]);
+            int startMinute = Integer.parseInt(startParts[1]);
+
+            // Check for the most recent end time
+            if ((intHour > endHour) || (intHour == endHour && intMinute >= endMinute)) {
+                result[0] = i; // Track the most recent lesson's end time index
+            }
+
+            // Check for the next start time
+            if ((intHour < startHour) || (intHour == startHour && intMinute < startMinute)) {
+                result[1] = i; // Track the next lesson's start time index
+                break; // No need to continue since START_TIMES is sorted
+            }
         }
 
-        static String whatBreakIsIt(int intHour, int intMinute, int intDay) {
-                boolean isABreak = false;
-                for (int i = 0; i < END_TIMES.length; i++) {
-
-                }
-                return "No Break"; // If no break is found, return "No Break"
-        }
+        return result;
+    }
 }

From 1716f0fb174c1c0b70ba913bbfcec2d94b3042a1 Mon Sep 17 00:00:00 2001
From: sageTheDM <info@photofuel.tech>
Date: Wed, 20 Nov 2024 13:19:16 +0100
Subject: [PATCH 3/3] hekp me god

---
 .../CO2-Daten-Projekt-V2/bin/App.class        | Bin 9439 -> 9378 bytes
 .../CO2-Daten-Projekt-V2/bin/FillTable.class  | Bin 5391 -> 6112 bytes
 .../Steiner/CO2-Daten-Projekt-V2/src/App.java |  22 ++--
 .../CO2-Daten-Projekt-V2/src/FillTable.java   | 124 +++++++++++-------
 4 files changed, 86 insertions(+), 60 deletions(-)

diff --git a/Code/Steiner/CO2-Daten-Projekt-V2/bin/App.class b/Code/Steiner/CO2-Daten-Projekt-V2/bin/App.class
index d4d89f4c2446cbc08dcd594a9dc08d6e42c34515..49fc4eca76d3ed152f7c0002904eead271775fb3 100644
GIT binary patch
delta 2181
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
CqP>{_

delta 2147
zcma)7YiyHM7=E6%YrF2O?YeGbUE6Kl92*R_DNM%3O%OJm2m%Tym%_@Jjt;jXg5taY
zf`YdbFrXOJAB%*jY`7GEpotna-lE1R-s4>p@s{{Q#rdAEO#SJXwBP%k?>+DHyqD*E
zkG6f<_S8;~#{&|Iq)pf71g8e8+pmdVAFtb->guj*@9Il6x7DmLJ`Tk!+K9Zaz6FUJ
zQtgSpzMf?J=H$8!1XmEHdR0zDZ_jCUD#cuS^{Y8!qkaZl%p?5&#+=pL8{gWen9rd0
ztNG3%#W5__Yg9>~gb^3RgmYm}S286&QN2$UIm;Bw8Pi8qELf>{9;*mfXCk#AzA-@r
ztM$+Jd{00aRx8$UoIb1O)z@;OixY@^3%9GMZeg!PT%77n#5XF|VZVgfWR|*<0oYir
zQ@L9jrYbh$AmP~%w^D3NraU;G(-fy;fow=h+UM40D%{5^9rngJN6+w9aIRkGZDp%I
z=AF&?`X}#Hw(Ie}S-ebd^c5{zB+Rhh!&)v@Tw>6(Ec7f`m;GB0mvM!Q%SS8K9Zz=F
zE!iM+I~1?t)v}?lJCWE#II8E@T;bs=u5od-{>WFs`2GI9!3~OCrZDbQk7U`E>~!;5
zeZ*hruBAzsNqx#+mn|jjV8YGK`ZxcShAj$*QEz&?RpGXbb)&-LIBM3mD|#|({fY&s
zck@=gI&Wp<cEt-h#dz#gyeQ*whvKEiV~;+a*W|cMajz~6H0i~GNz5JE9T*~OhFXHl
zZ43?_DBNY|lA%cG30u=PIB+Afu^qX%1^L3E1UpcMofwN<XuxhXVh^TaFXmt$=84ZD
z?8nu3KszEQ`yYf2rhuVw;WS33%RlXnjsnLaWJeAn%YDp#Ox`-MRsIVt&%<!yVZk~g
z&yQdX9>X?yHz^YZr!h{RBpyD;7ocT*0Joqx5fptmVVAwRq5`Kx{c@=|sB><oQ7cam
z$<GCz#TZeP$0$nnj+aFnU6KvZD(*J(Y%#N2%$!z;$1Ns>u<7z>LED$&lL>7TRwlH^
zXzzbVd-A{0^vq}(-8vp^t2u!no<=E#QH~Rm?Mch8O!9)DjOJg<Z2eBOnI7#cEvm}_
z()1lStS!C)$sIT)d!CiroI(zsv!a;1JS@;lORHxW4l~r4RghJ31jU0a4Hr9xSy7Pn
z495b)96x}{$iv79MZ%7bjy27pY2p+5$EV)%(a)7e`=1xg7X<G`>A*{Z^fCf?1!263
z7+%9<ypAb&11)${=Ho5Q#oJhpcV#|aLMPs{SWTCmHmqlZa5b~g!SltE69#K}fz?|#
zR^xZE>=JuECvmcPg)x(jaO;(2mGv^~;%~Z_kVs}K%7yMYNn;SxhuL%x9?NJsX5D7!
z<7N5%AIcnj3_m_W5k5l{A6aBFEiLCP8L`Z?IAC-6q--Lib0BL4#9R{vB%iYlj4>`A
zHRg>PZKK8|V*J~lkferwd?l*-S~B`Z6!k4C@f{}M`~UPw)Orr^kN_IUdJAWP1ameI
zpiG`Z&v2pX#pOXRP4mhDxZB4MbL9?<gbt5<eq8p4M5`5CCABjei&-`PL6EOJ122A*
z*FTHHF9QE7s&NK&_|2jqV=m3Cw8{>-JGhqXB%INYg5ytkxx~d)4jZz~aV6dv5v|w7
zv8qL-wZrTbnmfn|Cvku{H1dVT{hCZgN`~2O>X8wChSVPt<4+O&S>f{+D#Wf8iB1+t
zwa~8bjg_-U55^k$H}SemSs0TYMixnXOUXf~L2OC0cK~q<DJ4j0UZ3U-vhF`G&259&
z?60!!eg3g>PxGcUZ_ei}Y2G$1>^K6I=8iOX4WKwI=aXgmtXR7x*1*X7*6{S-X^3a4
zxgN!UoEtW};bgXap%r}0m9xc*68aFOA63l5L<Z2vd^9mA$rND*3o)C;Xk`eOutYvw
zVJu<<OBuy7mf|XwiwX+R$x3WwmDP~U36Ny&KHe<^Z0P1abm}t|%}qwiGVJD-rZxv^
c<`~EvThIQ}Pawb^5s$e7+|S8+ZRO0r0j@EN2LJ#7

diff --git a/Code/Steiner/CO2-Daten-Projekt-V2/bin/FillTable.class b/Code/Steiner/CO2-Daten-Projekt-V2/bin/FillTable.class
index 538aa18dbae24db8c874e22d79acc7d626e721e0..b1bff87c10024998fe4c8479d93a78f2278fd695 100644
GIT binary patch
delta 1529
zcmZ8hYfKzv6g}U(Sy0$vAzfZ-t<Z-JmA25J(1)6^hQ%txM!=R8Ms_VOWOs-VA1g|w
zv57U#4}Vx25R}A_Sg1wpkLo|8i7^qY^--<w_oKdBrFdp`Z4H~<Z|>ahe&^nE=FIM2
zeX7#;`njXW78h|X{+{+7QBC9SXvA)b-DL@AD?_1GZ6W7Pb;QZmgHE3oND26ob|hhM
z=PxOc<=r&&_9q0gy*M0;_uH0^<2p0}e=ON#4cLuVGT9q%?2mUw)3Bjctv(2Rl7mn2
znSj}C*%#_U@h)pXKy}-PeAt06a_}YE-LjNrw^)(RsFeuCV|Fak!x;jd{fUGX_l6F|
z)BTywjh}Cv0nERUX?8iJSq7G5Gt8DPNvDzPY>Uu&c6x^9Xm7%9inv;t9(fn>e<SFz
z<hFzr*`49i>WpY>@_*%B(miP4cLAlRH{R{cYb%@$dX30A+@rT;Irry}ZM_u=T4A6K
zIk*je>_RCzP>u*H(S@sF;X2%bFk;-f6P<{oAH5hvAMR!S2yCY#a9QeY9EXI9nUAts
zCdMwj1C7|_xCQSrrxGuW6O1&XZpC}N>crlJ_n9-eSBVc8Wnnjf_0SjK*YTlP<c?1W
zH`H;`4Y&ZZf6;|cZy*KfEYS>ngpc{SeSoOo6j?;tS(JB8w78?bv}6vas+9so8iguP
z&ESdxrK(m9s^+V+c&%0oYI4;a-e7T1Q{1SdS})K`Cr~znn@Xz8zBx2h@yIMbuQh^(
z`Oqv9Q}Pr$$k?3Xr5?Fl2ROzcg}4U+3RK9+%J2XxFodh{AjuAq{4nY7!HswrH}l#;
z5!>+yw(xX&dStvsA>7YS%rhcgMiwK9=sWNgBbhz6<7-9=JEXSY8{AHfD^P=PDU7S}
z<@k=<IvW`Hp1X#ptRK<>3WYd_>vd$iYEmw~9BJ9`JdsuQtC8y_v4$#<x+_rA+W+KP
zn^A{S7EM4cnHrWvs)Uut#un$Lj37iPV{711qU}c>9>a1xj+Jn*nz@a5!sELk-OFRd
zVh-=J6y&+yGm^xUMV?h;o;UD=$JaH80r?-OVui%$M~I)CSMm;Se3BkMKo38K5*%c+
zQLMulMSq%tkK+bBLxG>AgD2_U1AIi!;XX_`j(_tdt_M|CZt^^+vA)uCt<F>BIN_Z3
z7bzzxmXm8PEB+a$GbUR{wKPt%*W4GD>nAbjY%`aqnu~&pr`9+cii4`B*BI)GgNhf9
zqbd_+_PUHwWSPH&ClOq_F#*l|Ej%oX(izlI;5}C!VmmsHYc($7dWd(^6k&#jJB&;5
z0#emDLISgB#EX0l=lJMfqA!n<@H9R5vZs7~dhYX1+naHkOh^8~6B6YZ%Dl`0bmLFf
lD}-;uUyM}GN`+7sV9-Tk0qqor-!mwX+&|nioJ_*me*vRVVcP%z

delta 876
zcmZ8fTT4_?7+rhLoXd<+&7`K;kV1)8U>L=eq?tWrbfkv}ymXmzyr9m+%$cmrhCr}V
zG&qIz&_xXFDat6K2k9lEpoi}Fva4NxK#@-CY<+6Zuvy>!Zfmda8!PHx?7cU6b2ODg
z1%6%eUQ=i5&GB`yaHvH<EvT$4tg#=c-C3Tv6^dCKqKTM5n#5*vBw>Z^sFtbd(Cl0K
zlDyYUi8n=KmVvhd?$&6e(ZHC1Q5DUVCGAOlVTsY+6tcE7w}k~Xr$KEcK`b0kv|0i#
z$1=i^`ps+?7x2nn($Fz(=NhYo_iBw%>#<8R23AyK25RBMHq6I%6ksQoA%q}yp&Yxh
z5e=wABO++R9>#T`1)Yf4dS+SjF?}i{gLp!uF}?^-iF9V=;~9~`XrK_<U-(3d*B&8+
zj_3Rn2*8(ufFhym4?IkGftS4U0-_8GivoTA9#bhDMsfse0>%D2*Kv2XdjyN@+nIBc
z)$_95O7RWcA3{}5w(54^AS!aQ-4YHVIE|)#^~QO4{IASmEcoAXfsQwHX#RI*mm&ge
zH#(R~F1<_+3d(qvViwOBtvH!lNJlb(T<pb4wDa}*unGII0|%&G2d#rVJ8_8LVJ7sV
z3u|Q&`6xW3KF+TXkBF!Odhni^E^69MwHtVojy8Ot2yS)>;UkeM6`c!p0)~#X3^9Sa
zDM7P-!{s8aPxx$K@?9)H!mOjTk8!@eoNpfj=;vIHb4oT!a02Ub5++WO@o7%_3=%j?
z{^!WMmkfsN0e@cd3&zQ4Chw;h1sMHRGRntRIc=5oOgU|hRm<^>UY)graQ4HXuSo8P
tM>1ayeF8om-?<JZyv{a!cQ!(<g|iU~SAq|oa!_xsg-&&TP$?IF{sTbJ#3uj%

diff --git a/Code/Steiner/CO2-Daten-Projekt-V2/src/App.java b/Code/Steiner/CO2-Daten-Projekt-V2/src/App.java
index e440e0f..9027ed8 100644
--- a/Code/Steiner/CO2-Daten-Projekt-V2/src/App.java
+++ b/Code/Steiner/CO2-Daten-Projekt-V2/src/App.java
@@ -75,7 +75,6 @@ public class App {
                     case "long":
                         calculateLongerBreakPoints(data, time, roomNumber);
                         break;
-
                     default:
                         break;
                 }
@@ -83,6 +82,7 @@ public class App {
         }
     }
 
+    // #region 5min
     private static int calculateFiveMinuteBreakPoints(List<Co2Data> data, int[] time, int roomNumber) {
         // Calculate the time range for the break (e.g., a 5-minute break)
         int startMinute = time[0];
@@ -117,6 +117,7 @@ public class App {
         return Math.max(points, 0); // Ensure that points don't go below zero
     }
 
+    // #region 5+ min
     private static int calculateLongerBreakPoints(List<Co2Data> data, int[] time, int roomNumber) {
         // Take the time for the entire break
         int startMinute = time[0];
@@ -151,11 +152,12 @@ public class App {
         return Math.max(points, 0); // Ensure that points don't go below zero
     }
 
+    // #region bonus
     private static int calculateBonusPoints(List<Co2Data> data, int[] time, int roomNumber) {
         // Check if the next lesson isn't lunch or the same teacher (if the next lesson
         // is lunch, no bonus points possible)
-        boolean isTeacherChange = isTeacherChange(data, roomNumber); // Check if the teacher is changing
-        boolean isNextLessonLunch = isNextLessonLunch(data, roomNumber);
+        boolean isTeacherChange = isTeacherChange(data, roomNumber, time); // Check if the teacher is changing
+        boolean isNextLessonLunch = FillTable.isNextLessonLunch();
 
         if (!isNextLessonLunch && isTeacherChange) {
             return 5; // Bonus points for teacher switch
@@ -164,15 +166,11 @@ public class App {
         }
     }
 
-    private static boolean isTeacherChange(List<Co2Data> data, int roomNumber) {
-
-        return false; // Placeholder logic
-    }
-
-    private static boolean isNextLessonLunch(List<Co2Data> data, int roomNumber) {
-        // Logic to check if the next lesson is lunch (can be based on time and lesson
-        // schedule)
-        return false; // Placeholder logic
+    // #region checks
+    private static boolean isTeacherChange(List<Co2Data> data, int roomNumber, int[] time) {
+        // go through the lesson table of that day and time for the room
+        // check if the last teacher in the room equals itself or another teacher
+        return false; // Placeholder logic (to be implemented based on the timetable)
     }
 
     private static Co2Data getCo2DataForMinute(List<Co2Data> data, int minute) {
diff --git a/Code/Steiner/CO2-Daten-Projekt-V2/src/FillTable.java b/Code/Steiner/CO2-Daten-Projekt-V2/src/FillTable.java
index 594f5b0..ddad80d 100644
--- a/Code/Steiner/CO2-Daten-Projekt-V2/src/FillTable.java
+++ b/Code/Steiner/CO2-Daten-Projekt-V2/src/FillTable.java
@@ -84,54 +84,7 @@ public class FillTable {
                 "Friday", START_TIMES, END_TIMES, roomIndex);
     }
 
-    static boolean isBreak(int intHour, int intMinute) {
-        // Check if the time is between 7 AM and 5 PM
-        if (intHour >= 7 && intHour <= 17) {
-            // Check if the time falls between any lesson start and end times
-            for (int i = 0; i < START_TIMES.length; i++) {
-                // Split the start and end times into hours and minutes
-                String[] startTime = START_TIMES[i].split(":");
-                String[] endTime = END_TIMES[i].split(":");
-
-                int startHour = Integer.parseInt(startTime[0]);
-                int startMinute = Integer.parseInt(startTime[1]);
-                int endHour = Integer.parseInt(endTime[0]);
-                int endMinute = Integer.parseInt(endTime[1]);
-
-                // Check if the given time is during the current lesson
-                if ((intHour > startHour || (intHour == startHour && intMinute >= startMinute)) &&
-                        (intHour < endHour || (intHour == endHour && intMinute < endMinute))) {
-                    return false; // It's not a break, it's during a lesson
-                }
-            }
-            return true; // If no lessons match, it must be a break
-        }
-
-        return false; // Time is outside of the school hours (7 AM to 6 PM roughly)
-    }
-
-    static String whatBreakIsIt(int intHour, int intMinute) {
-        String whatBreak = "";
-        for (int i = 0; i < END_TIMES.length; i++) {
-            String[] tempEnd = END_TIMES[i].split(":");
-            String[] tempStart = START_TIMES[i].split(":");
-            if (intHour >= Integer.parseInt(tempStart[0]) && intHour <= Integer.parseInt(tempEnd[0])) {
-                if (intMinute >= Integer.parseInt(tempStart[1])
-                        && intMinute <= Integer.parseInt(tempEnd[1])) {
-                    if (Integer.parseInt(tempEnd[1]) - Integer.parseInt(tempStart[1]) == 5) {
-                        whatBreak = "short";
-                    } else if (Integer.parseInt(tempEnd[1]) - Integer.parseInt(tempStart[1]) > 5) {
-                        whatBreak = "long";
-                    } else {
-                        whatBreak = "No Break";
-                    }
-                }
-
-            }
-        }
-        return whatBreak; // If no break is found, return "No Break"
-    }
-
+    // #region Check Methods
     static int[] whatTime(int intHour, int intMinute) {
         int[] result = new int[2]; // [most recent end time, next start time]
         result[0] = -1; // Initialize to -1 (no previous end time found)
@@ -162,4 +115,79 @@ public class FillTable {
 
         return result;
     }
+
+    static boolean isNextLessonLunch(int intHour, int intMinute, int roomIndex) {
+        int currentTimeInMinutes = intHour * 60 + intMinute;
+        int nextLessonIndex = getNextLessonIndex(currentTimeInMinutes, roomIndex);
+
+        if (nextLessonIndex == -1) {
+            return false;
+        }
+
+        String nextLessonStartTime = START_TIMES[nextLessonIndex];
+        String[] nextLessonStartParts = nextLessonStartTime.split(":");
+        int nextLessonStartInMinutes = Integer.parseInt(nextLessonStartParts[0]) * 60
+                + Integer.parseInt(nextLessonStartParts[1]);
+
+        if (nextLessonStartInMinutes > currentTimeInMinutes) {
+            String teacherShortName = App.timeTable[roomIndex][getDayIndex("Monday")][nextLessonIndex]
+                    .getTeacherInitials();
+            return teacherShortName.equals("Lunch");
+        }
+
+        return false;
+    }
+
+    private static int getNextLessonIndex(int currentTimeInMinutes, int roomIndex) {
+        for (int i = 0; i < START_TIMES.length; i++) {
+            String[] startParts = START_TIMES[i].split(":");
+            int startTimeInMinutes = Integer.parseInt(startParts[0]) * 60 + Integer.parseInt(startParts[1]);
+
+            if (startTimeInMinutes > currentTimeInMinutes) {
+                return i;
+            }
+        }
+
+        return -1;
+    }
+
+    static boolean isBreak(int intHour, int intMinute) {
+        if (intHour >= 7 && intHour <= 17) {
+            for (int i = 0; i < START_TIMES.length; i++) {
+                String[] startTime = START_TIMES[i].split(":");
+                String[] endTime = END_TIMES[i].split(":");
+
+                int startHour = Integer.parseInt(startTime[0]);
+                int startMinute = Integer.parseInt(startTime[1]);
+                int endHour = Integer.parseInt(endTime[0]);
+                int endMinute = Integer.parseInt(endTime[1]);
+
+                if ((intHour > startHour || (intHour == startHour && intMinute >= startMinute)) &&
+                        (intHour < endHour || (intHour == endHour && intMinute < endMinute))) {
+                    return false;
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+
+    static String whatBreakIsIt(int intHour, int intMinute) {
+        String whatBreak = "";
+        for (int i = 0; i < END_TIMES.length; i++) {
+            String[] tempEnd = END_TIMES[i].split(":");
+            String[] tempStart = START_TIMES[i].split(":");
+            if (intHour >= Integer.parseInt(tempStart[0]) && intHour <= Integer.parseInt(tempEnd[0])) {
+                if (intMinute >= Integer.parseInt(tempStart[1])
+                        && intMinute <= Integer.parseInt(tempEnd[1])) {
+                    if (Integer.parseInt(tempEnd[1]) - Integer.parseInt(tempStart[1]) == 5) {
+                        whatBreak = "short";
+                    } else if (Integer.parseInt(tempEnd[1]) - Integer.parseInt(tempStart[1]) > 5) {
+                        whatBreak = "long";
+                    }
+                }
+            }
+        }
+        return whatBreak;
+    }
 }