Skip to content

Fix submission count on project submissions page #2612

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.

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
merged 3 commits into from
Jun 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 11 additions & 2 deletions src/frontend/src/components/ProjectSubmissions/ProjectInfo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,13 @@ import CoreModules from '@/shared/CoreModules';
import AssetModules from '@/shared/AssetModules';
import { useNavigate } from 'react-router-dom';
import { useAppSelector } from '@/types/reduxTypes';
import { EntityOsmMap } from '@/models/project/projectModel';

const ProjectInfo = ({ entities }) => {
type propType = {
entities: EntityOsmMap[];
};

const ProjectInfo = ({ entities }: propType) => {
const navigate = useNavigate();
const params = CoreModules.useParams();
const projectId = params.projectId;
Expand All @@ -25,6 +30,10 @@ const ProjectInfo = ({ entities }) => {
?.toISOString();

const updatedDateTime = latestDateSorted ? latestDateSorted?.split('T')[0] : '-';
const submissionCount = entities?.reduce((total, entity) => {
const entitySubmissionCount = entity?.submission_ids?.split(',')?.length || 0;
return total + entitySubmissionCount;
}, 0);

const dataCard = [
{
Expand All @@ -39,7 +48,7 @@ const ProjectInfo = ({ entities }) => {
},
{
title: 'Submissions',
count: entities?.length,
count: submissionCount,
icon: <AssetModules.SubmissionIcon sx={{ color: 'white', fontSize: { xs: '35px', xl: '40px' } }} />,
},
];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const SubmissionsInfographics = ({ toggleView, entities }) => {
updatedEntityLastNDays?.map((entity) => {
if (submissions?.find((submission) => submission.label === getMonthDate(entity.updated_at))) {
const index = submissions.findIndex((submission) => submission.label === getMonthDate(entity.updated_at));
submissions[index].count += 1;
submissions[index].count += entity?.submission_ids?.split(',')?.length;
} else {
submissions.push({
date: entity.updated_at?.split('T')[0],
Expand Down
3 changes: 2 additions & 1 deletion src/frontend/src/store/slices/TaskSlice.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ const TaskSlice = createSlice({
let lastSubmission: string | null = null;
items.forEach((item) => {
if (item.status > 1) {
submissionCount++;
const entitySubmissionCount = item?.submission_ids?.split(',')?.length || 0;
submissionCount += entitySubmissionCount;
}
if (item.updated_at && (!lastSubmission || item.updated_at > lastSubmission)) {
lastSubmission = item.updated_at;
Expand Down