From 0685d9f65520feca279d83dfd21ca8f73af17cde Mon Sep 17 00:00:00 2001 From: aliahfx Date: Tue, 29 Nov 2022 09:48:23 -0600 Subject: [PATCH 1/4] attemps java final --- src/com/generation/Main.java | 3 +++ src/com/generation/model/Student.java | 10 +++++++--- src/com/generation/service/StudentService.java | 1 + 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/com/generation/Main.java b/src/com/generation/Main.java index 9e24556..a07f380 100644 --- a/src/com/generation/Main.java +++ b/src/com/generation/Main.java @@ -104,4 +104,7 @@ private static void registerStudent( StudentService studentService, Scanner scan Student student = PrinterHelper.createStudentMenu( scanner ); studentService.subscribeStudent( student ); } + + Student bob = new Student("bob"); + bob. } diff --git a/src/com/generation/model/Student.java b/src/com/generation/model/Student.java index 0897ebe..841fdcb 100644 --- a/src/com/generation/model/Student.java +++ b/src/com/generation/model/Student.java @@ -21,9 +21,10 @@ public Student( String id, String name, String email, Date birthDate ) super( id, name, email, birthDate ); } - public void enrollToCourse( Course course ) + public void enrollToCourse(Course course) { //TODO implement this method + Course.add } public void registerApprovedCourse( Course course ) @@ -34,8 +35,11 @@ public void registerApprovedCourse( Course course ) public boolean isAttendingCourse( String courseCode ) { - //TODO implement this method - return false; + if (courseCode == courseCode){ + return true; + } else { + return false; + } } @Override diff --git a/src/com/generation/service/StudentService.java b/src/com/generation/service/StudentService.java index f980e40..1af7d93 100644 --- a/src/com/generation/service/StudentService.java +++ b/src/com/generation/service/StudentService.java @@ -27,6 +27,7 @@ public Student findStudent( String studentId ) public void showSummary() { //TODO implement + System.out.println(); } public void enrollToCourse( String studentId, Course course ) From 61f51c5f17c7d20c865da39890bda87a953917a9 Mon Sep 17 00:00:00 2001 From: aliahfx Date: Tue, 29 Nov 2022 09:54:09 -0600 Subject: [PATCH 2/4] additional changes --- src/com/generation/model/Student.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/generation/model/Student.java b/src/com/generation/model/Student.java index 841fdcb..5588b1d 100644 --- a/src/com/generation/model/Student.java +++ b/src/com/generation/model/Student.java @@ -24,7 +24,9 @@ public Student( String id, String name, String email, Date birthDate ) public void enrollToCourse(Course course) { //TODO implement this method - Course.add + for (Course enroll: courses) { + System.out.println(course); + } } public void registerApprovedCourse( Course course ) From 067b7df5d43c91be6f14215d1a539684217d8ad8 Mon Sep 17 00:00:00 2001 From: aliahfx Date: Tue, 29 Nov 2022 09:55:36 -0600 Subject: [PATCH 3/4] more changes --- src/com/generation/Main.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/com/generation/Main.java b/src/com/generation/Main.java index a07f380..46fd1a8 100644 --- a/src/com/generation/Main.java +++ b/src/com/generation/Main.java @@ -105,6 +105,5 @@ private static void registerStudent( StudentService studentService, Scanner scan studentService.subscribeStudent( student ); } - Student bob = new Student("bob"); - bob. + } From 7b3ca5e3db4f9f0bdebca1b678c2e3fc0c36d7e8 Mon Sep 17 00:00:00 2001 From: aliahfx Date: Tue, 29 Nov 2022 15:03:39 -0600 Subject: [PATCH 4/4] final adjustments after class session --- src/com/generation/model/Student.java | 13 ++++++------ .../generation/service/StudentService.java | 8 +++++++- src/com/generation/utils/PrinterHelper.java | 20 ++++++++++++++++--- 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/src/com/generation/model/Student.java b/src/com/generation/model/Student.java index 5588b1d..3b312e2 100644 --- a/src/com/generation/model/Student.java +++ b/src/com/generation/model/Student.java @@ -24,9 +24,7 @@ public Student( String id, String name, String email, Date birthDate ) public void enrollToCourse(Course course) { //TODO implement this method - for (Course enroll: courses) { - System.out.println(course); - } + courses.add(course); } public void registerApprovedCourse( Course course ) @@ -37,11 +35,12 @@ public void registerApprovedCourse( Course course ) public boolean isAttendingCourse( String courseCode ) { - if (courseCode == courseCode){ - return true; - } else { - return false; + for (Course course: courses) { + if (course.getCode().equals(courseCode)){ + return true; + } } + return false; } @Override diff --git a/src/com/generation/service/StudentService.java b/src/com/generation/service/StudentService.java index 1af7d93..375b658 100644 --- a/src/com/generation/service/StudentService.java +++ b/src/com/generation/service/StudentService.java @@ -27,7 +27,13 @@ public Student findStudent( String studentId ) public void showSummary() { //TODO implement - System.out.println(); + System.out.println("Students: "); + for (Student student: students.values() + ) { + System.out.println(student.toString()); + + + } } public void enrollToCourse( String studentId, Course course ) diff --git a/src/com/generation/utils/PrinterHelper.java b/src/com/generation/utils/PrinterHelper.java index 6f1ca9b..f0b554a 100644 --- a/src/com/generation/utils/PrinterHelper.java +++ b/src/com/generation/utils/PrinterHelper.java @@ -37,10 +37,24 @@ 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"); + + + //This is all Adam's code + boolean validDate = false; + Date birthDate = null; + while(!validDate){ + System.out.println( "| Enter student birth date(mm/dd/yyyy)|" ); + try{ + birthDate = formatter.parse( scanner.next()); + validDate = true; + } catch (ParseException e){ + System.out.println("Invalid date!"); + } + }; //TODO validate date format and catch exception to avoid crash - Date birthDate = formatter.parse( scanner.next()); + System.out.println( "|-------------------------------------|" ); Student student = new Student( id, name, email, birthDate ); System.out.println( "Student Successfully Registered! " );