28/02/2024 - 21h30

master
cherif 2024-02-28 21:35:04 +01:00
parent 213128998b
commit 680c6cb126
4 changed files with 2414 additions and 38 deletions

View File

@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="26/02/2024 - 11h30">
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="26/02/2024 - 16h30">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Inscription_mgt.py" beforeDir="false" afterPath="$PROJECT_DIR$/Inscription_mgt.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Log/log_file.log" beforeDir="false" afterPath="$PROJECT_DIR$/Log/log_file.log" afterDir="false" />
<change beforePath="$PROJECT_DIR$/partner_client.py" beforeDir="false" afterPath="$PROJECT_DIR$/partner_client.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/partner_invoice.py" beforeDir="false" afterPath="$PROJECT_DIR$/partner_invoice.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/partner_order.py" beforeDir="false" afterPath="$PROJECT_DIR$/partner_order.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Session_Formation.py" beforeDir="false" afterPath="$PROJECT_DIR$/Session_Formation.py" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -76,13 +75,6 @@
<option name="presentableId" value="Default" />
<updated>1680804787304</updated>
</task>
<task id="LOCAL-00180" summary="27/12/2023 - 13h">
<created>1703714268338</created>
<option name="number" value="00180" />
<option name="presentableId" value="LOCAL-00180" />
<option name="project" value="LOCAL" />
<updated>1703714268338</updated>
</task>
<task id="LOCAL-00181" summary="27/12/2023 - 23h">
<created>1703715749036</created>
<option name="number" value="00181" />
@ -419,7 +411,14 @@
<option name="project" value="LOCAL" />
<updated>1708944824618</updated>
</task>
<option name="localTasksCounter" value="229" />
<task id="LOCAL-00229" summary="26/02/2024 - 16h30">
<created>1708961961750</created>
<option name="number" value="00229" />
<option name="presentableId" value="LOCAL-00229" />
<option name="project" value="LOCAL" />
<updated>1708961961751</updated>
</task>
<option name="localTasksCounter" value="230" />
<servers />
</component>
<component name="Vcs.Log.Tabs.Properties">
@ -434,7 +433,6 @@
</option>
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="29/01/24 - 21h30" />
<MESSAGE value="ss" />
<MESSAGE value="31/01/2024 - 16h" />
<MESSAGE value="31/01/2024 - 20h" />
@ -459,6 +457,7 @@
<MESSAGE value="24/02/2024 - 22h30" />
<MESSAGE value="25/02/2024 - 22h30" />
<MESSAGE value="26/02/2024 - 11h30" />
<option name="LAST_COMMIT_MESSAGE" value="26/02/2024 - 11h30" />
<MESSAGE value="26/02/2024 - 16h30" />
<option name="LAST_COMMIT_MESSAGE" value="26/02/2024 - 16h30" />
</component>
</project>

View File

