Merge pull request nus-cs2103-AY2021S1#55 from shadowezz/tagging-completion

Display completion status of deliverable as a tag

Author: MerlinLim

src/main/java/seedu/address/model/deliverable/deliverable/Deliverable.java

@@ -61,7 +61,7 @@ public Deadline getDeadline() {
         return deadline;
     }
 
-    public boolean getCompletionStatus() {
+    public boolean getIsComplete() {
         return isComplete;
     }
 
@@ -101,7 +101,7 @@ public boolean equals(Object other) {
                 && otherDeliverable.getDescription().equals(getDescription())
                 && otherDeliverable.getDeadline().equals(getDeadline())
                 && otherDeliverable.getContacts().equals(getContacts())
-                && otherDeliverable.getCompletionStatus() == getCompletionStatus();
+                && otherDeliverable.getIsComplete() == getIsComplete();
     }
 
     @Override

src/main/java/seedu/address/storage/deliverable/JsonAdaptedDeliverable.java

@@ -44,7 +44,7 @@ public JsonAdaptedDeliverable(Deliverable source) {
         description = source.getDescription().value;
         deadline = source.getDeadline().value;
         contacts = source.getContacts();
-        isComplete = Boolean.toString(source.getCompletionStatus());
+        isComplete = Boolean.toString(source.getIsComplete());
     }
 
     /**

src/main/java/seedu/address/ui/DeliverableCard.java

@@ -49,7 +49,13 @@ public DeliverableCard(Deliverable deliverable, int displayedIndex) {
         description.setText("Description: " + deliverable.getDescription().value);
         deadline.setText("Deadline: " + deliverable.getDeadline().value);
         contacts.setText("Contacts: " + deliverable.getContacts());
-        isCompleted.setText("Completion status: " + deliverable.getCompletionStatus());
+        if (deliverable.getIsComplete()) {
+            isCompleted.setText("completed");
+            isCompleted.setStyle("-fx-background-color: #32cd32");
+        } else {
+            isCompleted.setText("on-going");
+            isCompleted.setStyle("-fx-background-color: #ffa500");
+        }
     }
 
     @Override

src/main/resources/view/DarkTheme.css

@@ -316,3 +316,11 @@
     -fx-background-radius: 2;
     -fx-font-size: 11;
 }
+
+#isCompleted {
+    -fx-text-fill: white;
+    -fx-padding: 1 3 1 3;
+    -fx-border-radius: 2;
+    -fx-background-radius: 2;
+    -fx-font-size: 11;
+}

src/main/resources/view/DeliverableListCard.fxml

@@ -26,10 +26,10 @@
                 </Label>
                 <Label fx:id="title" text="\$first" styleClass="cell_big_label" />
             </HBox>
+            <Label fx:id="isCompleted" />
             <Label fx:id="description" styleClass="cell_small_label" text="\$description" />
             <Label fx:id="deadline" styleClass="cell_small_label" text="\$deadline" />
             <Label fx:id="contacts" styleClass="cell_small_label" text="\$contacts" />
-            <Label fx:id="isCompleted" styleClass="cell_small_label" text="\$isCompleted" />
         </VBox>
     </GridPane>
 </HBox>

src/test/java/seedu/address/testutil/DeliverableBuilder.java

@@ -41,7 +41,7 @@ public DeliverableBuilder(Deliverable deliverableToCopy) {
         description = deliverableToCopy.getDescription();
         deadline = deliverableToCopy.getDeadline();
         contacts = deliverableToCopy.getContacts();
-        isComplete = deliverableToCopy.getCompletionStatus();
+        isComplete = deliverableToCopy.getIsComplete();
     }
 
     /**