Code

Backend Release to Main [1.30]#691

Code

Merged

one-community merged 70 commits intomainOneCommunityGlobal/HGNRest:mainfrom developmentOneCommunityGlobal/HGNRest:developmentCopy head branch name to clipboardJan 9, 2024

+1,406-791

Commits

Commits on Nov 1, 2023

• Tried to fix old approach

  tsunami776

  committed
  8036f37

  Copy full SHA for 8036f37

Commits on Nov 9, 2023

• Create default prompt when there is no prompt

  tsunami776

  committed
  fa3b768

  Copy full SHA for fa3b768

Commits on Nov 15, 2023

• Merge branch 'development' into Xiao-F-Create-way-for-owner-to-edit-update-ChatGPT-prompt-text

  tsunami776

  committed
  8ee7b3b

  Copy full SHA for 8ee7b3b

Commits on Nov 16, 2023

• initial commit

  cvtqx

  committed
  6caba89

  Copy full SHA for 6caba89

Commits on Nov 17, 2023

• merged origin/Aish_create_buildingTools_schema and updated file names

  cvtqx

  committed
  88dea1e

  Copy full SHA for 88dea1e

Commits on Nov 20, 2023

• remove duplictae conroller

  cvtqx

  committed
  14a1745

  Copy full SHA for 14a1745

• merge Aish_create_buildingTools_schema

  cvtqx

  committed
  4d4b50f

  Copy full SHA for 4d4b50f

• updated buildingtool controller and schema

  cvtqx

  committed
  10b371e

  Copy full SHA for 10b371e

Commits on Nov 22, 2023

• updated buildingtool schema and controller

  cvtqx

  committed
  507c61f

  Copy full SHA for 507c61f

• Merge branch 'development' into Xiao-F-Create-way-for-owner-to-edit-update-ChatGPT-prompt-text

  tsunami776

  committed
  a49a34a

  Copy full SHA for a49a34a

Commits on Nov 23, 2023

• Fix model, controller and route for AI prompt

  tsunami776

  committed
  403ca74

  Copy full SHA for 403ca74

Commits on Nov 30, 2023

• updates

  cvtqx

  committed
  03acb2f

  Copy full SHA for 03acb2f

Commits on Dec 1, 2023

• remake branch without package-lock.json modifications

  lacnoskillz

  committed
  c1294d4

  Copy full SHA for c1294d4

• changed fetchMaterialTypes back to how it was before

  lacnoskillz

  committed
  28badf2

  Copy full SHA for 28badf2

• renamed tool router and controller and fixed syntax error

  cvtqx

  committed
  be6b67f

  Copy full SHA for be6b67f

Commits on Dec 6, 2023

• added timeOffFrom and timeOffTill fields to mongoDB

  Shiwani99

  committed
  0a30abb

  Copy full SHA for 0a30abb

Commits on Dec 12, 2023

• merged development

  cvtqx

  committed
  c8b97d1

  Copy full SHA for c8b97d1

Commits on Dec 13, 2023

• updated toolcontroller query

  cvtqx

  committed
  18da208

  Copy full SHA for 18da208

Commits on Dec 17, 2023

• added TimeOffFrom and TimeOffTill to dashboardhelper leaderboard pipeline

  Shiwani99

  committed
  2df3865

  Copy full SHA for 2df3865

• added pst time instead of est for current date

  Shiwani99

  committed
  2ecf74d

  Copy full SHA for 2ecf74d

• removed current date from leaderboard aggregation pipeline

  Shiwani99

  committed
  511062f

  Copy full SHA for 511062f

• added timeOffFrom and timeOffTill to taskHelper

  Shiwani99

  committed
  ecc27d3

  Copy full SHA for ecc27d3

• added timeOffFrom and timeOffTill to reportHelper

  Shiwani99

  committed
  7de8947

  Copy full SHA for 7de8947

Commits on Dec 18, 2023

• updated dashboardhelper and taskHelper to add timeOffFrom anf timeOffTill for individual task and leaderboard data

  Shiwani99

  committed
  33a0546

  Copy full SHA for 33a0546

• modified the array representation for timeOffFrom and TimeOffTill to a value instead of array

  Shiwani99

  committed
  367abce

  Copy full SHA for 367abce

• Added comments to reasonSchedulingController.js

  Shiwani99

  authored
  676ab6d

  Copy full SHA for 676ab6d

Commits on Dec 21, 2023

• add equip controller, add equip func, update package-lock

  tdkent

  committed
  5b8c91b

  Copy full SHA for 5b8c91b

• add equipment router

  tdkent

  committed
  b8996e9

  Copy full SHA for b8996e9

• add equipment endpoint to routes

  tdkent

  committed
  08c45bb

  Copy full SHA for 08c45bb

• move api to invtype. delete redundant files.

  tdkent

  committed
  d911d14

  Copy full SHA for d911d14

Commits on Dec 22, 2023

• add invtype create method

  tdkent

  committed
  a503971

  Copy full SHA for a503971

• Update modifiedDatetime when team member added or removed from a team

  tsunami776

  committed
  80d45f1

  Copy full SHA for 80d45f1

• add discriminators to inv type model

  tdkent

  committed
  4acbedb

  Copy full SHA for 4acbedb

Commits on Dec 23, 2023

• add inv type models to routing. update controller func for new model.

  tdkent

  committed
  b4e0584

  Copy full SHA for b4e0584

• add validation error handling to create op

  tdkent

  committed
  e812126

  Copy full SHA for e812126

Commits on Dec 29, 2023

• Merge branch 'development' into Xiao-F-update-teams-page-sorting-part-b

  tsunami776

  committed
  cdbcaf8

  Copy full SHA for cdbcaf8

