From 7a9dd656989ea22f60a5f96ee90c0022518cb7d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= <becue@crans.org>
Date: Sun, 18 Oct 2015 20:56:32 +0200
Subject: [PATCH] Optimisation pour le tri suivant les aid. Ajout de kikooness

---
 tresorerie/controle_rapide.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/tresorerie/controle_rapide.py b/tresorerie/controle_rapide.py
index 3f41d8c3..431088e7 100755
--- a/tresorerie/controle_rapide.py
+++ b/tresorerie/controle_rapide.py
@@ -118,13 +118,15 @@ def traiter_factures(ldap, args):
     while True:
         # On trie les factures par fid en ordre décroissant.
         if args.tri == 'fid':
-            controle_ok.sort(cmp=lambda x, y: cmp(int(x['fid'][0]), int(y['fid'][0])), reverse=True)
-            controle_non.sort(cmp=lambda x, y: cmp(int(x['fid'][0]), int(y['fid'][0])), reverse=True)
-            sans_controle.sort(cmp=lambda x, y: cmp(int(x['fid'][0]), int(y['fid'][0])), reverse=True)
+            print affichage.style(u"Tri des factures en cours.", what=["gras", "rouge"])
+            controle_ok.sort(key=lambda x: int(x['fid'][0]), reverse=True)
+            controle_non.sort(key=lambda x: int(x['fid'][0]), reverse=True)
+            sans_controle.sort(key=lambda x: int(x['fid'][0]), reverse=True)
         else:
-            controle_ok.sort(cmp=lambda x, y: cmp(int(x.proprio().oid()[0]), int(y.proprio().oid()[0])), reverse=True)
-            controle_non.sort(cmp=lambda x, y: cmp(int(x.proprio().oid()[0]), int(y.proprio().oid()[0])), reverse=True)
-            sans_controle.sort(cmp=lambda x, y: cmp(int(x.proprio().oid()[0]), int(y.proprio().oid()[0])), reverse=True)
+            print affichage.style(u"Tri des factures en cours.", what=["gras", "rouge"])
+            controle_ok.sort(key=lambda x: int(x.parent_dn.split(",")[0].split("=")[1]), reverse=True)
+            controle_non.sort(key=lambda x: int(x.parent_dn.split(",")[0].split("=")[1]), reverse=True)
+            sans_controle.sort(key=lambda x: int(x.parent_dn.split(",")[0].split("=")[1]), reverse=True)
 
         # Menu principal
         (code, tag) = dialog_interface.menu(
@@ -422,7 +424,9 @@ def trie_factures(ldap, args):
         'recuPaiement': _recu_paiement,
     }
 
+    print affichage.style(u"Chargement des factures depuis la base de données.", what=["magenta"])
     factures = ldap.search(filterstr=filtre, mode="w", sizelimit=0)
+    _animation = affichage.Animation(texte=u"Classification des factures", nb_cycles=len(factures), couleur=True, kikoo=True)
     for facture in factures:
         if unicode(facture.get('controle', [u''])[0]) == u"TRUE":
             controle_ok.append(facture)
@@ -430,6 +434,8 @@ def trie_factures(ldap, args):
             controle_non.append(facture)
         else:
             sans_controle.append(facture)
+        _animation.new_step()
+    _animation.end()
 
     return controle_ok, controle_non, sans_controle