05/06/2025 - 20h

Signed-off-by: Cherif <cbalde@mysy-training.com>
master_Elyos_FI
Cherif 2025-06-05 19:52:32 +02:00
parent 691ce28984
commit 82970538d9
6 changed files with 28 additions and 15 deletions

View File

@ -4,12 +4,13 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="02/06/2025 - 20h">
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="04/06/2025 - 21h">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/GlobalVariable.py" beforeDir="false" afterPath="$PROJECT_DIR$/GlobalVariable.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Inscription_mgt.py" beforeDir="false" afterPath="$PROJECT_DIR$/Inscription_mgt.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/apprenant_mgt.py" beforeDir="false" afterPath="$PROJECT_DIR$/apprenant_mgt.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/note_evaluation_mgt.py" beforeDir="false" afterPath="$PROJECT_DIR$/note_evaluation_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$/survey_mgt.py" beforeDir="false" afterPath="$PROJECT_DIR$/survey_mgt.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/base_specific_fields.py" beforeDir="false" afterPath="$PROJECT_DIR$/base_specific_fields.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ela_user_account.py" beforeDir="false" afterPath="$PROJECT_DIR$/ela_user_account.py" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -451,7 +452,7 @@
<option name="project" value="LOCAL" />
<updated>1747251650255</updated>
</task>
<option name="localTasksCounter" value="466" />
<option name="localTasksCounter" value="467" />
<servers />
</component>
<component name="Vcs.Log.Tabs.Properties">
@ -493,7 +494,6 @@
</option>
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="11/02/2025 - 15h30" />
<MESSAGE value="11/02/2025 - 21h" />
<MESSAGE value="18/02/2025 - 21h" />
<MESSAGE value="27/02/2025 - 21h" />
@ -518,6 +518,7 @@
<MESSAGE value="Init - 29/05/2025 - FI" />
<MESSAGE value="31/05/2025 - 20h" />
<MESSAGE value="02/06/2025 - 20h" />
<option name="LAST_COMMIT_MESSAGE" value="02/06/2025 - 20h" />
<MESSAGE value="04/06/2025 - 21h" />
<option name="LAST_COMMIT_MESSAGE" value="04/06/2025 - 21h" />
</component>
</project>

View File

@ -669,7 +669,7 @@ Pour la personnalisation des champ, seuls certains objet metier / collection
sont autorisés
"""
PERSONALISATION_AUTORIZED_COLLECTION = ['ressource_humaine', 'ressource_materielle', 'partner_client',
'myclass', 'session_formation', 'inscription']
'myclass', 'session_formation', 'inscription', 'apprenant']

View File

@ -576,6 +576,11 @@ def AddStagiairetoClass(diction):
local_diction['inscription_id'] = str(inserted_id)
local_diction['class_id'] = str(is_myclass_valide_data['_id'])
if("tab_ue_ids" in diction.keys()):
local_diction['tab_ue_ids'] = diction['tab_ue_ids']
else:
local_diction['tab_ue_ids'] = ""
print(" ### Init_AcceptAttendeeInscription_For_Initial_Formation 11 local_diction = ",local_diction )
local_inscription_liste_ue_status, local_inscription_liste_ue_retval = Init_AcceptAttendeeInscription_For_Initial_Formation(
@ -592,7 +597,10 @@ def AddStagiairetoClass(diction):
local_diction['token'] = diction['token']
local_diction['inscription_id'] = str(inserted_id)
local_diction['class_id'] = str(is_myclass_valide_data['_id'])
local_diction['tab_ue_ids'] = str(diction['tab_ue_ids'])
if ("tab_ue_ids" in diction.keys()):
local_diction['tab_ue_ids'] = diction['tab_ue_ids']
else:
local_diction['tab_ue_ids'] = ""
print(" ### Init_AcceptAttendeeInscription_For_Initial_Formation 22 local_diction = ",local_diction )
@ -615,6 +623,7 @@ def AddStagiairetoClass(diction):
On doit donner la possibilité a l'utilisateur de saisir une inscription avec un statut en cours de creation : 'creation'
"""
if( inserted_id ):
# On verifie que le statut de l'inscription n'est pas (2 : en cours) avant de declencher des envoies d'email

View File

@ -207,7 +207,7 @@ def Add_Apprenant(diction):
new_data['date_creation'] = str(todays_date)
if ("date_naissance" not in new_data.keys() or str(new_data['user']) == ""):
if ("date_naissance" not in new_data.keys() or str(new_data['date_naissance']) == ""):
new_data['date_naissance'] = "01/01/1900"
del new_data['token']

View File

@ -95,8 +95,8 @@ def Add_specific_field(diction):
related_collection = diction['related_collection']
if( str(related_collection) not in MYSY_GV.PERSONALISATION_AUTORIZED_COLLECTION ):
mycommon.myprint(
str(inspect.stack()[0][3]) + " - La valeur '" + str(related_collection) + "' n'est pas autorisée pour la personnalisation ")
return False, " La valeur '" + str(related_collection) + "' n'est pas autorisée pour la personnalisation",
str(inspect.stack()[0][3]) + " - L'objet métier '" + str(related_collection) + "' n'est pas autorisée pour la personnalisation ")
return False, " L'objet métier '" + str(related_collection) + "' n'est pas autorisée pour la personnalisation",
data['related_collection'] = related_collection
@ -107,9 +107,9 @@ def Add_specific_field(diction):
if (str(field_type) not in MYSY_GV.SPECIFIC_FIELD_TYPE):
mycommon.myprint(
str(inspect.stack()[0][3]) + " - La valeur '" + str(
str(inspect.stack()[0][3]) + " - Le type de champ '" + str(
field_type) + "' n'est pas autorisée pour la personnalisation ")
return False, " La valeur '" + str(field_type) + "' n'est pas autorisée pour la personnalisation",
return False, "Le type de champ '" + str(field_type) + "' n'est pas autorisée pour la personnalisation",
data['field_type'] = field_type
@ -661,6 +661,7 @@ def Get_Partner_Object_Specific_Valide_Displayed_Fields(diction):
data_cle['related_collection'] = str(diction['object_name'])
data_cle['valide'] = "1"
data_cle['locked'] = "0"
data_cle['is_displayed'] = "1"
RetObject = []
val_tmp = 1
@ -918,6 +919,7 @@ def Get_Collection_Eligible_Champ_Specific():
mycollection_field3 = {"objet_metier": 'session_formation', "nom": 'Session', }
mycollection_field4 = {"objet_metier": 'myclass', "nom": 'Formation', }
mycollection_field5 = {"objet_metier": 'inscription', "nom": 'Inscription', }
mycollection_field6 = {"objet_metier": 'apprenant', "nom": 'Apprenant', }
RetObject.append(mycommon.JSONEncoder().encode(mycollection_field1))
@ -925,6 +927,7 @@ def Get_Collection_Eligible_Champ_Specific():
RetObject.append(mycommon.JSONEncoder().encode(mycollection_field3))
RetObject.append(mycommon.JSONEncoder().encode(mycollection_field4))
RetObject.append(mycommon.JSONEncoder().encode(mycollection_field5))
RetObject.append(mycommon.JSONEncoder().encode(mycollection_field6))
return True, RetObject

View File

@ -843,7 +843,7 @@ def get_user_account(diction):
RetObject = []
for retVal in coll_name.find({'token': str(token_value), 'locked': '0', 'active':'1'}):
#mycommon.myprint(retVal)
mycommon.myprint(retVal)
user = retVal
RetObject.append(JSONEncoder().encode(user))