Skip to content

Fix quick reports and submissions histogram #1039

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
idormenco merged 1 commit into from
Nov 28, 2025
Merged

Fix quick reports and submissions histogram #1039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions api/src/Feature.QuickReports/Get/Endpoint.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ private async Task<Results<Ok<QuickReportDetailedModel>, NotFound>> GetQuickRepo
WHERE
qra."ElectionRoundId" = @electionRoundId
AND qra."MonitoringObserverId" = qr."MonitoringObserverId"
and qra."QuickReportId" = @quickReportId
AND qra."IsDeleted" = false AND qra."IsCompleted" = true),'[]'::JSONB) AS "Attachments"

FROM "QuickReports" QR
Expand Down Expand Up @@ -154,6 +155,7 @@ private async Task<Results<Ok<QuickReportDetailedModel>, NotFound>> GetQuickRepo
WHERE
qra."ElectionRoundId" = @electionRoundId
AND qra."MonitoringObserverId" = qr."MonitoringObserverId"
AND qra."QuickReportId" = @quickReportId
AND qra."IsDeleted" = false AND qra."IsCompleted" = true),'[]'::JSONB) AS "Attachments"

FROM "QuickReports" QR
Expand Down
55 changes: 40 additions & 15 deletions api/src/Feature.Statistics/GetNgoAdminStatistics/Endpoint.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,22 +429,47 @@ GROUP BY

------------------------------------------------------------------------------
-------------------------- read hourly histogram------------------------------

WITH submission_histogram AS (
SELECT
DATE_TRUNC(
'hour',
TIMEZONE('utc', FS."LastUpdatedAt")
)::timestamptz AS bucket,
1 AS forms_submitted,
FS."NumberOfQuestionsAnswered" AS number_of_questions_answered,
FS."NumberOfFlaggedAnswers" AS number_of_flagged_answers
FROM "FormSubmissions" FS
INNER JOIN "GetAvailableMonitoringObservers"(
@ELECTIONROUNDID,
@NGOID,
@DATASOURCE) MO ON MO."MonitoringObserverId" = FS."MonitoringObserverId"

UNION ALL

SELECT
DATE_TRUNC(
'hour',
TIMEZONE('utc', qr."LastUpdatedAt")
)::timestamptz AS bucket,
1 AS forms_submitted,
qr."NumberOfQuestionsAnswered" AS number_of_questions_answered,
qr."NumberOfFlaggedAnswers" AS number_of_flagged_answers
FROM "PollingStationInformation" qr
INNER JOIN "GetAvailableMonitoringObservers"(
@ELECTIONROUNDID,
@NGOID,
@DATASOURCE) MO ON MO."MonitoringObserverId" = qr."MonitoringObserverId"
)

SELECT
DATE_TRUNC(
'hour',
TIMEZONE (
'utc',
FS."LastUpdatedAt"
)
)::TIMESTAMPTZ AS "Bucket",
COUNT(1) AS "FormsSubmitted",
SUM("NumberOfQuestionsAnswered") AS "NumberOfQuestionsAnswered",
SUM("NumberOfFlaggedAnswers") AS "NumberOfFlaggedAnswers"
FROM
"FormSubmissions" FS
INNER JOIN "GetAvailableMonitoringObservers" (@ELECTIONROUNDID, @NGOID, @DATASOURCE) MO ON MO."MonitoringObserverId" = FS."MonitoringObserverId"
GROUP BY
1;
bucket AS "Bucket",
COUNT(*) AS "FormsSubmitted",
SUM(number_of_questions_answered) AS "NumberOfQuestionsAnswered",
SUM(number_of_flagged_answers) AS "NumberOfFlaggedAnswers"
FROM submission_histogram
GROUP BY bucket
ORDER BY bucket;

SELECT
DATE_TRUNC(
Expand Down
Loading