Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0c9fb2ff46 |
+11
-13
@@ -71,9 +71,9 @@ public class Main {
|
||||
switch (choice) {
|
||||
case 1:
|
||||
success = school.registerStudent(username, password);
|
||||
if (success) {
|
||||
if(success){
|
||||
System.out.println(" Student registered successfully!");
|
||||
} else {
|
||||
}else {
|
||||
System.out.println(" Username already exists!");
|
||||
}
|
||||
break;
|
||||
@@ -108,10 +108,10 @@ public class Main {
|
||||
|
||||
switch (choice) {
|
||||
case 1:
|
||||
Student student = school.loginStudent(username, password);
|
||||
if (student != null) {
|
||||
Student student = school.loginStudent(username , password);
|
||||
if(student != null){
|
||||
studentMenu(student);
|
||||
} else {
|
||||
}else{
|
||||
System.out.println(" Invalid username or password!");
|
||||
}
|
||||
break;
|
||||
@@ -151,7 +151,7 @@ public class Main {
|
||||
enrollInCourse(student);
|
||||
break;
|
||||
case 3:
|
||||
System.out.print(student.getMyCoursesDisplay());
|
||||
//System.out.print(student.getMyCoursesDisplay());
|
||||
break;
|
||||
case 4:
|
||||
System.out.println(" Goodbye, " + student.getUsername() + "!");
|
||||
@@ -164,18 +164,16 @@ public class Main {
|
||||
|
||||
private static void enrollInCourse(Student student) {
|
||||
System.out.print(school.getAllCoursesDisplay());
|
||||
System.out.print("\nEnter Course ID to enroll: ");
|
||||
System.out.print("\n Enter Course ID to enroll: ");
|
||||
int courseId = getIntInput();
|
||||
|
||||
Course course = school.findCourseById(courseId);
|
||||
if (course == null) {
|
||||
if(course == null){
|
||||
System.out.println(" Course not found! Please enter a valid ID.");
|
||||
return;
|
||||
}
|
||||
|
||||
if (student.enrollInCourse(course)) {
|
||||
System.out.println(" Successfully enrolled in " + course.getName());
|
||||
} else {
|
||||
if(student.enrolledCourses(course)){
|
||||
System.out.println("Successfully enrolled in" + course.getName());
|
||||
}else{
|
||||
System.out.println(" You are already enrolled in this course!");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,8 +11,8 @@ public class Student extends User {
|
||||
this.enrolledCourses = new ArrayList<>();
|
||||
}
|
||||
|
||||
public boolean enrollInCourse(Course course) {
|
||||
if (enrolledCourses.contains(course)) {
|
||||
public boolean enrolledCourses(Course course){
|
||||
if(enrolledCourses.contains(course)){
|
||||
return false;
|
||||
}
|
||||
enrolledCourses.add(course);
|
||||
@@ -20,17 +20,17 @@ public class Student extends User {
|
||||
return true;
|
||||
}
|
||||
|
||||
public List<Course> getEnrolledCourses() {
|
||||
public List <Course> getEnrolledCourses(){
|
||||
return enrolledCourses;
|
||||
}
|
||||
|
||||
public String getMyCoursesDisplay() {
|
||||
if (enrolledCourses.isEmpty()) {
|
||||
public String getMyCoursesDisplay(){
|
||||
if(enrolledCourses.isEmpty()){
|
||||
return " You are not enrolled in any course yet.";
|
||||
} else {
|
||||
StringBuilder sb = new StringBuilder("\n My Courses:\n");
|
||||
}else{
|
||||
StringBuilder sb = new StringBuilder("\n My Course: \n");
|
||||
for (int i = 0; i < enrolledCourses.size(); i++) {
|
||||
sb.append(" ").append(i+1).append(". ").append(enrolledCourses.get(i)).append("\n");
|
||||
sb.append(" ").append(i+1).append(". ").append(enrolledCourses.get(i)).append("\n");
|
||||
}
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
@@ -16,16 +16,16 @@ public class SchoolSystem {
|
||||
}
|
||||
|
||||
// ========== Student Management ==========
|
||||
public boolean registerStudent(String username, String password) {
|
||||
if (findStudent(username) != null) {
|
||||
public boolean registerStudent(String username , String password){
|
||||
if(findStudent(username) != null){
|
||||
return false;
|
||||
}
|
||||
students.add(new Student(username, password));
|
||||
students.add(new Student(username , password));
|
||||
return true;
|
||||
}
|
||||
|
||||
public Student loginStudent(String username, String password) {
|
||||
Student student = findStudent(username);
|
||||
Student student = findStudent(username);
|
||||
if (student != null && student.checkPassword(password)) {
|
||||
return student;
|
||||
}
|
||||
@@ -65,8 +65,8 @@ public class SchoolSystem {
|
||||
|
||||
// ========== Course Management ==========
|
||||
public boolean addCourseToSystem(String courseName) {
|
||||
for (Course c : allCourses) {
|
||||
if (c.getName().equals(courseName)) {
|
||||
for (Course c : allCourses){
|
||||
if(c.getName().equals(courseName)){
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -75,8 +75,10 @@ public class SchoolSystem {
|
||||
}
|
||||
|
||||
public Course findCourseById(int id) {
|
||||
for (Course c : allCourses) {
|
||||
if (c.getId() == id) return c;
|
||||
for(Course c : allCourses){
|
||||
if (c.getId() == id){
|
||||
return c;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user