Commits on Dec 30, 2023

• add createdBy field to base inv type model

  tdkent

  committed
  6953ec3

  Copy full SHA for 6953ec3

• Consumables first commit

  Vishala09

  committed
  0888853

  Copy full SHA for 0888853

Commits on Jan 2, 2024

• add char limit to desc

  tdkent

  committed
  e587b6a

  Copy full SHA for e587b6a

Commits on Jan 3, 2024

• add duplicate name check

  tdkent

  committed
  b83b1b5

  Copy full SHA for b83b1b5

• merge w dev branch

  tdkent

  committed
  00c9387

  Copy full SHA for 00c9387

Commits on Jan 4, 2024

• took out the cc for review requests

  beblicarl

  committed
  037cc6f

  Copy full SHA for 037cc6f

• Merge pull request #683 from OneCommunityGlobal/Carl-review-request-bug

  Show description for fcf86f5
  one-community

  authored
  fcf86f5

  Copy full SHA for fcf86f5

Commits on Jan 5, 2024

• Merge branch 'development' into Xiao-F-Create-way-for-owner-to-edit-update-ChatGPT-prompt-text

  tsunami776

  committed
  ce8d244

  Copy full SHA for ce8d244

• Merge pull request #684 from OneCommunityGlobal/Olga_tools_controller_and_router

  Show description for 27c2361
  tdkent

  authored
  27c2361

  Copy full SHA for 27c2361

Commits on Jan 6, 2024

• Merge pull request #630 from OneCommunityGlobal/kaikane-updateNameAndUnitOfMeasurement-ControllerAndRoutes

  Show description for 3003610
  tdkent

  authored
  3003610

  Copy full SHA for 3003610

• Merge branch 'development' into Xiao-F-update-teams-page-sorting-part-b

  tsunami776

  committed
  cfbacf4

  Copy full SHA for cfbacf4

• revert lint

  tsunami776

  committed
  ae8bb2b

  Copy full SHA for ae8bb2b

• revert changes

  tsunami776

  committed
  33f99ab

  Copy full SHA for 33f99ab

• fix conflicts, add base type to invtype model export

  tdkent

  committed
  4923dea

  Copy full SHA for 4923dea

• revert lint

  tsunami776

  committed
  f939225

  Copy full SHA for f939225

• Merge pull request #677 from OneCommunityGlobal/Tim_add_equip_api

  Show description for 7010154
  tdkent

  authored
  7010154

  Copy full SHA for 7010154

• Merge pull request #671 from OneCommunityGlobal/Xiao-F-update-teams-page-sorting-part-b

  Show description for 15af5fc
  one-community

  authored
  15af5fc

  Copy full SHA for 15af5fc

• git conflicts , type-item mongoose key name changes

  Vishala09

  committed
  e19256d

  Copy full SHA for e19256d

• Merge pull request #603 from OneCommunityGlobal/Xiao-F-Create-way-for-owner-to-edit-update-ChatGPT-prompt-text

  Show description for 13e5c48
  one-community

  authored
  13e5c48

  Copy full SHA for 13e5c48

Commits on Jan 7, 2024

• Merge pull request #672 from OneCommunityGlobal/vishala_comsumables_view

  Show description for 7148218
  tdkent

  authored
  7148218

  Copy full SHA for 7148218

Commits on Jan 8, 2024

• added timeOffFrom and timeOffTill fields to new aggregation in taskHelper and dashboardHelper

  Shiwani99

  committed
  37ba941

  Copy full SHA for 37ba941

• Merge branch 'shiwani_create_wayforteams_when_off_fortheweek' of https://github.com/OneCommunityGlobal/HGNRest into shiwani_create_wayforteams_when_off_fortheweek

  Shiwani99

  committed
  9e5f9fb

  Copy full SHA for 9e5f9fb

• Merge branch 'development' into shiwani_create_wayforteams_when_off_fortheweek

  Shiwani99

  authored
  65149a6

  Copy full SHA for 65149a6

• added timeOffFrom and timeOffTill fields to mongoDB

  Shiwani99

  committed
  b81b0a1

  Copy full SHA for b81b0a1

• added timeOffFrom and timeOffTill to taskHelper

  Shiwani99

  committed
  02ba986

  Copy full SHA for 02ba986

• added timeOffFrom and timeOffTill to reportHelper

  Shiwani99

  committed
  c26046e

  Copy full SHA for c26046e

• updated dashboardhelper and taskHelper to add timeOffFrom anf timeOffTill for individual task and leaderboard data

  Shiwani99

  committed
  a153942

  Copy full SHA for a153942

• modified the array representation for timeOffFrom and TimeOffTill to a value instead of array

  Shiwani99

  committed
  f484767

  Copy full SHA for f484767

• Added comments to reasonSchedulingController.js

  Shiwani99

  committed
  a956753

  Copy full SHA for a956753

• fixed issues with rebasing current branch with development and added timeOffFrom and timeOffTill to the new aggregation in dashboard and task helper

  Shiwani99

  committed
  6346f4a

  Copy full SHA for 6346f4a

• resolved conflicts and rebased current branch with development

  Shiwani99

  committed
  2913a44

  Copy full SHA for 2913a44

• resolved errors after merge conflicts

  Shiwani99

  committed
  2f36291

  Copy full SHA for 2f36291

• resolved errors in userProfile.js after conflicts

  Shiwani99

  committed
  bd9a150

  Copy full SHA for bd9a150

Commits on Jan 9, 2024

• Merge pull request #660 from OneCommunityGlobal/shiwani_create_wayforteams_when_off_fortheweek

  Show description for 6fc4379
  one-community

  authored
  6fc4379

  Copy full SHA for 6fc4379