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.

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

Crud regime #90

Merged
merged 20 commits into from
Oct 12, 2019
Merged

Crud regime #90

merged 20 commits into from
Oct 12, 2019

Conversation

jietung
Copy link

@jietung jietung commented Oct 11, 2019

No description provided.

Copy link

@t-cheepeng t-cheepeng left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some parts are violating DRY principles but we can refactor out when doing schedule also.

private final UserPrefs userPrefs;
private final FilteredList<Exercise> filteredExercises;
private final SortedList<Exercise> sortedExercises;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a clarification, is there a reason why sortedExercises list was selected over filteredExercises list to be replaced by the filteredRegimes list?

Was it because sortedExercises list was just meant to be a filler for the left panel?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. SortedExercises was just filler for the left panel.

src/main/java/seedu/exercise/logic/Logic.java Outdated Show resolved Hide resolved
@@ -51,7 +51,7 @@
</StackPane>
<BorderPane prefHeight="58.0" prefWidth="410.0" styleClass="pane-with-border" VBox.vgrow="ALWAYS">
<left>
<StackPane fx:id="sortedListPanelPlaceholder" minHeight="150.0" minWidth="100.0"
<StackPane fx:id="regimeListPanelPlaceholder" minHeight="150.0" minWidth="100.0"
prefHeight="150.0" prefWidth="400.0" BorderPane.alignment="CENTER"/>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The current implementation is the regime list on Left panel and exercise list on Right panel. Nothing wrong with it for now, and it is very simple to switch sides from this fxml file. But if I remembered correctly, the original idea has exercise list on left and regime list on right.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

its regimes on the left and schedule on the right?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The mock up UI in user guide is regime list on the right, left is schedule list.
As for the middle, i think is result display?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will discuss the finalized UI design on our next meeting then.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh okay I might have remembered wrongly then

src/main/resources/view/MainWindow.fxml Show resolved Hide resolved
@t-cheepeng t-cheepeng added this to the v1.2 milestone Oct 12, 2019
Copy link

@t-cheepeng t-cheepeng left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Copy link

@garylyp garylyp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That was very efficient. Good job!

Copy link

@kwekke kwekke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok.

@t-cheepeng t-cheepeng merged commit b44a7ed into AY1920S1-CS2103T-T09-2:master Oct 12, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants