Skip to content

Commit 7940883

Browse files
Venk-rgbone-communityAnkuribohmashpotato9strallia
authored
Venkataramanan resolve development into main via pr (#1634)
* Newell - fix email issues (#1430) (#1431) * fix(email): resolve sendEmailWithAcknowledgment promise correctly * docs(email): add JSDoc to emailSender for improved type hints and clarity * docs(email): add JSDoc to emailSender for improved type hints and clarity * fix(transaction): revert transaction edits for local debugging Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> * Backend Release to Main [2.37] (#1436) * Newell - fix email issues (#1430) * fix(email): resolve sendEmailWithAcknowledgment promise correctly * docs(email): add JSDoc to emailSender for improved type hints and clarity * docs(email): add JSDoc to emailSender for improved type hints and clarity * fix(transaction): revert transaction edits for local debugging * Zhifan - hotfix not seeing hours logged in weekly summaries report page (#1432) * fixed logic for returning time info * fixed three weeks age tab showed no hours --------- Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> Co-authored-by: Zhifan Jia <127051168+mashpotato9@users.noreply.github.com> * Backend Release to Main [2.38] (#1443) * Newell - fix email issues (#1430) * fix(email): resolve sendEmailWithAcknowledgment promise correctly * docs(email): add JSDoc to emailSender for improved type hints and clarity * docs(email): add JSDoc to emailSender for improved type hints and clarity * fix(transaction): revert transaction edits for local debugging * Zhifan - hotfix not seeing hours logged in weekly summaries report page (#1432) * fixed logic for returning time info * fixed three weeks age tab showed no hours * Newell - move cc recipients to bcc for privacy (#1435) fix(email): move cc recipients to bcc for privacy * Strallia - Hours completed backend data (#1437) feat: get data for tangible hours percentages * Newell - add Jae to CC recipients in emailSender (#1441) feat(email): add Jae to CC recipients in emailSender * Rishitha noshow visualization metrics (#1227) * no show viz * fix url * resolve conflicts * resolve conflicts --------- Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> Co-authored-by: Zhifan Jia <127051168+mashpotato9@users.noreply.github.com> Co-authored-by: Strallia Chao <134454347+strallia@users.noreply.github.com> Co-authored-by: RishithaMamidala <113060798+RishithaMamidala@users.noreply.github.com> * Backend Release to Main [2.39] (#1453) * Newell - fix email issues (#1430) * fix(email): resolve sendEmailWithAcknowledgment promise correctly * docs(email): add JSDoc to emailSender for improved type hints and clarity * docs(email): add JSDoc to emailSender for improved type hints and clarity * fix(transaction): revert transaction edits for local debugging * Zhifan - hotfix not seeing hours logged in weekly summaries report page (#1432) * fixed logic for returning time info * fixed three weeks age tab showed no hours * Newell - move cc recipients to bcc for privacy (#1435) fix(email): move cc recipients to bcc for privacy * Strallia - Hours completed backend data (#1437) feat: get data for tangible hours percentages * Newell - add Jae to CC recipients in emailSender (#1441) feat(email): add Jae to CC recipients in emailSender * Rishitha noshow visualization metrics (#1227) * no show viz * fix url * resolve conflicts * resolve conflicts * Dharmik - fix - team code outlier and notification red (#1424) * teamCodeWarning added to userProfile * set teamcodewarning to true if the teamcode is not valid * set teamCodeWarning flag if teamcode is invalid * removed concole.logs * Rishitha create bargraph for number of issues by type backend (#1318) * issue chart backend * commit_1 * fix controller * issue chart backend * fix backend issue * Zhifan - Create way to see 6 months & yearly anniversaries (#1273) * Backend Changes for trophy functionality * changed logic to use startDate * completed follow up feature on weekly summary report * converted into CommonJS --------- Co-authored-by: Aishwarya Ramesh <arame008@odu.edu> * Nikhil - Added a unit test for bmReusableController (#1271) Added a unit test for bmReusableController.js file Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> * Nikhil - Added unit test for bmToolController (#1284) Added unit test for bmToolController Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> * Dharmik - fix/Add number of blue squares to bottom left corner of first column on User Management Page (#1410) * added infringements to getUserProfiles * fixed issues getting blue squares * Dipti create separate subscribe and unsubscribe pages linked to the app (#1418) * Update emailController.js * Update emailController.js --------- Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> Co-authored-by: Zhifan Jia <127051168+mashpotato9@users.noreply.github.com> Co-authored-by: Strallia Chao <134454347+strallia@users.noreply.github.com> Co-authored-by: RishithaMamidala <113060798+RishithaMamidala@users.noreply.github.com> Co-authored-by: Dharmik1710 <47842695+Dharmik1710@users.noreply.github.com> Co-authored-by: Aishwarya Ramesh <arame008@odu.edu> Co-authored-by: nikhilpittala16 <142841075+nikhilpittala16@users.noreply.github.com> Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> Co-authored-by: Dipti Yadav <dipti.yadav@outlook.com> * Sundar dev merge main fix (#1502) * Newell - fix email issues (#1430) * fix(email): resolve sendEmailWithAcknowledgment promise correctly * docs(email): add JSDoc to emailSender for improved type hints and clarity * docs(email): add JSDoc to emailSender for improved type hints and clarity * fix(transaction): revert transaction edits for local debugging * Zhifan - hotfix not seeing hours logged in weekly summaries report page (#1432) * fixed logic for returning time info * fixed three weeks age tab showed no hours * Newell - move cc recipients to bcc for privacy (#1435) fix(email): move cc recipients to bcc for privacy * Strallia - Hours completed backend data (#1437) feat: get data for tangible hours percentages * Newell - add Jae to CC recipients in emailSender (#1441) feat(email): add Jae to CC recipients in emailSender * Rishitha noshow visualization metrics (#1227) * no show viz * fix url * resolve conflicts * resolve conflicts * Dharmik - fix - team code outlier and notification red (#1424) * teamCodeWarning added to userProfile * set teamcodewarning to true if the teamcode is not valid * set teamCodeWarning flag if teamcode is invalid * removed concole.logs * Rishitha create bargraph for number of issues by type backend (#1318) * issue chart backend * commit_1 * fix controller * issue chart backend * fix backend issue * Zhifan - Create way to see 6 months & yearly anniversaries (#1273) * Backend Changes for trophy functionality * changed logic to use startDate * completed follow up feature on weekly summary report * converted into CommonJS --------- Co-authored-by: Aishwarya Ramesh <arame008@odu.edu> * Nikhil - Added a unit test for bmReusableController (#1271) Added a unit test for bmReusableController.js file Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> * Nikhil - Added unit test for bmToolController (#1284) Added unit test for bmToolController Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> * Dharmik - fix/Add number of blue squares to bottom left corner of first column on User Management Page (#1410) * added infringements to getUserProfiles * fixed issues getting blue squares * Dipti create separate subscribe and unsubscribe pages linked to the app (#1418) * Update emailController.js * Update emailController.js * Nikhil - Added unit test for bmProjectController (#1261) * Added unit test for bmProjectController * some changes --------- Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> * Nikhil - Added a unit test for bmNewLessonController (#1255) * Added a unit test for bmNewLessonController * resolved merge conflicts * fixed errors * errors fixed * fixed errors * resolved errors * resolved errors --------- Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> * Handling null comparision start and end dates (#1330) Co-authored-by: sidhu47 <sidhuemailid@gmail.com> * Sabitha - Create dropdown to filter based on village backend (#1402) * Village model with village map link and amenities * Controller with village map and amenities * Update controller * Add and validate properties * Humemah: fix - prevent deactivated managers from receiving notifications (#1363) * Humemah: fix - prevent deactivated managers from receiving notification emails * Update * Strallia - use pacific time in Total Org Summary data (#1466) * fix: use pacific time * refactor: format code * Dhrumil fix User Management new account no longer showing up at top of list (#1465) fix: update sorting criteria to prioritize startDate and createdDate * Jiaqi create bidding page backend (#1365) * create the data schema * create the router and controller for property * userbid endpoint * Fix all the bug * fix the problem in listing.js * Manusha donut chart show applicants by experience (#1458) * initial commit * initial commit * removed jobapplicationrouter file and added new files * Jiaqi Fix the dynamic scope questionarie controller (#1445) finish the logic * Zhifan - hotfix weekly email missed hours logged (#1467) included latest dev updates * Revert "Zhifan - hotfix weekly email missed hours logged" (#1469) Revert "Zhifan - hotfix weekly email missed hours logged (#1467)" This reverts commit dfe7bc322b01b4695f577155cb9fbd24028e6245. * Xiaolei Implement Bar Graph named Lessons Learned backend (#1302) * Implement lessons learnt API * revert code to first commit * Zhifan - hotfix weekly email missed hours logged (#1471) * included latest dev updates * removed testing implementation * removed logging * Angad - Implemented userSkillTabsContoller and Router for the tabs. (#1325) * Implemented userSkillTabsContoller and Router for the tabs. * Fixed the issue with model not loading and tested API endpoints in postman. * Update routes.js to remove duplicate declarations for hgnFormResponses * Reina create tracking button for advanced management backend (#1439) * reina create tracking button for advanced management * changes * Bhavpreet: listing's wishlist backend (#1317) * added a basic * made some changes to the code * made some changes * made some changes * finished the wishlist backend and testing * testing after merge --------- Co-authored-by: fangedShadow <bhavpreet666singh.com> * Humera and Sundar - Fix and protect the Badge scheduler code (#1479) * Add new code For Badge at One Place * Updated userhelper * Updated userhelper 2.0 * chore(userHelper): lint fixed * feat(badge): Added protection using husky for badge scheduler code * fix(badge): Fix husky install * fix(node version): hardcode to use node 14 version --------- Co-authored-by: Humera Naaz <humera.naaz@gmail.com> Co-authored-by: Sundar Machani <sundarmachani@gmail.com> * Bhavpreet - LB platform - messaging backend (#1366) * routes controllers and models for lbdashboard defined * created routes, controllers, models * socket communications working fine * updateUserpreferences function working * email and app notification feature activated * some changes * made changes to routes and function and removed notification for now * added socket instead of ws * removed socket.io and made the ws work this time * socket messaging is working properly, and also the user preferences are updating properly * lb dashboard messagin feature is compelete and also added notification to the email * changed the in-app notification of offline * fixed things to pass the test * fixed things to pass the test which where failing due to emailsender * fixed things to pass the test * fixed things to pass the test * fixed things to pass the test * fixed things to pass the test * fixed things to pass the test * fixed things to pass the test * fixing the error to pass the test * fixing the error to pass the test * fixing the error to pass the test * setting the lb message email to false --------- Co-authored-by: Jatin Agrawal <jatinagrawal0801@gmail.com> Co-authored-by: fangedShadow <bhavpreet666singh.com> * Sundar dev to main conlfict fix. (#1494) * Newell - fix email issues (#1430) (#1431) * fix(email): resolve sendEmailWithAcknowledgment promise correctly * docs(email): add JSDoc to emailSender for improved type hints and clarity * docs(email): add JSDoc to emailSender for improved type hints and clarity * fix(transaction): revert transaction edits for local debugging Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> * Backend Release to Main [2.37] (#1436) * Newell - fix email issues (#1430) * fix(email): resolve sendEmailWithAcknowledgment promise correctly * docs(email): add JSDoc to emailSender for improved type hints and clarity * docs(email): add JSDoc to emailSender for improved type hints and clarity * fix(transaction): revert transaction edits for local debugging * Zhifan - hotfix not seeing hours logged in weekly summaries report page (#1432) * fixed logic for returning time info * fixed three weeks age tab showed no hours --------- Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> Co-authored-by: Zhifan Jia <127051168+mashpotato9@users.noreply.github.com> * Backend Release to Main [2.38] (#1443) * Newell - fix email issues (#1430) * fix(email): resolve sendEmailWithAcknowledgment promise correctly * docs(email): add JSDoc to emailSender for improved type hints and clarity * docs(email): add JSDoc to emailSender for improved type hints and clarity * fix(transaction): revert transaction edits for local debugging * Zhifan - hotfix not seeing hours logged in weekly summaries report page (#1432) * fixed logic for returning time info * fixed three weeks age tab showed no hours * Newell - move cc recipients to bcc for privacy (#1435) fix(email): move cc recipients to bcc for privacy * Strallia - Hours completed backend data (#1437) feat: get data for tangible hours percentages * Newell - add Jae to CC recipients in emailSender (#1441) feat(email): add Jae to CC recipients in emailSender * Rishitha noshow visualization metrics (#1227) * no show viz * fix url * resolve conflicts * resolve conflicts --------- Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> Co-authored-by: Zhifan Jia <127051168+mashpotato9@users.noreply.github.com> Co-authored-by: Strallia Chao <134454347+strallia@users.noreply.github.com> Co-authored-by: RishithaMamidala <113060798+RishithaMamidala@users.noreply.github.com> * Backend Release to Main [2.39] (#1453) * Newell - fix email issues (#1430) * fix(email): resolve sendEmailWithAcknowledgment promise correctly * docs(email): add JSDoc to emailSender for improved type hints and clarity * docs(email): add JSDoc to emailSender for improved type hints and clarity * fix(transaction): revert transaction edits for local debugging * Zhifan - hotfix not seeing hours logged in weekly summaries report page (#1432) * fixed logic for returning time info * fixed three weeks age tab showed no hours * Newell - move cc recipients to bcc for privacy (#1435) fix(email): move cc recipients to bcc for privacy * Strallia - Hours completed backend data (#1437) feat: get data for tangible hours percentages * Newell - add Jae to CC recipients in emailSender (#1441) feat(email): add Jae to CC recipients in emailSender * Rishitha noshow visualization metrics (#1227) * no show viz * fix url * resolve conflicts * resolve conflicts * Dharmik - fix - team code outlier and notification red (#1424) * teamCodeWarning added to userProfile * set teamcodewarning to true if the teamcode is not valid * set teamCodeWarning flag if teamcode is invalid * removed concole.logs * Rishitha create bargraph for number of issues by type backend (#1318) * issue chart backend * commit_1 * fix controller * issue chart backend * fix backend issue * Zhifan - Create way to see 6 months & yearly anniversaries (#1273) * Backend Changes for trophy functionality * changed logic to use startDate * completed follow up feature on weekly summary report * converted into CommonJS --------- Co-authored-by: Aishwarya Ramesh <arame008@odu.edu> * Nikhil - Added a unit test for bmReusableController (#1271) Added a unit test for bmReusableController.js file Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> * Nikhil - Added unit test for bmToolController (#1284) Added unit test for bmToolController Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> * Dharmik - fix/Add number of blue squares to bottom left corner of first column on User Management Page (#1410) * added infringements to getUserProfiles * fixed issues getting blue squares * Dipti create separate subscribe and unsubscribe pages linked to the app (#1418) * Update emailController.js * Update emailController.js --------- Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> Co-authored-by: Zhifan Jia <127051168+mashpotato9@users.noreply.github.com> Co-authored-by: Strallia Chao <134454347+strallia@users.noreply.github.com> Co-authored-by: RishithaMamidala <113060798+RishithaMamidala@users.noreply.github.com> Co-authored-by: Dharmik1710 <47842695+Dharmik1710@users.noreply.github.com> Co-authored-by: Aishwarya Ramesh <arame008@odu.edu> Co-authored-by: nikhilpittala16 <142841075+nikhilpittala16@users.noreply.github.com> Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> Co-authored-by: Dipti Yadav <dipti.yadav@outlook.com> --------- Co-authored-by: One Community <one-community@users.noreply.github.com> Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> Co-authored-by: Zhifan Jia <127051168+mashpotato9@users.noreply.github.com> Co-authored-by: Strallia Chao <134454347+strallia@users.noreply.github.com> Co-authored-by: RishithaMamidala <113060798+RishithaMamidala@users.noreply.github.com> Co-authored-by: Dharmik1710 <47842695+Dharmik1710@users.noreply.github.com> Co-authored-by: Aishwarya Ramesh <arame008@odu.edu> Co-authored-by: nikhilpittala16 <142841075+nikhilpittala16@users.noreply.github.com> Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> Co-authored-by: Dipti Yadav <dipti.yadav@outlook.com> * Barnaboss conflict resolution for Main [2.40] (#1496) * Newell - fix email issues (#1430) (#1431) * fix(email): resolve sendEmailWithAcknowledgment promise correctly * docs(email): add JSDoc to emailSender for improved type hints and clarity * docs(email): add JSDoc to emailSender for improved type hints and clarity * fix(transaction): revert transaction edits for local debugging Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> * Backend Release to Main [2.37] (#1436) * Newell - fix email issues (#1430) * fix(email): resolve sendEmailWithAcknowledgment promise correctly * docs(email): add JSDoc to emailSender for improved type hints and clarity * docs(email): add JSDoc to emailSender for improved type hints and clarity * fix(transaction): revert transaction edits for local debugging * Zhifan - hotfix not seeing hours logged in weekly summaries report page (#1432) * fixed logic for returning time info * fixed three weeks age tab showed no hours --------- Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> Co-authored-by: Zhifan Jia <127051168+mashpotato9@users.noreply.github.com> * Backend Release to Main [2.38] (#1443) * Newell - fix email issues (#1430) * fix(email): resolve sendEmailWithAcknowledgment promise correctly * docs(email): add JSDoc to emailSender for improved type hints and clarity * docs(email): add JSDoc to emailSender for improved type hints and clarity * fix(transaction): revert transaction edits for local debugging * Zhifan - hotfix not seeing hours logged in weekly summaries report page (#1432) * fixed logic for returning time info * fixed three weeks age tab showed no hours * Newell - move cc recipients to bcc for privacy (#1435) fix(email): move cc recipients to bcc for privacy * Strallia - Hours completed backend data (#1437) feat: get data for tangible hours percentages * Newell - add Jae to CC recipients in emailSender (#1441) feat(email): add Jae to CC recipients in emailSender * Rishitha noshow visualization metrics (#1227) * no show viz * fix url * resolve conflicts * resolve conflicts --------- Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> Co-authored-by: Zhifan Jia <127051168+mashpotato9@users.noreply.github.com> Co-authored-by: Strallia Chao <134454347+strallia@users.noreply.github.com> Co-authored-by: RishithaMamidala <113060798+RishithaMamidala@users.noreply.github.com> * Backend Release to Main [2.39] (#1453) * Newell - fix email issues (#1430) * fix(email): resolve sendEmailWithAcknowledgment promise correctly * docs(email): add JSDoc to emailSender for improved type hints and clarity * docs(email): add JSDoc to emailSender for improved type hints and clarity * fix(transaction): revert transaction edits for local debugging * Zhifan - hotfix not seeing hours logged in weekly summaries report page (#1432) * fixed logic for returning time info * fixed three weeks age tab showed no hours * Newell - move cc recipients to bcc for privacy (#1435) fix(email): move cc recipients to bcc for privacy * Strallia - Hours completed backend data (#1437) feat: get data for tangible hours percentages * Newell - add Jae to CC recipients in emailSender (#1441) feat(email): add Jae to CC recipients in emailSender * Rishitha noshow visualization metrics (#1227) * no show viz * fix url * resolve conflicts * resolve conflicts * Dharmik - fix - team code outlier and notification red (#1424) * teamCodeWarning added to userProfile * set teamcodewarning to true if the teamcode is not valid * set teamCodeWarning flag if teamcode is invalid * removed concole.logs * Rishitha create bargraph for number of issues by type backend (#1318) * issue chart backend * commit_1 * fix controller * issue chart backend * fix backend issue * Zhifan - Create way to see 6 months & yearly anniversaries (#1273) * Backend Changes for trophy functionality * changed logic to use startDate * completed follow up feature on weekly summary report * converted into CommonJS --------- Co-authored-by: Aishwarya Ramesh <arame008@odu.edu> * Nikhil - Added a unit test for bmReusableController (#1271) Added a unit test for bmReusableController.js file Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> * Nikhil - Added unit test for bmToolController (#1284) Added unit test for bmToolController Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> * Dharmik - fix/Add number of blue squares to bottom left corner of first column on User Management Page (#1410) * added infringements to getUserProfiles * fixed issues getting blue squares * Dipti create separate subscribe and unsubscribe pages linked to the app (#1418) * Update emailController.js * Update emailController.js --------- Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> Co-authored-by: Zhifan Jia <127051168+mashpotato9@users.noreply.github.com> Co-authored-by: Strallia Chao <134454347+strallia@users.noreply.github.com> Co-authored-by: RishithaMamidala <113060798+RishithaMamidala@users.noreply.github.com> Co-authored-by: Dharmik1710 <47842695+Dharmik1710@users.noreply.github.com> Co-authored-by: Aishwarya Ramesh <arame008@odu.edu> Co-authored-by: nikhilpittala16 <142841075+nikhilpittala16@users.noreply.github.com> Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> Co-authored-by: Dipti Yadav <dipti.yadav@outlook.com> * Fix conflicts in userProfileCOntroller --------- Co-authored-by: One Community <one-community@users.noreply.github.com> Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> Co-authored-by: Zhifan Jia <127051168+mashpotato9@users.noreply.github.com> Co-authored-by: Strallia Chao <134454347+strallia@users.noreply.github.com> Co-authored-by: RishithaMamidala <113060798+RishithaMamidala@users.noreply.github.com> Co-authored-by: Dharmik1710 <47842695+Dharmik1710@users.noreply.github.com> Co-authored-by: Aishwarya Ramesh <arame008@odu.edu> Co-authored-by: nikhilpittala16 <142841075+nikhilpittala16@users.noreply.github.com> Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> Co-authored-by: Dipti Yadav <dipti.yadav@outlook.com> * Jaissica fix merge (#1497) * Newell - fix email issues (#1430) (#1431) * fix(email): resolve sendEmailWithAcknowledgment promise correctly * docs(email): add JSDoc to emailSender for improved type hints and clarity * docs(email): add JSDoc to emailSender for improved type hints and clarity * fix(transaction): revert transaction edits for local debugging Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> * Backend Release to Main [2.37] (#1436) * Newell - fix email issues (#1430) * fix(email): resolve sendEmailWithAcknowledgment promise correctly * docs(email): add JSDoc to emailSender for improved type hints and clarity * docs(email): add JSDoc to emailSender for improved type hints and clarity * fix(transaction): revert transaction edits for local debugging * Zhifan - hotfix not seeing hours logged in weekly summaries report page (#1432) * fixed logic for returning time info * fixed three weeks age tab showed no hours --------- Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> Co-authored-by: Zhifan Jia <127051168+mashpotato9@users.noreply.github.com> * Backend Release to Main [2.38] (#1443) * Newell - fix email issues (#1430) * fix(email): resolve sendEmailWithAcknowledgment promise correctly * docs(email): add JSDoc to emailSender for improved type hints and clarity * docs(email): add JSDoc to emailSender for improved type hints and clarity * fix(transaction): revert transaction edits for local debugging * Zhifan - hotfix not seeing hours logged in weekly summaries report page (#1432) * fixed logic for returning time info * fixed three weeks age tab showed no hours * Newell - move cc recipients to bcc for privacy (#1435) fix(email): move cc recipients to bcc for privacy * Strallia - Hours completed backend data (#1437) feat: get data for tangible hours percentages * Newell - add Jae to CC recipients in emailSender (#1441) feat(email): add Jae to CC recipients in emailSender * Rishitha noshow visualization metrics (#1227) * no show viz * fix url * resolve conflicts * resolve conflicts --------- Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> Co-authored-by: Zhifan Jia <127051168+mashpotato9@users.noreply.github.com> Co-authored-by: Strallia Chao <134454347+strallia@users.noreply.github.com> Co-authored-by: RishithaMamidala <113060798+RishithaMamidala@users.noreply.github.com> * Backend Release to Main [2.39] (#1453) * Newell - fix email issues (#1430) * fix(email): resolve sendEmailWithAcknowledgment promise correctly * docs(email): add JSDoc to emailSender for improved type hints and clarity * docs(email): add JSDoc to emailSender for improved type hints and clarity * fix(transaction): revert transaction edits for local debugging * Zhifan - hotfix not seeing hours logged in weekly summaries report page (#1432) * fixed logic for returning time info * fixed three weeks age tab showed no hours * Newell - move cc recipients to bcc for privacy (#1435) fix(email): move cc recipients to bcc for privacy * Strallia - Hours completed backend data (#1437) feat: get data for tangible hours percentages * Newell - add Jae to CC recipients in emailSender (#1441) feat(email): add Jae to CC recipients in emailSender * Rishitha noshow visualization metrics (#1227) * no show viz * fix url * resolve conflicts * resolve conflicts * Dharmik - fix - team code outlier and notification red (#1424) * teamCodeWarning added to userProfile * set teamcodewarning to true if the teamcode is not valid * set teamCodeWarning flag if teamcode is invalid * removed concole.logs * Rishitha create bargraph for number of issues by type backend (#1318) * issue chart backend * commit_1 * fix controller * issue chart backend * fix backend issue * Zhifan - Create way to see 6 months & yearly anniversaries (#1273) * Backend Changes for trophy functionality * changed logic to use startDate * completed follow up feature on weekly summary report * converted into CommonJS --------- Co-authored-by: Aishwarya Ramesh <arame008@odu.edu> * Nikhil - Added a unit test for bmReusableController (#1271) Added a unit test for bmReusableController.js file Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> * Nikhil - Added unit test for bmToolController (#1284) Added unit test for bmToolController Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> * Dharmik - fix/Add number of blue squares to bottom left corner of first column on User Management Page (#1410) * added infringements to getUserProfiles * fixed issues getting blue squares * Dipti create separate subscribe and unsubscribe pages linked to the app (#1418) * Update emailController.js * Update emailController.js --------- Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> Co-authored-by: Zhifan Jia <127051168+mashpotato9@users.noreply.github.com> Co-authored-by: Strallia Chao <134454347+strallia@users.noreply.github.com> Co-authored-by: RishithaMamidala <113060798+RishithaMamidala@users.noreply.github.com> Co-authored-by: Dharmik1710 <47842695+Dharmik1710@users.noreply.github.com> Co-authored-by: Aishwarya Ramesh <arame008@odu.edu> Co-authored-by: nikhilpittala16 <142841075+nikhilpittala16@users.noreply.github.com> Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> Co-authored-by: Dipti Yadav <dipti.yadav@outlook.com> --------- Co-authored-by: One Community <one-community@users.noreply.github.com> Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> Co-authored-by: Zhifan Jia <127051168+mashpotato9@users.noreply.github.com> Co-authored-by: Strallia Chao <134454347+strallia@users.noreply.github.com> Co-authored-by: RishithaMamidala <113060798+RishithaMamidala@users.noreply.github.com> Co-authored-by: Dharmik1710 <47842695+Dharmik1710@users.noreply.github.com> Co-authored-by: Aishwarya Ramesh <arame008@odu.edu> Co-authored-by: nikhilpittala16 <142841075+nikhilpittala16@users.noreply.github.com> Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> Co-authored-by: Dipti Yadav <dipti.yadav@outlook.com> --------- Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> Co-authored-by: Zhifan Jia <127051168+mashpotato9@users.noreply.github.com> Co-authored-by: Strallia Chao <134454347+strallia@users.noreply.github.com> Co-authored-by: RishithaMamidala <113060798+RishithaMamidala@users.noreply.github.com> Co-authored-by: Dharmik1710 <47842695+Dharmik1710@users.noreply.github.com> Co-authored-by: Aishwarya Ramesh <arame008@odu.edu> Co-authored-by: nikhilpittala16 <142841075+nikhilpittala16@users.noreply.github.com> Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> Co-authored-by: Dipti Yadav <dipti.yadav@outlook.com> Co-authored-by: sidhu47h <143651758+sidhu47h@users.noreply.github.com> Co-authored-by: sidhu47 <sidhuemailid@gmail.com> Co-authored-by: sabithanazareth <41137183+sabithanazareth@users.noreply.github.com> Co-authored-by: Humemah Kahlid <53024970+humemah@users.noreply.github.com> Co-authored-by: ddshah878 <dhrumil878@gmail.com> Co-authored-by: Peter-Nie2003 <139121798+Peter-Nie2003@users.noreply.github.com> Co-authored-by: manushajyasta30 <manushajyasta2002@gmail.com> Co-authored-by: One Community <one-community@users.noreply.github.com> Co-authored-by: Xiaolei Zhao <71137238+niccccccccer@users.noreply.github.com> Co-authored-by: Angad Anil Gosain <37550965+angad363@users.noreply.github.com> Co-authored-by: ReinaT5678 <56940344+ReinaT5678@users.noreply.github.com> Co-authored-by: fangedShadow <75034643+fangedShadow@users.noreply.github.com> Co-authored-by: humera314 <69070883+humera314@users.noreply.github.com> Co-authored-by: Humera Naaz <humera.naaz@gmail.com> Co-authored-by: Jatin Agrawal <jatinagrawal0801@gmail.com> Co-authored-by: barnaboss305 <66215389+barnaboss305@users.noreply.github.com> Co-authored-by: Jaissica <jaissica.hora@gmail.com> * Backend Release to Main [2.40] (#1493) * Newell - fix email issues (#1430) * fix(email): resolve sendEmailWithAcknowledgment promise correctly * docs(email): add JSDoc to emailSender for improved type hints and clarity * docs(email): add JSDoc to emailSender for improved type hints and clarity * fix(transaction): revert transaction edits for local debugging * Zhifan - hotfix not seeing hours logged in weekly summaries report page (#1432) * fixed logic for returning time info * fixed three weeks age tab showed no hours * Newell - move cc recipients to bcc for privacy (#1435) fix(email): move cc recipients to bcc for privacy * Strallia - Hours completed backend data (#1437) feat: get data for tangible hours percentages * Newell - add Jae to CC recipients in emailSender (#1441) feat(email): add Jae to CC recipients in emailSender * Rishitha noshow visualization metrics (#1227) * no show viz * fix url * resolve conflicts * resolve conflicts * Dharmik - fix - team code outlier and notification red (#1424) * teamCodeWarning added to userProfile * set teamcodewarning to true if the teamcode is not valid * set teamCodeWarning flag if teamcode is invalid * removed concole.logs * Rishitha create bargraph for number of issues by type backend (#1318) * issue chart backend * commit_1 * fix controller * issue chart backend * fix backend issue * Zhifan - Create way to see 6 months & yearly anniversaries (#1273) * Backend Changes for trophy functionality * changed logic to use startDate * completed follow up feature on weekly summary report * converted into CommonJS --------- Co-authored-by: Aishwarya Ramesh <arame008@odu.edu> * Nikhil - Added a unit test for bmReusableController (#1271) Added a unit test for bmReusableController.js file Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> * Nikhil - Added unit test for bmToolController (#1284) Added unit test for bmToolController Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> * Dharmik - fix/Add number of blue squares to bottom left corner of first column on User Management Page (#1410) * added infringements to getUserProfiles * fixed issues getting blue squares * Dipti create separate subscribe and unsubscribe pages linked to the app (#1418) * Update emailController.js * Update emailController.js * Nikhil - Added unit test for bmProjectController (#1261) * Added unit test for bmProjectController * some changes --------- Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> * Nikhil - Added a unit test for bmNewLessonController (#1255) * Added a unit test for bmNewLessonController * resolved merge conflicts * fixed errors * errors fixed * fixed errors * resolved errors * resolved errors --------- Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> * Handling null comparision start and end dates (#1330) Co-authored-by: sidhu47 <sidhuemailid@gmail.com> * Sabitha - Create dropdown to filter based on village backend (#1402) * Village model with village map link and amenities * Controller with village map and amenities * Update controller * Add and validate properties * Humemah: fix - prevent deactivated managers from receiving notifications (#1363) * Humemah: fix - prevent deactivated managers from receiving notification emails * Update * Strallia - use pacific time in Total Org Summary data (#1466) * fix: use pacific time * refactor: format code * Dhrumil fix User Management new account no longer showing up at top of list (#1465) fix: update sorting criteria to prioritize startDate and createdDate * Jiaqi create bidding page backend (#1365) * create the data schema * create the router and controller for property * userbid endpoint * Fix all the bug * fix the problem in listing.js * Manusha donut chart show applicants by experience (#1458) * initial commit * initial commit * removed jobapplicationrouter file and added new files * Jiaqi Fix the dynamic scope questionarie controller (#1445) finish the logic * Zhifan - hotfix weekly email missed hours logged (#1467) included latest dev updates * Revert "Zhifan - hotfix weekly email missed hours logged" (#1469) Revert "Zhifan - hotfix weekly email missed hours logged (#1467)" This reverts commit dfe7bc322b01b4695f577155cb9fbd24028e6245. * Xiaolei Implement Bar Graph named Lessons Learned backend (#1302) * Implement lessons learnt API * revert code to first commit * Zhifan - hotfix weekly email missed hours logged (#1471) * included latest dev updates * removed testing implementation * removed logging * Angad - Implemented userSkillTabsContoller and Router for the tabs. (#1325) * Implemented userSkillTabsContoller and Router for the tabs. * Fixed the issue with model not loading and tested API endpoints in postman. * Update routes.js to remove duplicate declarations for hgnFormResponses * Reina create tracking button for advanced management backend (#1439) * reina create tracking button for advanced management * changes * Bhavpreet: listing's wishlist backend (#1317) * added a basic * made some changes to the code * made some changes * made some changes * finished the wishlist backend and testing * testing after merge --------- Co-authored-by: fangedShadow <bhavpreet666singh.com> * Humera and Sundar - Fix and protect the Badge scheduler code (#1479) * Add new code For Badge at One Place * Updated userhelper * Updated userhelper 2.0 * chore(userHelper): lint fixed * feat(badge): Added protection using husky for badge scheduler code * fix(badge): Fix husky install * fix(node version): hardcode to use node 14 version --------- Co-authored-by: Humera Naaz <humera.naaz@gmail.com> Co-authored-by: Sundar Machani <sundarmachani@gmail.com> * Bhavpreet - LB platform - messaging backend (#1366) * routes controllers and models for lbdashboard defined * created routes, controllers, models * socket communications working fine * updateUserpreferences function working * email and app notification feature activated * some changes * made changes to routes and function and removed notification for now * added socket instead of ws * removed socket.io and made the ws work this time * socket messaging is working properly, and also the user preferences are updating properly * lb dashboard messagin feature is compelete and also added notification to the email * changed the in-app notification of offline * fixed things to pass the test * fixed things to pass the test which where failing due to emailsender * fixed things to pass the test * fixed things to pass the test * fixed things to pass the test * fixed things to pass the test * fixed things to pass the test * fixed things to pass the test * fixing the error to pass the test * fixing the error to pass the test * fixing the error to pass the test * setting the lb message email to false --------- Co-authored-by: Jatin Agrawal <jatinagrawal0801@gmail.com> Co-authored-by: fangedShadow <bhavpreet666singh.com> * Sundar dev to main conlfict fix. (#1494) * Newell - fix email issues (#1430) (#1431) * fix(email): resolve sendEmailWithAcknowledgment promise correctly * docs(email): add JSDoc to emailSender for improved type hints and clarity * docs(email): add JSDoc to emailSender for improved type hints and clarity * fix(transaction): revert transaction edits for local debugging Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> * Backend Release to Main [2.37] (#1436) * Newell - fix email issues (#1430) * fix(email): resolve sendEmailWithAcknowledgment promise correctly * docs(email): add JSDoc to emailSender for improved type hints and clarity * docs(email): add JSDoc to emailSender for improved type hints and clarity * fix(transaction): revert transaction edits for local debugging * Zhifan - hotfix not seeing hours logged in weekly summaries report page (#1432) * fixed logic for returning time info * fixed three weeks age tab showed no hours --------- Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> Co-authored-by: Zhifan Jia <127051168+mashpotato9@users.noreply.github.com> * Backend Release to Main [2.38] (#1443) * Newell - fix email issues (#1430) * fix(email): resolve sendEmailWithAcknowledgment promise correctly * docs(email): add JSDoc to emailSender for improved type hints and clarity * docs(email): add JSDoc to emailSender for improved type hints and clarity * fix(transaction): revert transaction edits for local debugging * Zhifan - hotfix not seeing hours logged in weekly summaries report page (#1432) * fixed logic for returning time info * fixed three weeks age tab showed no hours * Newell - move cc recipients to bcc for privacy (#1435) fix(email): move cc recipients to bcc for privacy * Strallia - Hours completed backend data (#1437) feat: get data for tangible hours percentages * Newell - add Jae to CC recipients in emailSender (#1441) feat(email): add Jae to CC recipients in emailSender * Rishitha noshow visualization metrics (#1227) * no show viz * fix url * resolve conflicts * resolve conflicts --------- Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> Co-authored-by: Zhifan Jia <127051168+mashpotato9@users.noreply.github.com> Co-authored-by: Strallia Chao <134454347+strallia@users.noreply.github.com> Co-authored-by: RishithaMamidala <113060798+RishithaMamidala@users.noreply.github.com> * Backend Release to Main [2.39] (#1453) * Newell - fix email issues (#1430) * fix(email): resolve sendEmailWithAcknowledgment promise correctly * docs(email): add JSDoc to emailSender for improved type hints and clarity * docs(email): add JSDoc to emailSender for improved type hints and clarity * fix(transaction): revert transaction edits for local debugging * Zhifan - hotfix not seeing hours logged in weekly summaries report page (#1432) * fixed logic for returning time info * fixed three weeks age tab showed no hours * Newell - move cc recipients to bcc for privacy (#1435) fix(email): move cc recipients to bcc for privacy * Strallia - Hours completed backend data (#1437) feat: get data for tangible hours percentages * Newell - add Jae to CC recipients in emailSender (#1441) feat(email): add Jae to CC recipients in emailSender * Rishitha noshow visualization metrics (#1227) * no show viz * fix url * resolve conflicts * resolve conflicts * Dharmik - fix - team code outlier and notification red (#1424) * teamCodeWarning added to userProfile * set teamcodewarning to true if the teamcode is not valid * set teamCodeWarning flag if teamcode is invalid * removed concole.logs * Rishitha create bargraph for number of issues by type backend (#1318) * issue chart backend * commit_1 * fix controller * issue chart backend * fix backend issue * Zhifan - Create way to see 6 months & yearly anniversaries (#1273) * Backend Changes for trophy functionality * changed logic to use startDate * completed follow up feature on weekly summary report * converted into CommonJS --------- Co-authored-by: Aishwarya Ramesh <arame008@odu.edu> * Nikhil - Added a unit test for bmReusableController (#1271) Added a unit test for bmReusableController.js file Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> * Nikhil - Added unit test for bmToolController (#1284) Added unit test for bmToolController Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> * Dharmik - fix/Add number of blue squares to bottom left corner of first column on User Management Page (#1410) * added infringements to getUserProfiles * fixed issues getting blue squares * Dipti create separate subscribe and unsubscribe pages linked to the app (#1418) * Update emailController.js * Update emailController.js --------- Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> Co-authored-by: Zhifan Jia <127051168+mashpotato9@users.noreply.github.com> Co-authored-by: Strallia Chao <134454347+strallia@users.noreply.github.com> Co-authored-by: RishithaMamidala <113060798+RishithaMamidala@users.noreply.github.com> Co-authored-by: Dharmik1710 <47842695+Dharmik1710@users.noreply.github.com> Co-authored-by: Aishwarya Ramesh <arame008@odu.edu> Co-authored-by: nikhilpittala16 <142841075+nikhilpittala16@users.noreply.github.com> Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> Co-authored-by: Dipti Yadav <dipti.yadav@outlook.com> --------- Co-authored-by: One Community <one-community@users.noreply.github.com> Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> Co-authored-by: Zhifan Jia <127051168+mashpotato9@users.noreply.github.com> Co-authored-by: Strallia Chao <134454347+strallia@users.noreply.github.com> Co-authored-by: RishithaMamidala <113060798+RishithaMamidala@users.noreply.github.com> Co-authored-by: Dharmik1710 <47842695+Dharmik1710@users.noreply.github.com> Co-authored-by: Aishwarya Ramesh <arame008@odu.edu> Co-authored-by: nikhilpittala16 <142841075+nikhilpittala16@users.noreply.github.com> Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> Co-authored-by: Dipti Yadav <dipti.yadav@outlook.com> * Barnaboss conflict resolution for Main [2.40] (#1496) * Newell - fix email issues (#1430) (#1431) * fix(email): resolve sendEmailWithAcknowledgment promise correctly * docs(email): add JSDoc to emailSender for improved type hints and clarity * docs(email): add JSDoc to emailSender for improved type hints and clarity * fix(transaction): revert transaction edits for local debugging Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> * Backend Release to Main [2.37] (#1436) * Newell - fix email issues (#1430) * fix(email): resolve sendEmailWithAcknowledgment promise correctly * docs(email): add JSDoc to emailSender for improved type hints and clarity * docs(email): add JSDoc to emailSender for improved type hints and clarity * fix(transaction): revert transaction edits for local debugging * Zhifan - hotfix not seeing hours logged in weekly summaries report page (#1432) * fixed logic for returning time info * fixed three weeks age tab showed no hours --------- Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> Co-authored-by: Zhifan Jia <127051168+mashpotato9@users.noreply.github.com> * Backend Release to Main [2.38] (#1443) * Newell - fix email issues (#1430) * fix(email): resolve sendEmailWithAcknowledgment promise correctly * docs(email): add JSDoc to emailSender for improved type hints and clarity * docs(email): add JSDoc to emailSender for improved type hints and clarity * fix(transaction): revert transaction edits for local debugging * Zhifan - hotfix not seeing hours logged in weekly summaries report page (#1432) * fixed logic for returning time info * fixed three weeks age tab showed no hours * Newell - move cc recipients to bcc for privacy (#1435) fix(email): move cc recipients to bcc for privacy * Strallia - Hours completed backend data (#1437) feat: get data for tangible hours percentages * Newell - add Jae to CC recipients in emailSender (#1441) feat(email): add Jae to CC recipients in emailSender * Rishitha noshow visualization metrics (#1227) * no show viz * fix url * resolve conflicts * resolve conflicts --------- Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> Co-authored-by: Zhifan Jia <127051168+mashpotato9@users.noreply.github.com> Co-authored-by: Strallia Chao <134454347+strallia@users.noreply.github.com> Co-authored-by: RishithaMamidala <113060798+RishithaMamidala@users.noreply.github.com> * Backend Release to Main [2.39] (#1453) * Newell - fix email issues (#1430) * fix(email): resolve sendEmailWithAcknowledgment promise correctly * docs(email): add JSDoc to emailSender for improved type hints and clarity * docs(email): add JSDoc to emailSender for improved type hints and clarity * fix(transaction): revert transaction edits for local debugging * Zhifan - hotfix not seeing hours logged in weekly summaries report page (#1432) * fixed logic for returning time info * fixed three weeks age tab showed no hours * Newell - move cc recipients to bcc for privacy (#1435) fix(email): move cc recipients to bcc for privacy * Strallia - Hours completed backend data (#1437) feat: get data for tangible hours percentages * Newell - add Jae to CC recipients in emailSender (#1441) feat(email): add Jae to CC recipients in emailSender * Rishitha noshow visualization metrics (#1227) * no show viz * fix url * resolve conflicts * resolve conflicts * Dharmik - fix - team code outlier and notification red (#1424) * teamCodeWarning added to userProfile * set teamcodewarning to true if the teamcode is not valid * set teamCodeWarning flag if teamcode is invalid * removed concole.logs * Rishitha create bargraph for number of issues by type backend (#1318) * issue chart backend * commit_1 * fix controller * issue chart backend * fix backend issue * Zhifan - Create way to see 6 months & yearly anniversaries (#1273) * Backend Changes for trophy functionality * changed logic to use startDate * completed follow up feature on weekly summary report * converted into CommonJS --------- Co-authored-by: Aishwarya Ramesh <arame008@odu.edu> * Nikhil - Added a unit test for bmReusableController (#1271) Added a unit test for bmReusableController.js file Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> * Nikhil - Added unit test for bmToolController (#1284) Added unit test for bmToolController Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> * Dharmik - fix/Add number of blue squares to bottom left corner of first column on User Management Page (#1410) * added infringements to getUserProfiles * fixed issues getting blue squares * Dipti create separate subscribe and unsubscribe pages linked to the app (#1418) * Update emailController.js * Update emailController.js --------- Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> Co-authored-by: Zhifan Jia <127051168+mashpotato9@users.noreply.github.com> Co-authored-by: Strallia Chao <134454347+strallia@users.noreply.github.com> Co-authored-by: RishithaMamidala <113060798+RishithaMamidala@users.noreply.github.com> Co-authored-by: Dharmik1710 <47842695+Dharmik1710@users.noreply.github.com> Co-authored-by: Aishwarya Ramesh <arame008@odu.edu> Co-authored-by: nikhilpittala16 <142841075+nikhilpittala16@users.noreply.github.com> Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> Co-authored-by: Dipti Yadav <dipti.yadav@outlook.com> * Fix conflicts in userProfileCOntroller --------- Co-authored-by: One Community <one-community@users.noreply.github.com> Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> Co-authored-by: Zhifan Jia <127051168+mashpotato9@users.noreply.github.com> Co-authored-by: Strallia Chao <134454347+strallia@users.noreply.github.com> Co-authored-by: RishithaMamidala <113060798+RishithaMamidala@users.noreply.github.com> Co-authored-by: Dharmik1710 <47842695+Dharmik1710@users.noreply.github.com> Co-authored-by: Aishwarya Ramesh <arame008@odu.edu> Co-authored-by: nikhilpittala16 <142841075+nikhilpittala16@users.noreply.github.com> Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> Co-authored-by: Dipti Yadav <dipti.yadav@outlook.com> * Jaissica fix merge (#1497) * Newell - fix email issues (#1430) (#1431) * fix(email): resolve sendEmailWithAcknowledgment promise correctly * docs(email): add JSDoc to emailSender for improved type hints and clarity * docs(email): add JSDoc to emailSender for improved type hints and clarity * fix(transaction): revert transaction edits for local debugging Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> * Backend Release to Main [2.37] (#1436) * Newell - fix email issues (#1430) * fix(email): resolve sendEmailWithAcknowledgment promise correctly * docs(email): add JSDoc to emailSender for improved type hints and clarity * docs(email): add JSDoc to emailSender for improved type hints and clarity * fix(transaction): revert transaction edits for local debugging * Zhifan - hotfix not seeing hours logged in weekly summaries report page (#1432) * fixed logic for returning time info * fixed three weeks age tab showed no hours --------- Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> Co-authored-by: Zhifan Jia <127051168+mashpotato9@users.noreply.github.com> * Backend Release to Main [2.38] (#1443) * Newell - fix email issues (#1430) * fix(email): resolve sendEmailWithAcknowledgment promise correctly * docs(email): add JSDoc to emailSender for improved type hints and clarity * docs(email): add JSDoc to emailSender for improved type hints and clarity * fix(transaction): revert transaction edits for local debugging * Zhifan - hotfix not seeing hours logged in weekly summaries report page (#1432) * fixed logic for returning time info * fixed three weeks age tab showed no hours * Newell - move cc recipients to bcc for privacy (#1435) fix(email): move cc recipients to bcc for privacy * Strallia - Hours completed backend data (#1437) feat: get data for tangible hours percentages * Newell - add Jae to CC recipients in emailSender (#1441) feat(email): add Jae to CC recipients in emailSender * Rishitha noshow visualization metrics (#1227) * no show viz * fix url * resolve conflicts * resolve conflicts --------- Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> Co-authored-by: Zhifan Jia <127051168+mashpotato9@users.noreply.github.com> Co-authored-by: Strallia Chao <134454347+strallia@users.noreply.github.com> Co-authored-by: RishithaMamidala <113060798+RishithaMamidala@users.noreply.github.com> * Backend Release to Main [2.39] (#1453) * Newell - fix email issues (#1430) * fix(email): resolve sendEmailWithAcknowledgment promise correctly * docs(email): add JSDoc to emailSender for improved type hints and clarity * docs(email): add JSDoc to emailSender for improved type hints and clarity * fix(transaction): revert transaction edits for local debugging * Zhifan - hotfix not seeing hours logged in weekly summaries report page (#1432) * fixed logic for returning time info * fixed three weeks age tab showed no hours * Newell - move cc recipients to bcc for privacy (#1435) fix(email): move cc recipients to bcc for privacy * Strallia - Hours completed backend data (#1437) feat: get data for tangible hours percentages * Newell - add Jae to CC recipients in emailSender (#1441) feat(email): add Jae to CC recipients in emailSender * Rishitha noshow visualization metrics (#1227) * no show viz * fix url * resolve conflicts * resolve conflicts * Dharmik - fix - team code outlier and notification red (#1424) * teamCodeWarning added to userProfile * set teamcodewarning to true if the teamcode is not valid * set teamCodeWarning flag if teamcode is invalid * removed concole.logs * Rishitha create bargraph for number of issues by type backend (#1318) * issue chart backend * commit_1 * fix controller * issue chart backend * fix backend issue * Zhifan - Create way to see 6 months & yearly anniversaries (#1273) * Backend Changes for trophy functionality * changed logic to use startDate * completed follow up feature on weekly summary report * converted into CommonJS --------- Co-authored-by: Aishwarya Ramesh <arame008@odu.edu> * Nikhil - Added a unit test for bmReusableController (#1271) Added a unit test for bmReusableController.js file Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> * Nikhil - Added unit test for bmToolController (#1284) Added unit test for bmToolController Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> * Dharmik - fix/Add number of blue squares to bottom left corner of first column on User Management Page (#1410) * added infringements to getUserProfiles * fixed issues getting blue squares * Dipti create separate subscribe and unsubscribe pages linked to the app (#1418) * Update emailController.js * Update emailController.js --------- Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> Co-authored-by: Zhifan Jia <127051168+mashpotato9@users.noreply.github.com> Co-authored-by: Strallia Chao <134454347+strallia@users.noreply.github.com> Co-authored-by: RishithaMamidala <113060798+RishithaMamidala@users.noreply.github.com> Co-authored-by: Dharmik1710 <47842695+Dharmik1710@users.noreply.github.com> Co-authored-by: Aishwarya Ramesh <arame008@odu.edu> Co-authored-by: nikhilpittala16 <142841075+nikhilpittala16@users.noreply.github.com> Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> Co-authored-by: Dipti Yadav <dipti.yadav@outlook.com> --------- Co-authored-by: One Community <one-community@users.noreply.github.com> Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> Co-authored-by: Zhifan Jia <127051168+mashpotato9@users.noreply.github.com> Co-authored-by: Strallia Chao <134454347+strallia@users.noreply.github.com> Co-authored-by: RishithaMamidala <113060798+RishithaMamidala@users.noreply.github.com> Co-authored-by: Dharmik1710 <47842695+Dharmik1710@users.noreply.github.com> Co-authored-by: Aishwarya Ramesh <arame008@odu.edu> Co-authored-by: nikhilpittala16 <142841075+nikhilpittala16@users.noreply.github.com> Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> Co-authored-by: Dipti Yadav <dipti.yadav@outlook.com> * Sundar dev merge main fix (#1503) * Newell - fix email issues (#1430) (#1431) * fix(email): resolve sendEmailWithAcknowledgment promise correctly * docs(email): add JSDoc to emailSender for improved type hints and clarity * docs(email): add JSDoc to emailSender for improved type hints and clarity * fix(transaction): revert transaction edits for local debugging Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> * Backend Release to Main [2.37] (#1436) * Newell - fix email issues (#1430) * fix(email): resolve sendEmailWithAcknowledgment promise correctly * docs(email): add JSDoc to emailSender for improved type hints and clarity * docs(email): add JSDoc to emailSender for improved type hints and clarity * fix(transaction): revert transaction edits for local debugging * Zhifan - hotfix not seeing hours logged in weekly summaries report page (#1432) * fixed logic for returning time info * fixed three weeks age tab showed no hours --------- Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> Co-authored-by: Zhifan Jia <127051168+mashpotato9@users.noreply.github.com> * Backend Release to Main [2.38] (#1443) * Newell - fix email issues (#1430) * fix(email): resolve sendEmailWithAcknowledgment promise correctly * docs(email): add JSDoc to emailSender for improved type hints and clarity * docs(email): add JSDoc to emailSender for improved type hints and clarity * fix(transaction): revert transaction edits for local debugging * Zhifan - hotfix not seeing hours logged in weekly summaries report page (#1432) * fixed logic for returning time info * fixed three weeks age tab showed no hours * Newell - move cc recipients to bcc for privacy (#1435) fix(email): move cc recipients to bcc for privacy * Strallia - Hours completed backend data (#1437) feat: get data for tangible hours percentages * Newell - add Jae to CC recipients in emailSender (#1441) feat(email): add Jae to CC recipients in emailSender * Rishitha noshow visualization metrics (#1227) * no show viz * fix url * resolve conflicts * resolve conflicts --------- Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> Co-authored-by: Zhifan Jia <127051168+mashpotato9@users.noreply.github.com> Co-authored-by: Strallia Chao <134454347+strallia@users.noreply.github.com> Co-authored-by: RishithaMamidala <113060798+RishithaMamidala@users.noreply.github.com> * Backend Release to Main [2.39] (#1453) * Newell - fix email issues (#1430) * fix(email): resolve sendEmailWithAcknowledgment promise correctly * docs(email): add JSDoc to emailSender for improved type hints and clarity * docs(email): add JSDoc to emailSender for improved type hints and clarity * fix(transaction): revert transaction edits for local debugging * Zhifan - hotfix not seeing hours logged in weekly summaries report page (#1432) * fixed logic for returning time info * fixed three weeks age tab showed no hours * Newell - move cc recipients to bcc for privacy (#1435) fix(email): move cc recipients to bcc for privacy * Strallia - Hours completed backend data (#1437) feat: get data for tangible hours percentages * Newell - add Jae to CC recipients in emailSender (#1441) feat(email): add Jae to CC recipients in emailSender * Rishitha noshow visualization metrics (#1227) * no show viz * fix url * resolve conflicts * resolve conflicts * Dharmik - fix - team code outlier and notification red (#1424) * teamCodeWarning added to userProfile * set teamcodewarning to true if the teamcode is not valid * set teamCodeWarning flag if teamcode is invalid * removed concole.logs * Rishitha create bargraph for number of issues by type backend (#1318) * issue chart backend * commit_1 * fix controller * issue chart backend * fix backend issue * Zhifan - Create way to see 6 months & yearly anniversaries (#1273) * Backend Changes for trophy functionality * changed logic to use startDate * completed follow up feature on weekly summary report * converted into CommonJS --------- Co-authored-by: Aishwarya Ramesh <arame008@odu.edu> * Nikhil - Added a unit test for bmReusableController (#1271) Added a unit test for bmReusableController.js file Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> * Nikhil - Added unit test for bmToolController (#1284) Added unit test for bmToolController Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> * Dharmik - fix/Add number of blue squares to bottom left corner of first column on User Management Page (#1410) * added infringements to getUserProfiles * fixed issues getting blue squares * Dipti create separate subscribe and unsubscribe pages linked to the app (#1418) * Update emailController.js * Update emailController.js --------- Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> Co-authored-by: Zhifan Jia <127051168+mashpotato9@users.noreply.github.com> Co-authored-by: Strallia Chao <134454347+strallia@users.noreply.github.com> Co-authored-by: RishithaMamidala <113060798+RishithaMamidala@users.noreply.github.com> Co-authored-by: Dharmik1710 <47842695+Dharmik1710@users.noreply.github.com> Co-authored-by: Aishwarya Ramesh <arame008@odu.edu> Co-authored-by: nikhilpittala16 <142841075+nikhilpittala16@users.noreply.github.com> Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> Co-authored-by: Dipti Yadav <dipti.yadav@outlook.com> --------- Co-authored-by: One Community <one-community@users.noreply.github.com> Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> Co-authored-by: Zhifan Jia <127051168+mashpotato9@users.noreply.github.com> Co-authored-by: Strallia Chao <134454347+strallia@users.noreply.github.com> Co-authored-by: RishithaMamidala <113060798+RishithaMamidala@users.noreply.github.com> Co-authored-by: Dharmik1710 <47842695+Dharmik1710@users.noreply.github.com> Co-authored-by: Aishwarya Ramesh <arame008@odu.edu> Co-authored-by: nikhilpittala16 <142841075+nikhilpittala16@users.noreply.github.com> Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> Co-authored-by: Dipti Yadav <dipti.yadav@outlook.com> --------- Co-authored-by: Ankuriboh <183397864+Ankuriboh@users.noreply.github.com> Co-authored-by: Zhifan Jia <127051168+mashpotato9@users.noreply.github.com> Co-authored-by: Strallia Chao <134454347+strallia@users.noreply.github.com> Co-authored-by: RishithaMamidala <113060798+RishithaMamidala@users.noreply.github.com> Co-authored-by: Dharmik1710 <47842695+Dharmik1710@users.noreply.github.com> Co-authored-by: Aishwarya Ramesh <arame008@odu.edu> Co-authored-by: nikhilpittala16 <142841075+nikhilpittala16@users.noreply.github.com> Co-authored-by: Nikhil Pittala <nikhilpittala7@gmail.com> Co-authored-by: Dipti Yadav <dipti.yadav@outlook.com> Co-authored-by: sidhu47h <143651758+sidhu47h@users.noreply.github.com> Co-authored-by: sidhu47 <sidhuemailid@gmail.com> Co-authored-by: sabithanazareth <41137183+sabithanazareth@users.noreply.github.com> Co-authored-by: Humemah Kahlid <53024970+humemah@users.noreply.github.com> Co-authored-by: ddshah878 <dhrumil878@gmail.com> Co-authored-by: Peter-Nie2003 <139121798+Peter-Nie2003@users.noreply.github.com> Co-auth…
1 parent c531c86 commit 7940883

3 files changed

Lines changed: 58 additions & 56 deletions

File tree

‎src/controllers/userProfileController.js‎

Lines changed: 55 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1715,7 +1715,7 @@ const userProfileController = function (UserProfile, Project) {
17151715
res.status(403).send('You are not authorized to add blue square');
17161716
return;
17171717
}
1718-
1718+
17191719
const userid = req.params.userId;
17201720

17211721
cache.removeCache(`user-${userid}`);
@@ -1797,7 +1797,7 @@ const userProfileController = function (UserProfile, Project) {
17971797
blueSquare.description = summary ?? blueSquare.description;
17981798
if (Array.isArray(reasons)) {
17991799
blueSquare.reasons = reasons;
1800-
}
1800+
}
18011801
}
18021802
return blueSquare;
18031803
});
@@ -2034,86 +2034,89 @@ const userProfileController = function (UserProfile, Project) {
20342034
if (!req.body.requestor || !req.body.requestor.requestorId) {
20352035
return res.status(401).send({ message: 'User not authenticated' });
20362036
}
2037-
2037+
20382038
const userId = req.body.requestor.requestorId;
2039-
2039+
20402040
// Get skill parameter
20412041
const skillName = req.params.skill;
20422042
if (!skillName) {
20432043
return res.status(400).send({ message: 'Skill parameter is required' });
20442044
}
2045-
2045+
20462046
// Get all form responses except for the current user
20472047
const formResponses = await HGNFormResponses.find({
2048-
user_id: { $ne: userId } // Exclude current user
2048+
user_id: { $ne: userId }, // Exclude current user
20492049
}).lean();
2050-
2050+
20512051
// Get user IDs from form responses
2052-
const userIds = formResponses.map(response => response.user_id);
2053-
2052+
const userIds = formResponses.map((response) => response.user_id);
2053+
20542054
// Get user profiles to get privacy settings
20552055
const userProfiles = await UserProfile.find({
2056-
_id: { $in: userIds }
2057-
}).select('_id email phoneNumber privacySettings').lean();
2058-
2056+
_id: { $in: userIds },
2057+
})
2058+
.select('_id email phoneNumber privacySettings')
2059+
.lean();
2060+
20592061
// Create a map of user profiles by ID for faster lookup
20602062
const profileMap = userProfiles.reduce((map, profile) => {
20612063
map[profile._id.toString()] = profile;
20622064
return map;
20632065
}, {});
2064-
2066+
20652067
// Map data with privacy considerations
2066-
const membersData = formResponses.map(response => {
2067-
const profile = profileMap[response.user_id];
2068-
2069-
if (!profile) {
2070-
return null;
2071-
}
2072-
2073-
let score = 0;
2074-
2075-
// Check for skill score in frontend or backend
2076-
if (response.frontend && response.frontend[skillName] !== undefined) {
2077-
score = parseInt(response.frontend[skillName], 10) || 0;
2078-
} else if (response.backend && response.backend[skillName] !== undefined) {
2079-
score = parseInt(response.backend[skillName], 10) || 0;
2080-
}
2081-
2082-
// Apply privacy settings
2083-
const email = profile.privacySettings?.email === false ? null : profile.email;
2084-
2085-
// Get phone number with privacy consideration
2086-
let phoneNumber = null;
2087-
if (profile.privacySettings?.phoneNumber !== false) {
2088-
if (profile.phoneNumber && profile.phoneNumber.length > 0) {
2089-
const [firstPhoneNumber] = profile.phoneNumber;
2090-
phoneNumber = firstPhoneNumber;
2068+
const membersData = formResponses
2069+
.map((response) => {
2070+
const profile = profileMap[response.user_id];
2071+
2072+
if (!profile) {
2073+
return null;
20912074
}
2092-
}
2093-
2094-
return {
2095-
name: response.userInfo.name,
2096-
email,
2097-
phoneNumber,
2098-
slack: response.userInfo.slack,
2099-
rating: `${score} / 10`
2100-
};
2101-
}).filter(item => item !== null);
2102-
2075+
2076+
let score = 0;
2077+
2078+
// Check for skill score in frontend or backend
2079+
if (response.frontend && response.frontend[skillName] !== undefined) {
2080+
score = parseInt(response.frontend[skillName], 10) || 0;
2081+
} else if (response.backend && response.backend[skillName] !== undefined) {
2082+
score = parseInt(response.backend[skillName], 10) || 0;
2083+
}
2084+
2085+
// Apply privacy settings
2086+
const email = profile.privacySettings?.email === false ? null : profile.email;
2087+
2088+
// Get phone number with privacy consideration
2089+
let phoneNumber = null;
2090+
if (profile.privacySettings?.phoneNumber !== false) {
2091+
if (profile.phoneNumber && profile.phoneNumber.length > 0) {
2092+
const [firstPhoneNumber] = profile.phoneNumber;
2093+
phoneNumber = firstPhoneNumber;
2094+
}
2095+
}
2096+
2097+
return {
2098+
name: response.userInfo.name,
2099+
email,
2100+
phoneNumber,
2101+
slack: response.userInfo.slack,
2102+
rating: `${score} / 10`,
2103+
};
2104+
})
2105+
.filter((item) => item !== null);
2106+
21032107
// Sort by skill score (highest first)
21042108
const sortedData = [...membersData].sort((a, b) => {
21052109
const scoreA = parseInt(a.rating.split(' / ')[0], 10);
21062110
const scoreB = parseInt(b.rating.split(' / ')[0], 10);
21072111
return scoreB - scoreA;
21082112
});
2109-
2113+
21102114
return res.status(200).send(sortedData);
2111-
21122115
} catch (error) {
21132116
console.error('Error in getAllMembersSkillsAndContact:', error);
21142117
return res.status(500).send({
21152118
message: 'Failed to retrieve members',
2116-
error: error.message
2119+
error: error.message,
21172120
});
21182121
}
21192122
};

‎src/models/materialLoss.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const materialLossModel = new mongoose.Schema({
66
year: { type: Number, required: true, index: true },
77
month: { type: String, required: true, index: true },
88
lossPercentage: { type: Number, required: true },
9-
updatedAt: { type: Date, default: Date.now, required: true}
9+
updatedAt: { type: Date, default: Date.now, required: true },
1010
});
1111

1212
materialLossModel.index({ materialId: 1, year: 1, month: 1 });

‎src/routes/materialLossRouter.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ const routes = function (materialLossModel) {
44
const router = express.Router();
55
const controller = require('../controllers/materialLossController')(materialLossModel);
66

7-
router.route('/loss-tracking')
8-
.get(controller.getMaterialLossData);
7+
router.route('/loss-tracking').get(controller.getMaterialLossData);
98

109
return router;
1110
};
1211

13-
module.exports = routes;
12+
module.exports = routes;

0 commit comments

Comments
 (0)