From 25c6f5d4fa04cf721a572b1f5bd9a9cb806f6f4c Mon Sep 17 00:00:00 2001
From: Andrej <andrej@scinote.net>
Date: Mon, 27 Jan 2025 13:37:23 +0100
Subject: [PATCH] Fix form responses export [SCI-11506]

---
 app/jobs/form_responses_zip_export_job.rb | 24 ++++++++++++++++-------
 app/models/form_datetime_field_value.rb   |  2 +-
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/app/jobs/form_responses_zip_export_job.rb b/app/jobs/form_responses_zip_export_job.rb
index 3df3c6044..37f0f135e 100644
--- a/app/jobs/form_responses_zip_export_job.rb
+++ b/app/jobs/form_responses_zip_export_job.rb
@@ -27,19 +27,29 @@ class FormResponsesZipExportJob < ZipExportJob
 
     workbook.add_worksheet(name: 'Form submissions') do |sheet|
       sheet.add_row build_header(form)
+      form_fields = form.form_fields
+
       form.form_responses.where(status: 'submitted').find_each do |form_response|
+        form_field_values = form_response.form_field_values
         sheet.add_row do |row|
           row.add_cell breadcrumbs(form_response)
-          row.add_cell form_response.submitted_at.to_s
+          row.add_cell form_response.submitted_at.utc.to_s
           row.add_cell form_response.submitted_by.full_name
-          form_response.form_field_values.joins(:form_field).where(latest: true).order(:position).each do |form_field_value|
-            if form_field_value.value_in_range?
-              row.add_cell form_field_value.formatted
+          form_fields.each do |form_field|
+            form_field_value = form_field_values.find_by(form_field_id: form_field.id, latest: true)
+            if form_field_value.present?
+              if form_field_value.value_in_range?
+                row.add_cell form_field_value.formatted
+              else
+                row.add_cell form_field_value.formatted, style: warning_bg_style
+              end
+              row.add_cell form_field_value.submitted_at.utc.to_s
+              row.add_cell form_field_value.submitted_by.full_name
             else
-              row.add_cell form_field_value.formatted, style: warning_bg_style
+              row.add_cell ''
+              row.add_cell ''
+              row.add_cell ''
             end
-            row.add_cell form_field_value.submitted_at.to_s
-            row.add_cell form_field_value.submitted_by.full_name
           end
         end
       end
diff --git a/app/models/form_datetime_field_value.rb b/app/models/form_datetime_field_value.rb
index 7b72a30c0..47451b75c 100644
--- a/app/models/form_datetime_field_value.rb
+++ b/app/models/form_datetime_field_value.rb
@@ -19,6 +19,6 @@ class FormDatetimeFieldValue < FormFieldValue
   end
 
   def formatted
-    range? ? [datetime, datetime_to].join(' - ') : datetime.to_s
+    range? ? [datetime.utc, datetime_to.utc].join(' - ') : datetime.utc.to_s
   end
 end