Skip to content

Diya 🔥 (hoursLogged): Fixed Hours Logged on Weekly Summaries Report #4481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
one-community merged 2 commits into from
Dec 4, 2025
Merged

Diya 🔥 (hoursLogged): Fixed Hours Logged on Weekly Summaries Report #4481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83bd127
fix(hoursLogged): Fixed Hours Logged on Weekly Summaries Report
DiyaWadhwani Nov 29, 2025
2ca4e86
Merge remote-tracking branch 'origin/development' into Diya_Fix_Weekl…
DiyaWadhwani Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/components/WeeklySummariesReport/FormattedReport.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,9 @@ function ReportDetails({
const ref = useRef(null);
const cantEditJaeRelatedRecord = cantUpdateDevAdminDetails(summary.email, loggedInUserEmail);

const hoursLogged = (summary.totalSeconds[weekIndex] || 0) / 3600;
const rawSeconds = summary.totalSeconds[weekIndex];
const hoursLogged = rawSeconds == null ? 0 : rawSeconds / 3600;

const isMeetCriteria =
canSeeBioHighlight &&
summary.totalTangibleHrs > 80 &&
Expand Down
186 changes: 94 additions & 92 deletions src/components/WeeklySummariesReport/WeeklySummariesReport.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -710,98 +710,100 @@ const WeeklySummariesReport = props => {
.filter(([, isSelected]) => isSelected)
.map(([color]) => color);

const temp = summaries.filter(summary => {
const { activeTab } = state;
const hoursLogged = (summary.totalSeconds[navItems.indexOf(activeTab)] || 0) / 3600;

// 🛑 Add this block at the very top inside the filter
// if (summary?.isActive === false) {
// const lastWeekStart = moment()
// .tz('America/Los_Angeles')
// .startOf('week')
// .subtract(1, 'week')
// .toDate();
// const lastWeekEnd = moment()
// .tz('America/Los_Angeles')
// .endOf('week')
// .subtract(1, 'week')
// .toDate();
// const summaryStart = new Date(summary.startDate);
// const summaryEnd = new Date(summary.endDate);
// const isLastWeek = summaryStart <= lastWeekEnd && summaryEnd >= lastWeekStart;

// if (!isLastWeek) {
// return false; // Skip inactive members unless their summary is from last week
// }
// }
if (
summary?.isActive === false &&
!doesSummaryBelongToWeek(summary.startDate, summary.endDate, weekIndex)
) {
return false;
}
const isMeetCriteria =
summary.totalTangibleHrs > 80 &&
summary.daysInTeam > 60 &&
summary.bioPosted !== 'posted';
const isBio = !selectedBioStatus || isMeetCriteria;
const isOverHours =
!selectedOverTime ||
(summary.weeklycommittedHours > 0 &&
hoursLogged > 0 &&
hoursLogged >= summary.promisedHoursByWeek[navItems.indexOf(activeTab)]);

// Add trophy filter logic
const summarySubmissionDate = moment()
.tz('America/Los_Angeles')
.endOf('week')
.subtract(weekIndex, 'week')
.format('YYYY-MM-DD');

const hasTrophy =
!selectedTrophies ||
showTrophyIcon(summarySubmissionDate, summary?.startDate?.split('T')[0]);

// Add special color filter logic
const matchesSpecialColor =
activeFilterColors.length === 0 || activeFilterColors.includes(summary.filterColor);

// Filtered by Team Code and Extra Members
const isInSelectedCode = selectedCodesArray.includes(summary.teamCode);
const isInSelectedExtraMember = selectedExtraMembersArray.includes(summary._id);
const noFilterSelected =
selectedCodesArray.length === 0 && selectedExtraMembersArray.length === 0;

let matchesLoggedHoursRange = true;
if (selectedLoggedHoursRange && selectedLoggedHoursRange.length > 0) {
matchesLoggedHoursRange = selectedLoggedHoursRange.some(range => {
switch (range.value) {
case '=0':
return hoursLogged === 0;
case '0-10':
return hoursLogged > 0 && hoursLogged <= 10;
case '10-20':
return hoursLogged > 10 && hoursLogged <= 20;
case '20-40':
return hoursLogged > 20 && hoursLogged <= 40;
case '>40':
return hoursLogged > 40;
default:
return true;
}
});
}
return (
(noFilterSelected || isInSelectedCode || isInSelectedExtraMember) &&
(selectedColorsArray.length === 0 ||
selectedColorsArray.includes(summary.weeklySummaryOption)) &&
matchesSpecialColor &&
isOverHours &&
isBio &&
hasTrophy &&
matchesLoggedHoursRange
);
});
const temp = summaries
.map(s => ({ ...s }))
.filter(summary => {
const { activeTab } = state;
const hoursLogged = (summary.totalSeconds[navItems.indexOf(activeTab)] || 0) / 3600;

// 🛑 Add this block at the very top inside the filter
// if (summary?.isActive === false) {
// const lastWeekStart = moment()
// .tz('America/Los_Angeles')
// .startOf('week')
// .subtract(1, 'week')
// .toDate();
// const lastWeekEnd = moment()
// .tz('America/Los_Angeles')
// .endOf('week')
// .subtract(1, 'week')
// .toDate();
// const summaryStart = new Date(summary.startDate);
// const summaryEnd = new Date(summary.endDate);
// const isLastWeek = summaryStart <= lastWeekEnd && summaryEnd >= lastWeekStart;

// if (!isLastWeek) {
// return false; // Skip inactive members unless their summary is from last week
// }
// }
if (
summary?.isActive === false &&
!doesSummaryBelongToWeek(summary.startDate, summary.endDate, weekIndex)
) {
return false;
}
const isMeetCriteria =
summary.totalTangibleHrs > 80 &&
summary.daysInTeam > 60 &&
summary.bioPosted !== 'posted';
const isBio = !selectedBioStatus || isMeetCriteria;
const isOverHours =
!selectedOverTime ||
(summary.weeklycommittedHours > 0 &&
hoursLogged > 0 &&
hoursLogged >= summary.promisedHoursByWeek[navItems.indexOf(activeTab)]);

// Add trophy filter logic
const summarySubmissionDate = moment()
.tz('America/Los_Angeles')
.endOf('week')
.subtract(weekIndex, 'week')
.format('YYYY-MM-DD');

const hasTrophy =
!selectedTrophies ||
showTrophyIcon(summarySubmissionDate, summary?.startDate?.split('T')[0]);

// Add special color filter logic
const matchesSpecialColor =
activeFilterColors.length === 0 || activeFilterColors.includes(summary.filterColor);

// Filtered by Team Code and Extra Members
const isInSelectedCode = selectedCodesArray.includes(summary.teamCode);
const isInSelectedExtraMember = selectedExtraMembersArray.includes(summary._id);
const noFilterSelected =
selectedCodesArray.length === 0 && selectedExtraMembersArray.length === 0;

let matchesLoggedHoursRange = true;
if (selectedLoggedHoursRange && selectedLoggedHoursRange.length > 0) {
matchesLoggedHoursRange = selectedLoggedHoursRange.some(range => {
switch (range.value) {
case '=0':
return hoursLogged === 0;
case '0-10':
return hoursLogged > 0 && hoursLogged <= 10;
case '10-20':
return hoursLogged > 10 && hoursLogged <= 20;
case '20-40':
return hoursLogged > 20 && hoursLogged <= 40;
case '>40':
return hoursLogged > 40;
default:
return true;
}
});
}
return (
(noFilterSelected || isInSelectedCode || isInSelectedExtraMember) &&
(selectedColorsArray.length === 0 ||
selectedColorsArray.includes(summary.weeklySummaryOption)) &&
matchesSpecialColor &&
isOverHours &&
isBio &&
hasTrophy &&
matchesLoggedHoursRange
);
});

// Use Dict and Set for quick access
const filteredTeamDict = {};
Expand Down
Loading