diff --git a/src/main/java/me/lensfrex/manager/Main.java b/src/main/java/me/lensfrex/manager/Main.java index 1e5be0c..cdcf0f1 100644 --- a/src/main/java/me/lensfrex/manager/Main.java +++ b/src/main/java/me/lensfrex/manager/Main.java @@ -1,10 +1,6 @@ package me.lensfrex.manager; import me.lensfrex.manager.utils.Console; -import me.lensfrex.manager.utils.Worker; - -import java.io.BufferedReader; -import java.io.InputStreamReader; public class Main { @@ -19,7 +15,7 @@ public class Main { private void run() { while (parseCommand(consoleTool.getUserInput()) != -1) { System.out.println( - "****************************************************************\n" + + "----------------------------------------------------------------\n" + " Please enter your choice:" ); } @@ -41,8 +37,16 @@ public class Main { } break; case "2": + System.out.println("Please enter the id or name of the student:"); String userInput = consoleTool.getUserInput(); - //System.out.println("Are you sure to delete" + userInput + "? (yes/no)"); + + System.out.println("Are you sure to delete \"" + userInput + "\"? (enter yes/no)"); + String sure = consoleTool.getUserInput(); + + if (!sure.equals("yes")) { + break; + } + try { long id = Long.parseLong(userInput); worker.removeStudent(id); @@ -67,6 +71,7 @@ public class Main { break; case "8": case "9": + System.out.println("Please enter the id or name of the student: "); String input = consoleTool.getUserInput(); try { long id = Long.parseLong(input); @@ -86,7 +91,7 @@ public class Main { worker.printHelp(); break; default: - System.out.println("Don't recognize... Please enter again. (Enter 12 to show help again)"); + System.out.println("- Don't recognize... Please enter again. (Enter 12 to show help again)"); break; } return 0; diff --git a/src/main/java/me/lensfrex/manager/utils/Worker.java b/src/main/java/me/lensfrex/manager/Worker.java similarity index 87% rename from src/main/java/me/lensfrex/manager/utils/Worker.java rename to src/main/java/me/lensfrex/manager/Worker.java index 35b17b6..aa4687d 100644 --- a/src/main/java/me/lensfrex/manager/utils/Worker.java +++ b/src/main/java/me/lensfrex/manager/Worker.java @@ -1,8 +1,9 @@ -package me.lensfrex.manager.utils; +package me.lensfrex.manager; import me.lensfrex.manager.Main; import me.lensfrex.manager.data.Student; import me.lensfrex.manager.data.manager.StudentManager; +import me.lensfrex.manager.utils.IOUtil; import java.nio.charset.StandardCharsets; import java.util.ArrayList; @@ -36,6 +37,8 @@ public class Worker { public void addStudent(String userInput) { studentManager.addStudent(userInput); System.out.println("[System]: Done. (Maybe?)"); + System.out.println("Any others? (enter \":wq\" to finish.)"); + } /** @@ -62,6 +65,8 @@ public class Worker { * 输出每门课程的总成绩及平均分 */ public void printAllSubjectInfo() { + System.out.println("----------------------------------------------------------------"); + System.out.println("All subject score:"); ArrayList table = studentManager.generateAllSubjectInfo(); for (String record : table) { System.out.println(record); @@ -81,7 +86,8 @@ public class Worker { public void printAllStudentScoreInfo() { ArrayList students = studentManager.getStudents(); - System.out.println("- All student general score:"); + System.out.println("----------------------------------------------------------------"); + System.out.println("Information of all subjects:"); StringBuilder stringBuilder = new StringBuilder(); for (Student student : students) { stringBuilder @@ -124,9 +130,9 @@ public class Worker { * 按姓名的字典顺序排出成绩表 */ public void printScoreTableByName() { - System.out.println("---------------------------------------------------------------------"); + System.out.println("-----------------------------------------------------------------------"); System.out.println("ID | Name | General Score | Subject1: score Subject2: score ..."); - System.out.println("---------------------------------------------------------------------"); + System.out.println("-----------------------------------------------------------------------"); ArrayList table = studentManager.generateScoreTableByName(); for (String record : table) { diff --git a/src/main/java/me/lensfrex/manager/data/manager/StudentManager.java b/src/main/java/me/lensfrex/manager/data/manager/StudentManager.java index c18153a..7b07187 100644 --- a/src/main/java/me/lensfrex/manager/data/manager/StudentManager.java +++ b/src/main/java/me/lensfrex/manager/data/manager/StudentManager.java @@ -271,7 +271,7 @@ public class StudentManager { .append(" All Student Information \n") .append("------------------------------------\n"); - ArrayList studentTable = this.generateScoreTableByName(); + ArrayList studentTable = this.generateScoreTableById(); for (String record : studentTable) { stringBuilder.append(record).append('\n'); } diff --git a/src/main/resources/me.lensfrex.manager/helpMessage.txt b/src/main/resources/me.lensfrex.manager/helpMessage.txt index 055ce30..c7e62d8 100644 --- a/src/main/resources/me.lensfrex.manager/helpMessage.txt +++ b/src/main/resources/me.lensfrex.manager/helpMessage.txt @@ -1,6 +1,6 @@ -**************************************************************** +---------------------------------------------------------------- Welcome to StudentManager-S -**************************************************************** +---------------------------------------------------------------- Do you want to: 1. Input record 2. Remove a student (by name or id) @@ -15,5 +15,5 @@ Do you want to: 11. List record 12. Show help again 0. Exit -**************************************************************** - Please enter your choice: \ No newline at end of file +---------------------------------------------------------------- + Please enter your choice: