-
Notifications
You must be signed in to change notification settings - Fork 29
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
Fix X hours in X weeks streak badges #890
Fix X hours in X weeks streak badges #890
Conversation
…_entry_blue_square Roberto-fixes logic to push to the edit time entry history
…GNRest into navneeth_add_google_doc_link_to_weekly_summaries_email
Backend Release to Main [1.54]
…lySummaryReport: { type: Date, default: undefined }, this will now be updated each to match the date, when a recipient was added
…lySummaryReport: { type: Date, default: undefined }, this will now be updated each to match the date, when a recipient was added
…nto Sucheta-refactor-weeklySummaryRecipient-button
…lySummaryRecipient-button Sucheta- Refactor WeeklySummaryRecipient Button Functionality
…nto shengwei_add_jae_account_edit_permission
…_Duplicate_Badges Roberto fix assigning duplicate badges
…mentor_will_make_user_invisible XiaoW_Hotfix of adding check for role in putUserProfile controller to make mentor invisible
…unt_edit_permission Shengwei add Jae account edit permission
…n_email fix blue square reason email
chore: deleted all related test changes leaving current functionality
…solved Diego merge conflict solved
…ls_backend_linked chris_equipment_details_backend_linked
…ckbox_user_profile_backend Jingyi-User Profile: Rehireable / Notrehireable Check Box
…ng-self Nathan prevent user from deleting self
…emails_notifications Fix time off request notification not being sent to the owner
…bles_request_form_backend Aishwarya-Purchase-Consumable-Request-Form-(Backend)
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.
The version I tested this on may be outdated but I just thought I'd mention that Before merging, please ensure to adjust the files edited for testing purposes. For example, revert 'userProfilJobs.js' to:
'1 0 * * 0', // Every Sunday, 1 minute past midnight.
- Extensively tested PR 890, added two sets of 30hrs to savedtangiblehrs, checked badgecollection did not receive a 30hr badge
(notes mentioned if badge doesnt appear in badgecollection, badge doesnt exist.)
-
added two sets of 40hrs via frontend ‘addtimeentry’
this method increased the existing count by 1 for 40hrs streak for 1 week -
did the following for 30 hrs as well, since badge doesnt exist, it didnt increase the count
PR.890.mov
![most hours in week badge](https://private-user-images.githubusercontent.com/141872402/323021300-43c6aae8-e0b7-4271-93af-997a4a446133.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzkzNzAxMzEsIm5iZiI6MTczOTM2OTgzMSwicGF0aCI6Ii8xNDE4NzI0MDIvMzIzMDIxMzAwLTQzYzZhYWU4LWUwYjctNDI3MS05M2FmLTk5N2E0YTQ0NjEzMy5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjUwMjEyJTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI1MDIxMlQxNDE3MTFaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT02MDc3YjcyMTFhNjg4MTZkMjE1ZjJkMGYyYmYwOTU2NThmM2UwMDcyNzllNGMwNjk5OWJmYjFjOTQyZGQ3YWI4JlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCJ9.gb0kJil2ApX9MNUXqr5rbXVQ1UrCdDa3LosLUTp_vCw)
![earned date updated](https://private-user-images.githubusercontent.com/141872402/323021302-e4bb7980-f5f1-4bb8-b3db-5a62aa3ad23f.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzkzNzAxMzEsIm5iZiI6MTczOTM2OTgzMSwicGF0aCI6Ii8xNDE4NzI0MDIvMzIzMDIxMzAyLWU0YmI3OTgwLWY1ZjEtNGJiOC1iM2RiLTVhNjJhYTNhZDIzZi5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjUwMjEyJTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI1MDIxMlQxNDE3MTFaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT04Y2YwNmUwNGI3ZTE0ZGM1OTgxNzA1NmJhYzY1MDBkNzA4Y2EzNWYwY2VlZTk5ZjIwMWMzYTZjZjdlN2RjN2ExJlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCJ9.eO0kC_7Lut294pw-9jWOaeWoH7d7bWVzxGD9vbZrhkM)
![x hrs for x weeks](https://private-user-images.githubusercontent.com/141872402/323021306-e307ed58-bcb3-4b29-b03d-3d3e26f9d522.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzkzNzAxMzEsIm5iZiI6MTczOTM2OTgzMSwicGF0aCI6Ii8xNDE4NzI0MDIvMzIzMDIxMzA2LWUzMDdlZDU4LWJjYjMtNGIyOS1iMDNkLTNkM2UyNmY5ZDUyMi5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjUwMjEyJTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI1MDIxMlQxNDE3MTFaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT0xYzUwYzkwNjc2YjNkNDk1NGFmODFiMmY0NTJkMDlkYmRmOGY3NDQ2OTc1MWUzNTZmMmFlZDIxYzhkMWUzZThhJlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCJ9.rd0CvNFxXvbTCYPE28eop2N0mt84akO1mb9SqtLxBmg)
![40hrs in 1 week](https://private-user-images.githubusercontent.com/141872402/323021314-44855ac6-af08-4672-834d-a2c2d8b7c8ef.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzkzNzAxMzEsIm5iZiI6MTczOTM2OTgzMSwicGF0aCI6Ii8xNDE4NzI0MDIvMzIzMDIxMzE0LTQ0ODU1YWM2LWFmMDgtNDY3Mi04MzRkLWEyYzJkOGI3YzhlZi5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjUwMjEyJTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI1MDIxMlQxNDE3MTFaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT05ODRlYjI3OWYwMDUzMzIyMzk5MzQwMGFmZTZlM2Y5NTJkOGFkY2FlNjc0ZGIzMTM4M2M3ZmNjNGFmYjIzZjhiJlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCJ9.SS3KmB2Y9Hvt16VZvjcrBAeR6vPYEdLcufkG1VLdEkc)
Description
Related PRS (if any):
To test this backend PR you need to check the latest frontend
Main changes explained:
it was included a simple logic in checkXHoursXWeeks function
…
How to test:
npm install
and...
to run this PR locallysee the tutorials how to test below:
2024-04-10.17-31-59.mov
2024-04-10.17-36-47.mov
2024-04-10.17-39-23.mov
Screenshots or videos of changes:
Note:
Include the information the reviewers need to know.
Some questions please send me a dm in slack