diff --git a/docs/SqlDatabase/ER-DiagramFile.mwb b/docs/SqlDatabase/ER-DiagramFile.mwb index c43ee85..babd305 100644 Binary files a/docs/SqlDatabase/ER-DiagramFile.mwb and b/docs/SqlDatabase/ER-DiagramFile.mwb differ diff --git a/docs/SqlDatabase/ER-DiagramFile.mwb.bak b/docs/SqlDatabase/ER-DiagramFile.mwb.bak index c348da3..c43ee85 100644 Binary files a/docs/SqlDatabase/ER-DiagramFile.mwb.bak and b/docs/SqlDatabase/ER-DiagramFile.mwb.bak differ 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 c59db00..4f5eeab 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 @@ -60,7 +60,7 @@ public CharityRegistry getCharitiesFromDB() { c.UUID_charities, c.org_number, c.pre_approved, c.status, f.UUID_feedback, f.feedback_comment, f.feedback_date, f.isAnonymous, f.charity_id, f.user_id, cv.charity_name, cv.charity_link, cv.description, cv.logoURL, cv.key_values, cv.logoBLOB, - u.UUID_user, u.user_displayname, u.user_name, u.user_email, u.user_password, u.role, + u.UUID_user, u.user_name, u.user_email, u.user_password, u.role, cat.category FROM Charities c LEFT JOIN Feedback f ON f.charity_id = c.UUID_charities @@ -110,7 +110,6 @@ public CharityRegistry getCharitiesFromDB() { User userWithMinimalSettingsAndInbox = new User( rs.getString("UUID_User"), - rs.getString("user_displayname"), rs.getString("user_name"), rs.getString("user_email"), rs.getString("user_password"), @@ -159,7 +158,7 @@ public ArrayList getFeedbackforCharityUUID(String charity_uuid) { """ SELECT f.UUID_feedback, f.feedback_comment, f.feedback_date, f.isAnonymous, f.charity_id, f.user_id, - u.UUID_user, u.user_displayname, u.user_name, u.user_email, u.user_password, u.role + u.UUID_user, u.user_name, u.user_email, u.user_password, u.role FROM Feedback f LEFT JOIN User u ON f.user_id = u.UUID_user WHERE f.charity_id = ?; @@ -172,7 +171,6 @@ public ArrayList getFeedbackforCharityUUID(String charity_uuid) { User userWithSettingsAndNoInbox = new User( rs.getString("UUID_User"), - rs.getString("user_displayname"), rs.getString("user_name"), rs.getString("user_email"), rs.getString("user_password"),