Implement functionalities in Student, StudentService, PrinterHelper, and Main classes.

edavud · edavud · commit ba6d428ad11f · 2022-12-01T12:39:32.000-05:00
diff --git a/src/com/generation/model/Instructor.java b/src/com/generation/model/Instructor.java
@@ -1,7 +1,7 @@
 package com.generation.model;
 
-import java.util.ArrayList;
 import java.util.Date;
+import java.util.ArrayList;
 import java.util.List;
 
 public class Instructor
@@ -12,7 +12,7 @@ public class Instructor
 
     private final List<Course> teachingCourses = new ArrayList<>();
 
-    protected Instructor( String id, String name, String email, Date birthDate )
+    protected Instructor(String id, String name, String email, Date birthDate )
     {
         super( id, name, email, birthDate );
     }
diff --git a/src/com/generation/model/Student.java b/src/com/generation/model/Student.java
@@ -1,7 +1,7 @@
 package com.generation.model;
 
-import java.util.ArrayList;
 import java.util.Date;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -16,14 +16,19 @@ public class Student
 
     private final Map<String, Course> approvedCourses = new HashMap<>();
 
-    public Student( String id, String name, String email, Date birthDate )
+    public Student(String id, String name, String email, Date birthDate )
     {
         super( id, name, email, birthDate );
     }
 
     public void enrollToCourse( Course course )
     {
         //TODO implement this method
+        if(!isAttendingCourse(course.getCode())) {
+            courses.add(course);
+        } else {
+            System.out.println("Student already enrolled.");
+        }
     }
 
     public void registerApprovedCourse( Course course )
@@ -35,6 +40,11 @@ public void registerApprovedCourse( Course course )
     public boolean isAttendingCourse( String courseCode )
     {
         //TODO implement this method
+        for(Course _course : courses) {
+            if(_course.getCode().equals(courseCode)) {
+                return true;
+            }
+        }
         return false;
     }
 
diff --git a/src/com/generation/service/StudentService.java b/src/com/generation/service/StudentService.java
@@ -27,6 +27,10 @@ public Student findStudent( String studentId )
     public void showSummary()
     {
         //TODO implement
+        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
@@ -37,10 +37,20 @@ 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());
+        formatter.setLenient(false);
+        Date birthDate = null;
+
+        while(birthDate == null) {
+            System.out.println( "| Enter student birth date(mm/dd/yyyy)|" );
+            try {
+                birthDate = formatter.parse(scanner.next());
+            } catch (ParseException e) {
+                System.out.println("Please input valid date");
+            }
+        }
         System.out.println( "|-------------------------------------|" );
         Student student = new Student( id, name, email, birthDate );
         System.out.println( "Student Successfully Registered! " );

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package com.generation.model;`
`2`	`2`
`3`		`-import java.util.ArrayList;`
`4`	`3`	`import java.util.Date;`
	`4`	`+import java.util.ArrayList;`
`5`	`5`	`import java.util.List;`
`6`	`6`
`7`	`7`	`public class Instructor`
`@@ -12,7 +12,7 @@ public class Instructor`
`12`	`12`
`13`	`13`	`private final List<Course> teachingCourses = new ArrayList<>();`
`14`	`14`
`15`		`- protected Instructor( String id, String name, String email, Date birthDate )`
	`15`	`+ protected Instructor(String id, String name, String email, Date birthDate )`
`16`	`16`	`{`
`17`	`17`	`super( id, name, email, birthDate );`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,10 @@ public Student findStudent( String studentId )`
`27`	`27`	`public void showSummary()`
`28`	`28`	`{`
`29`	`29`	`//TODO implement`
	`30`	`+ System.out.println("Students: ");`
	`31`	`+ for(Student _student : students.values()){`
	`32`	`+ System.out.println(_student.toString());`
	`33`	`+ }`
`30`	`34`	`}`
`31`	`35`
`32`	`36`	`public void enrollToCourse( String studentId, Course course )`