diff --git a/src/src/domain/Admin.java b/src/src/domain/Admin.java index 17d365c..dbae826 100644 --- a/src/src/domain/Admin.java +++ b/src/src/domain/Admin.java @@ -4,7 +4,7 @@ @Getter public class Admin { - private static Admin admin = new Admin(); + private static Admin admin; private String id; private String password; diff --git a/src/src/domain/AmsApp.java b/src/src/domain/AmsApp.java index 236f2cc..aa8e75a 100644 --- a/src/src/domain/AmsApp.java +++ b/src/src/domain/AmsApp.java @@ -63,6 +63,7 @@ public void run() throws IOException { num = scanner.nextLine(); switch (num) { case "1": { + while(true){ Constant.printRegistrationLectureMenu(); Constant.printInputText(); num = scanner.nextLine(); @@ -74,7 +75,6 @@ public void run() throws IOException { String choiceLectureId = scanner.nextLine(); studentService.registerLecture(choiceLectureId); - break; } else if (num.equals("2")) { //수강신청 취소 if (studentService.showStudentAllRegistrationLecture()) { System.out.println("취소하고자 하는 강의의 강의 id를 입력해주세요: \n"); @@ -85,34 +85,38 @@ public void run() throws IOException { } else if (num.equals("3")) { studentService.showStudentAllRegistrationLecture(); - } else if (num.equals("4")) { - Constant.printLogout(); - studentService.setStudent((Student) userService.logout()); + } else if (num.equals("0")) { + break; } else { //올바르지 않은 번호 선택 Constant.incorrectNumber(); } + } break; } case "2": { - studentService.showStudyRoom(); - Constant.printStudyRoomMenu(); - Constant.printInputText(); - num = scanner.nextLine(); - if (num.equals("1")) { - if (!studentService.isExistResevation()) { - System.out.println("\n예약을 원하는 좌석 번호를 입력하세요(ex: 1-1)"); + while(true) { + studentService.showStudyRoom(); + Constant.printStudyRoomMenu(); + Constant.printInputText(); + num = scanner.nextLine(); + if (num.equals("1")) { + if (!studentService.isExistResevation()) { + System.out.println("\n예약을 원하는 좌석 번호를 입력하세요(ex: 1-1)"); + Constant.printInputText(); + String choiceSeat = scanner.nextLine(); + studentService.isPossibleReserve(choiceSeat); + } + } else if (num.equals("2")) { + System.out.println("\n취소를 원하는 좌석 좌석 번호를 입력하세요(ex: 1-1)"); Constant.printInputText(); - String choiceSeat = scanner.nextLine(); - studentService.isPossibleReserve(choiceSeat); + String seatNum = scanner.nextLine(); + studentService.cancelReservation(seatNum); + }else if(num.equals("0")){ + break; + } else { + Constant.incorrectNumber(); } - } else if (num.equals("2")) { - System.out.println("\n취소를 원하는 좌석 좌석 번호를 입력하세요(ex: 1-1)"); - Constant.printInputText(); - String seatNum = scanner.nextLine(); - studentService.cancelReservation(seatNum); - } else { - Constant.incorrectNumber(); } break; } @@ -183,50 +187,62 @@ public void run() throws IOException { switch (num) { case "1": { - adminService.showStudentList(); - Constant.printStudentInformationMenu(); - Constant.printInputText(); - num = scanner.nextLine(); - if (num.equals("1")) { //학생 상세 - showDetailStudent(); - } else if (num.equals("2")) { //학생 수정 - editStudentInformation(); - } else if (num.equals("3")) { //학생 삭제 - deleteStudentInformation(); - } else { - Constant.incorrectNumber(); + while(true) { + adminService.showStudentList(); + Constant.printStudentInformationMenu(); + Constant.printInputText(); + num = scanner.nextLine(); + if (num.equals("1")) { //학생 상세 + showDetailStudent(); + } else if (num.equals("2")) { //학생 수정 + editStudentInformation(); + } else if (num.equals("3")) { //학생 삭제 + deleteStudentInformation(); + } else if(num.equals("0")){ + break; + }else { + Constant.incorrectNumber(); + } } break; } case "2": { - adminService.showTeacherList(); - Constant.printTeacherInformationMenu(); - Constant.printInputText(); - num = scanner.nextLine(); - - if (num.equals("1")) { //강사 상세 - showDetailTeacher(); - } else if (num.equals("2")) { //강사 수정 - editTeacherInformation(); - } else { - Constant.incorrectNumber(); + while(true) { + adminService.showTeacherList(); + Constant.printTeacherInformationMenu(); + Constant.printInputText(); + num = scanner.nextLine(); + + if (num.equals("1")) { //강사 상세 + showDetailTeacher(); + } else if (num.equals("2")) { //강사 수정 + editTeacherInformation(); + } else if (num.equals("0")) { //뒤로 가기 + break; + } else { + Constant.incorrectNumber(); + } } break; } case "3": { - adminService.showLectureList(); - Constant.printLectureInfromationMenu(); - Constant.printInputText(); - num = scanner.nextLine(); - - if (num.equals("1")) { //강의 상세 - showDetailLecture(); - } else if (num.equals("2")) { //강의 등록 - registerLecture(); - } else if (num.equals("3")) { //강의 삭제 - deleteLectureInformation(); - } else { //숫자 잘못 입력 - Constant.incorrectNumber(); + while(true) { + adminService.showLectureList(); + Constant.printLectureInfromationMenu(); + Constant.printInputText(); + num = scanner.nextLine(); + + if (num.equals("1")) { //강의 상세 + showDetailLecture(); + } else if (num.equals("2")) { //강의 등록 + registerLecture(); + } else if (num.equals("3")) { //강의 삭제 + deleteLectureInformation(); + } else if (num.equals("0")) { //뒤로 가기 + break; + } else { //숫자 잘못 입력 + Constant.incorrectNumber(); + } } break; } diff --git a/src/src/util/Constant.java b/src/src/util/Constant.java index 2c449fa..5633a79 100644 --- a/src/src/util/Constant.java +++ b/src/src/util/Constant.java @@ -39,6 +39,7 @@ public static void printRegistrationLectureMenu() { System.out.println("1. 수강 신청"); System.out.println("2. 수강 취소"); System.out.println("3. 수강 신청 내역"); + System.out.println("0. 뒤로 가기"); System.out.println("----------------------------------\n"); System.out.println("원하시는 서비스 번호를 선택하세요"); } @@ -47,6 +48,7 @@ public static void printStudyRoomMenu() { System.out.println("---------[자습실 관리 시스템]---------"); System.out.println("1. 좌석 예약하기"); System.out.println("2. 좌석 취소하기"); + System.out.println("0. 뒤로 가기"); System.out.println("-----------------------------------\n"); System.out.println("원하시는 서비스 번호를 선택하세요"); } @@ -75,6 +77,7 @@ public static void printStudentInformationMenu() { System.out.println("1. 학생상세정보"); System.out.println("2. 학생정보수정"); System.out.println("3. 학생정보삭제"); + System.out.println("0. 뒤로 가기"); System.out.println("---------------------------------"); } @@ -83,6 +86,7 @@ public static void printTeacherInformationMenu() { System.out.println("----------[강사정보관리]------------"); System.out.println("1. 강사상세정보"); System.out.println("2. 강사정보수정"); + System.out.println("0. 뒤로 가기"); System.out.println("---------------------------------"); } @@ -92,6 +96,7 @@ public static void printLectureInfromationMenu() { System.out.println("1. 강의상세정보"); System.out.println("2. 신규강의등록"); System.out.println("3. 강의정보삭제"); + System.out.println("0. 뒤로 가기"); System.out.println("---------------------------------"); }