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

V1.4 Check Command Update #102

Merged
merged 15 commits into from Nov 8, 2018
Merged

Conversation

pinjuen
Copy link
Collaborator

@pinjuen pinjuen commented Oct 31, 2018

  • took out check in time and working rate from Person Card
  • different colors for check in and out status
  • took out NRIC and Password from command
  • not allow more than one repeated prefix
  • updated user guide and developer guide accordingly.

…into uiUpdate

# Conflicts:
#	src/main/java/seedu/address/model/util/SampleDataUtil.java
#	src/test/java/seedu/address/testutil/TypicalPersons.java
Copy link
Collaborator

@speezy37 speezy37 left a comment

Choose a reason for hiding this comment

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

Awaiting for UI changes

pinjuen and others added 9 commits November 2, 2018 01:02
- removed working rate and check in time on person card
- changing colour when checking in/out
…into uiUpdate

# Conflicts:
#	docs/UserGuide.adoc
#	src/main/java/seedu/address/model/util/SampleDataUtil.java
- not allow more than one prefix
- updated user guide
- fix checkstyle
@pinjuen pinjuen changed the title Person Card update V1.4 Check Command Update Nov 5, 2018
@pinjuen pinjuen added this to the v1.4 milestone Nov 5, 2018
@pinjuen pinjuen added enhancement New feature or request update.documentation Update of documentation v1.4 labels Nov 5, 2018
@jinyao-lee jinyao-lee self-requested a review November 7, 2018 15:53
Copy link
Collaborator

@jinyao-lee jinyao-lee left a comment

Choose a reason for hiding this comment

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

UI looks good to me.

@jinyao-lee jinyao-lee dismissed speezy37’s stale review November 8, 2018 02:18

Changes have been made

@jinyao-lee jinyao-lee merged commit c939251 into CS2113-AY1819S1-T16-3:master Nov 8, 2018
@pinjuen pinjuen added this to In progress in Main Project via automation Nov 8, 2018
@pinjuen pinjuen moved this from In progress to Done in Main Project Nov 8, 2018
@pinjuen pinjuen moved this from Done to In progress in Main Project Nov 8, 2018
@pinjuen pinjuen moved this from In progress to Done in Main Project Nov 8, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request update.documentation Update of documentation v1.4
Projects
No open projects
Main Project
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

3 participants