Merge pull request #63 from CS2103AUG2016-W10-C3/TaskView_beautify

Slight Improvement to UI of TaskCard
CS2103AUG2016-W10-C3 · Oct 25, 2016 · b0e8c0f · b0e8c0f
2 parents 9c60b47 + 8bc05f3
commit b0e8c0f
Showing 1 changed file with 24 additions and 9 deletions.
diff --git a/src/main/java/seedu/address/model/task/ReadOnlyTask.java b/src/main/java/seedu/address/model/task/ReadOnlyTask.java
@@ -1,5 +1,6 @@
 package seedu.address.model.task;
 
+import java.time.format.DateTimeFormatter;
 import java.util.Optional;
 
 import seedu.address.model.tag.UniqueTagList;
@@ -81,17 +82,31 @@ default String getAsText() {
      */
     default String getAsHTML() {
         final StringBuilder builder = new StringBuilder();
-        builder.append("<html> <body>")
+        builder.append("<html>")
+                .append("<body>")
                 .append("<h1>" + getName() + "</h1>")
-                .append("<br> Time: ")
-                .append(getTime())
-                .append("<br> Description: ")
-                .append(getDescription())
-                .append("<br> Location: ")
-                .append(getLocation())
-                .append("<br> Tags: ");
+                .append("<h3> Date: ");
+        if(getTime().isPresent()){
+        builder.append(getTime().get().getStartDate().toLocalDate().format(DateTimeFormatter.ofPattern("d MMM uuuu")));
+        }
+        builder.append("</h3>")
+                .append("<h3> Time: ");
+        if(getTaskType()==TaskType.DEADLINE){
+            builder.append(getTime().get().getStartDate().toLocalTime());
+        }else if(getTaskType()==TaskType.TIMERANGE){
+            builder.append(getTime().get().getStartDate().toLocalTime())
+                    .append(" ~ ")
+                    .append(getTime().get().getEndDate().get().toLocalTime());
+        }
+        builder.append("</h3>")
+                .append("<h3> Description: </h3>")
+                .append("<p>" + getDescription()+ "</p>")
+                .append("<h3> Location: </h3>")
+                .append("<p>" + getLocation()+ "</p>")
+                .append("<h3> Tags: ");
         getTags().forEach(builder::append);
-        builder.append("</body> </html>");
+        builder.append("</h3>")
+                .append("</body> </html>");
         return builder.toString();
     }