Reverse commit: Refer to the commit about the revesere commit

cathrkri · Apr 16, 2026 · 1c798f9 · 1c798f9
1 parent 94ca5ac
commit 1c798f9
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/docs/SqlDatabase/ER-DiagramFile.mwb b/docs/SqlDatabase/ER-DiagramFile.mwb
diff --git a/docs/SqlDatabase/ER-DiagramFile.mwb.bak b/docs/SqlDatabase/ER-DiagramFile.mwb.bak
diff --git a/...papplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/CharitySelect.java b/...papplication/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<Feedback> 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<Feedback> 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"),