From 5d25b023d87f1a04a4e3a51b2136a2b588472b3a Mon Sep 17 00:00:00 2001
From: Daniel STAN <daniel.stan@crans.org>
Date: Sun, 28 Oct 2012 01:41:30 +0200
Subject: [PATCH] [intranet/impression] Ajout log imprimeur club

Ignore-this: 2662fa44212c256ce4208e4299eff7f8

darcs-hash:20121027234130-28565-07456e146bf5e083d090d726e4fbfce30cb4a9de.gz
---
 impression/impression_canon.py      | 7 +++++--
 intranet/Root.py                    | 1 +
 intranet/modules/impression/main.py | 6 +++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/impression/impression_canon.py b/impression/impression_canon.py
index ad46377d..88d246c8 100755
--- a/impression/impression_canon.py
+++ b/impression/impression_canon.py
@@ -378,10 +378,13 @@ class impression:
 
         # debite l'adhérent si adherent il y a
         if (self._adh != None):
-            adh = self._get_adh(self._adh)
+            adh = self._adh.split('@')
+            if len(adh) > 1:
+                adh = adh[1:]
+            adh = self._get_adh(adh[0])
             if (self._prix > (adh.solde() - DECOUVERT_AUTHORISE)):
                 raise SoldeInsuffisant
-            adh.solde(-self._prix, "impression(%d): %s" % (self._jid,self._fichier))
+            adh.solde(-self._prix, "impression(%d): %s par %s" % (self._jid,self._fichier,self._adh))
             adh.save()
             del adh
         # imprime le document
diff --git a/intranet/Root.py b/intranet/Root.py
index 6094fc08..7de427f7 100644
--- a/intranet/Root.py
+++ b/intranet/Root.py
@@ -170,6 +170,7 @@ def verifLogin(login = '', password = ''):
                     cherrypy.session['uid'] = login_club
                     cherrypy.session['droits'] = []
                     cherrypy.session['estClub'] = True
+                    cherrypy.session['adh_uid'] = login
                 else:
                     cherrypy.session['uid'] = login
                     cherrypy.session['droits'] = adh.droits()
diff --git a/intranet/modules/impression/main.py b/intranet/modules/impression/main.py
index a42c2d3a..d4735bb7 100644
--- a/intranet/modules/impression/main.py
+++ b/intranet/modules/impression/main.py
@@ -50,6 +50,7 @@ def fmt_exc(e):
 # #############################################################
 class threadedImpression(Thread, impression):
     def __init__(self, path_to_pdf, adh = None, callback = None):
+        raise Exception('Code mort ')
         self.tpath_to_pdf = path_to_pdf
         self.tadh = adh
         Thread.__init__(self)
@@ -163,7 +164,10 @@ class main(ModuleBase):
     def useFile(self, fileName):
         try:
             filepath = os.path.join(os.path.join(FILE_UPLOAD_BASE_FOLDER,  cherrypy.session['uid']+"/"), fileName)
-            cherrypy.session['impression'] = impression(filepath, cherrypy.session['uid'])
+            adh = cherrypy.session['uid']
+            if cherrypy.session['estClub']:
+                adh = cherrypy.session['adh_uid'] + '@' + adh
+            cherrypy.session['impression'] = impression(filepath, adh)
             crans.cp.log("useFile returns: %s" % str( cherrypy.session['impression'].pages() ))
             return {'nbPages': cherrypy.session['impression'].pages()}
         except FichierInvalide, e: