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

Implement stats command and add stats window #111

Merged
merged 42 commits into from Nov 10, 2019
Merged

Implement stats command and add stats window #111

merged 42 commits into from Nov 10, 2019

Conversation

wpuffs
Copy link

@wpuffs wpuffs commented Oct 29, 2019 •
edited

Closes #110

  • Adds stats command
  • Implement the stats functionality (stats command will show 5 type of "stats")
  • Update UI to accommodate the stats window view
  • Create a custom graph class that has a bar and line chart stacked on top of each other
  • Create a custom pie chart class
  • Create two exceptions related to the stats command

walnads and others added 30 commits September 25, 2019 15:11
Remove all instances of address
5e1abfd
Add new command: Remark
6e73dd6
Merge branch 'tutorial-adding-command'
3f671ae
@wpuffs
Update UserGuide.adoc
ea7590c
@wpuffs
Update UserGuide.adoc
c907562
Update Ui.png
43aa00b
@wpuffs
Update UserGuide.adoc
1011cb1
Update Ui.png
09529ff
Revert "Update Ui.png"
00d6e20 
This reverts commit 09529ff.
Revert "Update UserGuide.adoc"
425a715 
This reverts commit 1011cb1.
Revert "Update Ui.png"
284567d 
This reverts commit 43aa00b.
Revert "Update UserGuide.adoc"
c1ba200 
This reverts commit c907562.
Revert "Update UserGuide.adoc"
57fc252 
This reverts commit ea7590c.
Revert "Merge branch 'tutorial-adding-command'"
e5c943f 
This reverts commit 3f671ae, reversing
changes made to 5e1abfd.
Revert "Remove all instances of address"
6841673 
This reverts commit 5e1abfd.
Update UserGuide.adoc
ce3e8d9
@wpuffs
Update UserGuide.adoc
414c095
@wpuffs
Merge upstream
fecff89
@wpuffs
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-W11-3/main…
dfb99f6 
… into branch-stats
@wpuffs
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-W11-3/main…
8db40f5 
… into branch-stats
@wpuffs
Implement stats command i.e. the statistics feature
a4eaab4
@wpuffs
Fix line ending
18409b7
@wpuffs
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-W11-3/main…
0f67044 
… into branch-stats
@wpuffs
Change the logic of how stats command works
2c51bdc
@wpuffs
Remove existing stats exceptions and add new ones
8d871c9
@wpuffs
Add stylesheets related to the charts and graphs generated by stats c…
08fb0cc 
…ommand
@wpuffs
Modify and add new custom charts and graphs
80976a6
@wpuffs
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-W11-3/main…
7d762e5 
… into branch-stats
@wpuffs
Fix coding style violations
7020c10
@wpuffs
Minor changes to exception handling
6c4d1a4
@wpuffs
Create tests for stats command
5dbc167
@wpuffs
Fix coding style violations
705bdc5
@wpuffs
Create tests for parsing stats command
f1dca88
@wpuffs
Fixed unhandled exception when review is less than 3
6f75ef6
@wpuffs
Fix coding style violations
b6f531e
@wpuffs
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-W11-3/main…
621f8cd 
… into branch-stats

# Conflicts:
#	src/main/java/seedu/address/logic/Logic.java
#	src/main/java/seedu/address/logic/LogicManager.java
#	src/main/java/seedu/address/model/ModelManager.java
#	src/main/java/seedu/address/model/eatery/Eatery.java
#	src/main/java/seedu/address/model/eatery/Review.java
dvrylc
dvrylc reviewed Nov 9, 2019
View reviewed changes
src/main/java/seedu/address/logic/commands/StatsCommand.java Outdated Show resolved Hide resolved
src/main/java/seedu/address/model/eatery/Category.java Outdated Show resolved Hide resolved
src/main/java/seedu/address/model/statistics/Statistics.java Outdated Show resolved Hide resolved
src/main/java/seedu/address/model/statistics/Statistics.java Outdated Show resolved Hide resolved
src/main/java/seedu/address/model/statistics/Statistics.java Outdated Show resolved Hide resolved
src/main/java/seedu/address/model/statistics/Statistics.java Outdated Show resolved Hide resolved
src/main/java/seedu/address/model/statistics/Statistics.java Outdated Show resolved Hide resolved
src/main/java/seedu/address/ui/StatsWindow.java Show resolved Hide resolved
@dvrylc dvrylc merged commit cab6001 into AY1920S1-CS2103T-W11-3:master Nov 10, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dvrylc dvrylc dvrylc approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Implement stats command and add stats window
2 participants
@wpuffs @dvrylc