From dc4f9026f4630e1743d258ddb6e9f23754248e4d Mon Sep 17 00:00:00 2001
From: Ben Pitzer <pitzer@google.com>
Date: Tue, 28 Jul 2015 15:03:39 +0545
Subject: [PATCH 1/3] Enable Google Sheets export in the UI.

---
 templates/show.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/show.html b/templates/show.html
index d069943..940cea3 100644
--- a/templates/show.html
+++ b/templates/show.html
@@ -245,7 +245,7 @@ <h2 class="dashboard__group-label">
           <a href="{% url "onadata.apps.viewer.views.export_list" content_user.username xform.id_string 'xls' %}" class="download__drop-button">XLS</a>
           <a href="{% url "onadata.apps.viewer.views.export_list" content_user.username xform.id_string 'csv' %}" class="download__drop-button">CSV</a>
           <a href="{% url "onadata.apps.viewer.views.export_list" content_user.username xform.id_string 'zip' %}" class="download__drop-button">ZIP</a>
-          <!-- <a href="{% url "onadata.apps.viewer.views.export_list" content_user.username xform.id_string 'gdoc' %}" class="download__drop-button">GDOCS</a> -->
+          <a href="{% url "onadata.apps.viewer.views.export_list" content_user.username xform.id_string 'gsheets' %}" class="download__drop-button">Google Sheets</a>
           <a href="{% url "onadata.apps.viewer.views.export_list" content_user.username xform.id_string 'kml'%}"  class="download__drop-button">KML</a>
           <a href="{% url "onadata.apps.logger.views.download_excel_analyser" content_user.username xform.id_string %}"  class="download__drop-button">Excel Analyser</a>
           <!-- a href="{% url "onadata.apps.viewer.views.export_list" content_user.username xform.id_string 'sav_zip' %}" class="download__drop-button">SAV ZIP</a> -->

From c0c1fcf57afa6f3ff3b3e1d1d78565e98fd355d8 Mon Sep 17 00:00:00 2001
From: Ben Pitzer <pitzer@google.com>
Date: Thu, 30 Jul 2015 18:50:53 +0545
Subject: [PATCH 2/3] Added UI options to configure Google Sheets Export.

- Flattened or tabular output
- Export of XLSForm data
---
 templates/export_list.html | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/templates/export_list.html b/templates/export_list.html
index 6a020b9..7278c51 100644
--- a/templates/export_list.html
+++ b/templates/export_list.html
@@ -29,7 +29,7 @@ <h1>{{ export_type_name|upper }} {% blocktrans %}Exports{% endblocktrans %}</h1>
             <span style='float:middle;'>
               <div>
                 <input type="submit" class="btn btn-primary" value="{% trans 'New Export' %}" />
-                {% if export_type == 'xls' or export_type == 'csv' %}
+                {% if export_type == 'xls' or export_type == 'csv' or export_type == 'gsheets' %}
                   <a href="#advanced-export-modal" role="button" class="btn" data-toggle="modal">{% trans "Advanced Export" %}</a>
                 {% endif %}
             </div>
@@ -61,9 +61,19 @@ <h3>{% trans "Advanced Export" %}</h3>
             <option value="/" selected>/ ({% trans "Slash" %})</option>
           </select>
           <label class="checkbox">
-            <input type="checkbox" name="options[dont_split_select_multiples]" value="yes" />
-            {% trans "DONT split select multiple choice answers into separate columns" %}
+            <input type="checkbox" name="options[split_select_multiples]" />
+            {% trans "Split select multiple choice answers into separate columns" %}
           </label>
+          {% if export_type == 'gsheets' %}
+          <label class="checkbox">
+            <input type="checkbox" name="options[flatten_repeated_fields]" checked="yes" />
+            {% trans "Flatten repeated groups into a single worksheet." %}
+          </label>
+          <label class="checkbox">
+            <input type="checkbox" name="options[export_xlsform]" checked="yes" />
+            {% trans "Export the XLSForm along with the survey data." %}
+          </label>
+          {% endif %}
         </div>
         {% endif %}
         <div class="modal-footer">

From 0e28c2f65d2765e730e9a66a7997a1ddbbcb695c Mon Sep 17 00:00:00 2001
From: Ben Pitzer <pitzer@google.com>
Date: Sun, 23 Aug 2015 16:08:13 -0400
Subject: [PATCH 3/3] Makes default settings for advanced export equivalent to
 the settings for the standard export.

---
 templates/export_list.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/export_list.html b/templates/export_list.html
index 7278c51..0d5a822 100644
--- a/templates/export_list.html
+++ b/templates/export_list.html
@@ -66,11 +66,11 @@ <h3>{% trans "Advanced Export" %}</h3>
           </label>
           {% if export_type == 'gsheets' %}
           <label class="checkbox">
-            <input type="checkbox" name="options[flatten_repeated_fields]" checked="yes" />
+            <input type="checkbox" name="options[flatten_repeated_fields]" />
             {% trans "Flatten repeated groups into a single worksheet." %}
           </label>
           <label class="checkbox">
-            <input type="checkbox" name="options[export_xlsform]" checked="yes" />
+            <input type="checkbox" name="options[export_xlsform]" />
             {% trans "Export the XLSForm along with the survey data." %}
           </label>
           {% endif %}