From 80a846eaa9dad3ac0a1e252eda538ae2d79460d0 Mon Sep 17 00:00:00 2001 From: LearningStacy Date: Wed, 30 Nov 2022 05:26:50 -0500 Subject: [PATCH 1/7] add course to list of courses --- src/com/generation/model/Student.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/com/generation/model/Student.java b/src/com/generation/model/Student.java index 0897ebe..7ca4a6f 100644 --- a/src/com/generation/model/Student.java +++ b/src/com/generation/model/Student.java @@ -24,6 +24,8 @@ public Student( String id, String name, String email, Date birthDate ) public void enrollToCourse( Course course ) { //TODO implement this method + courses.add(course); + } public void registerApprovedCourse( Course course ) From 6357d5e0e805e4b054b33797cc7b990335c4b31b Mon Sep 17 00:00:00 2001 From: LearningStacy Date: Wed, 30 Nov 2022 05:28:27 -0500 Subject: [PATCH 2/7] add logic body for isAttendingCourse - checks if course matches in list --- src/com/generation/model/Student.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/com/generation/model/Student.java b/src/com/generation/model/Student.java index 7ca4a6f..0cbeaaa 100644 --- a/src/com/generation/model/Student.java +++ b/src/com/generation/model/Student.java @@ -37,6 +37,11 @@ public void registerApprovedCourse( Course course ) public boolean isAttendingCourse( String courseCode ) { //TODO implement this method + for(Course c : courses){ + if(c.getCode().equalsIgnoreCase(courseCode)){ + return true; + } + } return false; } From 67b08a9cab42a64cf0ed30e31aadb5a990679204 Mon Sep 17 00:00:00 2001 From: LearningStacy Date: Sat, 3 Dec 2022 06:25:27 -0500 Subject: [PATCH 3/7] finish showSummary method --- src/com/generation/service/StudentService.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/com/generation/service/StudentService.java b/src/com/generation/service/StudentService.java index f980e40..d96732d 100644 --- a/src/com/generation/service/StudentService.java +++ b/src/com/generation/service/StudentService.java @@ -27,6 +27,13 @@ public Student findStudent( String studentId ) public void showSummary() { //TODO implement + System.out.println("Student Summary"); + for (String s : students.keySet()){ + Student student =students.get(s); + + System.out.println(student.toString()); + } + } public void enrollToCourse( String studentId, Course course ) From 681e4f2285b6b1b97b4b4b090e6d0e97c2be0f8a Mon Sep 17 00:00:00 2001 From: LearningStacy Date: Sat, 3 Dec 2022 06:55:46 -0500 Subject: [PATCH 4/7] birthdate validation implemented --- src/com/generation/utils/PrinterHelper.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/com/generation/utils/PrinterHelper.java b/src/com/generation/utils/PrinterHelper.java index 6f1ca9b..cbf86c8 100644 --- a/src/com/generation/utils/PrinterHelper.java +++ b/src/com/generation/utils/PrinterHelper.java @@ -37,10 +37,23 @@ public static Student createStudentMenu( Scanner scanner ) String id = scanner.next(); System.out.println( "| Enter student email: |" ); String email = scanner.next(); - System.out.println( "| Enter student birth date(mm/dd/yyyy)|" ); - DateFormat formatter = new SimpleDateFormat( "mm/dd/yyyy"); + DateFormat formatter = new SimpleDateFormat( "MM/dd/yyyy"); //TODO validate date format and catch exception to avoid crash - Date birthDate = formatter.parse( scanner.next()); + boolean isValid = false; + Date birthDate = null; + do{ + + System.out.println( "| Enter student birth date(mm/dd/yyyy)|" ); + try{ + birthDate = formatter.parse( scanner.next()); + isValid = true; + } catch (ParseException ex){ + System.out.println("The date must be in mm/dd/yyyy format."); + } + }while(!isValid); + + +// Date birthDate = (Date) formatter.parse( scanner.next()); System.out.println( "|-------------------------------------|" ); Student student = new Student( id, name, email, birthDate ); System.out.println( "Student Successfully Registered! " ); From 3b2d032c8b96d490888cff903070c253bee34112 Mon Sep 17 00:00:00 2001 From: LearningStacy Date: Sat, 3 Dec 2022 07:00:24 -0500 Subject: [PATCH 5/7] update method to include already enrolled clause --- src/com/generation/model/Student.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/com/generation/model/Student.java b/src/com/generation/model/Student.java index 0cbeaaa..0926470 100644 --- a/src/com/generation/model/Student.java +++ b/src/com/generation/model/Student.java @@ -23,8 +23,12 @@ public Student( String id, String name, String email, Date birthDate ) public void enrollToCourse( Course course ) { - //TODO implement this method - courses.add(course); + if(!isAttendingCourse(course.getCode())){ + //TODO implement this method + courses.add(course); + } else { + System.out.println("Student has already been enrolled in this course"); + } } From 26075c9b68ecbb619502658870fd47d969e5d909 Mon Sep 17 00:00:00 2001 From: LearningStacy Date: Sat, 3 Dec 2022 07:44:40 -0500 Subject: [PATCH 6/7] update showSummary method --- src/com/generation/service/StudentService.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/com/generation/service/StudentService.java b/src/com/generation/service/StudentService.java index d96732d..9cbebad 100644 --- a/src/com/generation/service/StudentService.java +++ b/src/com/generation/service/StudentService.java @@ -28,10 +28,8 @@ public void showSummary() { //TODO implement System.out.println("Student Summary"); - for (String s : students.keySet()){ - Student student =students.get(s); - - System.out.println(student.toString()); + for (Student s : students.values()){ + System.out.println(s.toString()); } } From afd4f6703337dce4f60bd2b0b382934f776ebd52 Mon Sep 17 00:00:00 2001 From: LearningStacy Date: Sat, 3 Dec 2022 07:45:02 -0500 Subject: [PATCH 7/7] maven update --- JavaFinalProject.iml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/JavaFinalProject.iml b/JavaFinalProject.iml index c90834f..0910ac0 100644 --- a/JavaFinalProject.iml +++ b/JavaFinalProject.iml @@ -3,9 +3,27 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file