26/06/2024 - 19h30

master
cherif 2024-06-26 19:36:46 +02:00
parent 112106929f
commit ba83140fc2
10 changed files with 6544 additions and 39 deletions

View File

@ -3,7 +3,15 @@
<component name="ChangeListManager">
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="qsds">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Contact.py" beforeDir="false" afterPath="$PROJECT_DIR$/Contact.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Dashbord_queries/inscription_tdb_qries.py" beforeDir="false" afterPath="$PROJECT_DIR$/Dashbord_queries/inscription_tdb_qries.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Dashbord_queries/ressources_humaines_tbd_qries.py" beforeDir="false" afterPath="$PROJECT_DIR$/Dashbord_queries/ressources_humaines_tbd_qries.py" 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$/Session_Formation.py" beforeDir="false" afterPath="$PROJECT_DIR$/Session_Formation.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/apprenant_mgt.py" beforeDir="false" afterPath="$PROJECT_DIR$/apprenant_mgt.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/prj_common.py" beforeDir="false" afterPath="$PROJECT_DIR$/prj_common.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ressources_humaines.py" beforeDir="false" afterPath="$PROJECT_DIR$/ressources_humaines.py" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -73,13 +81,6 @@
<option name="presentableId" value="Default" />
<updated>1680804787304</updated>
</task>
<task id="LOCAL-00290" summary="08/05/2024 - 21h30">
<created>1715196233243</created>
<option name="number" value="00290" />
<option name="presentableId" value="LOCAL-00290" />
<option name="project" value="LOCAL" />
<updated>1715196233246</updated>
</task>
<task id="LOCAL-00291" summary="0dfd">
<created>1715267879323</created>
<option name="number" value="00291" />
@ -416,7 +417,14 @@
<option name="project" value="LOCAL" />
<updated>1719094222662</updated>
</task>
<option name="localTasksCounter" value="339" />
<task id="LOCAL-00339" summary="qsds">
<created>1719144150975</created>
<option name="number" value="00339" />
<option name="presentableId" value="LOCAL-00339" />
<option name="project" value="LOCAL" />
<updated>1719144150976</updated>
</task>
<option name="localTasksCounter" value="340" />
<servers />
</component>
<component name="Vcs.Log.Tabs.Properties">

View File

@ -147,7 +147,7 @@ def Add_Contact(diction):
civilite = ""
if ("civilite" in diction.keys()):
if diction['civilite']:
civilite = diction['civilite']
civilite = str(diction['civilite']).lower()
data['civilite'] = civilite
@ -389,7 +389,7 @@ def Update_Contact(diction):
civilite = ""
if ("civilite" in diction.keys()):
civilite = diction['civilite']
data_update['civilite'] = diction['civilite']
data_update['civilite'] = str(diction['civilite']).lower()
include_com = ""
if ("include_com" in diction.keys()):
@ -415,7 +415,7 @@ def Update_Contact(diction):
civilite = ""
if ("civilite" in diction.keys()):
civilite = diction['civilite']
data_update['civilite'] = diction['civilite']
data_update['civilite'] = str(diction['civilite']).lower()
adr_adresse = ""
if ("adr_adresse" in diction.keys()):

View File

@ -1159,7 +1159,7 @@ def Format_Inscription_Data(tab_diction):
if( "apprenant_id" in val.keys() and str(val['apprenant_id']).strip() != "" and "apprenant_collection" in val.keys()):
if( "civilite" in val['apprenant_collection'][0].keys() and val['apprenant_collection'][0]['civilite']):
node_inscrit['civilite'] = val['apprenant_collection'][0]['civilite']
node_inscrit['civilite'] = str(val['apprenant_collection'][0]['civilite']).lower()
else:
node_inscrit['civilite'] = ""
@ -1188,7 +1188,7 @@ def Format_Inscription_Data(tab_diction):
elif ("apprenant_id" not in val.keys() or str(val['apprenant_id']).strip() != ""):
if ("civilite" in val.keys() and val['civilite']):
node_inscrit['civilite'] = val['civilite']
node_inscrit['civilite'] = str(val['civilite']).lower()
else:
node_inscrit['civilite'] = ""

View File

@ -219,7 +219,7 @@ def Get_Humain_Ressource_With_Planning(diction):
new_node['_id'] = str(retval['_id'])
if ("civilite" in retval.keys()):
new_node['civilite'] = str(retval['civilite'])
new_node['civilite'] = str(retval['civilite']).lower()
else:
new_node['civilite'] = ""

View File

