mirror of
https://github.com/makeplane/plane.git
synced 2026-07-14 06:25:58 +02:00
[WEB-3905] fix: cancelled issues on epic analytics of a initiative (#3005)
This commit is contained in:
@@ -525,6 +525,12 @@ class InitiativeEpicAnalytics(BaseAPIView):
|
||||
.count()
|
||||
)
|
||||
|
||||
cancelled_issues = (
|
||||
issues.filter(id__in=issue_ids, workspace__slug=slug)
|
||||
.filter(state__group="cancelled")
|
||||
.count()
|
||||
)
|
||||
|
||||
total_issues = issues.filter(id__in=issue_ids, workspace__slug=slug).count()
|
||||
|
||||
result.append(
|
||||
@@ -532,6 +538,7 @@ class InitiativeEpicAnalytics(BaseAPIView):
|
||||
"epic_id": epic_id,
|
||||
"total_issues": total_issues,
|
||||
"completed_issues": completed_issues,
|
||||
"cancelled_issues": cancelled_issues,
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
@@ -50,7 +50,10 @@ export const EpicListItem: React.FC<Props> = observer((props) => {
|
||||
const projectIdentifier = issue?.project_id ? project.getProjectIdentifierById(issue?.project_id) : "";
|
||||
const issueSequenceId = issue?.sequence_id;
|
||||
|
||||
const progress = getProgress(initiativeEpicStats?.completed_issues, initiativeEpicStats?.total_issues);
|
||||
const progress = getProgress(
|
||||
(initiativeEpicStats?.completed_issues ?? 0) + (initiativeEpicStats?.cancelled_issues ?? 0),
|
||||
initiativeEpicStats?.total_issues ?? 0
|
||||
);
|
||||
|
||||
if (!issue || !issue.project_id) return <></>;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user