format time

CS2103AUG2016-W11-C2 · Nov 1, 2016 · 23f646e · 23f646e
1 parent 78bef53
commit 23f646e
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/src/main/java/seedu/agendum/ui/TaskCard.java b/src/main/java/seedu/agendum/ui/TaskCard.java
@@ -21,7 +21,7 @@ public class TaskCard extends UiPart {
 
     private static final String FXML = "TaskCard.fxml";
     private static final String OVERDUE_PREFIX = "Overdue\n";
-    private static final String COMPLETED_PREFIX = "Completed ";
+    private static final String COMPLETED_PREFIX = "Completed on ";
     private static final String NAME_COLOR = "#3a3d42";
     private static final String TIME_COLOR = "#4172c1";
     private static final String NON_COMPLETED_TIME_PATTERN = "HH:mm EEE, dd MMM";
@@ -72,16 +72,20 @@ public void initialize() {
         time.setTextFill(Color.web(TIME_COLOR));
         time.setWrapText(true);
 
+        String taskTime = formatTime(true, NON_COMPLETED_TIME_PATTERN, START_TIME_PREFIX, task.getStartDateTime()) 
+                + formatTime(true, NON_COMPLETED_TIME_PATTERN, END_TIME_PREFIX, task.getEndDateTime());
+
         if(task.isOverdue()) {
-            time.setText(OVERDUE_PREFIX 
-                    + formatTime(NON_COMPLETED_TIME_PATTERN, START_TIME_PREFIX, task.getStartDateTime()) 
-                    + formatTime(NON_COMPLETED_TIME_PATTERN, END_TIME_PREFIX, task.getEndDateTime()));
+            time.setText(OVERDUE_PREFIX + taskTime);
         } else if(task.hasTime()){
-            time.setText(formatTime(NON_COMPLETED_TIME_PATTERN, START_TIME_PREFIX, task.getStartDateTime()) 
-                    + formatTime(NON_COMPLETED_TIME_PATTERN, END_TIME_PREFIX, task.getEndDateTime()));
-        } else if(task.isCompleted()) {
-            time.setText(COMPLETED_PREFIX 
-                    + formatTime(COMPLETED_TIME_PATTERN, EMPTY_PREFIX, 
+            time.setText(taskTime);
+        }
+        if(task.isCompleted()) {
+            if (task.hasTime()) {
+                taskTime += "\n";
+            }
+            time.setText(taskTime + COMPLETED_PREFIX 
+                    + formatTime(false, COMPLETED_TIME_PATTERN, EMPTY_PREFIX, 
                             Optional.ofNullable(task.getLastUpdatedTime())));
         }
 
@@ -93,12 +97,12 @@ public void initialize() {
         }
     }
 
-    public String formatTime(String dateTimePattern, String prefix, Optional<LocalDateTime> dateTime) {
+    public String formatTime(boolean addPrefix, String dateTimePattern, String prefix, Optional<LocalDateTime> dateTime) {
 
         StringBuilder sb = new StringBuilder();
         DateTimeFormatter format = DateTimeFormatter.ofPattern(dateTimePattern);
 
-        if(task.isCompleted()) {
+        if(!addPrefix) {
             sb.append(dateTime.get().format(format));
         } else if (dateTime.isPresent() && task.getStartDateTime().isPresent()) {
             sb.append(prefix).append(dateTime.get().format(format));
@@ -108,7 +112,7 @@ public String formatTime(String dateTimePattern, String prefix, Optional<LocalDa
             sb.append(EMPTY_PREFIX);
         }
 
-        return sb.toString().toLowerCase();
+        return sb.toString();
     }
 
     public HBox getLayout() {