Merge b62f72b into c5cf7ac

CS2103-AY1819S1-F10-2 · Nov 5, 2018 · 541be89 · 541be89
2 parents c5cf7ac + b62f72b
commit 541be89
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/docs/UserGuide.adoc b/docs/UserGuide.adoc
@@ -355,6 +355,23 @@ Examples:
 
 * `remind x/123456 n/Alex b/Bike001`
 * `remind x/nscjhbdhv n/Peter Lee b/NewBike`
+
+== Future features
+The following are a list of features that the team will implement in version 2.0.
+
+=== Allow a log in system that require a username and password
+This will be done with a login page that requires users to log in before having access to the app's feature.
+
+* This allows separation of password from command argument.
+* This solves the issue of users having to type their password repeatedly when executing multiple commands that require
+a password.
+* This prevents any password being entered on the command line from showing when users view command history.
+
+=== Reset password
+* This allows users to reset their password by receiving a new password via email.
+
+=== Prevent some commands from showing in the command history.
+
 // end::sendemail[]
 
 ////

diff --git a/src/main/java/loanbook/commons/core/Messages.java b/src/main/java/loanbook/commons/core/Messages.java
@@ -13,7 +13,8 @@ public class Messages {
     public static final String MESSAGE_INVALID_OLD_PASS = "The old password entered is incorrect!";
     public static final String MESSAGE_SAME_AS_CURRENT_PASSWORD = "The password provided is same as before!";
     public static final String MESSAGE_INVALID_DATE_FORMAT =
-            "Dates provided are in an invalid format. Please use the format YYYY-MM-DD.";
+            "Dates provided are either an invalid date or they are in an invalid format.\n"
+            + "Please use the format YYYY-MM-DD.";
     public static final String MESSAGE_INVALID_DATE_RANGE =
             "Dates provided are not in a valid range. The end date cannot be before the start date.";
     public static final String MESSAGE_AUTHEN_FAILURE = "Your password might be wrong "

diff --git a/src/main/java/loanbook/model/loan/Nric.java b/src/main/java/loanbook/model/loan/Nric.java
@@ -9,7 +9,7 @@
 public class Nric implements Censor {
 
     public static final String MESSAGE_NRIC_CONSTRAINTS =
-            "NRIC should be Singapore issued. It may be blank. ";
+            "Invalid NRIC input. NRIC should consist of a prefix letter, followed by 7 letters and a checksum suffix.";
 
     public static final String NRIC_VALIDATION_REGEX = "^[ST]\\d{7}[A-JZ]|[FG]\\d{7}[K-NPQRTUWX]$";