From 787f4de21f6883884f427a7717643bfc09bdae38 Mon Sep 17 00:00:00 2001 From: JJChong777 Date: Sun, 26 Nov 2023 13:38:15 +0800 Subject: [PATCH 1/6] Update ProfileView.java --- src/views/ProfileView.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/views/ProfileView.java b/src/views/ProfileView.java index 3d19c32..557e5d9 100644 --- a/src/views/ProfileView.java +++ b/src/views/ProfileView.java @@ -12,26 +12,26 @@ import models.CommitteeMember; public class ProfileView implements ProfileViewable { - - private static final CurrentUserDao currentUserDao = new CurrentUserDaoImpl(); - + + private static final CurrentUserDao currentUserDao = new CurrentUserDaoImpl(); + public void view() { - + User currentUser = currentUserDao.getCurrentUser(); CommitteeMember committeeMember; - + PrintUtil.header("User Profile"); - System.out.printf("%-10s: %s\n","User ID" , currentUser.getUserID()); + System.out.printf("%-10s: %s\n", "User ID", currentUser.getUserID()); System.out.printf("%-10s: %s\n", "Name", currentUser.getName()); - System.out.printf("%-10s: %s\n", "Format", currentUser.getFaculty()); + System.out.printf("%-10s: %s\n", "Faculty", currentUser.getFaculty()); System.out.printf("%-10s: %s", "Role", Role.toString(currentUser.getRole())); - + if (currentUser.getRole() == Role.COMMITTEE) { committeeMember = (CommitteeMember) currentUser; System.out.printf(" of %s\n", committeeMember.getFacilitatingCamp()); System.out.printf("%-10s: %d\n", "Points", committeeMember.getPoints()); } - + System.out.println("\n"); } } \ No newline at end of file From 75f577a5605af06fad2fb90b05bf1bfe19911919 Mon Sep 17 00:00:00 2001 From: JJChong777 Date: Sun, 26 Nov 2023 14:54:57 +0800 Subject: [PATCH 2/6] fix up enquiry views --- src/views/StaffEnquiryView.java | 16 ++++++++++------ src/views/StudentEnquiryView.java | 28 +++++++--------------------- 2 files changed, 17 insertions(+), 27 deletions(-) diff --git a/src/views/StaffEnquiryView.java b/src/views/StaffEnquiryView.java index c6edcc1..7be7b66 100644 --- a/src/views/StaffEnquiryView.java +++ b/src/views/StaffEnquiryView.java @@ -13,6 +13,7 @@ import models.Enquiry; import models.Staff; import models.Student; +import utils.PrintUtil; public class StaffEnquiryView implements EnquiryViewable { public void view() { @@ -24,15 +25,18 @@ public void view() { Map studentsMap = studentDao.getStudents(); for (String createdCampID : staff.getCreatedCamps()) { Camp createdCamp = campsMap.get(createdCampID); - System.out.printf("===== %s Enquiries =====\n", createdCamp.getName()); + PrintUtil.header("Enquiries for created camps"); for (Enquiry enq : createdCamp.getEnquiries().values()) { - System.out.printf("***** Enquiry %d from $s*****\n", enq.getEnquiryID(), - studentsMap.get(enq.getEnquirer())); - System.out.printf("%s\n", enq.getEnquiry()); + System.out.println("-".repeat(29)); + System.out.printf("%-10s: %s\n", "Enquiry ID", enq.getEnquiryID()); + System.out.printf("%-10s: %s\n", "Enquirer", studentsMap.get(enq.getEnquirer())); + System.out.printf("%-10s: %s\n", "Camp", createdCampID); + System.out.printf("%-10s: %s\n", "Enquiry", enq.getEnquiry()); if (enq.getReplier() != null) { - System.out.printf("~~~~~ Replied by: %s ~~~~~\n", enq.getReplier()); - System.out.printf("%s\n", enq.getReply()); + System.out.printf("%-10s: %s\n", "Replier", enq.getReplier()); + System.out.printf("%-10s: %s\n", "Reply", enq.getReply()); } + System.out.println(); } } } diff --git a/src/views/StudentEnquiryView.java b/src/views/StudentEnquiryView.java index ed8f995..c3c37c9 100644 --- a/src/views/StudentEnquiryView.java +++ b/src/views/StudentEnquiryView.java @@ -18,7 +18,7 @@ public class StudentEnquiryView implements EnquiryViewable { private static final CampDao campDao = new CampDaoImpl(); private static final CurrentUserDao currentUserDao = new CurrentUserDaoImpl(); - + public void view() { String campName; @@ -27,7 +27,7 @@ public void view() { Map campEnquiryData; Map campsData = campDao.getCamps(); Student student = (Student) currentUserDao.getCurrentUser(); - + PrintUtil.header("My Enquiries"); for (Map.Entry> entry : student.getEnquiries().entrySet()) { campName = entry.getKey(); @@ -36,12 +36,12 @@ public void view() { for (Integer enquiryID : studentCampEnquiryIDList) { enquiry = campEnquiryData.get(enquiryID); System.out.println("-".repeat(29)); - System.out.printf("%-10s: %s\n","Enquiry ID" , enquiry.getEnquiryID()); - System.out.printf("%-10s: %s\n","Camp" , campName); - System.out.printf("%-10s: %s\n","Enquiry" , enquiry.getEnquiry()); + System.out.printf("%-10s: %s\n", "Enquiry ID", enquiry.getEnquiryID()); + System.out.printf("%-10s: %s\n", "Camp", campName); + System.out.printf("%-10s: %s\n", "Enquiry", enquiry.getEnquiry()); if (enquiry.getReplier() != null) { - System.out.printf("%-10s: %s\n","Replier" , enquiry.getReplier()); - System.out.printf("%-10s: %s\n","Reply" , enquiry.getReply()); + System.out.printf("%-10s: %s\n", "Replier", enquiry.getReplier()); + System.out.printf("%-10s: %s\n", "Reply", enquiry.getReply()); } System.out.println(); @@ -49,17 +49,3 @@ public void view() { } } } - -// for (String registeredCampID : registeredCampIDs) { -// Camp registeredCamp = campsMap.get(registeredCampID); -// for (Enquiry enq : registeredCamp.getEnquiries().values()) { -// if (enq.getEnquirer().equals(student.getUserID())) -// System.out.printf("***** Enquiry %d *****\n", enq.getEnquiryID()); -// System.out.printf("%s\n", enq.getEnquiry()); -// if (enq.getReplier() != null) { -// System.out.printf("~~~~~ Replied by: %s ~~~~~\n", enq.getReplier()); -// System.out.printf("%s\n", enq.getReply()); -// } -// } - -// } \ No newline at end of file From 2925bff897a3ad353af9daa90baaaecaab863851 Mon Sep 17 00:00:00 2001 From: JJChong777 Date: Sun, 26 Nov 2023 15:01:18 +0800 Subject: [PATCH 3/6] fix enquiry views --- src/views/CommitteeEnquiryView.java | 17 +++++++++++------ src/views/StaffEnquiryView.java | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/views/CommitteeEnquiryView.java b/src/views/CommitteeEnquiryView.java index bd0b10f..7975c5f 100644 --- a/src/views/CommitteeEnquiryView.java +++ b/src/views/CommitteeEnquiryView.java @@ -5,6 +5,7 @@ import models.CommitteeMember; import models.Enquiry; import models.Student; +import utils.PrintUtil; import interfaces.dao.CurrentUserDao; import interfaces.dao.StudentDao; import dao.CurrentUserDaoImpl; @@ -23,15 +24,19 @@ public void view() { Camp facilitatingCamp = campDao.getCamps().get(committeeMember.getFacilitatingCamp()); StudentDao studentDao = new StudentDaoImpl(); Map studentsMap = studentDao.getStudents(); - System.out.printf("===== (Facilitating Camp Enquiries) %s =====\n", facilitatingCamp.getName()); + PrintUtil.header("Facilitating Camp Enquiries"); for (Enquiry enq : facilitatingCamp.getEnquiries().values()) { - System.out.printf("***** Enquiry %d from %s *****\n", enq.getEnquiryID(), - studentsMap.get(enq.getEnquirer())); - System.out.printf("%s\n", enq.getEnquiry()); + System.out.println("-".repeat(29)); + System.out.printf("%-10s: %s\n", "Enquiry ID", enq.getEnquiryID()); + System.out.printf("%-10s: %s\n", "Enquirer", studentsMap.get(enq.getEnquirer())); + System.out.printf("%-10s: %s\n", "Camp", facilitatingCamp.getName()); + System.out.printf("%-10s: %s\n", "Enquiry", enq.getEnquiry()); if (enq.getReplier() != null) { - System.out.printf("~~~~~ Reply by: %s ~~~~~\n", enq.getReplier()); - System.out.printf("%s\n", enq.getReply()); + System.out.printf("%-10s: %s\n", "Replier", enq.getReplier()); + System.out.printf("%-10s: %s\n", "Reply", enq.getReply()); } + System.out.println(); } + } } diff --git a/src/views/StaffEnquiryView.java b/src/views/StaffEnquiryView.java index 7be7b66..d19b71f 100644 --- a/src/views/StaffEnquiryView.java +++ b/src/views/StaffEnquiryView.java @@ -25,7 +25,7 @@ public void view() { Map studentsMap = studentDao.getStudents(); for (String createdCampID : staff.getCreatedCamps()) { Camp createdCamp = campsMap.get(createdCampID); - PrintUtil.header("Enquiries for created camps"); + PrintUtil.header("Created Camp Enquiries"); for (Enquiry enq : createdCamp.getEnquiries().values()) { System.out.println("-".repeat(29)); System.out.printf("%-10s: %s\n", "Enquiry ID", enq.getEnquiryID()); From ed25fa91084b160ad81560a81e578a73f63e977b Mon Sep 17 00:00:00 2001 From: JJChong777 Date: Sun, 26 Nov 2023 15:42:32 +0800 Subject: [PATCH 4/6] Update CommitteeReplyEnquiryService.java --- .../CommitteeReplyEnquiryService.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/services/CommitteeReplyEnquiryService.java b/src/services/CommitteeReplyEnquiryService.java index 48261f6..5451eb3 100644 --- a/src/services/CommitteeReplyEnquiryService.java +++ b/src/services/CommitteeReplyEnquiryService.java @@ -26,23 +26,24 @@ public class CommitteeReplyEnquiryService implements ReplyEnquiryServiceable { public static final CurrentUserDao currentUserDao = new CurrentUserDaoImpl(); public void reply() { - + int i = 0, choice; Enquiry selectedEnquiry; String replyField; - CommitteeMember currentUser = (CommitteeMember)currentUserDao.getCurrentUser(); + CommitteeMember currentUser = (CommitteeMember) currentUserDao.getCurrentUser(); String campName = currentUser.getFacilitatingCamp(); Camp camp = campDao.getCamps().get(campName); ArrayList validEnquiryList = new ArrayList(); for (Enquiry enquiry : camp.getEnquiries().values()) { - if (enquiry.getEnquirer() != null) continue; + if (enquiry.getEnquirer() != null) + continue; validEnquiryList.add(enquiry); } if (validEnquiryList.size() == 0) { - System.out.println("No enqury to reply"); + System.out.println("No enquiry to reply"); return; } @@ -52,20 +53,21 @@ public void reply() { System.out.printf("%2d : Back\n", i + 1); choice = InputUtil.choice(); - if (choice == i + 1) return; - + if (choice == i + 1) + return; + if (choice >= 1 || choice <= i) { selectedEnquiry = validEnquiryList.get(choice - 1); break; } } while (true); - - System.out.printf("%-10s: %s\n","Camp" , campName); - System.out.printf("%-10s: %s\n","Enquiry" , selectedEnquiry.getEnquiry()); + System.out.printf("%-10s: %s\n", "Camp", campName); + System.out.printf("%-10s: %s\n", "Enquiry", selectedEnquiry.getEnquiry()); do { replyField = InputUtil.nextString("Enter reply"); - if (!replyField.isBlank()) break; + if (!replyField.isBlank()) + break; PrintUtil.invalid("input"); } while (true); From 4b04e78ea828c9ea2547bc4941dfdb84b4af4439 Mon Sep 17 00:00:00 2001 From: JJChong777 Date: Sun, 26 Nov 2023 17:45:23 +0800 Subject: [PATCH 5/6] small change --- src/views/CreatedCampView.java | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/views/CreatedCampView.java b/src/views/CreatedCampView.java index c3694e9..13ce8ee 100644 --- a/src/views/CreatedCampView.java +++ b/src/views/CreatedCampView.java @@ -38,7 +38,7 @@ public void sortView(SortType sortType) { int i = 1; ArrayList dateList; - Staff currentUser = (Staff)currentUserDao.getCurrentUser(); + Staff currentUser = (Staff) currentUserDao.getCurrentUser(); ArrayList createdCampNameList = currentUser.getCreatedCamps(); Map campsData = campDao.getCamps(); ArrayList createdCampList = new ArrayList(); @@ -48,21 +48,22 @@ public void sortView(SortType sortType) { } createdCampList = SortCampUtil.sort(createdCampList, sortType); - PrintUtil.header("List of All Camps"); + PrintUtil.header("List of Created Camps"); for (Camp camp : createdCampList) { dateList = camp.getDates(); PrintUtil.header(String.format("Camp %d", i++)); - System.out.printf("%-30s: %s\n","Name" , camp.getName()); - System.out.printf("%-30s: %s -> %s\n","Duration", - DateUtil.toString(dateList.get(0)), - DateUtil.toString(dateList.get(dateList.size() - 1))); - System.out.printf("%-30s: %s\n","Registration Closing Date" ,DateUtil.toString(camp.getRegistrationClosingDate())); - System.out.printf("%-30s: %s\n","User group" , camp.getOpenTo()); - System.out.printf("%-30s: %s\n","Location" , camp.getLocation()); - System.out.printf("%-30s: %s\n","Total slots" , camp.getTotalSlots()); - System.out.printf("%-30s: %s\n","Camp committee slots" , camp.getCommitteeSlots()); - System.out.printf("%-30s: %s\n","Description" , camp.getDescription()); - System.out.printf("%-30s: %s\n","Visibility" , Visibility.toString(camp.getVisibility())); + System.out.printf("%-30s: %s\n", "Name", camp.getName()); + System.out.printf("%-30s: %s -> %s\n", "Duration", + DateUtil.toString(dateList.get(0)), + DateUtil.toString(dateList.get(dateList.size() - 1))); + System.out.printf("%-30s: %s\n", "Registration Closing Date", + DateUtil.toString(camp.getRegistrationClosingDate())); + System.out.printf("%-30s: %s\n", "User group", camp.getOpenTo()); + System.out.printf("%-30s: %s\n", "Location", camp.getLocation()); + System.out.printf("%-30s: %s\n", "Total slots", camp.getTotalSlots()); + System.out.printf("%-30s: %s\n", "Camp committee slots", camp.getCommitteeSlots()); + System.out.printf("%-30s: %s\n", "Description", camp.getDescription()); + System.out.printf("%-30s: %s\n", "Visibility", Visibility.toString(camp.getVisibility())); System.out.println(); } } From 992647b2e16be6a4e1e18f294c7c2878705ecff3 Mon Sep 17 00:00:00 2001 From: JJChong777 Date: Sun, 26 Nov 2023 20:16:39 +0800 Subject: [PATCH 6/6] frick --- src/views/CommitteeEnquiryView.java | 14 ++++++++------ src/views/StaffEnquiryView.java | 14 ++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/views/CommitteeEnquiryView.java b/src/views/CommitteeEnquiryView.java index 309f6e0..e337da6 100644 --- a/src/views/CommitteeEnquiryView.java +++ b/src/views/CommitteeEnquiryView.java @@ -32,12 +32,14 @@ public void view() { PrintUtil.header(String.format("View %s Enquiries", camp.getName())); for (Enquiry enquiry : camp.getEnquiries().values()) { System.out.println("-".repeat(29)); - System.out.printf("%-15s: %s\n","Enquiry ID" , enquiry.getEnquiryID()); - System.out.printf("%-15s: %s\n","Camp" , camp.getName()); - System.out.printf("%-15s: %s\n","Enquired by" , studentData.get(enquiry.getEnquirer())); - System.out.printf("%-15s: %s\n","Enquiry" , enquiry.getEnquiry()); - System.out.printf("%-15s: %s\n","Replied by" , enquiry.getReplier()); - System.out.printf("%-15s: %s\n","Reply" , enquiry.getReply()); + System.out.printf("%-10s: %s\n", "Enquiry ID", enq.getEnquiryID()); + System.out.printf("%-10s: %s\n", "Enquirer", studentsMap.get(enq.getEnquirer()).getName()); + System.out.printf("%-10s: %s\n", "Camp", facilitatingCamp.getName()); + System.out.printf("%-10s: %s\n", "Enquiry", enq.getEnquiry()); + if (enq.getReplier() != null) { + System.out.printf("%-10s: %s\n", "Replier", enq.getReplier()); + System.out.printf("%-10s: %s\n", "Reply", enq.getReply()); + } System.out.println(); } diff --git a/src/views/StaffEnquiryView.java b/src/views/StaffEnquiryView.java index 2dde9aa..63e554c 100644 --- a/src/views/StaffEnquiryView.java +++ b/src/views/StaffEnquiryView.java @@ -34,12 +34,14 @@ public void view() { camp = campDao.getCamps().get(createdCampID); for (Enquiry enquiry : camp.getEnquiries().values()) { System.out.println("-".repeat(29)); - System.out.printf("%-15s: %s\n","Enquiry ID" , enquiry.getEnquiryID()); - System.out.printf("%-15s: %s\n","Camp" , camp.getName()); - System.out.printf("%-15s: %s\n","Enquired by" , studentData.get(enquiry.getEnquirer())); - System.out.printf("%-15s: %s\n","Enquiry" , enquiry.getEnquiry()); - System.out.printf("%-15s: %s\n","Replied by" , enquiry.getReplier()); - System.out.printf("%-15s: %s\n","Reply" , enquiry.getReply()); + System.out.printf("%-10s: %s\n", "Enquiry ID", enq.getEnquiryID()); + System.out.printf("%-10s: %s\n", "Enquirer", studentsMap.get(enq.getEnquirer()).getName()); + System.out.printf("%-10s: %s\n", "Camp", createdCamp.getName()); + System.out.printf("%-10s: %s\n", "Enquiry", enq.getEnquiry()); + if (enq.getReplier() != null) { + System.out.printf("%-10s: %s\n", "Replier", enq.getReplier()); + System.out.printf("%-10s: %s\n", "Reply", enq.getReply()); + } System.out.println(); } }