Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update UI for AddCommand #29

Merged
merged 12 commits into from
Mar 20, 2024
Merged

Update UI for AddCommand #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7d8347b
Merge branch 'branch-AboutUs'
erv-teo Mar 6, 2024
614cb2e
Merge branch 'master' of https://github.com/erv-teo/tp
erv-teo Mar 15, 2024
879393d
Include required fields in Ui and change title to NAB.
erv-teo Mar 15, 2024
7240ff4
Change parameter name to value
erv-teo Mar 18, 2024
ca3a779
Merge branch 'master' of https://github.com/erv-teo/tp
erv-teo Mar 18, 2024
0c2e2e6
Fix merge conflict
erv-teo Mar 18, 2024
9d69a0f
Fix merge conflicts
erv-teo Mar 18, 2024
abf4e65
Fix merge conflicts
erv-teo Mar 18, 2024
af632b2
Add email Label to fxml
erv-teo Mar 18, 2024
45a2900
Commit
erv-teo Mar 18, 2024
46f8c67
Merge branch 'master' into branch-AddCommandUi
erv-teo Mar 18, 2024
dfb0f6c
Remove unnecessary fields - phone, email and address
erv-teo Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/main/java/seedu/address/ui/PersonCard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
@FXML
private FlowPane tags;


/**
* Creates a {@code PersonCode} with the given {@code Person} and index to display.
*/
Expand All @@ -57,13 +58,10 @@
this.person = person;
id.setText(displayedIndex + ". ");
name.setText(person.getName().fullName);
phone.setText(person.getPhone().value);
address.setText(person.getAddress().value);
email.setText(person.getEmail().value);
dob.setText(person.getDob().value);
ic.setText(person.getIc().value);
admissionDate.setText(person.getAdmissionDate().value);
ward.setText(person.getWard().value);

Check warning on line 64 in src/main/java/seedu/address/ui/PersonCard.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/seedu/address/ui/PersonCard.java#L61-L64 

Added lines #L61 - L64 were not covered by tests
person.getTags().stream()
.sorted(Comparator.comparing(tag -> tag.tagName))
.forEach(tag -> tags.getChildren().add(new Label(tag.tagName)));
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/view/MainWindow.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<?import javafx.scene.layout.VBox?>

<fx:root type="javafx.stage.Stage" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1"
title="Address App" minWidth="450" minHeight="600" onCloseRequest="#handleExit">
title="Nursing Address Book" minWidth="450" minHeight="600" onCloseRequest="#handleExit">
<icons>
<Image url="@/images/address_book_32.png" />
</icons>
Expand Down
7 changes: 2 additions & 5 deletions src/main/resources/view/PersonListCard.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,10 @@
<Label fx:id="name" text="\$first" styleClass="cell_big_label" />
</HBox>
<FlowPane fx:id="tags" />
<Label fx:id="phone" styleClass="cell_small_label" text="\$phone" />
<Label fx:id="address" styleClass="cell_small_label" text="\$address" />
<Label fx:id="email" styleClass="cell_small_label" text="\$email" />
<Label fx:id="dob" styleClass="cell_small_label" text="\$dob" />
<Label fx:id="ic" styleClass="cell_small_label" text="\$ic" />
<Label fx:id="admissionDate" styleClass="cell_small_label" text="\$admissionDate" />
<Label fx:id="dob" styleClass="cell_small_label" text="\$dob" />
<Label fx:id="ward" styleClass="cell_small_label" text="\$ward" />
<Label fx:id="admissionDate" styleClass="cell_small_label" text="\$admissionDate" />
</VBox>
</GridPane>
</HBox>
Loading