Optimisation pour le tri suivant les aid. Ajout de kikooness

This commit is contained in:
Pierre-Elliott Bécue 2015-10-18 20:56:32 +02:00
parent fbe99ab65c
commit 7a9dd65698

View file

@ -118,13 +118,15 @@ def traiter_factures(ldap, args):
while True: while True:
# On trie les factures par fid en ordre décroissant. # On trie les factures par fid en ordre décroissant.
if args.tri == 'fid': if args.tri == 'fid':
controle_ok.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_non.sort(cmp=lambda x, y: cmp(int(x['fid'][0]), int(y['fid'][0])), reverse=True) controle_ok.sort(key=lambda x: int(x['fid'][0]), reverse=True)
sans_controle.sort(cmp=lambda x, y: cmp(int(x['fid'][0]), int(y['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: else:
controle_ok.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_non.sort(cmp=lambda x, y: cmp(int(x.proprio().oid()[0]), int(y.proprio().oid()[0])), reverse=True) controle_ok.sort(key=lambda x: int(x.parent_dn.split(",")[0].split("=")[1]), reverse=True)
sans_controle.sort(cmp=lambda x, y: cmp(int(x.proprio().oid()[0]), int(y.proprio().oid()[0])), 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 # Menu principal
(code, tag) = dialog_interface.menu( (code, tag) = dialog_interface.menu(
@ -422,7 +424,9 @@ def trie_factures(ldap, args):
'recuPaiement': _recu_paiement, '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) 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: for facture in factures:
if unicode(facture.get('controle', [u''])[0]) == u"TRUE": if unicode(facture.get('controle', [u''])[0]) == u"TRUE":
controle_ok.append(facture) controle_ok.append(facture)
@ -430,6 +434,8 @@ def trie_factures(ldap, args):
controle_non.append(facture) controle_non.append(facture)
else: else:
sans_controle.append(facture) sans_controle.append(facture)
_animation.new_step()
_animation.end()
return controle_ok, controle_non, sans_controle return controle_ok, controle_non, sans_controle