From 4c99a1e399eca6b10816bb7d54a6333b4a2ad9e2 Mon Sep 17 00:00:00 2001
From: Sage The DM <luca.burger@grischuni.net>
Date: Thu, 14 Nov 2024 15:05:41 +0100
Subject: [PATCH] dear god help me

---
 .../CO2-Daten-Projekt-V2/bin/App.class        | Bin 6973 -> 7223 bytes
 .../CO2-Daten-Projekt-V2/bin/FillTable.class  | Bin 5157 -> 4623 bytes
 .../Steiner/CO2-Daten-Projekt-V2/src/App.java |  36 +++++++++++-------
 .../CO2-Daten-Projekt-V2/src/FillTable.java   |  35 +----------------
 4 files changed, 23 insertions(+), 48 deletions(-)

diff --git a/Code/Steiner/CO2-Daten-Projekt-V2/bin/App.class b/Code/Steiner/CO2-Daten-Projekt-V2/bin/App.class
index d0a7ed6b1dd7b105c44da3bc7ed0eb4f502663a0..d32077e6087db2f09836c3b5423f03a817741143 100644
GIT binary patch
delta 2877
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

delta 2598
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
bN-FE5E&O`*%v!h7wJfCGwCxn8>yh_AGP@X(

diff --git a/Code/Steiner/CO2-Daten-Projekt-V2/bin/FillTable.class b/Code/Steiner/CO2-Daten-Projekt-V2/bin/FillTable.class
index d226863c442d91c04883609a56755ab59215cc31..ed665e75b9be72b92720ac62310b68d6f070ed1c 100644
GIT binary patch
delta 150
zcmZ3g(XYaF>ff$?3=9mm3=cMP^|R@VYj}EkYWid)mL=-vB<7{-2bUCO=A~P6Fx+8e
z;PA^=a4Jeo%w}X@%gifrNvzx~&Hjtam%)*Nk%1X#3bWAd4M2*C!5&Dm0R<Tt3K<-L
jqyj{m;Sxg{kOx%Aa2dz~$ul$D1+tic?0Y~S6T^J~xg{VF

delta 694
zcmXYu+e=hY6vlu1TxZTqY2sAlB?^M9hlqI)Qq&L%G%G@JUZgNRsb~((jA24eHPe+q
z>ZQv=I9>25(1Iy?u(!mhm+ny6&8~lfNYgqqoy%I^x4z9<-`;zC{hb=;>EA~)Km&iK
zopH-tS<}+8@v>E(it-`IN4gZjJ~!E(?2acp1`fFnQ9cFv><Nwt+lPC-vX8F{v%NnS
zPx@F;_;$zEHpkuWK}BH5O(bH&EyKO;sKP2TS<%*3sMkxM_Si_g$K5e7<SLd+8tUl2
zKW{BKDa}A9DE6M|4U;_98z;G|*BX;txyRnBNOdG+MC#12`Gj=X%<;Y~og;poQjg3R
z$Th68^i)xt%`sPJ6}1Ak!<HU-$n#oX*fI*hAGV7XCu|#$l&1wMLcUv+NSt6zWyqgp
zbw$X@dKG7aU}Y$9Q)Yab$`~qS{I@le%^%3<s=7dh?8#`VN{GOwvTsweA)O|P`&cD0
zj!6QCB&Cc{#Szvq%4UwHsAr5uj?v0-Iyu39PSVdQ4wDw;j8x8Yk#k(-JU6&NR+>yp
zvl(eR$0fE&`?2B)@`8iH<Scn9NTD%{D@eoU0eymWmT{Z!f()^7n$!<|inms|^BydD
zJK0IEWLu0h^GX)_#LiY;3-XJpExZxr$jA-66%=4l1~wB|!c<Eb@_TucO;pRXi=grz
eVK(pN^9ZcSizU;;<-)W@N)}}YieJ)7<M%&~*QJ#J

diff --git a/Code/Steiner/CO2-Daten-Projekt-V2/src/App.java b/Code/Steiner/CO2-Daten-Projekt-V2/src/App.java
index f79b847..5222634 100644
--- a/Code/Steiner/CO2-Daten-Projekt-V2/src/App.java
+++ b/Code/Steiner/CO2-Daten-Projekt-V2/src/App.java
@@ -41,12 +41,16 @@ public class App {
             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);
+                String whatBreak = FillTable.whatBreakIsIt(intHour, intMinute, intDay);
 
                 switch (whatBreak) {
                     case "short":
-
+                        calculateFiveMinuteBreakPoints(co2Data);
+                        break;
+                    case "long":
+                        calculateLongerBreakPoints(co2Data);
                         break;
 
                     default:
@@ -57,11 +61,12 @@ public class App {
     }
 
     private static int calculateFiveMinuteBreakPoints(Co2Data data) {
-
+        calculateBonusPoints(data);
         return 5;
     }
 
     private static int calculateLongerBreakPoints(Co2Data data) {
+        calculateBonusPoints(data);
         return 10;
     }
 
@@ -152,6 +157,7 @@ public class App {
             // debbugingValueLists(room38Data);
             // debbugingValueLists(room39Data);
         } else {
+            System.out.println("Calculations in process please do not shut off...");
             fillInTimeTable();
             initializeTeachers();
             calculatePoints(room37Data);
@@ -159,19 +165,21 @@ public class App {
             calculatePoints(room39Data);
             sortTeachers();
             printTeachers();
+            while (true) {
+                int userInput = getUserInput(
+                        "Do you want to see how the points were calculated? (Yes 1, No 0; anything is an error)");
 
-            int userInput = getUserInput(
-                    "Do you want to see how the points were calculated? (Yes 1, No 0; anything is an error)");
-
-            if (userInput == 1) {
-                printExplanation();
-                printShutDown();
-            } else if (userInput == 0) {
-                printShutDown();
-            } else {
-                System.out.println("Invalid input. Please enter 1 for Yes or 0 for No.");
+                if (userInput == 1) {
+                    printExplanation();
+                    printShutDown();
+                    break;
+                } else if (userInput == 0) {
+                    printShutDown();
+                    break;
+                } else {
+                    System.out.println("Invalid input. Please enter 1 for Yes or 0 for No.");
+                }
             }
-
             scanner.close();
         }
     }
diff --git a/Code/Steiner/CO2-Daten-Projekt-V2/src/FillTable.java b/Code/Steiner/CO2-Daten-Projekt-V2/src/FillTable.java
index 25f9aed..5dfd4b4 100644
--- a/Code/Steiner/CO2-Daten-Projekt-V2/src/FillTable.java
+++ b/Code/Steiner/CO2-Daten-Projekt-V2/src/FillTable.java
@@ -109,40 +109,7 @@ public class FillTable {
         return false; // Time is outside of the school hours (7 AM to 6 PM roughly)
     }
 
-    static String whatBreakIsIt(int intHour, int intMinute) {
-        // Iterate through the timetable for all rooms and days
-        for (int roomIndex = 0; roomIndex < App.timeTable.length; roomIndex++) {
-            for (int dayIndex = 0; dayIndex < App.timeTable[roomIndex].length; dayIndex++) {
-                for (int lessonIndex = 0; lessonIndex < App.timeTable[roomIndex][dayIndex].length; lessonIndex++) {
-                    Lesson lesson = App.timeTable[roomIndex][dayIndex][lessonIndex];
-                    if (lesson != null) {
-                        // Check if this lesson is labeled as "Lunch"
-                        if (lesson.getStartTime().equals("Lunch")
-                                || lesson.getEndTime().equals("Lunch")) {
-                            return "Lunch"; // It's lunch time
-                        }
-                        // Check if the time is between any lessons (a short break)
-                        String[] startTime = lesson.getStartTime().split(":");
-                        String[] endTime = lesson.getEndTime().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 "Short"; // It is a short break (between lessons)
-                        }
-                    }
-                }
-            }
-        }
-
+    static String whatBreakIsIt(int intHour, int intMinute, int intDay) {
         return "No Break"; // If no break is found, return "No Break"
     }
-
 }