forked from se-edu/addressbook-level4
-
Notifications
You must be signed in to change notification settings - Fork 54
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
[W17-1] The Food Diary #38
Open
rbth7e5
wants to merge
774
commits into
nus-cs2103-AY1819S2:master
Choose a base branch
from
CS2103-AY1819S2-W17-1:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
774 commits
Select commit
Hold shift + click to select a range
7404513
add break to switch statement
rbth7e5 04c5fde
implement filtering on autocomplete context menu
rbth7e5 c7b0307
add defensive coding stuff
rbth7e5 85634a6
fix spaces triggering autocomplete
rbth7e5 8d509a1
update docs
rbth7e5 54880f5
fix activity diagram error
rbth7e5 4936f91
Fix display of added/edited/deleted review
8bd2bdc
update developer guide with autocomplete
rbth7e5 a1e210c
Add SortCommand to sort Restaurants by avgRatings
2c57a22
fixed some minor comment errors in AddReviewCommand
skpai27 419cf8a
created and implemented AddDefaultReviewCommand class, also AddDefaul…
skpai27 fa594fa
implementation of the AddDefaultReviewUtil class
skpai27 9b2d958
implemented AddDefaultReviewCommandParser class
skpai27 a3df8a5
Added the addDefaultReview into FoodDiaryParser, also implemented che…
skpai27 971f06d
added a check to ensure that defaultReview index provided is between …
skpai27 76bf7b9
Added unit tests for AddDefaultReviewCommandParser
skpai27 1c28fcf
allow edit of only openinghours field
Wklee96 a49667a
Merge branch 'editBug' into browserWindow
Wklee96 810b758
modified FoodDiaryParserTest to account for AddDefaultReviewCommand
skpai27 3538904
added javadocs on browser panel
Wklee96 4c0f711
edited variable order
Wklee96 b14d661
fixed checkstyle
Wklee96 f9862ce
update user guide with pictures and autocomplete usage
rbth7e5 06eca3f
update developer guide diagrams
rbth7e5 6a82222
update size of diagrams
rbth7e5 c1f3bd7
corrected check for weblink
Wklee96 f9410b8
add prefaces to sections
rbth7e5 7c25daa
fix user guide bugs
rbth7e5 993a4ab
fix developer guide errors
rbth7e5 806f407
update PPP to follow rubrics
rbth7e5 6329f8b
update images to smaller versions
rbth7e5 f8c5cdb
Merge pull request #118 from weixin-koh/fixSummary
weixin-koh dcb8b2d
Merge pull request #141 from Wklee96/editBug
rbth7e5 cb9a9ca
Merge pull request #140 from rbth7e5/autocomplete
rbth7e5 61c6adb
Place Comparator into a separate package
chanqingzhou f9bbd08
removed browser panel functions as it is changed to a popup window
Wklee96 1dabe65
made test to display browser with kfc website
Wklee96 d3c7d56
made test to display browser with kfc website
Wklee96 e19e228
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w17-1/mai…
chanqingzhou 2e29356
included coverage
chanqingzhou fd1eb6f
modularised AddDefaultReviewCommandParser
skpai27 b9a358f
modified AddDefaultReviewCommand, its constructor now takes in the re…
skpai27 e20c070
implemented unit test for AddDefaultReviewCommand
skpai27 71cb52b
modified AddDefaultReviewParserTest to take into account new Review c…
skpai27 7690b14
removed unused static var
Wklee96 655f2c6
updated docs
Wklee96 a50fd5b
Merge branch 'master' into browserWindow
Wklee96 19b813b
updated developer guide
Wklee96 f51d80c
updated UserGuide
Wklee96 843d352
changed UI diagram
Wklee96 7e79bc0
merge
skpai27 196cb17
lowered event timeout time
Wklee96 527fa26
updated regex
Wklee96 b4c483e
removed file prefix as it is not used
Wklee96 a9f1689
removed duplicated check
Wklee96 05ee01d
added http:// to regex
Wklee96 ece57a2
checkstyle fixes
skpai27 3d6ae21
Added the default review commands to the userguide, as well as a edit…
skpai27 68d6f4e
Implement Sort Command which will leave the current list of Restauran…
470ab99
Edit Sort command description
e5debb8
Undo Postal addition to Restaurant Card UI
e7d6663
Merge pull request #146 from skpai27/addDefaultReview
skpai27 d888abc
removed name in status bar
chanqingzhou 655ef04
updated documentation fixed bugs
chanqingzhou be7bcae
Merge pull request #142 from Wklee96/browserWindow
Wklee96 6d7ecb4
updated styling:
chanqingzhou a5b2562
reform methods in WebUtil
Wklee96 dc4d692
Merge pull request #144 from chanqingzhou/v1.4
chanqingzhou f014268
updated method calls of WebUtil in other classes
Wklee96 fd3ec7e
change toString method to remove http prefix
Wklee96 d32a397
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w17-1/mai…
5cfcb42
Merge pull request #148 from weixin-koh/sortByRatings
weixin-koh cfee979
added javadocs and removed unused imports
Wklee96 996fb94
updated error message
Wklee96 caf1147
implemented a placeholder for Email
Wklee96 7e0265c
implement dummy placeholder for phone
Wklee96 ae29d1a
make phone and email optional to be added
Wklee96 7f67dc7
made phone and email optional and updated add message
Wklee96 8eca1d6
changed toString of all optional fields to be empty string
Wklee96 1b80238
updated UI to not show optional fields
Wklee96 0b395f4
logged no internet exception
Wklee96 f8f87df
modified Restaurant's toString method to show only non optional
Wklee96 df505ca
changed restaurant toString to display only non default fields
Wklee96 58b9a45
removed tests for optional fields
Wklee96 b8e10d1
removed optional fields failure tests
Wklee96 c93f9a2
added postal desc to tests
Wklee96 7c044a0
Merge pull request #152 from Wklee96/optional
Wklee96 0ef1bc7
Merge branch 'master' into browserWindow
Wklee96 9fe0c36
changed method name to be consistent
Wklee96 ba163e3
created opening hours test
Wklee96 fdc575d
added a few more test cases
Wklee96 cb99f02
imposed better constraints for opening hours
Wklee96 fc7b0a2
added test for weblink class
Wklee96 491ca06
added valid weblink to restaurant typical restaurants
Wklee96 7ac60d0
added visitWebCommandTest
Wklee96 0941fd8
changed variable naming style to camel style
Wklee96 ad41cf9
changed add https to all weblink used for testing
Wklee96 9e27234
adding test for visitWeb weblink
Wklee96 8142509
merged
Wklee96 9ff8781
test for valid visitWeb Weblink command
Wklee96 54fda04
added parser tests for weblink and opening hours
Wklee96 88c1edb
Resize panels and main window
9597fe6
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w17-1/mai…
77b7960
Merge branch 'browserWindow' of https://github.com/Wklee96/main into …
Wklee96 68ecdde
refractor code
Wklee96 032f680
ensured visitWebCommand parses the correct msg, and implemented test …
Wklee96 a764874
add tests for Categories
rbth7e5 1c9a7b0
fix style violations
rbth7e5 85cb094
add undo redo tests to categories
rbth7e5 d62436a
add test for occasion and price range
rbth7e5 16e7cba
fix style violations
rbth7e5 66508d4
fix diagram errors
rbth7e5 7c464c8
reduce length of PPP
rbth7e5 77e6157
add logging for autocomplete
rbth7e5 f0c9701
shorten user guide to fit 10 pages
rbth7e5 50f7dde
updated implementation
chanqingzhou aed3771
updated equals method in visitWeb command
Wklee96 57e4af4
added invalid opening hours and weblink for testing
Wklee96 21e249f
Add placeholder images for each panel, change the logo of the app, in…
0873154
add in tests for invalid weblink and opening hours for add command
Wklee96 460bd29
added on to addcommand system test
Wklee96 77b13e0
updated edit command system test
Wklee96 2cbff33
added tests for browser panel
Wklee96 e411653
fix typos in User Guide
rbth7e5 1ed8399
update user guide to be more user friendly
rbth7e5 12fbd49
update docs to offer guidance for symbols and formatting
rbth7e5 f6b41f9
update user guide, remove negatives so can understand better
rbth7e5 e22246d
shorten PPP to fit 10 pages
rbth7e5 cd48c4a
add prefix hints to User guide
rbth7e5 180dd2f
fix grammar errors in PPP
rbth7e5 a2ab9aa
updated activity diagram
Wklee96 4eb98a5
updated PPP
Wklee96 36f1680
Updated UG, DG, PPP, diagrams for addReview, editReview for DG
skpai27 dba0160
updated diagram
Wklee96 ab00c89
updated visitWebUrlSeqDiagram
Wklee96 3fddad4
Add tests for RestaurantSummaryPanel
b6cdfc4
updated developer guide
Wklee96 fd99681
updated user guide with pictures
Wklee96 ea0bbe6
refractor EditCommand method
Wklee96 9f6c31a
updated test cases
chanqingzhou 62fe7d3
Add SortCommand Test
2a47dd6
Remove SortName comparator
d887a0d
add test to categories command to check reviews unchanged
rbth7e5 0ea81fd
fix style violations
rbth7e5 33af4cf
add autocomplete tests for command box
rbth7e5 abfd891
Fix checkstyle
614d391
add human pause for autocomplete test
rbth7e5 5829ddd
Fix checkstyletest
221857d
DG updated with editReview, deleteReview descriptions and implementat…
skpai27 3dc75c5
updated UG
Wklee96 4432e3e
modified DG, minor edits
skpai27 6459830
typo fix
skpai27 d89af3c
Increase height of ResultDisplayPlaceholder
b1fd316
updated test cases to work with postal data
chanqingzhou 92fdb67
hide url in docs
rbth7e5 78bdcf7
reduced pages
Wklee96 52220b9
reduced pages of doc
Wklee96 54796d6
merger
skpai27 ab986ea
Merge pull request #150 from Wklee96/browserWindow
Wklee96 08a915a
merge 2
skpai27 a79a431
Merge pull request #153 from rbth7e5/tests
rbth7e5 ad00462
Merge pull request #159 from skpai27/documentationX
skpai27 7c3658d
modified ReviewBuilder final variables to private
skpai27 d050988
added test cases for AddReviewCommandTest, for successful and unsucce…
skpai27 89f6341
added default review values to EditReviewDescriptorBuilder
skpai27 c548c58
Remove unused pictures and update select activity & sequence diagrams…
37f6c34
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w17-1/mai…
9af2975
updated doucments
chanqingzhou 536e705
Make SortCommand more modular, fix SummaryPanel label for test
eb6bcb7
Added tests for EditReviewCOmmand, default values for editReviewDescr…
skpai27 6720358
Update diagrams
dde461b
editReviewCOmmandTest edit
skpai27 66d8ab2
Modify Tip, Note and Warning icons
c15afec
updated test cases
chanqingzhou ece117d
Implemented EditReviewDescriptorTest
skpai27 2bc126e
implemented DeleteReviewCommandtest
skpai27 67c067f
implemented AddReviewCommandParserTest, modified equals() of AddRevie…
skpai27 6ae1270
Implemented EditReviewCommandParserTest, and minor changes to the Edi…
skpai27 81e7c30
updated documentaions
chanqingzhou 8a78683
updated documents
chanqingzhou 4b92446
implemented DeleteReviewCommandParserTest
skpai27 2074f2f
checkstyle for AddReviewCOmmadnParserTest
skpai27 3581b74
checkstyle
skpai27 5ee531e
Merge pull request #161 from skpai27/ReviewCommandTest
skpai27 c57b375
updated docs
chanqingzhou 2783ea5
fixed styling errors
chanqingzhou 93355c2
manual test case for review commands
skpai27 bcdb07e
Modify boolean variable name
a7ff415
added sample data w/o reviews
Wklee96 1a582af
Edit command message
a86d106
updated weblink validation check
Wklee96 fe31b7a
updated dg on manual testing
Wklee96 0deb4ff
updated documentation grammar
chanqingzhou 31368e5
updated visitWeb error messages
Wklee96 aea83cc
updated tests
Wklee96 f01b83f
Merge pull request #162 from skpai27/minorEdits
skpai27 27a7b4d
edited aboutUS page
skpai27 e917031
Add decorative images
55a1dce
Update diagrams for DG and update DG
4801d2d
Edit UG and update pictures
951f9e0
Change tag in PPP
67f80ee
Merge pull request #160 from chanqingzhou/v1.4
Wklee96 f67db5c
Merge branch 'master' into sampledata
Wklee96 a4dc526
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w17-1/mai…
134da36
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w17-1/mai…
5f4040a
Merge pull request #154 from weixin-koh/sortByRatings
weixin-koh a95f3ee
removed phone and email to check if restaurant is equal since items a…
Wklee96 5746f32
ug, dg ppp of skpai27 edits
skpai27 9f6bcc0
merge
skpai27 ef9d01c
Merge pull request #163 from skpai27/docEdits
skpai27 5db2ce7
commented qz tests
Wklee96 4914811
Merge branch 'master' into sampledata
Wklee96 9b8187f
updated docs and sample data reviews
Wklee96 05b19bd
add logos to intro page and PPP
rbth7e5 4291844
shift user and dev guide logo down to welcome section
rbth7e5 a810e0f
fix typo in note callout
rbth7e5 a86263e
Merge pull request #165 from Wklee96/sampledata
Wklee96 da9499a
Merge pull request #166 from rbth7e5/docs
rbth7e5 f751bee
updated test case and docs
chanqingzhou ed99f5b
updated docs
Wklee96 5c67d39
updated documents
chanqingzhou 6fe9bda
update docs
Wklee96 e9df3e2
updated grammar
chanqingzhou 89bece4
added image to ppp
skpai27 9c9cac8
merge
skpai27 9894ceb
Make changes to UG/DG and shorten PPP
439440c
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w17-1/mai…
646559a
fix display error
rbth7e5 b1423e6
updated UG
Wklee96 f5b9d29
Grammar fix to UG and add undo/redo commands
bde8ead
Merge pull request #169 from rbth7e5/docs
rbth7e5 8110f3d
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w17-1/mai…
23a34d4
Merge pull request #168 from Wklee96/sampledata
Wklee96 19f9555
updated docs
chanqingzhou a332dee
documentation ug, ppp changes
skpai27 9af440f
Update UserGuide.adoc
chanqingzhou 73b7d2f
Merge pull request #170 from skpai27/docEdits
skpai27 00abb38
final updated doucments
chanqingzhou 11c05a4
Merge branch 'master' into v1.4
chanqingzhou a1f4463
Minor tweaks to DG and PPP
038b7b8
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w17-1/mai…
26bae57
updated style
chanqingzhou 352af5b
update style
chanqingzhou 47d46c1
Merge pull request #167 from chanqingzhou/v1.4
chanqingzhou e865c6c
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w17-1/mai…
54ae957
Merge pull request #171 from weixin-koh/sortByRatings
weixin-koh c378933
Edit DG
439458f
Fix checkstyle
4c57ee1
Fix checkstyle
d10eb97
Merge pull request #173 from weixin-koh/sortByRatings
weixin-koh File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,13 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
|
||
<?import javafx.scene.control.Label?> | ||
<?import javafx.scene.control.ListView?> | ||
<?import javafx.scene.layout.VBox?> | ||
|
||
<VBox xmlns="http://javafx.com/javafx/10.0.1" xmlns:fx="http://javafx.com/fxml/1"> | ||
<ListView fx:id="reviewListView" VBox.vgrow="ALWAYS" /> | ||
<ListView fx:id="reviewListView" VBox.vgrow="ALWAYS"> | ||
<placeholder> | ||
<Label styleClass="cell_placeholder_label" text="Reviews"/> | ||
</placeholder> | ||
</ListView> | ||
</VBox> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,5 +5,6 @@ | |
</head> | ||
|
||
<body class="background"> | ||
<p class="cell_placeholder_web">Website</p> | ||
</body> | ||
</html> |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @weixin-koh, just wanted to check which of these fields you're having problems manipulating. Changing the font family for
.cell_big_label
appears to work on my Mac. You might want to zero in on the font issue by checking if changing the font-size works as well.Here's an external reference that I found with regards to integrating custom fonts - http://www.guigarage.com/2014/10/integrate-custom-fonts-javafx-application-using-css/
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @sharan8, the one that I was having problems manipulating is actually the CSS font-family field for the HTML files, more specifically for
.cell_placeholder_web
as the font would appear to be Times New Roman when I specified it as "Segoe UI Semibold". However, I followed the external reference you gave and it works now! Thank you :)Just curious though, it seems that the CSS for HTML files require an import of the font, but how is JavaFX able to access all my local fonts without importing? (I changed the
-fx-font-family
in.cell_big_label
to a custom font I downloaded and it worked without having to import the font in the CSS file)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great that it works! @weixin-koh
I'm not entirely sure how it may be able to access or interpret local fonts, and it could be a font that's present in JavaFX itself as well (you can check this by running
javafx.scene.text.Font.getFamilies();
). Regardless, do confirm if the font works as expected on your team members' workstations too. I'm guessing embedding the font files directly under resources would be best.Using web fonts is another alternative that introduces a dependency, but works - http://fxexperience.com/2012/12/use-webgoogle-fonts-in-javafx/
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yup I added the font file into the resources folder! I ran the line of code and it showed all of the fonts in my computer, so I think JavaFX just has a way to read in all your local fonts? Thanks so much for your help @sharan8!