From b9b2367fed5c6f1e3e3d97eebc8f0e3adadd8b13 Mon Sep 17 00:00:00 2001 From: AdrianBalunan Date: Wed, 22 Apr 2026 17:14:05 +0200 Subject: [PATCH] Fixes: Syntax sql fix, able to reopen it after disselecting, and categories appear with a little style. --- .../ntnu/systemutvikling/team6/HmHApplication.java | 11 ++++++++--- .../team6/controller/FrontpageController.java | 1 + .../team6/controller/components/LoaderScene.java | 6 ++++++ .../team6/database/Readers/CharitySelect.java | 2 +- .../src/main/resources/fxml/frontPage.fxml | 2 +- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java index 1026c20..0f4a58b 100644 --- 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/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java index a4bd599..041f32d 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java +++ b/helpmehelpapplication/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/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/LoaderScene.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/LoaderScene.java index d9ec09a..1c61e22 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/LoaderScene.java +++ b/helpmehelpapplication/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/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/CharitySelect.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/CharitySelect.java index 640d90c..3c81035 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/CharitySelect.java +++ b/helpmehelpapplication/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 index 1e095ea..a564a0b 100644 --- a/helpmehelpapplication/src/main/resources/fxml/frontPage.fxml +++ b/helpmehelpapplication/src/main/resources/fxml/frontPage.fxml @@ -130,7 +130,7 @@ -