@ -229,7 +229,7 @@ def AddStagiairetoClass(diction):
civilite = "Neutre"
if ("civilite" in diction.keys()):
if diction['civilite']:
civilite = str(diction['civilite']).strip()
civilite = str(diction['civilite']).strip().lower()
mydata['civilite'] = civilite
@ -795,7 +795,7 @@ def UpdateStagiairetoClass(diction):
user_nom = str(diction['nom']).strip()
if ("civilite" in diction.keys()):
mydata['civilite'] = str(diction['civilite']).strip()
mydata['civilite'] = str(diction['civilite']).strip().lower()
if ("date_naissance" in diction.keys()):
@ -6185,7 +6185,7 @@ def AcceptAttendeeInscription(diction):
new_apprenant_diction['prenom'] = inscription_data['prenom']
if( "civilite" in inscription_data.keys()):
new_apprenant_diction['civilite'] = inscription_data['civilite']
new_apprenant_diction['civilite'] = str(inscription_data['civilite']).lower()
else:
new_apprenant_diction['civilite'] = ""
@ -7274,7 +7274,7 @@ def Get_Statgaire_List_Partner_with_filter(diction):
val['email'] = retVal['email']
if ("civilite" in retVal.keys()):
val['civilite'] = retVal['civilite']
val['civilite'] = str(retVal['civilite']).lower()
else:
val['civilite'] = ""
@ -7463,7 +7463,7 @@ def Get_Statgaire_List_Partner_with_filter(diction):
"""
if ('apprenant_collection' in retVal.keys() and len( retVal['apprenant_collection']) > 0):
if ("civilite" in retVal['apprenant_collection'][0].keys()):
val['civilite'] = str(retVal['apprenant_collection'][0]['civilite'])
val['civilite'] = str(retVal['apprenant_collection'][0]['civilite']).lower()
else:
val['civilite'] = ""
@ -7714,7 +7714,7 @@ def GetAttendeeDetail_perSession_from_line_id(diction):
local_civilite = ""
if ("civilite" in local_Insc_retval.keys()):
local_civilite = local_Insc_retval['civilite']
my_retrun_dict['civilite'] = local_civilite
my_retrun_dict['civilite'] = str(local_civilite).lower()
local_employeur = ""
@ -11519,7 +11519,7 @@ def Get_Statgaire_List_Partner_with_filter_FOR_ONLY_INSCRIPTION_NO_TOKEN(diction
val['email'] = retVal['email']
if ("civilite" in retVal.keys()):
val['civilite'] = retVal['civilite']
val['civilite'] = str(retVal['civilite']).lower()
else:
val['civilite'] = ""

File diff suppressed because it is too large Load Diff

View File

@ -7370,7 +7370,7 @@ def Prepare_and_Send_Facture_From_Session_By_Email(tab_files, Folder, diction):
if ("civilite" in local_inscription_no_client.keys()):
# Pour le contact
new_client_contact_data['civilite'] = local_inscription_no_client['civilite']
new_client_contact_data['civilite'] = str(local_inscription_no_client['civilite']).lower()
if( "email" in local_inscription_no_client.keys() ):
@ -7762,7 +7762,7 @@ def Prepare_and_Send_Facture_From_Session_By_Email_SAVE_ORIG(tab_files, Folder,
if ("civilite" in local_inscription_no_client.keys()):
# Pour le contact
new_client_contact_data['civilite'] = local_inscription_no_client['civilite']
new_client_contact_data['civilite'] = str(local_inscription_no_client['civilite']).lower()
if( "email" in local_inscription_no_client.keys() ):
@ -9387,7 +9387,7 @@ def Prepare_and_Send_Facture_From_Session_By_Inscription_Id(tab_files, Folder, d
if ("civilite" in local_inscription_no_client.keys()):
# Pour le contact
new_client_contact_data['civilite'] = local_inscription_no_client['civilite']
new_client_contact_data['civilite'] = str(local_inscription_no_client['civilite']).lower()
if ("email" in local_inscription_no_client.keys()):
new_client_data['email'] = local_inscription_no_client['email']
@ -9908,7 +9908,7 @@ def Prepare_and_Send_Facture_From_Session_By_Inscription_Id_SAVE_ORIG(tab_files,
if ("civilite" in local_inscription_no_client.keys()):
# Pour le contact
new_client_contact_data['civilite'] = local_inscription_no_client['civilite']
new_client_contact_data['civilite'] = str(local_inscription_no_client['civilite']).lower()
if ("email" in local_inscription_no_client.keys()):
new_client_data['email'] = local_inscription_no_client['email']

View File

@ -754,6 +754,12 @@ def Get_List_Partner_Apprenant(diction):
user['client_nom'] = client_nom
if( 'civilite' in val.keys() ):
user['civilite'] = str(val['civilite']).lower()
else:
user['civilite'] = ""
RetObject.append(mycommon.JSONEncoder().encode(user))
return True, RetObject
@ -945,7 +951,7 @@ def Apprenant_Inscrire_Session(diction):
new_data['token'] = diction['token']
new_data['email'] = apprenant_data['email']
new_data['nom'] = apprenant_data['nom']
new_data['civilite'] = apprenant_data['civilite']
new_data['civilite'] = str(apprenant_data['civilite']).lower()
new_data['prenom'] = apprenant_data['prenom']
new_data['telephone'] = apprenant_data['telephone']
new_data['modefinancement'] = str(diction['modefinancement'])
@ -1064,11 +1070,12 @@ def Apprenant_Inscrire_Session_List(diction):
client_rattachement_id = str(diction['client_rattachement_id'])
# Verifier que la session de formation existe et est valide
# Verifier que la session de formation existe et est valide et qu'elle n'est pas completement facturée
is_session_existe = MYSY_GV.dbname['session_formation'].count_documents(
{'_id': ObjectId(str(diction['session_id'])),
'partner_owner_recid': str(my_partner['recid']),
'valide': '1',
'invoiced_statut': {'$ne': '2'},
})
if (is_session_existe <= 0):
@ -1145,13 +1152,13 @@ def Apprenant_Inscrire_Session_List(diction):
if (is_warning_message is True):
return True, " Les apprenants ont été inscrits avec les erreurs suivantes : \n " + str(warning_message)
return True, " Les apprenants ont correctement inscrits "
return True, " Les apprenants ont été correctement inscrits "
except Exception as e:
exc_type, exc_obj, exc_tb = sys.exc_info()
mycommon.myprint(str(inspect.stack()[0][3]) + " -" + str(e) + " - Line : " + str(exc_tb.tb_lineno))
return False, " Impossible d'inscrire l'apprenant à la session de formation "
return False, " Impossible d'inscrire les apprenants à la session de formation "
@ -1623,7 +1630,7 @@ def Add_Apprenant_mass(file=None, Folder=None, diction=None):
civilite = ""
if ("civilite" in df.keys()):
if (str(df['civilite'].values[n])):
civilite = str(df['civilite'].values[n])
civilite = str(df['civilite'].values[n]).lower()
mydata['civilite'] = civilite
telephone = ""

View File

@ -3190,7 +3190,7 @@ def GetAttendeeDetail_perSession(diction):
if ("civilite" in local_Insc_retval.keys()):
my_retrun_dict['civilite'] = local_Insc_retval['civilite']
my_retrun_dict['civilite'] = str(local_Insc_retval['civilite']).lower()
else:
my_retrun_dict['civilite'] = ""
@ -3512,7 +3512,7 @@ def GetAttendeeDetail_perSession(diction):
if ('apprenant_collection' in local_Insc_retval.keys() and len( local_Insc_retval['apprenant_collection']) > 0):
print(" ### apprenant_collection = ", str(local_Insc_retval['apprenant_collection'][0]) )
if ("civilite" in local_Insc_retval['apprenant_collection'][0].keys()):
my_retrun_dict['civilite'] = str(local_Insc_retval['apprenant_collection'][0]['civilite'])
my_retrun_dict['civilite'] = str(local_Insc_retval['apprenant_collection'][0]['civilite']).lower()
else:
my_retrun_dict['civilite'] = ""
@ -4903,7 +4903,7 @@ def Get_Dictionnary_data_For_Template(diction):
#print(" my_json = ", contact_communication)
contact_communication_node = {}
contact_communication_node['civilite'] = contact_communication['civilite']
contact_communication_node['civilite'] = str(contact_communication['civilite']).lower()
contact_communication_node['nom'] = contact_communication['nom']
contact_communication_node['prenom'] = contact_communication['prenom']
contact_communication_node['fonction'] = contact_communication['fonction']

View File

@ -502,7 +502,7 @@ def Add_Ressource_Humaine(diction):
civilite = ""
if ("civilite" in diction.keys()):
if diction['civilite']:
civilite = diction['civilite']
civilite = str(diction['civilite']).lower()
data['civilite'] = civilite
@ -760,7 +760,7 @@ def Update_Ressource_Humaine(diction):
civilite = ""
if ("civilite" in diction.keys()):
data_update['civilite'] = diction['civilite']
data_update['civilite'] = str(diction['civilite']).lower()
date_naissance = ""
if ("date_naissance" in diction.keys()):
@ -1477,7 +1477,7 @@ def Get_List_Ressource_Humaine_with_filter(diction):
user['prenom'] = ""
if ("civilite" in New_retVal.keys()):
user['civilite'] = New_retVal['civilite']
user['civilite'] = str(New_retVal['civilite']).lower()
else:
user['civilite'] = ""
@ -1589,7 +1589,7 @@ def Get_List_Ressource_Humaine_with_filter(diction):
user['prenom'] = ""
if ("civilite" in retval.keys()):
user['civilite'] = retval['civilite']
user['civilite'] = str(retval['civilite']).lower()
else:
user['civilite'] = ""
@ -1717,7 +1717,7 @@ def Get_List_Ressource_Humaine_no_filter(diction):
user['prenom'] = ""
if ("civilite" in retval.keys()):
user['civilite'] = retval['civilite']
user['civilite'] = str(retval['civilite']).lower()
else:
user['civilite'] = ""
@ -2766,7 +2766,7 @@ def Controle_Add_Ressource_Humaine_mass(saved_file=None, Folder=None, diction=No
df['civilite'].values[n]) + "- est invalide. Les valeurs autorisées : 'm', 'mme', 'neutre' "
mydata['civilite'] = civilite
mydata['civilite'] = str(civilite).lower()
date_naissance = ""
if ("date_naissance" in df.keys()):