26/05/2024 - 20h30

master
cherif 2024-05-26 20:28:04 +02:00
parent 850e22a927
commit d080f8970a
4 changed files with 2614 additions and 71 deletions

View File

@ -1,16 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="ss"> <list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="gdfgdf">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <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$/Inscription_mgt.py" beforeDir="false" afterPath="$PROJECT_DIR$/Inscription_mgt.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Job_Cron.py" beforeDir="false" afterPath="$PROJECT_DIR$/Job_Cron.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$/Log/log_file.log" beforeDir="false" afterPath="$PROJECT_DIR$/Log/log_file.log" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Session_Formation_Sequence.py" beforeDir="false" afterPath="$PROJECT_DIR$/Session_Formation_Sequence.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/unite_enseignement_mgt.py" beforeDir="false" afterPath="$PROJECT_DIR$/unite_enseignement_mgt.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.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$/prj_common.py" beforeDir="false" afterPath="$PROJECT_DIR$/prj_common.py" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -80,13 +75,6 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1680804787304</updated> <updated>1680804787304</updated>
</task> </task>
<task id="LOCAL-00264" summary="10/04/2024 - 11h50">
<created>1712742562300</created>
<option name="number" value="00264" />
<option name="presentableId" value="LOCAL-00264" />
<option name="project" value="LOCAL" />
<updated>1712742562301</updated>
</task>
<task id="LOCAL-00265" summary="10/04/2024 - 22h50"> <task id="LOCAL-00265" summary="10/04/2024 - 22h50">
<created>1712781951218</created> <created>1712781951218</created>
<option name="number" value="00265" /> <option name="number" value="00265" />
@ -423,7 +411,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1716568731554</updated> <updated>1716568731554</updated>
</task> </task>
<option name="localTasksCounter" value="313" /> <task id="LOCAL-00313" summary="gdfgdf">
<created>1716732752643</created>
<option name="number" value="00313" />
<option name="presentableId" value="LOCAL-00313" />
<option name="project" value="LOCAL" />
<updated>1716732752644</updated>
</task>
<option name="localTasksCounter" value="314" />
<servers /> <servers />
</component> </component>
<component name="Vcs.Log.Tabs.Properties"> <component name="Vcs.Log.Tabs.Properties">
@ -465,7 +460,6 @@
</option> </option>
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="05/05/2024 - 17h30" />
<MESSAGE value="06/05/2024 - 22h30" /> <MESSAGE value="06/05/2024 - 22h30" />
<MESSAGE value="07/05/2024 - 17h30" /> <MESSAGE value="07/05/2024 - 17h30" />
<MESSAGE value="08/05/2024 - 17h30" /> <MESSAGE value="08/05/2024 - 17h30" />
@ -490,6 +484,7 @@
<MESSAGE value="21/05/2024 - 21h" /> <MESSAGE value="21/05/2024 - 21h" />
<MESSAGE value="sdsqq" /> <MESSAGE value="sdsqq" />
<MESSAGE value="ss" /> <MESSAGE value="ss" />
<option name="LAST_COMMIT_MESSAGE" value="ss" /> <MESSAGE value="gdfgdf" />
<option name="LAST_COMMIT_MESSAGE" value="gdfgdf" />
</component> </component>
</project> </project>

View File

