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 9c32776..815ff01 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java @@ -54,6 +54,7 @@ public class FrontpageController extends BaseController{ protected void authTokenisSet(){ navbarController.setAuthToken(authToken); footerController.setAuthToken(authToken); + loadPage(); } /** @@ -66,6 +67,10 @@ protected void authTokenisSet(){ */ @FXML public void initialize() { + + } + + private void loadPage(){ try { DatabaseConnection conn = new DatabaseConnection(); CharitySelect cdb = new CharitySelect(conn); @@ -87,15 +92,15 @@ public void initialize() { Total_Orgnisasjon.setText(Integer.toString(charitiesSize)); Total_Donations.setText( - Double.toString( - donations.getAllDonations().stream().mapToDouble(Donation::getAmount).sum())); + Double.toString( + donations.getAllDonations().stream().mapToDouble(Donation::getAmount).sum())); PreApproved_Percentage.setText( - String.format( - "%.2f", - charities.getAllCharities().stream().filter(Charity::getPreApproved).count() - * 100.0 - / charitiesSize) - + "%"); + String.format( + "%.2f", + charities.getAllCharities().stream().filter(Charity::getPreApproved).count() + * 100.0 + / charitiesSize) + + "%"); } catch (Exception e) { e.printStackTrace(); } diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/OrganizationCardController.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/OrganizationCardController.java index df70bb2..3d7c53e 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/OrganizationCardController.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/OrganizationCardController.java @@ -10,7 +10,7 @@ * looped upon in FronpageController. It is used to display the name and description of a charity, * and to switch to the charity page or donation page when the user clicks on the card. */ -public class OrganizationCardController extends BaseController{ +public class OrganizationCardController extends BaseController { @FXML private Label organizationName; @@ -36,6 +36,7 @@ public void switchToCharityPage(ActionEvent event) { } public void switchToDonationPage(ActionEvent event) { + System.out.println(authToken.getCurrentUser().getId().toString()); LoaderScene.LoadScene("DonationPage", event, charity, null, authToken); }