From 6afdd4e5170ea209e02457b914c01d6c7ca74fba Mon Sep 17 00:00:00 2001 From: AdrianBalunan Date: Fri, 13 Mar 2026 18:49:08 +0100 Subject: [PATCH] Feat: Frontpage is now 100% navigiaontal on has some working buttons --- .../team6/controller/FrontpageController.java | 4 +- .../OrganizationCardController.java | 43 +++++++++++++++++-- .../main/resources/fxml/organizationCard.fxml | 19 ++++---- 3 files changed, 50 insertions(+), 16 deletions(-) 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 3ae3ca0..bf648a0 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java @@ -46,8 +46,8 @@ public void initialize() { OrganizationCardController cardController = loader.getController(); - System.out.println("Added Name: " + ch.getName() + " Added Description: " + ch.getDescription()); - cardController.setOrganization(ch.getName(), ch.getDescription()); + // System.out.println("Added Name: " + ch.getName() + " Added Description: " + ch.getDescription()); + cardController.setOrganization(ch); cardsContainer.getChildren().add(card); } diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/OrganizationCardController.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/OrganizationCardController.java index 86090ce..5de24a9 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/OrganizationCardController.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/OrganizationCardController.java @@ -1,7 +1,18 @@ package ntnu.systemutvikling.team6.controller; +import javafx.event.ActionEvent; import javafx.fxml.FXML; +import javafx.fxml.FXMLLoader; +import javafx.scene.Node; +import javafx.scene.Parent; +import javafx.scene.Scene; import javafx.scene.control.Label; +import javafx.stage.Stage; +import ntnu.systemutvikling.team6.HmHApplication; +import ntnu.systemutvikling.team6.models.Charity; + +import java.io.IOException; +import java.util.Objects; public class OrganizationCardController { @@ -9,8 +20,34 @@ public class OrganizationCardController { @FXML private Label organizationDescription; - public void setOrganization(String name, String description) { - organizationName.setText(name); - organizationDescription.setText(description); + private Charity charity; + + public void setOrganization(Charity charity) { + this.charity = charity; + + organizationName.setText(charity.getName()); + organizationDescription.setText(charity.getDescription()); + } + + /* EVENTS */ + public void switchToCharityPage(ActionEvent event){ + try { + FXMLLoader fxmlLoader = + new FXMLLoader(HmHApplication.class.getResource("/fxml/charityPage.fxml")); + Parent root = fxmlLoader.load(); + CharityPageController controller = fxmlLoader.getController(); + controller.setCharity(charity); + + Stage stage = (Stage) ((Node)event.getSource()).getScene().getWindow(); + Scene scene = new Scene(root); + stage.setScene(scene); + stage.setFullScreen(true); + stage.show(); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + public void switchToDonationPage(ActionEvent event){ + CharityPageController.loadNewScene(event, charity); } } diff --git a/helpmehelpapplication/src/main/resources/fxml/organizationCard.fxml b/helpmehelpapplication/src/main/resources/fxml/organizationCard.fxml index 73616b8..47ddc78 100644 --- a/helpmehelpapplication/src/main/resources/fxml/organizationCard.fxml +++ b/helpmehelpapplication/src/main/resources/fxml/organizationCard.fxml @@ -1,15 +1,12 @@ - - - - - - - - + + + + + - + @@ -30,8 +27,8 @@ -