From f5fc4f28bffd7815635d0cae57a84c25f8809f13 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 23 Jul 2021 17:51:56 +0200
Subject: [PATCH] Improve forms CSV export with polls

---
 www/form/inner.js | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/www/form/inner.js b/www/form/inner.js
index 773740701..8db1f8e16 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -1724,15 +1724,31 @@ define([
 
                 return h('div.cp-form-type-poll', lines);
             },
-            exportCSV: function (answer) {
-                if (answer === false) { return; }
-                if (!answer || !answer.values) { return ['']; }
+            exportCSV: function (answer, form) {
+                var opts = form.opts || TYPES.poll.defaultOpts;
+                var q = form.q || Messages.form_default;
+                if (answer === false) {
+                    var cols = opts.values.map(function (key) {
+                        return q + ' | ' + key;
+                    });
+                    cols.unshift(q);
+                    return cols;
+                }
+                if (!answer || !answer.values) {
+                    var empty = opts.values.map(function () { return ''; });
+                    empty.unshift('');
+                    return empty;
+                }
                 var str = '';
                 Object.keys(answer.values).sort().forEach(function (k, i) {
                     if (i !== 0) { str += ';'; }
                     str += k.replace(';', '').replace(':', '') + ':' + answer.values[k];
                 });
-                return [str];
+                var res = opts.values.map(function (key) {
+                    return answer.values[key] || '';
+                });
+                res.unshift(str);
+                return res;
             },
             icon: h('i.cptools.cptools-form-poll')
         },