From 5180bb4b5353a2d9f06641d0231352fbee57c268 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl-David=20Lasseri?= Date: Thu, 27 Aug 2015 18:11:48 +0200 Subject: [PATCH] [dump.py, client.py] Support complet des impressions de factures On ne filtre plus sur les dates de connexion et d'adhesion pour les factures autres --- client.py | 25 ++++++++++++++++++------- dump.py | 10 ++++++---- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/client.py b/client.py index 767aa8e..a61c8ce 100644 --- a/client.py +++ b/client.py @@ -69,18 +69,29 @@ class Ticket(object): else: chambre = u'EXT' - deb_adh = crans_utils.datetime_from_generalized_time_format(facture['debutAdhesion'][0].value) - fin_adh = crans_utils.datetime_from_generalized_time_format(facture['finAdhesion'][0].value) - fin_co = crans_utils.datetime_from_generalized_time_format(facture['finConnexion'][0].value) - + try: + deb_adh = crans_utils.datetime_from_generalized_time_format(facture['debutAdhesion'][0].value) + deb_adh = deb_adh.strftime('%d/%m/%Y') + except: + deb_adh=False + try: + fin_adh = crans_utils.datetime_from_generalized_time_format(facture['finAdhesion'][0].value) + fin_adh = fin_adh.strftime('%d/%m/%Y') + except: + fin_adh=False + try: + fin_co = crans_utils.datetime_from_generalized_time_format(facture['finConnexion'][0].value) + fin_co = fin_co.strftime('%d/%m/%Y') + except: + fin_co=False todo = { 'fid' : facture['fid'][0].value, 'article' : [ art.value for art in facture['article']], 'modePaiement' : facture['modePaiement'][0].value, 'recuPaiement' : facture['recuPaiement'][0].value, - 'debutAdhesion' : deb_adh.strftime('%d/%m/%Y'), - 'finAdhesion' : fin_adh.strftime('%d/%m/%Y'), - 'finConnexion' : fin_co.strftime('%d/%m/%Y'), + 'debutAdhesion' : deb_adh, + 'finAdhesion' : fin_adh, + 'finConnexion' : fin_co, 'chbre' : chambre, 'nom' : proprietaire['nom'][0].value, 'prenom' : proprietaire['prenom'][0].value, diff --git a/dump.py b/dump.py index 5d10ac7..0765e45 100755 --- a/dump.py +++ b/dump.py @@ -113,10 +113,12 @@ def show_facture(facture): printer.println(u'Externe'.encode(CODING)) else: printer.println((u'Chambre : ' + facture['chbre']).encode(CODING)) - - printer.println((u'Début adhésion : ' + facture['debutAdhesion']).encode(CODING)) - printer.println((u'Fin adhésion : ' + facture['finAdhesion']).encode(CODING)) - printer.println((u'Fin connexion : ' + facture['finConnexion']).encode(CODING)) + if facture['debutAdhesion']: + printer.println((u'Début adhésion : ' + facture['debutAdhesion']).encode(CODING)) + if facture['finAdhesion']: + printer.println((u'Fin adhésion : ' + facture['finAdhesion']).encode(CODING)) + if facture['finConnexion']: + printer.println((u'Fin connexion : ' + facture['finConnexion']).encode(CODING)) printer.justify('L') printer.println(u'--------------------------------'.encode(CODING))