From 3d48338b293e67bb000c46d2ab5463506577947a Mon Sep 17 00:00:00 2001 From: AdrianBalunan Date: Wed, 22 Apr 2026 16:46:45 +0200 Subject: [PATCH 1/5] Fix: non final role and setmethod, also authtoken changes --- .../ntnu/systemutvikling/team6/models/user/User.java | 10 +++++++++- .../team6/service/AuthenticationService.java | 3 +++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/user/User.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/user/User.java index 20e1663..fde91f9 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/user/User.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/user/User.java @@ -20,7 +20,7 @@ public class User { private String username; private String email; private String passwordHash; - private final Role role; + private Role role; private Settings settings; private Inbox inbox; @@ -200,4 +200,12 @@ public void setInbox(Inbox inbox) { } this.inbox = inbox; } + + public void setRole(Role role) { + if (role == null) { + throw new IllegalArgumentException("Inbox cannot be null"); + } + this.role = role; + } } + diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/service/AuthenticationService.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/service/AuthenticationService.java index cd9cbc2..032d138 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/service/AuthenticationService.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/service/AuthenticationService.java @@ -55,6 +55,9 @@ public boolean login(String email, String password){ if (user != null){ currentUser = user; isCharityUser = userDataReader.getUserCharityUser(currentUser.getId().toString()); + if (isCharityUser != null){ + currentUser.setRole(Role.CHARITY_USER); + } System.out.println("User gotten"); return true; } From b9b2367fed5c6f1e3e3d97eebc8f0e3adadd8b13 Mon Sep 17 00:00:00 2001 From: AdrianBalunan Date: Wed, 22 Apr 2026 17:14:05 +0200 Subject: [PATCH 2/5] 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 @@ - + + + - - - + + - + + + - - - + + - - - + + - - - - - - + + + + + + + + + + + From b4b1b13472764c37b39c3be0db48fd585ce7bbed Mon Sep 17 00:00:00 2001 From: AdrianBalunan Date: Wed, 22 Apr 2026 18:45:02 +0200 Subject: [PATCH 4/5] Fixes: Fixed org_editPage page displaying wrongly, and fixed sidebar on org moving to user-side settings not org-side settings --- .../profileOrgEditController.java | 5 +- .../profileOrgInboxController.java | 2 +- .../profileOrgPaymentsController.java | 2 +- .../resources/fxml/profile_org_Payments.fxml | 10 -- .../main/resources/fxml/profile_org_edit.fxml | 147 ++++++++---------- 5 files changed, 74 insertions(+), 92 deletions(-) diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgEditController.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgEditController.java index 5ad1d17..12c0094 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgEditController.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgEditController.java @@ -25,7 +25,9 @@ public class profileOrgEditController extends BaseController { @FXML private NavbarController navbarController; + @FXML private Label charityNameLabel; + @FXML private Label charityNameLabel2; @FXML private TextArea descriptionField; @Override @@ -50,6 +52,7 @@ protected void authTokenisSet() { private void populateFields(){ Charity usersCharity = authToken.isCharityUser(); charityNameLabel.setText(usersCharity.getName()); + charityNameLabel2.setText(usersCharity.getName()); descriptionField.setText(usersCharity.getDescription()); } @@ -99,7 +102,7 @@ private void switchToFeedbackPage(ActionEvent event){ @FXML private void switchToSettingsPage(ActionEvent event){ - LoaderScene.LoadScene("profile_user_Settings", event, null, null, authToken); + LoaderScene.LoadScene("profile_org_Settings", event, null, null, authToken); } diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgInboxController.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgInboxController.java index 6b89eee..40d8549 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgInboxController.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgInboxController.java @@ -125,7 +125,7 @@ private void switchToEditPage(ActionEvent event) { @FXML private void switchToSettingsPage(ActionEvent event) { - LoaderScene.LoadScene("profile_user_Settings", event, null, null, authToken); + LoaderScene.LoadScene("profile_org_Settings", event, null, null, authToken); } diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgPaymentsController.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgPaymentsController.java index de65107..e1baa79 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgPaymentsController.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileCharity/profileOrgPaymentsController.java @@ -92,7 +92,7 @@ private void switchToFeedbackPage(ActionEvent event){ @FXML private void switchToSettingsPage(ActionEvent event){ - LoaderScene.LoadScene("profile_user_Settings", event, null, null, authToken); + LoaderScene.LoadScene("profile_org_Settings", event, null, null, authToken); } diff --git a/helpmehelpapplication/src/main/resources/fxml/profile_org_Payments.fxml b/helpmehelpapplication/src/main/resources/fxml/profile_org_Payments.fxml index e63aa4d..9bd4e1f 100644 --- a/helpmehelpapplication/src/main/resources/fxml/profile_org_Payments.fxml +++ b/helpmehelpapplication/src/main/resources/fxml/profile_org_Payments.fxml @@ -147,16 +147,6 @@ - - - - - - diff --git a/helpmehelpapplication/src/main/resources/fxml/profile_org_edit.fxml b/helpmehelpapplication/src/main/resources/fxml/profile_org_edit.fxml index 0ec3088..a17a1cf 100644 --- a/helpmehelpapplication/src/main/resources/fxml/profile_org_edit.fxml +++ b/helpmehelpapplication/src/main/resources/fxml/profile_org_edit.fxml @@ -1,14 +1,12 @@ - - - - + + @@ -20,12 +18,11 @@ - - + @@ -34,15 +31,15 @@ - + - + - + @@ -55,7 +52,7 @@ -