Skip to content

Commit

Permalink
Fixes Confusing Listing index issue and Updates UserGuide
Browse files Browse the repository at this point in the history
  • Loading branch information
Yufannnn committed Apr 4, 2023
1 parent 44dddcc commit 332a8cf
Show file tree
Hide file tree
Showing 11 changed files with 99 additions and 55 deletions.
140 changes: 97 additions & 43 deletions docs/UserGuide.md

Large diffs are not rendered by default.

Binary file added docs/images/delete-homework.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/mark-homework.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/new-homework.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/unmark-homework.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/update-homework.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/view-homework.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 1 addition & 5 deletions src/main/java/seedu/address/ui/exam/ExamCard.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ public class ExamCard extends UiPart<Region> {
@FXML
private HBox cardPane;
@FXML
private Label id;
@FXML
private Label title;
@FXML
private Label startTime;
Expand All @@ -35,7 +33,6 @@ public class ExamCard extends UiPart<Region> {
*/
public ExamCard(Exam exam, int id) {
super(FXML);
this.id.setText(id + ". ");
title.setText(exam.getDescription());
startTime.setText(exam.getStartTime().format(PRINT_FORMATTER));
endTime.setText(exam.getEndTime().format(PRINT_FORMATTER));
Expand All @@ -53,8 +50,7 @@ public boolean equals(Object other) {
}
// state check
ExamCard card = (ExamCard) other;
return id.getText().equals(card.id.getText())
&& title.getText().equals(card.title.getText())
return title.getText().equals(card.title.getText())
&& startTime.getText().equals(card.startTime.getText())
&& endTime.getText().equals(card.endTime.getText());
}
Expand Down
6 changes: 1 addition & 5 deletions src/main/java/seedu/address/ui/lesson/LessonCard.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ public class LessonCard extends UiPart<Region> {
@FXML
private HBox cardPane;
@FXML
private Label id;
@FXML
private Label title;
@FXML
private Label startTime;
Expand All @@ -36,7 +34,6 @@ public class LessonCard extends UiPart<Region> {
*/
public LessonCard(Lesson lesson, int id) {
super(FXML);
this.id.setText(id + DOT);
title.setText(lesson.getTitle());
startTime.setText(lesson.getStartTime().format(PRINT_FORMATTER));
endTime.setText(lesson.getEndTime().format(PRINT_FORMATTER));
Expand All @@ -54,8 +51,7 @@ public boolean equals(Object other) {
}
// state check
LessonCard card = (LessonCard) other;
return id.getText().equals(card.id.getText())
&& title.getText().equals(card.title.getText())
return title.getText().equals(card.title.getText())
&& startTime.getText().equals(card.startTime.getText())
&& endTime.getText().equals(card.endTime.getText());
}
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/view/ExamListCard.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
</padding>
<VBox>
<HBox spacing="3">
<Label fx:id="id" styleClass="cell_big_label" />
<Label fx:id="title" VBox.vgrow="NEVER" />
</HBox>
<HBox>
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/view/LessonListCard.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
</padding>
<VBox>
<HBox spacing="3">
<Label fx:id="id" styleClass="cell_big_label" />
<Label fx:id="title" VBox.vgrow="NEVER" />
</HBox>
<HBox>
Expand Down

0 comments on commit 332a8cf

Please sign in to comment.