crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fin_connexion: plus besoin de dateutil.parse

Browse source 
Car generalizedTimeFormat.value est un dt localisé now (lc_ldap)
This commit is contained in:
Daniel STAN 2015-10-05 00:28:20 +02:00
parent 955dd379c7
commit af9d15bcc6
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
gestion/mail/fin_connexion.py
View file

@ -7,7 +7,6 @@ affluences en perm"""
import sys import sys
import pytz import pytz
import datetime import datetime
from dateutil.parser import parse as parse_gtf
import calendar import calendar
from lc_ldap.shortcuts import lc_ldap_readonly from lc_ldap.shortcuts import lc_ldap_readonly
@ -81,7 +80,7 @@ def warn(mail_conn, adh):
'adh': adh, 'adh': adh,
} }
for l in fields: for l in fields:
fin = max(parse_gtf(v.value) for v in adh[l]) fin = max(v.value for v in adh[l])
data[l] = fin data[l] = fin
deco = min(data[l] for l in fields) deco = min(data[l] for l in fields)
if deco >= PERIODE_TRANSITOIRE[0] and deco < PERIODE_TRANSITOIRE[1]: if deco >= PERIODE_TRANSITOIRE[0] and deco < PERIODE_TRANSITOIRE[1]:
@ -95,7 +94,7 @@ def compute_fin_connexion(adh):
fields = ['finAdhesion'] fields = ['finAdhesion']
if 'aid' in adh: if 'aid' in adh:
fields.append('finConnexion') fields.append('finConnexion')
value = min(max(parse_gtf(v.value) for v in adh[l]) for l in fields) value = min(max(v.value for v in adh[l]) for l in fields)
if value >= PERIODE_TRANSITOIRE[0] and value < PERIODE_TRANSITOIRE[1]: if value >= PERIODE_TRANSITOIRE[0] and value < PERIODE_TRANSITOIRE[1]:
return PERIODE_TRANSITOIRE[1] return PERIODE_TRANSITOIRE[1]
return value return value
@ -148,7 +147,7 @@ def brief(c, debut, fin):
if "--list" in sys.argv: if "--list" in sys.argv:
for adh in to_warn: for adh in to_warn:
valeurs = [max(parse_gtf(v.value) for v in adh[l]) \ valeurs = [max(v.value for v in adh[l]) \
for l in ['finConnexion', 'finAdhesion'] ] for l in ['finConnexion', 'finAdhesion'] ]
[f_con, f_adh] = [coul(str(v), 'rouge' if v >= debut and v < fin else 'vert') \ [f_con, f_adh] = [coul(str(v), 'rouge' if v >= debut and v < fin else 'vert') \
for v in valeurs] for v in valeurs]