diff --git a/src/com/generation/model/Person.java b/src/com/generation/model/Person.java index 56cb7fd..728609c 100644 --- a/src/com/generation/model/Person.java +++ b/src/com/generation/model/Person.java @@ -43,6 +43,6 @@ public Date getBirthDate() @Override public String toString() { - return id + '\'' + ", name='" + name + '\'' + ", email='" + email + '\'' + ", birthDate=" + birthDate; + return "'"+ id + '\'' + ", name='" + name + '\'' + ", email='" + email + '\'' + ", birthDate=" + birthDate; } } diff --git a/src/com/generation/service/StudentService.java b/src/com/generation/service/StudentService.java index f980e40..bbe44da 100644 --- a/src/com/generation/service/StudentService.java +++ b/src/com/generation/service/StudentService.java @@ -2,6 +2,7 @@ import com.generation.model.Course; import com.generation.model.Student; +import java.util.*; import java.util.HashMap; import java.util.Map; @@ -26,7 +27,9 @@ public Student findStudent( String studentId ) public void showSummary() { - //TODO implement + for(Student student : students.values()) { + System.out.println(student); + } } 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..cf5a4fd 100644 --- a/src/com/generation/utils/PrinterHelper.java +++ b/src/com/generation/utils/PrinterHelper.java @@ -37,10 +37,21 @@ 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"); + boolean isCorrectDateFormat = false; + Date birthDate = null; + + while(!isCorrectDateFormat) { + System.out.println( "| Enter student birth date(mm/dd/yyyy)|" ); + DateFormat formatter = new SimpleDateFormat( "mm/dd/yyyy"); + try{ + birthDate = formatter.parse( scanner.next()); + isCorrectDateFormat = true; + } catch(Exception ex) { + System.out.println( "| Invalid date format, please try again with the correct format (mm/dd/yyyy)|" ); + } + } + //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! " );