Fixes: Syntax sql fix, able to reopen it after disselecting, and cate…

…gories appear with a little style.
cathrkri · Apr 22, 2026 · b9b2367 · b9b2367
1 parent 3d48338
commit b9b2367
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java
@@ -46,6 +46,12 @@ public void start(Stage stage) throws Exception {
     stage.setFullScreen(true);
 
     stage.show();
+    // Re-enter fullscreen when restored from taskbar
+    stage.iconifiedProperty().addListener((obs, wasIconified, isNowIconified) -> {
+      if (!isNowIconified) {
+        stage.setFullScreen(true);
+      }
+    });
   }
 
   @Override
@@ -78,9 +84,8 @@ public void init() {
            */
 
         // Comment out the two below to use already generated database.
-        CharityRegistry charityRegistry = scraper.getAPIAndURLCharityData();
-
-        db.addAPIDataToTable(charityRegistry.getAllCharities());
+        //CharityRegistry charityRegistry = scraper.getAPIAndURLCharityData();
+        //db.addAPIDataToTable(charityRegistry.getAllCharities());
       }
     } catch (Exception e) {
       e.printStackTrace();

diff --git a/...papplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java b/...papplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java
@@ -86,6 +86,7 @@ private void loadPage(){
 
       for (String category : categories) {
         CheckBox cb = new CheckBox(category);
+        cb.setStyle("-fx-font-size: 12; -fx-padding: 10 0 0 20; -fx-text-fill: black" );
 
         cb.setOnAction(
             e -> {

diff --git a/...plication/src/main/java/ntnu/systemutvikling/team6/controller/components/LoaderScene.java b/...plication/src/main/java/ntnu/systemutvikling/team6/controller/components/LoaderScene.java
@@ -73,6 +73,12 @@ public static void LoadScene(String sceneName, Stage stage, Charity charity, Str
       stage.setScene(scene);
       stage.setFullScreen(true);
       stage.show();
+      // Re-enter fullscreen when restored from taskbar
+      stage.iconifiedProperty().addListener((obs, wasIconified, isNowIconified) -> {
+        if (!isNowIconified) {
+          stage.setFullScreen(true);
+        }
+      });
     } catch (IOException e) {
       throw new RuntimeException(e);
     }

diff --git a/...papplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/CharitySelect.java b/...papplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/CharitySelect.java
@@ -69,7 +69,7 @@ public CharityRegistry getCharitiesFromDB() {
           LEFT JOIN User u ON f.user_id = u.UUID_user
           LEFT JOIN Charity_Categories cc ON cc.Charities_UUID_charities = c.UUID_charities
           LEFT JOIN Categories cat ON cat.category_id = cc.Categories_category_id
-          INNER JOIN CharityVanity cv ON cv.UUID_charity = c.UUID_charities;
+          INNER JOIN CharityVanity cv ON cv.UUID_charity = c.UUID_charities
           ORDER BY c.UUID_charities;
           """;
       Statement stmt = conn.createStatement();

diff --git a/helpmehelpapplication/src/main/resources/fxml/frontPage.fxml b/helpmehelpapplication/src/main/resources/fxml/frontPage.fxml
@@ -130,7 +130,7 @@
                   <padding><Insets top="10.0" /></padding>
                   <children>
                      <!-- FILTER SIDEBAR -->
-                     <VBox prefWidth="160.0"
+                     <VBox fx:id="categoryList" prefWidth="160.0"
                            style="-fx-background-color: transparent; -fx-border-color: #2F8F8B; -fx-border-radius: 10; -fx-border-width: 2;">
                         <children>
                            <Label textFill="black" text="Categories:">