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 a3b5d324..cb39b223 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,13 +60,13 @@ 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_name, u.user_email, u.user_password, u.role, + u.UUID_user, u.user_displayname, 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 LEFT JOIN User u ON f.user_id = u.UUID_user LEFT JOIN Charity_Categories cc ON cc.Charities_UUID_charities = c.UUID_charities - LEFT JOIN Cateegories cat ON cat.category_id = cc.Categories_category_id + LEFT JOIN Cat|egories cat ON cat.category_id = cc.Categories_category_id INNER JOIN CharityVanity cv ON cv.UUID_charity = c.UUID_charities; """; Statement stmt = conn.createStatement(); @@ -110,6 +110,7 @@ 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"), @@ -158,7 +159,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_name, u.user_email, u.user_password, u.role + u.UUID_user, u.user_displayname, 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 = ?; @@ -171,6 +172,7 @@ 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"),