Skip to content

Commit 0f8f5bd

Browse files
Venk-rgbone-communityAnkuribohmashpotato9strallia
authored
Venkataramanan. resolve merge conflict 1630 v1 (#1631)
* 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-authored-…
1 parent 82ec071 commit 0f8f5bd

1 file changed

Lines changed: 41 additions & 9 deletions

File tree

‎src/startup/routes.js‎

Lines changed: 41 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,9 @@ const timeOffRequestRouter = require('../routes/timeOffRequestRouter')(
142142
userProfile,
143143
);
144144
const followUpRouter = require('../routes/followUpRouter')(followUp);
145-
const form=require('../models/forms')
146-
const formResponse=require('../models/formResponse')
147-
const formRouter=require('../routes/formRouter')(form,formResponse);
145+
const form = require('../models/forms');
146+
const formResponse = require('../models/formResponse');
147+
const formRouter = require('../routes/formRouter')(form, formResponse);
148148
const materialLossRouter = require('../routes/materialLossRouter')(materialLoss);
149149
const wastedMaterialRouter = require('../routes/mostWastedRouter');
150150

@@ -192,15 +192,21 @@ const blueSquareEmailAssignmentRouter = require('../routes/BlueSquareEmailAssign
192192
userProfile,
193193
);
194194

195-
const weeklySummaryEmailAssignmentRouter = require('../routes/WeeklySummaryEmailAssignmentRoute')(weeklySummaryEmailAssignment, userProfile);
196-
197195
// Automations
198196
const appAccessRouter = require('../routes/automation/appAccessRouter');
199197
const dropboxRouter = require('../routes/automation/dropboxRouter');
200198
const githubRouter = require('../routes/automation/githubRouter');
201199
const sentryRouter = require('../routes/automation/sentryRouter');
202200
const slackRouter = require('../routes/automation/slackRouter');
203201

202+
//commnunity portal
203+
const cpNoShowRouter = require('../routes/CommunityPortal/NoshowVizRouter')();
204+
205+
const weeklySummaryEmailAssignmentRouter = require('../routes/WeeklySummaryEmailAssignmentRoute')(
206+
weeklySummaryEmailAssignment,
207+
userProfile,
208+
);
209+
204210
//lbdashboard_bidoverview
205211

206212
const bidPropertyRouter = require('../routes/lbdashboard/bidPropertyRouter')(bidoverview_Listing);
@@ -211,9 +217,6 @@ const userBidRouter = require('../routes/lbdashboard/userBidNotificationRouter')
211217
bidoverview_Notification,
212218
);
213219

214-
//commnunity portal
215-
const cpNoShowRouter = require('../routes/CommunityPortal/NoshowVizRouter')();
216-
217220
const registrationRouter = require('../routes/registrationRouter')(registration);
218221

219222
const templateRouter = require('../routes/templateRouter');
@@ -234,6 +237,9 @@ module.exports = function (app) {
234237
app.use('/api', teamRouter);
235238
app.use('/api', wastedMaterialRouter);
236239

240+
app.use('/api', laborCostRouter);
241+
app.use('/api', wastedMaterialRouter);
242+
237243
app.use('/api', laborCostRouter);
238244
// app.use('/api', actionItemRouter);
239245
app.use('/api', notificationRouter);
@@ -266,19 +272,24 @@ module.exports = function (app) {
266272
app.use('/api', followUpRouter);
267273
app.use('/api', blueSquareEmailAssignmentRouter);
268274
app.use('/api', weeklySummaryEmailAssignmentRouter);
269-
275+
276+
app.use('/api', weeklySummaryEmailAssignmentRouter);
277+
270278
app.use('/api', formRouter);
271279
app.use('/api', collaborationRouter);
272280
app.use('/api', userSkillsProfileRouter);
273281
app.use('/api/jobs', jobsRouter);
274282
app.use('/api/questions', hgnformRouter);
275283
app.use('/api/hgnform', hgnFormResponseRouter);
276284
app.use('/api/skills', userSkillTabsRouter);
285+
app.use('/api/skills', userSkillTabsRouter);
277286
app.use('/api/questionnaire-analytics/', questionnaireAnalyticsRouter);
278287
app.use('/api/job-notification-list/', jobNotificationListRouter);
279288

280289
app.use('/api', templateRouter);
281290

291+
app.use('/api', templateRouter);
292+
282293
app.use('/api/help-categories', helpCategoryRouter);
283294
app.use('/api', tagRouter);
284295
app.use('/api/materials', materialLossRouter);
@@ -298,6 +309,11 @@ module.exports = function (app) {
298309
app.use('/api/sentry', sentryRouter);
299310
app.use('/api/slack', slackRouter);
300311
app.use('/api/accessManagement', appAccessRouter);
312+
app.use('/api/dropbox', dropboxRouter);
313+
app.use('/api/github', githubRouter);
314+
app.use('/api/sentry', sentryRouter);
315+
app.use('/api/slack', slackRouter);
316+
app.use('/api/accessManagement', appAccessRouter);
301317
app.use('/api/bm', bmExternalTeam);
302318

303319
app.use('/api/bm', bmIssueRouter);
@@ -310,13 +326,29 @@ module.exports = function (app) {
310326
//community portal
311327
app.use('/api/communityportal/reports/participation', cpNoShowRouter);
312328

329+
app.use('/api/bm', bmIssueRouter);
330+
app.use('/api/bm', bmActualVsPlannedCostRouter);
331+
app.use('/api/bm', bmTimeLoggerRouter);
332+
333+
app.use('/api/lb', bidPropertyRouter);
334+
app.use('/api/lb', userBidRouter);
335+
336+
//community portal
337+
app.use('/api/communityportal/reports/participation', cpNoShowRouter);
338+
313339
// lb dashboard
314340
app.use('/api/lb', lbListingsRouter);
315341
app.use('/api/villages', require('../routes/lbdashboard/villages'));
316342
app.use('/api/lb', lbMessageRouter);
317343
app.use('/api/lb', lbUserPrefRouter);
344+
app.use('/api/villages', require('../routes/lbdashboard/villages'));
345+
app.use('/api/lb', lbMessageRouter);
346+
app.use('/api/lb', lbUserPrefRouter);
318347
app.use('/api', registrationRouter);
319348
app.use('/api', projectMaterialRouter);
320349
app.use('/api/bm', bmRentalChart);
321350
app.use('/api/lb', lbWishlistsRouter);
351+
app.use('/api', projectMaterialRouter);
352+
app.use('/api/bm', bmRentalChart);
353+
app.use('/api/lb', lbWishlistsRouter);
322354
};

0 commit comments

Comments
 (0)