Skip to content

add submission number column to form submissions export #1032

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
Oct 31, 2025
Merged

add submission number column to form submissions export #1032

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
10 changes: 10 additions & 0 deletions api/src/Vote.Monitor.Hangfire/Jobs/Export/FormSubmissions/ExportFormSubmissionsJob.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ private async Task<List<SubmissionModel>> GetSubmissions(Guid electionRoundId, G
SUBMISSIONS AS (
SELECT
PSI."Id" AS "SubmissionId",
1 as "SubmissionNumber",
PSI."PollingStationInformationFormId" AS "FormId",
'PSI' AS "FormType",
PSI."PollingStationId",
Expand Down Expand Up @@ -193,6 +194,14 @@ AND PSIF."NumberOfQuestions" <> PSI."NumberOfQuestionsAnswered"
UNION ALL
SELECT
FS."Id" AS "SubmissionId",
ROW_NUMBER() OVER (
PARTITION BY
FS."PollingStationId",
F."Id",
FS."MonitoringObserverId"
ORDER BY
FS."CreatedAt"
) AS "SubmissionNumber",
F."Id" AS "FormId",
F."FormType",
FS."PollingStationId",
Expand Down Expand Up @@ -298,6 +307,7 @@ ORDER BY
)
SELECT
S."SubmissionId",
S."SubmissionNumber",
S."FormId",
S."FormType",
S."TimeSubmitted",
Expand Down
1 change: 1 addition & 0 deletions api/src/Vote.Monitor.Hangfire/Jobs/Export/FormSubmissions/FormSubmissionsDataTable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ private FormSubmissionsDataTable(Guid formId, string defaultLanguage, IReadOnlyL

_header.AddRange([
"SubmissionId",
"SubmissionNumber",
"TimeSubmitted",
"FollowUpStatus",
"Level1",
Expand Down
1 change: 1 addition & 0 deletions ...rc/Vote.Monitor.Hangfire/Jobs/Export/FormSubmissions/FormSubmissionsDataTableGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public FormSubmissionsDataTableGenerator ForSubmission(SubmissionModel submissio
var row = new List<object>
{
submission.SubmissionId.ToString(),
submission.SubmissionNumber,
submission.TimeSubmitted.ToString("s"),
submission.FollowUpStatus.Value,
submission.Level1,
Expand Down
1 change: 1 addition & 0 deletions api/src/Vote.Monitor.Hangfire/Jobs/Export/FormSubmissions/ReadModels/SubmissionModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ namespace Vote.Monitor.Hangfire.Jobs.Export.FormSubmissions.ReadModels;
public class SubmissionModel
{
public Guid SubmissionId { get; init; }
public int SubmissionNumber { get; set; }

[JsonConverter(typeof(SmartEnumNameConverter<SubmissionFollowUpStatus, string>))]
public SubmissionFollowUpStatus FollowUpStatus { get; set; }
Expand Down
1 change: 1 addition & 0 deletions ...Vote.Monitor.Hangfire.UnitTests/Jobs/ExportData/FormSubmissionsDataTableGeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ public class FormSubmissionsDataTableGeneratorTests
private static readonly string[] _submissionColumns =
[
"SubmissionId",
"SubmissionNumber",
"TimeSubmitted",
"FollowUpStatus",
"Level1",
Expand Down
Loading