Skip to content

Commit

Permalink
Add bracket to the time string
Browse files Browse the repository at this point in the history
  • Loading branch information
SukiTsang committed Oct 28, 2016
1 parent 572c52c commit 62ad5e7
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 1 deletion.
21 changes: 20 additions & 1 deletion src/main/java/seedu/task/ui/TaskCard.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,27 @@ public class TaskCard extends UiPart{

@FXML
private Label closeTime;
//@@author

//@@author A0153467Y
@FXML
private Label actualOpenTime;

@FXML
private Label actualCloseTime;

@FXML
private Label firstOpenBracket;

@FXML
private Label firstCloseBracket;

@FXML
private Label secondOpenBracket;

@FXML
private Label secondCloseBracket;
//@@author

@FXML
private VBox cardDetails;

Expand Down Expand Up @@ -70,6 +82,7 @@ public void initialize() {
setVisualFlags();
showExtendedInformation();
}

//@@author A0144939R
private void setCardDetails() {
name.setText(task.getName().taskName);
Expand All @@ -81,6 +94,12 @@ private void setCardDetails() {
actualOpenTime.setText(task.getOpenTime().toString());
actualCloseTime.setText(task.getCloseTime().toString());

firstOpenBracket.setText("(");
firstCloseBracket.setText(")");

secondOpenBracket.setText("(");
secondCloseBracket.setText(")");

tagListPanel = TagListPanel.load(getPrimaryStage(), tagsListPlaceholder, task.getTags().getInternalList());
}
//@@author
Expand Down
4 changes: 4 additions & 0 deletions src/main/resources/view/TaskListCard.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,18 @@
<children>
<Label styleClass="cell_big_label" text="Start: "></Label>
<Label fx:id="actualOpenTime" styleClass="cell_big_label" text="\$actualOpenTime" />
<Label fx:id="firstOpenBracket" styleClass="cell_big_label" text="\$firstOpenBracket" />
<Label fx:id="openTime" styleClass="cell_big_label" text="\$openTime" />
<Label fx:id="firstCloseBracket" styleClass="cell_big_label" text="\$firstCloseBracket" />
</children>
</HBox>
<HBox spacing="5" alignment="CENTER_LEFT">
<children>
<Label styleClass="cell_big_label" text="End: "></Label>
<Label fx:id="actualCloseTime" styleClass="cell_big_label" text="\$actualCloseTime" />
<Label fx:id="secondOpenBracket" styleClass="cell_big_label" text="\$secondOpenBracket" />
<Label fx:id="closeTime" styleClass="cell_big_label" text="\$closeTime" />
<Label fx:id="secondCloseBracket" styleClass="cell_big_label" text="\$secondCloseBracket" />
</children>
</HBox>
</children>
Expand Down

0 comments on commit 62ad5e7

Please sign in to comment.