showing deleted list will no longer need new command. leave can have …

…date updated only on the end date
AY1920S1-CS2113T-F14-3 · Nov 7, 2019 · be4ef02 · be4ef02
1 parent beb2ce3
commit be4ef02
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 27 deletions.
diff --git a/src/main/java/Operations/Storage.java b/src/main/java/Operations/Storage.java
@@ -145,7 +145,6 @@ public ArrayList<Task> loadFile(String fileName) throws RoomShareException {
                     Leave leave = new Leave(description, user, from, to);
                     leave.setPriority(priority);
                     leave.setRecurrenceSchedule(recurrence);
-                    leave.setDone(done);
                     taskArrayList.add(leave);
                 } else {
                     //Meeting type

diff --git a/src/main/java/Operations/TaskCreator.java b/src/main/java/Operations/TaskCreator.java
@@ -152,7 +152,6 @@ public ArrayList<Date> extractDate(String input) throws RoomShareException {
                     // date of the leave
                     throw new RoomShareException(ExceptionType.invalidDateRange);
                 }
-                dates.add(parser.formatDate(toInput));
             }
         } else
             throw new RoomShareException(ExceptionType.emptyDate);
@@ -432,7 +431,7 @@ public void updateTask(String input, Task oldTask) throws RoomShareException {
         }
 
         if (input.contains("&")) {
-            ArrayList<Date> dates = this.extractDate(input);
+            ArrayList<Date> dates = extractDate(input);
             if (oldTask instanceof Leave && dates.size() == 2) {
                 Leave oldLeave = (Leave) oldTask;
                 Date start = dates.get(0);
@@ -442,7 +441,12 @@ public void updateTask(String input, Task oldTask) throws RoomShareException {
                 oldLeave.setEndDate(end);
             } else {
                 Date date = dates.get(0);
-                oldTask.setDate(date);
+                if (oldTask instanceof Leave) {
+                    Leave oldLeave = (Leave)oldTask;
+                    oldLeave.setEndDate(date);
+                } else {
+                    oldTask.setDate(date);
+                }
             }
         }
 

diff --git a/src/main/java/Operations/TaskList.java b/src/main/java/Operations/TaskList.java
@@ -6,6 +6,7 @@
 import Enums.SortType;
 import Enums.TimeUnit;
 import Model_Classes.Assignment;
+import Model_Classes.Leave;
 import Model_Classes.Task;
 
 import java.util.ArrayList;
@@ -375,7 +376,7 @@ public void snooze (int index, int amount, TimeUnit timeUnit) throws RoomShareEx
     public int getSize() {
         int count =0;
         for(Task t : tasks) {
-            if(!t.getOverdue()) {
+            if(!t.getOverdue() && !(t instanceof Leave)) {
                 count += 1;
             }
         }
@@ -389,7 +390,9 @@ public int getSize() {
     public int getDoneSize(){
         int count = 0;
         for (Task t: tasks){
-            if (t.getDone() && !t.getOverdue()) count++;
+            if (t.getDone() && !t.getOverdue() && !(t instanceof Leave)) {
+                count++;
+            }
         }
         return count;
     }
@@ -446,4 +449,5 @@ public int[] listTagged(String user) throws RoomShareException{
         int[] done = {belongCount, doneCount};
         return done;
     }
+
 }
diff --git a/src/main/java/RoomShare.java b/src/main/java/RoomShare.java
@@ -254,7 +254,7 @@ public void run() throws RoomShareException, IOException, InterruptedException {
                 try {
                     String input = parser.getCommandLine();
                     int index = parser.getIndex(input);
-                    Task oldTask = taskList.get(index);
+                    Task oldTask = TaskList.get(index);
                     taskCreator.updateTask(input,oldTask);
                     ui.showUpdated(index+1);
                     storage.writeFile(TaskList.currentList(), "data.txt");
@@ -355,26 +355,23 @@ public void run() throws RoomShareException, IOException, InterruptedException {
                 Ui.clearScreen();
                 ui.startUp();
                 String input = parser.getCommandLine();
-                ui.showTagged(input);
-                try {
-                    int[] doneArray = taskList.listTagged(input);
-                    ui.showTaggedPercentage(input);
-                    ProgressBar progressBar = new ProgressBar(doneArray[0], doneArray[1]);
-                    ui.showBar(progressBar.showBar());
-                } catch (RoomShareException e) {
-                    ui.showError(e);
-                }
-                listRoutine.list();
-                break;
-
-            case deleted:
-                Ui.clearScreen();
-                ui.startUp();
-                ui.showDeletedList();
-                try {
-                    tempDeleteList.list();
-                } catch (RoomShareException e) {
-                    ui.showError(e);
+                if (input.equals("deleted")) {
+                    ui.showDeletedList();
+                    try {
+                        tempDeleteList.list();
+                    } catch (RoomShareException e) {
+                        ui.showError(e);
+                    }
+                } else {
+                    ui.showTagged(input);
+                    try {
+                        int[] doneArray = taskList.listTagged(input);
+                        ui.showTaggedPercentage(input);
+                        ProgressBar progressBar = new ProgressBar(doneArray[0], doneArray[1]);
+                        ui.showBar(progressBar.showBar());
+                    } catch (RoomShareException e) {
+                        ui.showError(e);
+                    }
                 }
                 listRoutine.list();
                 break;