-
Notifications
You must be signed in to change notification settings - Fork 44
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
[#220] - Combine first_name and last_name into one name field #364
Open
abis555
wants to merge
16
commits into
se701team3:main-a2
Choose a base branch
from
abis555:abis555-branch-1
base: main-a2
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.
Conversation
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
* Created upcoming birthday summary and added card to main page * Updated date format and birthday api retrieval based on api spec * Finished adding component to home page properly utilising new api, creating new service functions * Wrote some static tests where possible (Dates are always changing for birthday so cannot test in same way as previous tests * Cleaned up code as per review changes, removed duplicate function, and fixed indentation * Removed service account json * Fixed test to ignore date
* Created upcoming birthday summary and added card to main page * Updated date format and birthday api retrieval based on api spec * Finished adding component to home page properly utilising new api, creating new service functions * Wrote some static tests where possible (Dates are always changing for birthday so cannot test in same way as previous tests * Cleaned up code as per review changes, removed duplicate function, and fixed indentation * Removed service account json * Fixed test to ignore date
* Added labels into person model, created getPersonByLabel endpoint with tests * Added labels input to person form * Added label chips to person card * Added labels to person drawer * Fixed labels not rendering on person page * Added conditional rendering for labels * Updated PersonDrawer snapshot Co-authored-by: Henry <[email protected]>
* Added TTL for encounters of 1 year * Pruning endpoint created. Takes input of date which we want to prune before TODO testing. * Added test to check that encounters before prune date are deleted * Fixed prune test to properly call api
* add dropdown box for gender selection
* Updating Company model * Person can be created to already belong to company
* Added Goal Model * Added goals to Person schema with temporary requirement of false * Added goal controller and routes * Removed goals from person model to add to users model * Added goals to user model * Added goal services to get/create/update/delete and user services to add/delete goals from user * Implemented /GET /POST /PUT /DELETE goal apis * Added api routes for testing * Modified controller, routes, index for backend * Fixed code which failed in tests, removed irrelevant test cases * Changed behaviour of code according to requirements in issue se701team3#233 and refactored test * Updated comments * Fixed all test cases with new modified models * Added progress data to goal model * Added progress variable to goal examples in tests * Removed progress variable from goal model, implemented get progress in /GET goals * Updated return progress behaviour * Modified the conditions when comparing dates and updated goal service * Modified code according to pull request feedback
* Add Streaks component need npm i react-calendar-heatmap and npm i react-tooltip * remove dead code, add some comments
…o abis555-branch-1
abis555
changed the title
resolving the conflicts
[#220] - Combine first_name and last_name into one name field
Apr 5, 2022
hmit106
reviewed
Apr 5, 2022
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.
I get linting & runtime js errors when running the branch, can't really approve such a wide PR so close to the deadline unfortunately.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.