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 7220423..6b89eee 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
@@ -101,8 +101,8 @@ private void handleSendMessage(ActionEvent event) {
DatabaseConnection conn = new DatabaseConnection();
MessageDAO messageDAO = new MessageDAO(conn);
Charity charity = authToken.isCharityUser();
- Message message = new Message(title, authToken.isCharityUser(), content);
- messageDAO.addMessage(message);
+ Message messageStaticId = new Message(title, authToken.isCharityUser(), content);
+ messageDAO.addMessage(messageStaticId);
showAlert(Alert.AlertType.INFORMATION, "Sent!", "Your message has been sent to all donors.");
messageTitleField.clear();
messageContentField.clear();
diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileUser/profileUserHistoryController.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileUser/profileUserHistoryController.java
index 59a6556..32b11a9 100644
--- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileUser/profileUserHistoryController.java
+++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/profileUser/profileUserHistoryController.java
@@ -21,6 +21,7 @@
import java.io.IOException;
import java.util.List;
+import java.util.stream.Collectors;
public class profileUserHistoryController extends BaseController {
@FXML
@@ -58,6 +59,8 @@ public void populateFields() {
DatabaseConnection conn = new DatabaseConnection();
DonationSelect donationSelect = new DonationSelect(conn);
DonationRegistry donationRegistry = donationSelect.getDonationForUser(authToken.getCurrentUser().getId().toString());
+ double ammount = donationRegistry.getAllDonations().stream().mapToDouble(d->d.getAmount()).sum();
+ totalAmmount.setText(String.valueOf(ammount));
displayDonations(donationRegistry);
}
diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DAO/MessageDAO.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DAO/MessageDAO.java
index dc7adf3..8545863 100644
--- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DAO/MessageDAO.java
+++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DAO/MessageDAO.java
@@ -10,6 +10,7 @@
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
+import java.util.UUID;
public class MessageDAO {
private final DatabaseConnection connection;
@@ -32,7 +33,7 @@ public boolean addMessage(Message message){
PreparedStatement stmt = conn.prepareStatement(sql)) {
for (String donorId : donorIds) {
- stmt.setString(1, message.getId().toString());
+ stmt.setString(1, UUID.randomUUID().toString());
stmt.setString(2, message.getTitle());
stmt.setString(3, message.getContent());
stmt.setDate(4, Date.valueOf(message.getTimeAndDate()));
diff --git a/helpmehelpapplication/src/main/resources/fxml/profile_user_history.fxml b/helpmehelpapplication/src/main/resources/fxml/profile_user_history.fxml
index c7e931f..e417c2b 100644
--- a/helpmehelpapplication/src/main/resources/fxml/profile_user_history.fxml
+++ b/helpmehelpapplication/src/main/resources/fxml/profile_user_history.fxml
@@ -165,7 +165,7 @@
-
+