@ -107,6 +107,24 @@ def AddStagiairetoClass(diction):
connected_user_id = my_partner['recid'] connected_user_id = my_partner['recid']
"""
Verifier que la formation est valide
"""
is_myclass_valide_count = MYSY_GV.dbname['myclass'].count_documents({'internal_url':str(diction['class_internal_url']),
'valide':'1',
'locked':'0',
'partner_owner_recid':str(my_partner['recid'])})
if( is_myclass_valide_count != 1 ):
mycommon.myprint(str(inspect.stack()[0][
3]) + " L'identifiant de la formation est invalide ")
return False, " L'identifiant de la formation est invalide "
is_myclass_valide_data = MYSY_GV.dbname['myclass'].find_one({'internal_url':str(diction['class_internal_url']),
'valide':'1',
'locked':'0',
'partner_owner_recid':str(my_partner['recid'])})
mydata = {} mydata = {}
@ -483,6 +501,29 @@ def AddStagiairetoClass(diction):
inserted_id = ret_val['_id'] inserted_id = ret_val['_id']
"""
26/05/2024 : S'il s'agit d'une formation initiale, alors on lance la fonction 'xxxx'
qui permet de créer les contenus des collection 'inscription_liste_ue' et peut etre 'inscription_liste_ue_type_eval'
Il s'agit du remplissage par defaut ou tout est actif
"""
if ("formation_initiale" in my_partner.keys() and my_partner['formation_initiale'] == "1"):
local_diction = {}
local_diction['token'] = diction['token']
local_diction['inscription_id'] = str(inserted_id)
local_diction['class_id'] = str(is_myclass_valide_data['_id'])
print(" ### Init_AcceptAttendeeInscription_For_Initial_Formation local_diction = ",local_diction )
local_inscription_liste_ue_status, local_inscription_liste_ue_retval = Init_AcceptAttendeeInscription_For_Initial_Formation(
local_diction)
print(" local_inscription_liste_ue_status, local_inscription_liste_ue_retval = ",
local_inscription_liste_ue_status, local_inscription_liste_ue_retval)
""" """
update du 25/08/23 update du 25/08/23
On ne declenche l'envoie d'un email que l'inscription est soit : On ne declenche l'envoie d'un email que l'inscription est soit :
@ -5454,7 +5495,7 @@ on créer le contenu des collection :
cette fonction prend en entrée : cette fonction prend en entrée :
- inscription_id - inscription_id
- class_id - class_id
- tab_type_evaluation : [ {'eu_id':'xxx', 'type_eval_id':'yyy'}, {'eu_id':'xxx', 'type_eval_id':'yyy'},....]
""" """
def Init_AcceptAttendeeInscription_For_Initial_Formation(diction): def Init_AcceptAttendeeInscription_For_Initial_Formation(diction):
@ -5462,7 +5503,7 @@ def Init_AcceptAttendeeInscription_For_Initial_Formation(diction):
""" """
Verification de la liste des champs obligatoires Verification de la liste des champs obligatoires
""" """
field_list_obligatoire = ['token', 'inscription_id', 'class_id', 'tab_type_evaluation'] field_list_obligatoire = ['token', 'inscription_id', 'class_id']
for val in field_list_obligatoire: for val in field_list_obligatoire:
if val not in diction: if val not in diction:
mycommon.myprint( mycommon.myprint(
@ -5472,7 +5513,7 @@ def Init_AcceptAttendeeInscription_For_Initial_Formation(diction):
mytoken = "" mytoken = ""
if ("token" in diction.keys()): if ("token" in diction.keys()):
if diction['token']: if diction['token']:
mytoken = diction['token', 'inscription_id', 'class_id', 'tab_type_evaluation'] mytoken = diction['token']
local_status, my_partner = mycommon.Check_Connexion_And_Return_Partner_Data(diction) local_status, my_partner = mycommon.Check_Connexion_And_Return_Partner_Data(diction)
@ -5537,8 +5578,9 @@ def Init_AcceptAttendeeInscription_For_Initial_Formation(diction):
qry = {"partner_owner_recid": str(my_partner['recid']), 'valide': '1', 'locked': '0', qry = {"partner_owner_recid": str(my_partner['recid']), 'valide': '1', 'locked': '0',
'_id': ObjectId(str(diction['class_id']))} '_id': ObjectId(str(diction['class_id']))}
"""
Remplissage de la collection : inscription_liste_ue
"""
for New_retVal in MYSY_GV.dbname['myclass'].find(qry).sort([("_id", pymongo.DESCENDING), ]): for New_retVal in MYSY_GV.dbname['myclass'].find(qry).sort([("_id", pymongo.DESCENDING), ]):
if( "list_unite_enseignement" in New_retVal.keys() ): if( "list_unite_enseignement" in New_retVal.keys() ):
for local_val in New_retVal['list_unite_enseignement'] : for local_val in New_retVal['list_unite_enseignement'] :
@ -5578,42 +5620,42 @@ def Init_AcceptAttendeeInscription_For_Initial_Formation(diction):
""" """
Remplissage de la collection : inscription_liste_ue_type_eval Remplissage de la collection : inscription_liste_ue_type_eval
""" """
for val in MYSY_GV.dbname['class_unite_enseignement_type_evaluation'].find({'partner_owner_recid':str(my_partner['recid']), for val in MYSY_GV.dbname['class_unite_enseignement_type_evaluation'].find({'partner_owner_recid':str(my_partner['recid']),
'valide':'1', 'valide':'1',
'locked':'0', 'locked':'0',
'class_id':str(diction['class_id'])}): 'class_id':str(diction['class_id'])}):
new_data = {} new_data = {}
new_data['inscription_id'] = str(diction['inscription_id']) new_data['inscription_id'] = str(diction['inscription_id'])
new_data['class_id'] = str(diction['class_id']) new_data['class_id'] = str(diction['class_id'])
new_data['class_eu_id'] = str(val['class_ue_id']) new_data['class_eu_id'] = str(val['class_ue_id'])
new_data['type_evaluation_id'] = str(val['type_evaluation_id']) new_data['type_evaluation_id'] = str(val['type_evaluation_id'])
new_data['date_update'] = str(datetime.now()) new_data['date_update'] = str(datetime.now())
new_data['update_by'] = str(my_partner['_id']) new_data['update_by'] = str(my_partner['_id'])
new_data['partner_owner_recid'] = str(my_partner['recid']) new_data['partner_owner_recid'] = str(my_partner['recid'])
new_data['valide'] = "1" new_data['valide'] = "1"
new_data['locked'] = "0" new_data['locked'] = "0"
key_data = {} key_data = {}
key_data['inscription_id'] = str(diction['inscription_id']) key_data['inscription_id'] = str(diction['inscription_id'])
key_data['class_id'] = str(diction['class_id']) key_data['class_id'] = str(diction['class_id'])
key_data['class_eu_id'] = str(local_val['_id']) key_data['class_eu_id'] = str(local_val['_id'])
key_data['valide'] = "1" key_data['valide'] = "1"
key_data['partner_owner_recid'] = str(my_partner['recid']) key_data['partner_owner_recid'] = str(my_partner['recid'])
result = MYSY_GV.dbname['inscription_liste_ue'].find_one_and_update( result = MYSY_GV.dbname['inscription_liste_ue'].find_one_and_update(
key_data, key_data,
{"$set": new_data}, {"$set": new_data},
upsert=True, upsert=True,
return_document=ReturnDocument.AFTER return_document=ReturnDocument.AFTER
) )
if ("_id" not in result.keys()): if ("_id" not in result.keys()):
mycommon.myprint( mycommon.myprint(
" Impossible de valider l'inscription pour la formation initiale (2) ") " Impossible de valider l'inscription pour la formation initiale (2) ")
return False, "Impossible de valider l'inscription pour la formation initiale (2) " return False, "Impossible de valider l'inscription pour la formation initiale (2) "
return True, "L'inscription a été correctement validée" return True, "L'inscription a été correctement validée"
@ -6118,22 +6160,6 @@ def AcceptAttendeeInscription(diction):
) )
"""
26/05/2024 : S'il s'agit d'une formation initiale, alors on lance la fonction 'xxxx'
qui permet de créer les contenus des collection 'inscription_liste_ue' et peut etre 'inscription_liste_ue_type_eval'
Il s'agit du remplissage par defaut ou tout est actif
"""
if( "formation_initiale" in my_partner.keys() and my_partner['formation_initiale'] == "1"):
local_diction = {}
local_diction['token'] = diction['token']
local_diction['inscription_id'] = diction['inscription_id']
local_diction['class_id'] = str(local_class[0]['_id'])
local_inscription_liste_ue_status, local_inscription_liste_ue_retval = Init_AcceptAttendeeInscription_For_Initial_Formation(local_diction)
print(" local_inscription_liste_ue_status, local_inscription_liste_ue_retval = ", local_inscription_liste_ue_status, local_inscription_liste_ue_retval)
""" """

File diff suppressed because it is too large Load Diff

View File

@ -669,6 +669,8 @@ def Get_List_Unite_Enseignement_Of_Given_Class(diction):
'internal_url': str(diction['class_internal_url'])} 'internal_url': str(diction['class_internal_url'])}
print(" #### Get_List_Unite_Enseignement_Of_Given_Class qry = ", qry)
for New_retVal in MYSY_GV.dbname['myclass'].find(qry).sort([("_id", pymongo.DESCENDING), ]): for New_retVal in MYSY_GV.dbname['myclass'].find(qry).sort([("_id", pymongo.DESCENDING), ]):
if( "list_unite_enseignement" in New_retVal.keys() ): if( "list_unite_enseignement" in New_retVal.keys() ):
for local_val in New_retVal['list_unite_enseignement'] : for local_val in New_retVal['list_unite_enseignement'] :