25/10/22 - 10h

master
cherif 2022-10-25 10:17:28 +02:00
parent 988d50ad18
commit 914c0393c4
2 changed files with 50 additions and 12 deletions

View File

@ -325,6 +325,11 @@ def add_class(diction):
tmp_str = tmp_str2.split( tmp_str = tmp_str2.split(
";") # ==> ce qui va donner un tableau de : Country_Code-City : ['11/02/2012-paris-75001', '24/04/2022-marseille-13002',] ";") # ==> ce qui va donner un tableau de : Country_Code-City : ['11/02/2012-paris-75001', '24/04/2022-marseille-13002',]
i = 0
for tmp_val in tmp_str:
tmp_str[i] = str(tmp_str[i]).strip()
i = i +1
dl_cpt = 0 dl_cpt = 0
tab_dl = [] tab_dl = []
for tmp_dl in tmp_str: for tmp_dl in tmp_str:
@ -375,10 +380,22 @@ def add_class(diction):
diction['external_code']) + " " diction['external_code']) + " "
# On créé un identifiant unique par session # On créé un identifiant unique par session
session_id = mycommon.create_token_urlsafe() #session_id = mycommon.create_token_urlsafe()
val_dl = {'date_du': str(tab_date_lieu[0]), 'date_au': str(tab_date_lieu[1]), """
'ville': str(tab_date_lieu[2]), 'code_postal': str(tab_date_lieu[3]), On créé un identifiant unique par session
'adresse': str(tab_date_lieu[4]), 'session_id':str(session_id)} Session_id = date_du+date_au+code_postal+adresse
"""
session_id = str(str(tab_date_lieu[0]) + str(tab_date_lieu[1]) + str(tab_date_lieu[3]) + str(
tab_date_lieu[4])).replace(' ', '')
session_id = mycommon.remove_non_ascii(session_id)
session_id = re.sub(r'[^a-zA-Z0-9]', '', session_id)
val_dl = {'date_du': str(tab_date_lieu[0]).strip(), 'date_au': str(tab_date_lieu[1]).strip(),
'ville': str(tab_date_lieu[2]).strip(), 'code_postal': str(tab_date_lieu[3]).strip(),
'adresse': str(tab_date_lieu[4]).strip(), 'session_id': str(session_id).strip()}
tab_dl.append(val_dl)
tab_dl.append(val_dl) tab_dl.append(val_dl)
# mydata['date_lieu'][dl_cpt] = {'date': str(tab_date_lieu[0]), 'ville': str(tab_date_lieu[1])} # mydata['date_lieu'][dl_cpt] = {'date': str(tab_date_lieu[0]), 'ville': str(tab_date_lieu[1])}
# print(str(mydata['date_lieu'] )) # print(str(mydata['date_lieu'] ))
@ -424,7 +441,7 @@ def add_class(diction):
if (local_tmp[0] and "ranking" in local_tmp[0].keys()): if (local_tmp[0] and "ranking" in local_tmp[0].keys()):
if local_tmp[0]['ranking']: if local_tmp[0]['ranking']:
print(" ### le ranking du pack est " + str(local_tmp[0]['ranking'])) #print(" ### le ranking du pack est " + str(local_tmp[0]['ranking']))
mydata['display_rank'] = str(local_tmp[0]['ranking']) mydata['display_rank'] = str(local_tmp[0]['ranking'])
@ -703,9 +720,15 @@ def update_class(diction):
tmp_str = tmp_str2.split( tmp_str = tmp_str2.split(
";") # ==> ce qui va donner un tableau de : Country_Code-City : ['11/02/2012-paris-75001', '24/04/2022-marseille-13002',] ";") # ==> ce qui va donner un tableau de : Country_Code-City : ['11/02/2012-paris-75001', '24/04/2022-marseille-13002',]
i = 0
for tmp_val in tmp_str:
tmp_str[i] = str(tmp_str[i]).strip()
i = i + 1
dl_cpt = 0 dl_cpt = 0
tab_dl = [] tab_dl = []
for tmp_dl in tmp_str: for tmp_dl in tmp_str:
#print(" ### tmp_dl = "+str(tmp_dl))
if (len(str(tmp_dl)) > 0 and ("-" in tmp_dl)): if (len(str(tmp_dl)) > 0 and ("-" in tmp_dl)):
# print(" ###### DATE LIEU = "+tmp_dl) # print(" ###### DATE LIEU = "+tmp_dl)
tab_date_lieu = tmp_dl.split('-') tab_date_lieu = tmp_dl.split('-')
@ -733,7 +756,7 @@ def update_class(diction):
"jj/mm/aaaa-jj/mm/aaaa-ville-code_postale-adresse;jj/mm/aaaa-jj/mm/aaaa-ville-code_postale-adresse 2" "jj/mm/aaaa-jj/mm/aaaa-ville-code_postale-adresse;jj/mm/aaaa-jj/mm/aaaa-ville-code_postale-adresse 2"
print("### isdate = " + str(tab_date_lieu[0]) + " CM isdate_au = " + str(tab_date_lieu[1])) #print("### isdate = " + str(tab_date_lieu[0]) + " CM isdate_au = " + str(tab_date_lieu[1]))
if (datetime.strptime(str(tab_date_lieu[0]), '%d/%m/%Y') >= datetime.strptime(str(tab_date_lieu[1]), '%d/%m/%Y')): if (datetime.strptime(str(tab_date_lieu[0]), '%d/%m/%Y') >= datetime.strptime(str(tab_date_lieu[1]), '%d/%m/%Y')):
mycommon.myprint( mycommon.myprint(
str(inspect.stack()[0][ str(inspect.stack()[0][
@ -750,12 +773,21 @@ def update_class(diction):
diction['external_code']) + " ") diction['external_code']) + " ")
return False, " La date debut est posterieure à la date du jour pour la formation : " + str( return False, " La date debut est posterieure à la date du jour pour la formation : " + str(
diction['external_code']) + " " diction['external_code']) + " "
# On créé un identifiant unique par session
session_id = mycommon.create_token_urlsafe()
val_dl = {'date_du': str(tab_date_lieu[0]), 'date_au': str(tab_date_lieu[1]), """
'ville': str(tab_date_lieu[2]), 'code_postal': str(tab_date_lieu[3]), On créé un identifiant unique par session
'adresse': str(tab_date_lieu[4]), 'session_id':str(session_id)} Session_id = date_du+date_au+code_postal+adresse
"""
session_id = str(str(tab_date_lieu[0]) + str(tab_date_lieu[1]) + str(tab_date_lieu[3]) + str(
tab_date_lieu[4])).replace(' ','')
session_id = mycommon.remove_non_ascii(session_id)
session_id = re.sub(r'[^a-zA-Z0-9]', '', session_id)
val_dl = {'date_du': str(tab_date_lieu[0]).strip(), 'date_au': str(tab_date_lieu[1]).strip(),
'ville': str(tab_date_lieu[2]).strip(), 'code_postal': str(tab_date_lieu[3]).strip(),
'adresse': str(tab_date_lieu[4]).strip(), 'session_id':str(session_id).strip()}
tab_dl.append(val_dl) tab_dl.append(val_dl)
# mydata['date_lieu'][dl_cpt] = {'date': str(tab_date_lieu[0]), 'ville': str(tab_date_lieu[1])} # mydata['date_lieu'][dl_cpt] = {'date': str(tab_date_lieu[0]), 'ville': str(tab_date_lieu[1])}
# print(str(mydata['date_lieu'] )) # print(str(mydata['date_lieu'] ))

View File

@ -465,7 +465,7 @@ def CheckisDate(mydate):
# mydate doit etre au format : jj/mm/aaaa # mydate doit etre au format : jj/mm/aaaa
try: try:
#print(" analyse de "+mydate) #print(" analyse de "+mydate)
val = datetime.strptime(mydate, '%d/%m/%Y') val = datetime.strptime(str(mydate).strip(), '%d/%m/%Y')
return True return True
except Exception as e: except Exception as e:
@ -2285,3 +2285,9 @@ def correction_collection():
exc_type, exc_obj, exc_tb = sys.exc_info() exc_type, exc_obj, exc_tb = sys.exc_info()
print(str(inspect.stack()[0][3]) + " -" + str(e) + " - ERRORRRR AT Line : " + str(exc_tb.tb_lineno)) print(str(inspect.stack()[0][3]) + " -" + str(e) + " - ERRORRRR AT Line : " + str(exc_tb.tb_lineno))
return False, False return False, False
"""
Cette fonction enleve les caractères non ascii
"""
def remove_non_ascii(string):
return ''.join(char for char in string if ord(char) < 128)