From 895630328e4af275b7a67026b2e1e5e91f149287 Mon Sep 17 00:00:00 2001
From: marshalys <marshalys@gmail.com>
Date: Thu, 27 Feb 2014 18:26:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0Excel=20xlsx=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E6=94=AF=E6=8C=81=E5=A4=A7=E6=95=B0=E6=8D=AE=E9=87=8F?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.py                                      |  4 +-
 xadmin/plugins/export.py                      | 55 +++++++++++++++++--
 .../model_list.top_toolbar.exports.html       |  3 +
 3 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/setup.py b/setup.py
index 246a06731..aa862e3c4 100644
--- a/setup.py
+++ b/setup.py
@@ -22,10 +22,10 @@
         'django-crispy-forms>=1.4.0',
     ],
     extras_require={
-        'Excel': ['xlwt'],
+        'Excel': ['xlwt', 'xlsxwriter'],
         'Reversion': ['django-reversion'],
     },
-    zip_safe=True,
+    zip_safe=False,
     keywords=['admin', 'django', 'xadmin', 'bootstrap'],
     classifiers=[
         'Development Status :: 4 - Beta',
diff --git a/xadmin/plugins/export.py b/xadmin/plugins/export.py
index c7daea789..06b75f0fa 100644
--- a/xadmin/plugins/export.py
+++ b/xadmin/plugins/export.py
@@ -20,15 +20,23 @@
 except:
     has_xlwt = False
 
+try:
+    import xlsxwriter
+    has_xlsxwriter = True
+except:
+    has_xlsxwriter = False
+
 
 class ExportMenuPlugin(BaseAdminPlugin):
 
-    list_export = ('xls', 'csv', 'xml', 'json')
-    export_names = {'xls': 'Excel', 'csv': 'CSV', 'xml': 'XML', 'json': 'JSON'}
+    list_export = ('xlsx', 'xls', 'csv', 'xml', 'json')
+    export_names = {'xlsx': 'Excel 2007', 'xls': 'Excel', 'csv': 'CSV',
+                    'xml': 'XML', 'json': 'JSON'}
 
     def init_request(self, *args, **kwargs):
         self.list_export = [
-            f for f in self.list_export if f != 'xls' or has_xlwt]
+            f for f in self.list_export
+            if (f != 'xlsx' or has_xlsxwriter) and (f != 'xls' or has_xlwt)]
 
     def block_top_toolbar(self, context, nodes):
         if self.list_export:
@@ -42,14 +50,14 @@ def block_top_toolbar(self, context, nodes):
 
 class ExportPlugin(BaseAdminPlugin):
 
-    export_mimes = {'xls': 'application/vnd.ms-excel', 'csv': 'text/csv',
+    export_mimes = {'xlsx': 'application/vnd.ms-excel',
+                    'xls': 'application/vnd.ms-excel', 'csv': 'text/csv',
                     'xml': 'application/xhtml+xml', 'json': 'application/json'}
 
     def init_request(self, *args, **kwargs):
         return self.request.GET.get('_do_') == 'export'
 
     def _format_value(self, o):
-        value = None
         if (o.field is None and getattr(o.attr, 'boolean', False)) or \
            (o.field and isinstance(o.field, (BooleanField, NullBooleanField))):
                 value = o.value
@@ -75,6 +83,43 @@ def _get_datas(self, context):
         new_rows.insert(0, [force_unicode(c.text) for c in context['result_headers'].cells if c.export])
         return new_rows
 
+    def get_xlsx_export(self, context):
+        datas = self._get_datas(context)
+        output = StringIO.StringIO()
+        export_header = (
+            self.request.GET.get('export_xlsx_header', 'off') == 'on')
+
+        model_name = self.opts.verbose_name
+        book = xlsxwriter.Workbook(output)
+        sheet = book.add_worksheet(
+            u"%s %s" % (_(u'Sheet'), force_unicode(model_name)))
+        styles = {'datetime': book.add_format({'num_format': 'yyyy-mm-dd hh:mm:ss'}),
+                  'date': book.add_format({'num_format': 'yyyy-mm-dd'}),
+                  'time': book.add_format({'num_format': 'hh:mm:ss'}),
+                  'header': book.add_format({'font': 'name Times New Roman', 'color': 'red', 'bold': 'on', 'num_format': '#,##0.00'}),
+                  'default': book.add_format()}
+
+        if not export_header:
+            datas = datas[1:]
+        for rowx, row in enumerate(datas):
+            for colx, value in enumerate(row):
+                if export_header and rowx == 0:
+                    cell_style = styles['header']
+                else:
+                    if isinstance(value, datetime.datetime):
+                        cell_style = styles['datetime']
+                    elif isinstance(value, datetime.date):
+                        cell_style = styles['date']
+                    elif isinstance(value, datetime.time):
+                        cell_style = styles['time']
+                    else:
+                        cell_style = styles['default']
+                sheet.write(rowx, colx, value, cell_style)
+        book.close()
+
+        output.seek(0)
+        return output.getvalue()
+
     def get_xls_export(self, context):
         datas = self._get_datas(context)
         output = StringIO.StringIO()
diff --git a/xadmin/templates/xadmin/blocks/model_list.top_toolbar.exports.html b/xadmin/templates/xadmin/blocks/model_list.top_toolbar.exports.html
index 55a5ebed5..f15081fa9 100644
--- a/xadmin/templates/xadmin/blocks/model_list.top_toolbar.exports.html
+++ b/xadmin/templates/xadmin/blocks/model_list.top_toolbar.exports.html
@@ -22,6 +22,9 @@ <h4 class="modal-title">{% trans "Export" %} {{et.name}}</h4>
             {{ form_params|safe }}
             <input type="hidden" name="export_type" value="{{et.type}}">
               <label class="checkbox">
+                {% if et.type == "xlsx" %}
+                <input type="checkbox" name="export_xlsx_header" checked="checked" value="on"> {% trans "Export with table header." %}
+                {% endif %}
                 {% if et.type == "xls" %}
                 <input type="checkbox" name="export_xls_header" checked="checked" value="on"> {% trans "Export with table header." %}
                 {% endif %}