@ -307,10 +307,10 @@ def AddStagiairetoClass(diction):
if diction['email']:
mydata['email'] = str(diction['email']).strip()
regex = r'\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Z|a-z]{2,7}\b'
if (not re.fullmatch(regex, str(diction['email']) ) ):
if (not re.fullmatch(regex, str(diction['email']).strip() ) ):
mycommon.myprint(
str(inspect.stack()[0][3]) + " l'adresse email "+str(diction['email'])+" est invalide")
return False, " l'adresse email -"+str(diction['email'])+"- est invalide"
str(inspect.stack()[0][3]) + " l'adresse email "+str(diction['email']).strip() +" est invalide")
return False, " l'adresse email -"+str(diction['email']).strip() +"- est invalide"
if ("modefinancement" in diction.keys()):
@ -2322,12 +2322,12 @@ def AddStagiairetoClass_mass(file=None, Folder=None, diction=None):
mydata['employeur'] = str(df['employeur'].values[n])
mydata['telephone'] = str(df['telephone'].values[n])
mydata['email'] = str(df['email'].values[n])
mydata['email'] = str(df['email'].values[n]).strip()
regex = r'\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Z|a-z]{2,7}\b'
if (not re.fullmatch(regex, str(df['email'].values[n]))):
if (not re.fullmatch(regex, str(df['email'].values[n]).strip() )):
mycommon.myprint(
str(inspect.stack()[0][3]) + " l'adresse email " + str(df['email'].values[n]) + " est invalide")
return False, " l'adresse email -" + str(df['email'].values[n]) + "- est invalide"
str(inspect.stack()[0][3]) + " l'adresse email " + str(df['email'].values[n]).strip() + " est invalide")
return False, " l'adresse email -" + str(df['email'].values[n]).strip() + "- est invalide"
mydata['session_id'] = str(session_data['_id'])
@ -2669,12 +2669,12 @@ def Controle_AddStagiairetoClass_mass(saved_file=None, Folder=None, diction=None
mydata['employeur'] = str(df['employeur'].values[n])
mydata['telephone'] = str(df['telephone'].values[n])
mydata['email'] = str(df['email'].values[n])
mydata['email'] = str(df['email'].values[n]).strip()
regex = r'\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Z|a-z]{2,7}\b'
if (not re.fullmatch(regex, str(df['email'].values[n]))):
if (not re.fullmatch(regex, str(df['email'].values[n]).strip() )):
mycommon.myprint(
str(inspect.stack()[0][3]) + " l'adresse email " + str(df['email'].values[n]) + " est invalide")
return False, " l'adresse email -" + str(df['email'].values[n]) + "- est invalide"
str(inspect.stack()[0][3]) + " l'adresse email " + str(df['email'].values[n]).strip() + " est invalide")
return False, " l'adresse email -" + str(df['email'].values[n]).strip() + "- est invalide"
mydata['session_id'] = str(session_data['_id'])
mydata['token'] = str(my_token)
@ -2997,12 +2997,12 @@ def AddStagiairetoClass_mass_for_many_session(file=None, Folder=None, diction=No
mydata['employeur'] = str(df['employeur'].values[n])
mydata['telephone'] = str(df['telephone'].values[n])
mydata['email'] = str(df['email'].values[n])
mydata['email'] = str(df['email'].values[n]).strip()
regex = r'\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Z|a-z]{2,7}\b'
if (not re.fullmatch(regex, str(df['email'].values[n]))):
if (not re.fullmatch(regex, str(df['email'].values[n]).strip() )):
mycommon.myprint(
str(inspect.stack()[0][3]) + " l'adresse email " + str(df['email'].values[n]) + " est invalide")
return False, " l'adresse email -" + str(df['email'].values[n]) + "- est invalide"
str(inspect.stack()[0][3]) + " l'adresse email " + str(df['email'].values[n]).strip() + " est invalide")
return False, " l'adresse email -" + str(df['email'].values[n]).strip() + "- est invalide"
mydata['token'] = str(my_token)
@ -3323,7 +3323,7 @@ def Controle_AddStagiairetoClass_mass_for_many_session(saved_file=None, Folder=N
mydata['employeur'] = str(df['employeur'].values[n])
mydata['telephone'] = str(df['telephone'].values[n])
mydata['email'] = str(df['email'].values[n])
mydata['email'] = str(df['email'].values[n]).strip()
print(" contole du mail = ", mydata['email'])
regex = r'\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Z|a-z]{2,7}\b'
if (not re.fullmatch(regex, str( mydata['email']) )):
@ -7586,7 +7586,7 @@ def Sent_Convention_Stagiaire_By_Email(tab_files, Folder, diction):
# Verifier si le modele de courrier est 'edit_by_client', au quel cas on verifie que l'appressant est bien lié à un client
# Verifier si le modele de courrier est 'edit_by_client', au quel cas on verifie que l'apprenant est bien lié à un client
if ("edit_by_client" in courrier_template_data.keys() and str(courrier_template_data['edit_by_client']) == "1"):
stagiaire_client_id = ""
if( "client_rattachement_id" in inscription_data.keys() ):

File diff suppressed because one or more lines are too long

View File

@ -5886,14 +5886,14 @@ def Prepare_and_Send_Convocation_From_Session_By_Email(tab_files, Folder, dictio
mycommon.myprint(" WARNING impossible d'envoyer la convocation a l'apprenant : " + str(single_inscrit['_id']) )
# Traitement de l'eventuel fichier joint
tab_files_to_attache_to_mail = []
# Traitement de l'eventuel fichier joint
tab_files_to_attache_to_mail = []
"""
25/01/2024 : pour loger une action dans la collection ==> courrier_template_tracking_history
"""
local_status, local_retval = module_editique.Editic_Log_History_Action(my_partner, courrier_template_data,
str(diction['session_id']), "inscription", str(single_inscrit['_id']))
"""
25/01/2024 : pour loger une action dans la collection ==> courrier_template_tracking_history
"""
local_status, local_retval = module_editique.Editic_Log_History_Action(my_partner, courrier_template_data,
str(diction['session_id']), "inscription", str(single_inscrit['_id']))
return True, " Les convocations ont été correctement envoyées par emails"