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

Modify pay v1.2.1 #99

Merged
merged 18 commits into from Oct 17, 2018
Merged

Modify pay v1.2.1 #99

merged 18 commits into from Oct 17, 2018

Conversation

ChuaZhenWei
Copy link
Collaborator

@ChuaZhenWei ChuaZhenWei commented Oct 17, 2018 •
edited

Resolves #62 issue.

Implemented the modifypay function to allow users to modify the salary and bonus of employees based on user input.

LimYiSheng
LimYiSheng reviewed Oct 17, 2018
View reviewed changes
src/main/java/seedu/address/logic/commands/EditCommand.java Outdated
public void setEmail(Email email) {
this.email = email;
}
public void setEmail(Email email) { this.email = email; }
Copy link
Collaborator

Choose a reason for hiding this comment

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

<< Do edit this file back to the original copy (since there wasn't an actual change in the code)

@ChuaZhenWei ChuaZhenWei self-assigned this Oct 17, 2018
@ChuaZhenWei ChuaZhenWei added the priority.high Must do label Oct 17, 2018
@ChuaZhenWei ChuaZhenWei added this to the v1.2 milestone Oct 17, 2018
@coveralls
Copy link

coveralls commented Oct 17, 2018 •
edited

Pull Request Test Coverage Report for Build 360

  • 0 of 79 (0.0%) changed or added relevant lines in 4 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage decreased (-2.0%) to 72.883%
Changes Missing Coverage Covered Lines Changed/Added Lines %
src/main/java/seedu/address/logic/parser/AddressBookParser.java 0 1 0.0%
src/main/java/seedu/address/logic/parser/ParserUtil.java 0 5 0.0%
src/main/java/seedu/address/logic/parser/ModifyPayCommandParser.java 0 16 0.0%
src/main/java/seedu/address/logic/commands/ModifyPayCommand.java 0 57 0.0%
Totals Coverage Status
Change from base Build 342: -2.0%
Covered Lines: 2083
Relevant Lines: 2858
💛 - Coveralls

@ChuaZhenWei ChuaZhenWei added the type.story A user story label Oct 17, 2018
@LimYiSheng LimYiSheng self-requested a review October 17, 2018 15:18
LimYiSheng
LimYiSheng approved these changes Oct 17, 2018
View reviewed changes
Copy link
Collaborator

@LimYiSheng LimYiSheng left a comment

Choose a reason for hiding this comment

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

PR approved, command work as per stated. @XiiaoPanda go ahead with the merge once your testing has been completed.

@ChuaZhenWei
Copy link
Collaborator Author

Implemented the modifypay function to allow users to modify the salary and bonus of employees based on user input.

XiiaoPanda
XiiaoPanda approved these changes Oct 17, 2018
View reviewed changes
Copy link
Collaborator

@XiiaoPanda XiiaoPanda left a comment

Choose a reason for hiding this comment

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

ModifyPay command now allows salary and bonus to be modified

@XiiaoPanda XiiaoPanda removed the request for review from zhihong8888 October 17, 2018 15:59
@LimYiSheng LimYiSheng merged commit 01305df into CS2113-AY1819S1-T16-4:master Oct 17, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@XiiaoPanda XiiaoPanda XiiaoPanda approved these changes

@LimYiSheng LimYiSheng LimYiSheng approved these changes

Assignees

@ChuaZhenWei ChuaZhenWei

Labels
priority.high Must do type.story A user story
Projects
No open projects
Centralized Human Resource System (CHRS)
  
Awaiting triage
Milestone
v1.2
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@ChuaZhenWei @coveralls @XiiaoPanda @LimYiSheng