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 @@ -