Masse salariale: export en ODS

diff --git a/project/rh/masse_salariale.py b/project/rh/masse_salariale.py
index 79cddf5..485c8b2 100644 (file)
--- a/project/rh/masse_salariale.py
+++ b/project/rh/masse_salariale.py
@@ -42,7 +42,7 @@ TYPE_NATURE_INDEMN = u"Indemnité"
 TYPE_NATURE_PAIEMENT = u"Accessoire"
 TYPE_NATURE_CHARGES = u"Charges"
 TYPE_NATURE_TRAITEMENT = u"Traitement"
-HEADER_SEPARATOR = ('sep', ods.Separator, {'columnwidth': '0.4cm'})
+HEADER_SEPARATOR = ('sep', ods.Separator(), {'columnwidth': '0.4cm'})
 
 
 class MasseSalariale():

diff --git a/project/rh/ods.py b/project/rh/ods.py
index cfccc89..07f0976 100644 (file)
--- a/project/rh/ods.py
+++ b/project/rh/ods.py
@@ -15,6 +15,9 @@ class Separator():
     def __unicode__(self):
         return u""
 
+    def __str__(self):
+        return ""
+
 
 def valuetype(val):
     valuetype = "string"
@@ -113,7 +116,7 @@ class TableRow(Wrapper):
             elif isinstance(value, (int, float, Decimal)):
                 kwargs['valuetype'] = "float"
                 kwargs['value'] = float(value)
-            elif type(value) == type(None):
+            elif type(value) == type(None) or isinstance(value, Separator):
                 kwargs['stringvalue'] = u""
             else:
                 kwargs['stringvalue'] = unicode(value)
@@ -124,7 +127,7 @@ class TableRow(Wrapper):
                 verticalalign=kwargs['verticalalign'], wrapoption='wrap'))
             del kwargs['verticalalign']
 
-        if isinstance(value, Separator):
+        if isinstance(value, Separator) or type(value) == type(Separator()):
             style.addElement(odf.style.TableCellProperties(
                 backgroundcolor='#D3D3D3'))
 

diff --git a/project/rh/templates/rh/rapports/masse_salariale.html b/project/rh/templates/rh/rapports/masse_salariale.html
index 1ef26c1..558e1ff 100644 (file)
--- a/project/rh/templates/rh/rapports/masse_salariale.html
+++ b/project/rh/templates/rh/rapports/masse_salariale.html
@@ -16,7 +16,13 @@
 {% endblock %}
 
 {% block contentrapport %}
-
+{% if url_ods %}
+<ul class="object-tools">
+    <li>
+        <a href="{{ url_ods }}">Exporter en ods</a>
+    </li>
+</ul>
+{% endif %}
 <form method="GET">
     <input type="hidden" name="ne_pas_grouper" value="True" />
     <div class="actions">

diff --git a/project/rh/views.py b/project/rh/views.py
index c0a3f14..28b3ecf 100644 (file)
--- a/project/rh/views.py
+++ b/project/rh/views.py
@@ -3,6 +3,7 @@
 import urllib
 from datetime import date
 from itertools import izip
+import StringIO
 
 import pygraphviz as pgv
 
@@ -15,6 +16,7 @@ from django.http import HttpResponse
 from django import forms
 from django.contrib.auth.decorators import login_required
 from django.contrib.admin import widgets as adminwidgets
+from django.core.servers.basehttp import FileWrapper
 
 from datamaster_modeles import models as ref
 
@@ -259,19 +261,38 @@ def rapports_masse_salariale(request):
         masse = MasseSalariale(date_debut, date_fin, custom_filter,
                 request.GET.get('ne_pas_grouper', False))
         if masse.rapport:
-            c['rapport'] = masse.rapport
-            c['header_keys'] = [h[0] for h in masse.headers]
-            #on enleve le background pour le header
-            for h in (h for h in masse.headers if 'background-color' in h[2]):
-                h[2]['background'] = 'none'
-            h = SortHeaders(request, masse.headers, order_field_type="ot",
-                    not_sortable=c['header_keys'], order_field="o")
-            c['headers'] = list(h.headers())
-            for key, nom, opts in masse.headers:
-                c['headers']
-            c['total'] = masse.grand_totaux[0]
-            c['total_euro'] = masse.grand_totaux[1]
-            c['colspan'] = len(c['header_keys']) - 1
+            if request.GET.get('ods'):
+                for h in (h for h in masse.headers if 'background-color' in h[2]):
+                    del h[2]['background-color']
+                masse.ods()
+                output = StringIO.StringIO()
+                masse.doc.save(output)
+                output.seek(0)
+
+                response = HttpResponse(FileWrapper(output), content_type=
+                        'application/vnd.oasis.opendocument.spreadsheet')
+                response['Content-Disposition'] = \
+                        'attachment; filename=Masse Salariale %s.ods' % \
+                            masse.annee
+                return response
+            else:
+                c['rapport'] = masse.rapport
+                c['header_keys'] = [h[0] for h in masse.headers]
+                #on enleve le background pour le header
+                for h in (h for h in masse.headers if 'background-color' in h[2]):
+                    h[2]['background'] = 'none'
+                h = SortHeaders(request, masse.headers, order_field_type="ot",
+                        not_sortable=c['header_keys'], order_field="o")
+                c['headers'] = list(h.headers())
+                for key, nom, opts in masse.headers:
+                    c['headers']
+                c['total'] = masse.grand_totaux[0]
+                c['total_euro'] = masse.grand_totaux[1]
+                c['colspan'] = len(c['header_keys']) - 1
+                get_filtre.append(('ods', True))
+                query_string = urllib.urlencode(get_filtre)
+                c['url_ods'] = "%s?%s" % (
+                        reverse('rhr_masse_salariale'), query_string)
 
     return render_to_response('rh/rapports/masse_salariale.html', c, RequestContext(request))