Minor change on block command parser to add flexibility and minor cha…

…nges fro taskcard
CS2103AUG2016-W09-C2 · Nov 6, 2016 · 58df78f · 58df78f
1 parent 9cddfa2
commit 58df78f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/src/main/java/seedu/address/logic/parser/Parser.java b/src/main/java/seedu/address/logic/parser/Parser.java
@@ -358,11 +358,10 @@ private Command prepareBlock(String args) {
         try {
 
             String startInput = matcher.group("startTime");
-            String endInput = matcher.group("endTime");
-
+            List<Date> datesToAdd = DateParser.getInstance().getFromToDatesFromString(startInput);
             return new BlockCommand(getTagsFromArgs(matcher.group("tagArguments")),
-                    new TaskDate(DateParser.getInstance().getDateFromString(startInput).getTime()),
-                    new TaskDate(DateParser.getInstance().getDateFromString(endInput).getTime()));
+                    new TaskDate(datesToAdd.get(0)),
+                    new TaskDate(datesToAdd.get(1)));
         } catch (IllegalValueException ive) {
             return new IncorrectCommand(ive.getMessage());
         }
@@ -754,14 +753,10 @@ private Command prepareView(String arguments) {
     public static ArrayList<Date> extractDateInfo(Matcher m) throws IllegalValueException{
         ArrayList<Date> resultSet = new ArrayList<Date>();
         try {
-            String[] time = m.group("startTime").replace(" from ", "").split(" to ");
+            List<Date> datesToAdd = DateParser.getInstance().getFromToDatesFromString(m.group("startTime"));
             resultSet.clear();
-            try {
-                resultSet.add(DateParser.getInstance().getDateFromString(time[START_TIME_INDEX]));
-                resultSet.add(DateParser.getInstance().getDateFromString(time[END_TIME_INDEX]));
-            } catch (IllegalValueException e) {              
-                throw new IllegalValueException(MESSAGE_ILLEGAL_DATE_INPUT);
-            }
+            resultSet.add(datesToAdd.get(0));
+            resultSet.add(datesToAdd.get(1));
         } catch (Exception ise) {
             resultSet.clear();
             try {

diff --git a/src/main/java/seedu/address/ui/TaskCard.java b/src/main/java/seedu/address/ui/TaskCard.java
@@ -68,7 +68,7 @@ private void initializeRecurringType() {
 
     //@@author A0147967J
     private void initializaRecurringPeriod() {
-        if(task.getRecurringPeriod() == Task.NO_RECURRING_PERIOD){
+        if(task.getRecurringPeriod() == Task.NO_RECURRING_PERIOD && !task.getRecurringType().equals(RecurringType.NONE)){
             period.setText("Always");
         } else {
             period.setText("");