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 tagcolor features #214

Merged
merged 30 commits into from Nov 9, 2019
Merged

implement tagcolor features #214

merged 30 commits into from Nov 9, 2019

Conversation

LuWenQ
Copy link

@LuWenQ LuWenQ commented Nov 4, 2019

closes #120

@LuWenQ
add tagcolor command
fca5391
@LuWenQ
Merge remote-tracking branch 'origin/master' into tags
ed97cd8 
# Conflicts:
#	src/main/java/seedu/algobase/model/tag/Tag.java
#	src/main/java/seedu/algobase/ui/ProblemCard.java
@LuWenQ
fix som parts in storage
936c7ad
@LuWenQ
Fix storage bugs about tag color
b8a3ca6
@LuWenQ
Add edittagcolor command
cbb3885
@LuWenQ
Merge remote-tracking branch 'upstream/master' into tags
a500301 
# Conflicts:
#	src/main/java/seedu/algobase/logic/commands/Command.java
#	src/main/java/seedu/algobase/logic/parser/CliSyntax.java
#	src/main/java/seedu/algobase/model/util/SampleDataUtil.java
#	src/main/java/seedu/algobase/ui/ProblemCard.java
#	src/test/java/seedu/algobase/logic/commands/HelpCommandTest.java
@LuWenQ
resolved conflicts
5341a2b
@LuWenQ LuWenQ added the status.Ongoing The issue is currently being worked on. note: remove this label before closing an issue. label Nov 4, 2019
@LuWenQ LuWenQ added this to the v1.4 milestone Nov 4, 2019
@LuWenQ LuWenQ self-assigned this Nov 4, 2019
@LuWenQ LuWenQ added this to In progress in AlgoBase via automation Nov 4, 2019
@coveralls
Copy link

coveralls commented Nov 4, 2019 •
edited

Pull Request Test Coverage Report for Build 487

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 111 unchanged lines in 10 files lost coverage.
  • Overall coverage increased (+0.5%) to 51.793%
Files with Coverage Reduction New Missed Lines %
file:/home/travis/build/AY1920S1-CS2103T-W11-1/main/src/main/java/seedu/algobase/model/ModelManager.java 2 79.39%
file:/home/travis/build/AY1920S1-CS2103T-W11-1/main/src/main/java/seedu/algobase/logic/commands/tag/AddTagCommand.java 3 75.0%
file:/home/travis/build/AY1920S1-CS2103T-W11-1/main/src/main/java/seedu/algobase/logic/commands/problem/AddCommand.java 4 78.95%
file:/home/travis/build/AY1920S1-CS2103T-W11-1/main/src/main/java/seedu/algobase/storage/JsonAdaptedTag.java 6 30.77%
file:/home/travis/build/AY1920S1-CS2103T-W11-1/main/src/main/java/seedu/algobase/logic/commands/tag/EditTagCommand.java 8 70.0%
file:/home/travis/build/AY1920S1-CS2103T-W11-1/main/src/main/java/seedu/algobase/ui/TagCard.java 8 0.0%
file:/home/travis/build/AY1920S1-CS2103T-W11-1/main/src/main/java/seedu/algobase/ui/TaskCard.java 9 0.0%
file:/home/travis/build/AY1920S1-CS2103T-W11-1/main/src/main/java/seedu/algobase/logic/parser/AlgoBaseParser.java 12 70.45%
file:/home/travis/build/AY1920S1-CS2103T-W11-1/main/src/main/java/seedu/algobase/logic/commands/problem/EditCommand.java 14 80.0%
file:/home/travis/build/AY1920S1-CS2103T-W11-1/main/src/main/java/seedu/algobase/logic/parser/ParserUtil.java 45 59.63%
Totals Coverage Status
Change from base Build 484: 0.5%
Covered Lines: 2874
Relevant Lines: 5549
💛 - Coveralls

jiayushe
jiayushe requested changes Nov 5, 2019
View reviewed changes
Copy link

@jiayushe jiayushe left a comment

