IT4Change/ohmyform-ui
3
0
Fork 0
mirror of https://github.com/IT4Change/ohmyform-ui.git synced 2025-12-13 09:45:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix field sort in excel submission export

Browse Source
This commit is contained in:
Michael Schramm 2022-03-13 23:30:46 +01:00
parent 23e67c8f7e
commit 30ff2c96bc
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -26,6 +26,8 @@ Template for next version
### Fixed
- field sort in excel submission export (https://github.com/ohmyform/ohmyform/issues/163)
### Security
## [1.0.1] - 2022-03-01

9
components/form/admin/export.submission.action.tsx
View File

@ -36,6 +36,9 @@ export const ExportSubmissionAction: React.FC<Props> = (props) => {
workbook.created = new Date()
workbook.modified = new Date()
const orderedFields = form.data.form.fields
.sort((a, b) => (a.idx ?? 0) - (b.idx ?? 0))
const sheet = workbook.addWorksheet('Submissions')
sheet.getRow(1).values = [
'Submission ID',
@ -45,7 +48,7 @@ export const ExportSubmissionAction: React.FC<Props> = (props) => {
'City',
'User Agent',
'Device',
...form.data.form.fields.map((field) => `${field.title} (${field.type})`),
...orderedFields.map((field) => `${field.title} (${field.type})`),
]
const firstPage = await getSubmissions({
@ -65,7 +68,9 @@ export const ExportSubmissionAction: React.FC<Props> = (props) => {
data.device.name,
]
data.fields.forEach((field) => {
orderedFields.forEach((formField) => {
const field = data.fields.find(field => field.id === formField.id)
try {
fieldTypes[field.type]?.stringifyValue(field.value)