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

yihan Create way to manually add in lost hours for past years of volunteers #611

Merged
merged 13 commits into from
Dec 20, 2023
Merged

yihan Create way to manually add in lost hours for past years of volunteers #611

merged 13 commits into from
Dec 20, 2023

Conversation

AriaYu927
Copy link
Contributor

@AriaYu927 AriaYu927 commented Nov 14, 2023 •
edited
Loading

Description

image

Related PRS (if any):

To test this backend PR you need to checkout the #1535 frontend PR.

Main changes explained:

  • Update timeentry.js for including new properties.
  • Update timeentryRouter.js and timeEntryController.js for updating exist functions and adding new functions that related to time entries.
  • Update dashboardhelper.js, taskHelper.js and userHelper.js for filtering unrelated timeEntries.

How to test:

  1. check into current branch on both FE and BE.
  2. do npm run build and npm start to run this PR locally
  3. follow test steps in #1535.

@AriaYu927 AriaYu927 mentioned this pull request Nov 14, 2023
Merged
@palakgosalia
Copy link

Hey, I Left a comment in FE PR. Thank you

@ptrpengdev
Copy link
Contributor

Hi @AriaYu927, I tested the FE PR1535 with this BE PR611 and had no issues with the PRs. Thank you!

@one-community one-community added the High Priority - Please Review First This is an important PR we'd like to get merged as soon as possible label Dec 11, 2023
pika-chu11
pika-chu11 approved these changes Dec 14, 2023
View reviewed changes
Copy link

@pika-chu11 pika-chu11 left a comment

Choose a reason for hiding this comment

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

Hi @AriaYu927 , I have tested your PRs and left a comment in the FrontEnd #1535. Great Job!

Alforoan
Alforoan approved these changes Dec 17, 2023
View reviewed changes
Copy link

@Alforoan Alforoan left a comment

Choose a reason for hiding this comment

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

I left my comment on the FE pr.

@beblicarl beblicarl self-requested a review December 20, 2023 09:51
@beblicarl
Copy link
Contributor

I left a comment on the frontend, this branch has conflicts though

@AriaYu927
Copy link
Contributor Author

I left a comment on the frontend, this branch has conflicts though

Thanks for the reminder! I've solved the conflicts.

@one-community one-community merged commit 2d22e9a into development Dec 20, 2023
3 checks passed
navneeeth
navneeeth reviewed Dec 20, 2023
View reviewed changes
Copy link
Contributor

@navneeeth navneeeth left a comment

Choose a reason for hiding this comment

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

Just reviewed the implementation on the FE and everything looks good!

@one-community one-community mentioned this pull request Dec 20, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@navneeeth navneeeth navneeeth left review comments

@Alforoan Alforoan Alforoan approved these changes

@pika-chu11 pika-chu11 pika-chu11 approved these changes

@beblicarl beblicarl Awaiting requested review from beblicarl

Assignees
No one assigned
Labels
High Priority - Please Review First This is an important PR we'd like to get merged as soon as possible
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@AriaYu927 @palakgosalia @ptrpengdev @beblicarl @navneeeth @pika-chu11 @Alforoan @one-community