Skip to content

Commit

Permalink
Merge pull request #87 from getsquared/remove-reminders-panel
Browse files Browse the repository at this point in the history
Remove Reminders Panel for 1.2
  • Loading branch information
ReganChoy authored Mar 21, 2024
2 parents e16a8ca + b2f474c commit fc6890d
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 39 deletions.
72 changes: 36 additions & 36 deletions src/main/java/seedu/address/ui/MainWindow.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public class MainWindow extends UiPart<Stage> {
// Independent Ui parts residing in this Ui container
private ClientListPanel clientListPanel;
private ClientViewPanel clientViewPanel;
private RemindersPanel remindersPanel;
// private RemindersPanel remindersPanel;
private ResultDisplay resultDisplay;
private HelpWindow helpWindow;

Expand All @@ -52,11 +52,11 @@ public class MainWindow extends UiPart<Stage> {
@FXML
private StackPane clientPolicyTablePlaceholder;

@FXML
private StackPane lastMetCardPlaceholder;

@FXML
private StackPane appointmentsCardPlaceholder;
// @FXML
// private StackPane lastMetCardPlaceholder;
//
// @FXML
// private StackPane appointmentsCardPlaceholder;

@FXML
private StackPane resultDisplayPlaceholder;
Expand Down Expand Up @@ -134,8 +134,8 @@ void fillInnerParts() {
clearClientViewPanel();
}

remindersPanel = new RemindersPanel();
addRemindersPanel();
// remindersPanel = new RemindersPanel();
// addRemindersPanel();

resultDisplay = new ResultDisplay();

Expand Down Expand Up @@ -178,33 +178,33 @@ private void refreshClientViewPanel() {
}
}

/**
* Fills up placeholders of reminders panel.
*/
private void addRemindersPanel() {
RemindersCard lastMetCard = remindersPanel.getLastMetCard();
lastMetCardPlaceholder.getChildren().add(lastMetCard.getRoot());

RemindersCard appointmentsCard = remindersPanel.getAppointmentsCard();
appointmentsCardPlaceholder.getChildren().add(appointmentsCard.getRoot());
}

/**
* Clears the placeholders of reminders panel.
*/
private void clearRemindersPanel() {
lastMetCardPlaceholder.getChildren().clear();
appointmentsCardPlaceholder.getChildren().clear();
}

/**
* Refreshes the reminders panel.
*/
private void refreshRemindersPanel() {
clearRemindersPanel();
remindersPanel.updateRemindersPanel();
addRemindersPanel();
}
// /**
// * Fills up placeholders of reminders panel.
// */
// private void addRemindersPanel() {
// RemindersCard lastMetCard = remindersPanel.getLastMetCard();
// lastMetCardPlaceholder.getChildren().add(lastMetCard.getRoot());
//
// RemindersCard appointmentsCard = remindersPanel.getAppointmentsCard();
// appointmentsCardPlaceholder.getChildren().add(appointmentsCard.getRoot());
// }
//
// /**
// * Clears the placeholders of reminders panel.
// */
// private void clearRemindersPanel() {
// lastMetCardPlaceholder.getChildren().clear();
// appointmentsCardPlaceholder.getChildren().clear();
// }
//
// /**
// * Refreshes the reminders panel.
// */
// private void refreshRemindersPanel() {
// clearRemindersPanel();
// remindersPanel.updateRemindersPanel();
// addRemindersPanel();
// }

/**
* Sets the default size based on {@code guiSettings}.
Expand Down Expand Up @@ -258,7 +258,7 @@ private CommandResult executeCommand(String commandText) throws CommandException
resultDisplay.setFeedbackToUser(commandResult.getFeedbackToUser());

refreshClientViewPanel();
refreshRemindersPanel();
// refreshRemindersPanel();

if (commandResult.isShowHelp()) {
handleHelp();
Expand Down
5 changes: 2 additions & 3 deletions src/main/resources/view/MainWindow.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,11 @@
<?import javafx.scene.control.Menu?>
<?import javafx.scene.control.MenuBar?>
<?import javafx.scene.control.MenuItem?>
<?import javafx.scene.control.ScrollPane?>
<?import javafx.scene.image.Image?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.StackPane?>
<?import javafx.scene.layout.VBox?>


<?import javafx.scene.layout.Region?>
<fx:root type="javafx.stage.Stage" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1"
title="ClientCare" minWidth="1000" minHeight="600" onCloseRequest="#handleExit">
<icons>
Expand Down Expand Up @@ -63,6 +60,7 @@
<StackPane fx:id="clientDetailsCardPlaceholder" VBox.vgrow="ALWAYS"/>
<StackPane fx:id="clientPolicyTablePlaceholder" VBox.vgrow="ALWAYS"/>
</VBox>
<!--
<VBox fx:id="remindersView" styleClass="pane-with-border" minWidth="350" prefWidth="350" maxWidth="350" HBox.hgrow="ALWAYS">
<padding>
<Insets top="10" right="10" bottom="10" left="10" />
Expand All @@ -77,6 +75,7 @@
</content>
</ScrollPane>
</VBox>
-->
</HBox>

<StackPane fx:id="statusbarPlaceholder" VBox.vgrow="NEVER" />
Expand Down

0 comments on commit fc6890d

Please sign in to comment.