Skip to content

Commit c7b9df4

Browse files
committed
fix: use selected date range instead of hardcoded current week in getTotalHoursWorked
1 parent e610c64 commit c7b9df4

2 files changed

Lines changed: 8 additions & 4 deletions

File tree

src/controllers/reportsController.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ const reportsController = function () {
191191
isoComparisonStartDate,
192192
isoComparisonEndDate,
193193
),
194-
overviewReportHelper.getTotalHoursWorked(),
194+
overviewReportHelper.getTotalHoursWorked(isoStartDate, isoEndDate),
195195
overviewReportHelper.getTasksStats(
196196
isoStartDate,
197197
isoEndDate,

src/helpers/overviewReportHelper.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1502,9 +1502,13 @@ const overviewReportHelper = function () {
15021502
* - Only active users with weeklycommittedHours >= 1 and role != Mentor
15031503
* - Excludes entryType of 'person', 'team', or 'project'
15041504
*/
1505-
async function getTotalHoursWorked() {
1506-
const pdtstart = moment().tz('America/Los_Angeles').startOf('week').format('YYYY-MM-DD');
1507-
const pdtend = moment().tz('America/Los_Angeles').endOf('week').format('YYYY-MM-DD');
1505+
async function getTotalHoursWorked(startDate, endDate) {
1506+
const pdtstart = startDate
1507+
? moment(startDate).format('YYYY-MM-DD')
1508+
: moment().tz('America/Los_Angeles').startOf('week').format('YYYY-MM-DD');
1509+
const pdtend = endDate
1510+
? moment(endDate).format('YYYY-MM-DD')
1511+
: moment().tz('America/Los_Angeles').endOf('week').format('YYYY-MM-DD');
15081512

15091513
const data = await UserProfile.aggregate([
15101514
{

0 commit comments

Comments
 (0)