Choose a reason for hiding this comment

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

Hmm can't you just use the edittag command to change the colors? The user should be allowed to specify the tag color upon creating new tags as well.

src/main/java/seedu/algobase/logic/commands/EditTagColorCommand.java Outdated Show resolved Hide resolved
src/main/java/seedu/algobase/logic/commands/EditTagColorCommand.java Outdated Show resolved Hide resolved
src/main/java/seedu/algobase/logic/commands/EditTagColorCommand.java Outdated Show resolved Hide resolved
src/main/java/seedu/algobase/logic/commands/EditTagColorCommand.java Outdated Show resolved Hide resolved
src/main/java/seedu/algobase/logic/commands/EditTagColorCommand.java Outdated Show resolved Hide resolved
src/main/java/seedu/algobase/logic/commands/EditTagColorCommand.java Outdated Show resolved Hide resolved
AlgoBase automation moved this from In progress to Review in progress Nov 5, 2019
@le0tan le0tan added status.reviewRequired and removed status.Ongoing The issue is currently being worked on. note: remove this label before closing an issue. labels Nov 5, 2019
@nus-se-bot nus-se-bot mentioned this pull request Nov 5, 2019
Closed
17 tasks
@le0tan le0tan requested a review from jiayushe November 6, 2019 15:55
jiayushe
jiayushe requested changes Nov 6, 2019
View reviewed changes
Copy link

@jiayushe jiayushe left a comment

Choose a reason for hiding this comment

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

Can you address my previous review as well? Thanks.

src/test/java/seedu/algobase/logic/commands/HelpCommandTest.java Show resolved Hide resolved
src/main/java/seedu/algobase/model/tag/Tag.java Outdated Show resolved Hide resolved
src/main/java/seedu/algobase/model/tag/Tag.java Outdated Show resolved Hide resolved
@LuWenQ LuWenQ added status.Ongoing The issue is currently being worked on. note: remove this label before closing an issue. and removed status.reviewRequired labels Nov 7, 2019
@LuWenQ
Merge remote-tracking branch 'origin/tags' into tags
aee6a9c 
# Conflicts:
#	src/main/java/seedu/algobase/ui/ProblemCard.java
@LuWenQ
delete unused imports
19f791a
@LuWenQ
Copy link
Author

LuWenQ commented Nov 7, 2019

Got bug in storage

@LuWenQ LuWenQ added status.reviewRequired and removed status.Ongoing The issue is currently being worked on. note: remove this label before closing an issue. labels Nov 8, 2019
le0tan
le0tan requested changes Nov 9, 2019
View reviewed changes
Copy link

@le0tan le0tan left a comment

Choose a reason for hiding this comment

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

Have you updated the UG for addtag and the MESSAGE_USAGE in AddTagCommand?
And can you check if your changes affect other parts of DG & UG?

docs/UserGuide.adoc Outdated Show resolved Hide resolved
@LuWenQ LuWenQ requested a review from le0tan November 9, 2019 06:34
@le0tan le0tan requested a review from jiayushe November 9, 2019 08:31
AlgoBase automation moved this from Review in progress to Reviewer approved Nov 9, 2019
jiayushe
jiayushe approved these changes Nov 9, 2019
View reviewed changes
Copy link

@jiayushe jiayushe left a comment

Choose a reason for hiding this comment

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

LGTM

@LuWenQ LuWenQ merged commit 4b11fc1 into AY1920S1-CS2103T-W11-1:master Nov 9, 2019
AlgoBase automation moved this from Reviewer approved to Done Nov 9, 2019
This was referenced Nov 13, 2019
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@le0tan le0tan le0tan approved these changes

@jiayushe jiayushe jiayushe approved these changes

Assignees

@LuWenQ LuWenQ

Labels
status.reviewRequired
Projects
AlgoBase
  
Done
Milestone
v1.4
Development

Successfully merging this pull request may close these issues.

As a user, I want to set and change tag colors.
4 participants
@LuWenQ @coveralls @le0tan @jiayushe