Fix the CSV export to not build up and exclude unwanted fields (StepF…

…ields)
Firesphere · Jun 8, 2018 · dc2e386 · dc2e386
1 parent 28470d5
commit dc2e386
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/jobs/PartialSubmissionJob.php b/src/jobs/PartialSubmissionJob.php
@@ -175,15 +175,21 @@ protected function buildCSV($file, $form)
      */
     protected function processSubmissions($form, $submissions, $resource)
     {
-        $editableFields = $form->Fields()->map('Name', 'Title')->toArray();
+        $editableFields = $form
+            ->Fields()
+            ->exclude(['Name:PartialMatch' => 'EditableFormStep'])
+            ->map('Name', 'Title')
+            ->toArray();
         $submitted = [];
         foreach ($submissions as $submission) {
+            $submitted = [];
             $values = $submission->PartialFields()->map('Name', 'Value')->toArray();
             $i = 0;
             foreach ($editableFields as $field => $title) {
-                $submitted[] = '';
                 if (isset($values[$field])) {
                     $submitted[] = $values[$field];
+                } else {
+                    $submitted[] = '';
                 }
                 $i++;
             }