parent
08bf77bf2d
commit
18f751e1ab
|
@ -4,116 +4,17 @@
|
|||
<option name="autoReloadType" value="SELECTIVE" />
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="08/06/2025 - 16h30">
|
||||
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="09/06/2025 - 21h30">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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$/attached_file_mgt.py" beforeDir="false" afterPath="$PROJECT_DIR$/attached_file_mgt.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Contrat_nom_Enseignant_3_Prenom_3_411.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Convention_43598_07744.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Convention_43598_11507.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Convention_43598_14883.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Convention_43598_14947.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Convention_43598_21954.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Convention_43598_28321.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Convention_43598_29121.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Convention_43598_31058.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Convention_43598_40103.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Convention_43598_54061.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Convention_43598_56381.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Convention_43598_59326.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Convention_43598_65589.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Convention_43598_70529.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Convention_43598_75547.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Convention_43598_76972.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Convention_43598_80482.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Convocation_43598_18279.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Convocation_43598_40596.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Convocation_43598_49786.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Convocation_43598_54368.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Convocation_43598_64548.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Convocation_43598_70584.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Convocation_43598_73426.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Convocation_43598_76003.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Convocation_43598_77545.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Convocation_43598_84968.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Convocation_43598_85648.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Convocation_43598_92329.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Devis_43598_09_05_2025_07.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Devis_43598_09_05_2025_24.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Devis_43598_49647.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Eval_Convocation_part nom6_client_09793.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Evaluation_BONDU01_12_part nom5_client_062.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Export_Reponse_38466.xlsx" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/List_Convention_session_67dc3278eaba42b1ff7cee6e_369.zip" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/List_Convention_session_67dc3278eaba42b1ff7cee6e_648.zip" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/List_Convention_session_67dc3278eaba42b1ff7cee6e_667.zip" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/List_Convention_session_67dc3278eaba42b1ff7cee6e_854.zip" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/List_Convention_session_67dc3278eaba42b1ff7cee6e_998.zip" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/List_Convention_session_680210c6b388f9e2c4165b9e_342.zip" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/List_Convention_session_680210c6b388f9e2c4165b9e_344.zip" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/List_Convention_session_681dc0a102742603b1a919b3_145.zip" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/List_Convocation_Evaluation_055.zip" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/List_Convocation_session_680210c6b388f9e2c4165b9e_978.zip" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/List_Convocation_session_681dc0a102742603b1a919b3_297.zip" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/List_Evaluation_048.zip" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Partner_Invoice_Invoice_640.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Partner_Invoice_Invoice_641.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Partner_Invoice_Invoice_642.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/Partner_Invoice_Invoice_643.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/SessionBONDU01_20250416190131.csv" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/SessionBONDU01_20250418094731.csv" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/SessionBONDU01_20250418094944.csv" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/SessionBONDU01_20250418104350.csv" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/SessionBONDU01_20250418123136.csv" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/SessionBONDU01_20250508205837.csv" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/SessionBONDU01_20250509095613.csv" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/SessionBONDU01_20250509104521.csv" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/StagiairesBONDU0111_20250418095544.csv" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/StagiairesBONDU0111_20250418101511.csv" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/StagiairesBONDU0111_20250418101625.csv" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/StagiairesBONDU0111_20250418101714.csv" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/StagiairesBONDU0111_20250418104110.csv" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/StagiairesBONDU0111_20250418104419.csv" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/StagiairesBONDU0111_20250418104648.csv" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/StagiairesBONDU0111_20250418104828.csv" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/StagiairesBONDU0111_20250425130053.csv" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/StagiairesBONDU0111_20250425134931.csv" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/StagiairesBONDU0111_20250425135005.csv" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/StagiairesBONDU0112_20250418104857.csv" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/StagiairesBONDU0112_20250418123148.csv" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/StagiairesBONDU0112_20250508210703.csv" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/StagiairesBONDU0112_20250509095636.csv" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/StagiairesBONDU0112_20250509105053.csv" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/StagiairesBONDU01Mai_20250416190329.csv" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/StagiairesBONDU01_20250416190212.csv" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/cv02_20250414141621.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/cv02_20250509113405.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/devis_43598_29465.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/devis_43598_61696.pdf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/qr_code_026.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/qr_code_034.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/qr_code_049.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/qr_code_105.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/qr_code_151.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/qr_code_165.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/qr_code_178.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/qr_code_181.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/qr_code_194.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/qr_code_197.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/qr_code_506.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/qr_code_574.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/qr_code_594.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/qr_code_617.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/qr_code_699.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/qr_code_701.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/qr_code_764.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/qr_code_815.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/qr_code_904.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/qr_code_948.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/qr_code_963.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/qr_code_964.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/qr_code_974.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/temp_direct/qr_code_992.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Session_Formation.py" beforeDir="false" afterPath="$PROJECT_DIR$/Session_Formation.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/base_class_calcul_note.py" beforeDir="false" afterPath="$PROJECT_DIR$/base_class_calcul_note.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/class_mgt.py" beforeDir="false" afterPath="$PROJECT_DIR$/class_mgt.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/jury_mgt.py" beforeDir="false" afterPath="$PROJECT_DIR$/jury_mgt.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.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" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
|
@ -555,7 +456,7 @@
|
|||
<option name="project" value="LOCAL" />
|
||||
<updated>1747251650255</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="473" />
|
||||
<option name="localTasksCounter" value="474" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="Vcs.Log.Tabs.Properties">
|
||||
|
@ -597,7 +498,6 @@
|
|||
</option>
|
||||
</component>
|
||||
<component name="VcsManagerConfiguration">
|
||||
<MESSAGE value="29/03/2025 - 9h" />
|
||||
<MESSAGE value="29/03/2025 - 21h" />
|
||||
<MESSAGE value="25/04/2025 - 15h" />
|
||||
<MESSAGE value="30/04/2025 - 15h" />
|
||||
|
@ -622,6 +522,7 @@
|
|||
<MESSAGE value="qsd" />
|
||||
<MESSAGE value="07/06/2025 - 21h30" />
|
||||
<MESSAGE value="08/06/2025 - 16h30" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="08/06/2025 - 16h30" />
|
||||
<MESSAGE value="09/06/2025 - 21h30" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="09/06/2025 - 21h30" />
|
||||
</component>
|
||||
</project>
|
4479
Log/log_file.log
4479
Log/log_file.log
File diff suppressed because one or more lines are too long
|
@ -7893,6 +7893,15 @@ def Sent_Convocation_Stagiaire_By_Email(tab_files, Folder, diction):
|
|||
tab_class = []
|
||||
tab_class.append(class_data['_id'])
|
||||
|
||||
# Recuperation des sequences d'une session de formation
|
||||
tab_sequence_session = []
|
||||
for local_retval in MYSY_GV.dbname['session_formation_sequence'].find(
|
||||
{'partner_owner_recid': str(my_partner['recid']),
|
||||
'session_id': str(session_data['_id']),
|
||||
'valide': '1',
|
||||
'locked': '0'}):
|
||||
tab_sequence_session.append(local_retval['_id'])
|
||||
|
||||
# Creation du dictionnaire d'information à utiliser pour la creation du doc
|
||||
convention_dictionnary_data = {}
|
||||
new_diction = {}
|
||||
|
@ -7902,6 +7911,7 @@ def Sent_Convocation_Stagiaire_By_Email(tab_files, Folder, diction):
|
|||
new_diction['list_class_id'] = tab_class
|
||||
new_diction['list_client_id'] = []
|
||||
new_diction['list_apprenant_id'] = tab_apprenant
|
||||
new_diction['list_sequence_session_id'] = tab_sequence_session # zzzzzz
|
||||
|
||||
local_status, local_retval = mycommon.Get_Dictionnary_data_For_Template(new_diction)
|
||||
|
||||
|
|
|
@ -1687,9 +1687,18 @@ def Calcul_Note_Classement_Session(diction):
|
|||
return False, " L'unité d'enseignement " + str(
|
||||
unite_enseignement_data['code']) + " n'a pas de règle de calcul de la note (2) "
|
||||
|
||||
local_coef = "1"
|
||||
if( "coefficient" in class_class_ue_data.keys() and class_class_ue_data['coefficient'] ):
|
||||
local_coef = class_class_ue_data['coefficient']
|
||||
|
||||
local_seuil_validation = "10"
|
||||
if ("seuil_validation" in class_class_ue_data.keys() and class_class_ue_data['seuil_validation']):
|
||||
local_seuil_validation = class_class_ue_data['seuil_validation']
|
||||
|
||||
|
||||
print(" ### Pour l'UE : ",str(unite_enseignement_data['code']),
|
||||
" Coef : ", class_class_ue_data['coefficient'],
|
||||
" seuil validation : ", class_class_ue_data['seuil_validation'])
|
||||
" Coef : ", local_coef,
|
||||
" seuil validation : ", local_seuil_validation)
|
||||
|
||||
print(" ### la formule de calcul est : ", base_calcul_note_class_and_ue_data['fonction_name'])
|
||||
|
||||
|
|
|
@ -3875,6 +3875,10 @@ def find_partner_class_like(diction):
|
|||
retVal['recyclage_alert'] = ""
|
||||
|
||||
|
||||
if ("lms_class_code" not in retVal.keys()):
|
||||
retVal['lms_class_code'] = ""
|
||||
|
||||
|
||||
if ("recyclage_periodicite" not in retVal.keys()):
|
||||
retVal['recyclage_periodicite'] = ""
|
||||
|
||||
|
|
|
@ -2379,7 +2379,10 @@ def Get_List_Jury_Soutenenace(diction):
|
|||
RetObject = []
|
||||
val_tmp = 0
|
||||
|
||||
print(" ### data_cle = ", data_cle)
|
||||
for retval in MYSY_GV.dbname['jury_soutenance'].find(data_cle).sort([("_id", pymongo.DESCENDING), ]):
|
||||
|
||||
print(" ### retvalretvalretval = ", retval)
|
||||
user = retval
|
||||
|
||||
if( "session_id" in jury_data.keys() ):
|
||||
|
|
2
main.py
2
main.py
|
@ -11679,7 +11679,7 @@ API pour recuperer un modele de planning AVEC option
|
|||
def Get_Given_Sequence_Planning_Model_With_Option():
|
||||
# On recupere le corps (payload) de la requete
|
||||
payload = mycommon.strip_dictionary (request.form.to_dict())
|
||||
print(" ### Get_Given_Sequence_Planning_Model_With_Option payload = ",payload)
|
||||
print(" ### Get_Given_Sequence_Planning_Model_With_Option payload (long) = ",)
|
||||
status, retval = model_planning_sequence_mgt.Get_Given_Sequence_Planning_Model_With_Option(payload)
|
||||
return jsonify(status=status, message=retval)
|
||||
|
||||
|
|
|
@ -65,7 +65,7 @@ def Add_Evaluation_Planification(diction):
|
|||
field_list = ['token', 'code', 'titre', 'description', 'comment',
|
||||
'class_id', 'class_eu_id', 'type_eval_id',
|
||||
'eval_date_heure_debut', 'eval_date_heure_fin', 'statut', 'adress', 'cp', 'ville',
|
||||
'pays', 'responsable_id', 'session_id']
|
||||
'pays', 'responsable_id', 'session_id', 'mode_animation']
|
||||
|
||||
incom_keys = diction.keys()
|
||||
for val in incom_keys:
|
||||
|
@ -191,10 +191,23 @@ def Add_Evaluation_Planification(diction):
|
|||
|
||||
return False, " La date debut " + str(eval_date_heure_debut) + " est postérieure à la date de fin " + str(eval_date_heure_fin) + " "
|
||||
|
||||
local_mode_animation = "0"
|
||||
if( "mode_animation" not in diction.keys() or diction['mode_animation'] not in ['0', '1']):
|
||||
local_mode_animation = "0"
|
||||
else:
|
||||
local_mode_animation = diction['mode_animation']
|
||||
|
||||
|
||||
|
||||
|
||||
new_data = diction
|
||||
del diction['token']
|
||||
|
||||
if( "mode_animation" in diction.keys() ):
|
||||
del diction['mode_animation']
|
||||
|
||||
diction['mode_animation'] = str(local_mode_animation)
|
||||
|
||||
# Initialisation des champs non envoyés à vide
|
||||
for val in field_list:
|
||||
if val not in diction.keys():
|
||||
|
@ -236,7 +249,7 @@ def Update_Evaluation_Planification(diction):
|
|||
field_list = ['token', 'evaluation_id', 'code', 'titre', 'description', 'comment',
|
||||
'class_id', 'class_eu_id', 'type_eval_id',
|
||||
'eval_date_heure_debut', 'eval_date_heure_fin', 'statut', 'site_id', 'adress', 'cp', 'ville',
|
||||
'pays', 'responsable_id', 'session_id']
|
||||
'pays', 'responsable_id', 'session_id', 'mode_animation']
|
||||
|
||||
incom_keys = diction.keys()
|
||||
for val in incom_keys:
|
||||
|
@ -380,6 +393,9 @@ def Update_Evaluation_Planification(diction):
|
|||
eval_date_heure_fin) + " "
|
||||
|
||||
|
||||
if ("mode_animation" in diction.keys() and diction['mode_animation'] not in ['0', '1']):
|
||||
del diction['mode_animation']
|
||||
|
||||
local_evaluation_id = diction['evaluation_id']
|
||||
new_data = diction
|
||||
del diction['token']
|
||||
|
@ -871,6 +887,10 @@ def Get_Given_Evaluation_Planification(diction):
|
|||
|
||||
user['class_internal_url'] = str(class_data['internal_url'])
|
||||
|
||||
if( "mode_animation" not in retval.keys() ):
|
||||
user['mode_animation'] = ""
|
||||
|
||||
|
||||
RetObject.append(mycommon.JSONEncoder().encode(user))
|
||||
|
||||
return True, RetObject
|
||||
|
@ -1380,10 +1400,21 @@ def Send_Evaluation_Convocation_Participant_By_Email(tab_files, Folder, diction)
|
|||
if (local_status is False):
|
||||
return local_status, local_retval
|
||||
|
||||
type_evaluation_code = ""
|
||||
type_evaluation_data = MYSY_GV.dbname['type_evaluation'].find_one({'_id': ObjectId(str(evaluation_data['type_eval_id'])),
|
||||
'partner_owner_recid': my_partner['recid'],
|
||||
'valide': '1',
|
||||
'locked': '0'})
|
||||
|
||||
if( type_evaluation_data and "code" in type_evaluation_data.keys() ):
|
||||
type_evaluation_code = type_evaluation_data['code']
|
||||
|
||||
|
||||
convention_dictionnary_data = local_retval
|
||||
convention_dictionnary_data['evaluation_data'] = evaluation_data
|
||||
convention_dictionnary_data['evaluation_class_data'] = eval_class_data
|
||||
convention_dictionnary_data['evaluation_ue_data'] = eval_eu_data
|
||||
convention_dictionnary_data['type_evaluation_code'] = str(type_evaluation_code)
|
||||
|
||||
|
||||
"""
|
||||
|
@ -1443,6 +1474,7 @@ def Send_Evaluation_Convocation_Participant_By_Email(tab_files, Folder, diction)
|
|||
'partner_owner_recid': str(my_partner['recid'])})
|
||||
|
||||
|
||||
|
||||
email_to_cc = []
|
||||
email_to_bcc = []
|
||||
email_to_bcc.append(str(my_partner['email']))
|
||||
|
@ -1477,6 +1509,7 @@ def Send_Evaluation_Convocation_Participant_By_Email(tab_files, Folder, diction)
|
|||
"params": convention_dictionnary_data,
|
||||
}
|
||||
|
||||
#print("convention_dictionnary_data = ddd = ", convention_dictionnary_data)
|
||||
# Verifier s'il s'agit d'un document à envoyer avec une version de pièce jointe.
|
||||
if ("joint_pdf" in courrier_data_retval.keys() and str(courrier_data_retval['joint_pdf']) == "1"):
|
||||
# Il s'agit bien d'un envoie avec 'contenu_doc' en pièce jointe PDF
|
||||
|
@ -1561,8 +1594,7 @@ def Send_Evaluation_Convocation_Participant_By_Email(tab_files, Folder, diction)
|
|||
email_to_bcc = ",".join(email_to_bcc)
|
||||
msg['Bcc'] = str(email_to_bcc)
|
||||
|
||||
toaddrs = ",".join(email_to_cc)
|
||||
msg['to'] = str(toaddrs)
|
||||
msg['to'] = str(apprenant_id_data['email'])
|
||||
|
||||
# Attacher l'eventuelle pièces jointes
|
||||
for myfile in single_inscription_tab_files_to_attache_to_mail:
|
||||
|
@ -1580,8 +1612,8 @@ def Send_Evaluation_Convocation_Participant_By_Email(tab_files, Folder, diction)
|
|||
email_to_bcc = ",".join(email_to_bcc)
|
||||
msg['Bcc'] = str(email_to_bcc)
|
||||
|
||||
toaddrs = ",".join(email_to_cc)
|
||||
msg['to'] = str(toaddrs)
|
||||
msg['to'] = str(apprenant_id_data['email'])
|
||||
|
||||
|
||||
# Attacher l'eventuelle pièces jointes
|
||||
for myfile in single_inscription_tab_files_to_attache_to_mail:
|
||||
|
@ -1727,10 +1759,21 @@ def Send_Evaluation_Convocation_Participant_By_PDF(diction):
|
|||
if (local_status is False):
|
||||
return local_status, local_retval
|
||||
|
||||
type_evaluation_code = ""
|
||||
type_evaluation_data = MYSY_GV.dbname['type_evaluation'].find_one(
|
||||
{'_id': ObjectId(str(evaluation_data['type_eval_id'])),
|
||||
'partner_owner_recid': my_partner['recid'],
|
||||
'valide': '1',
|
||||
'locked': '0'})
|
||||
|
||||
if (type_evaluation_data and "code" in type_evaluation_data.keys()):
|
||||
type_evaluation_code = type_evaluation_data['code']
|
||||
|
||||
convention_dictionnary_data = local_retval
|
||||
convention_dictionnary_data['evaluation_data'] = evaluation_data
|
||||
convention_dictionnary_data['evaluation_class_data'] = eval_class_data
|
||||
convention_dictionnary_data['evaluation_ue_data'] = eval_eu_data
|
||||
convention_dictionnary_data['type_evaluation_code'] = str(type_evaluation_code)
|
||||
|
||||
|
||||
"""
|
||||
|
@ -1787,7 +1830,7 @@ def Send_Evaluation_Convocation_Participant_By_PDF(diction):
|
|||
"params": convention_dictionnary_data,
|
||||
}
|
||||
|
||||
|
||||
#print(" #### convention_dictionnary_data = ", convention_dictionnary_data)
|
||||
|
||||
"""
|
||||
1 - Creation du PDF
|
||||
|
|
|
@ -5110,8 +5110,6 @@ def Get_Dictionnary_data_For_Template(diction):
|
|||
|
||||
#print( " ### pipe_qry select sequence = ", pipe_qry)
|
||||
for sequence_session_data in MYSY_GV.dbname['session_formation_sequence'].aggregate(pipe_qry):
|
||||
|
||||
|
||||
new_session_data = {}
|
||||
for champ in sequence_session_liste_champ:
|
||||
if (champ in sequence_session_data.keys() ):
|
||||
|
@ -7702,13 +7700,21 @@ def Push_Document_To_ENT_For_Inscrit(tab_files, Folder, diction):
|
|||
str(inspect.stack()[0][3]) + " L'adresse email '" + str(email_dest) + "' est invalide ")
|
||||
return False, "L'adresse email '" + str(email_dest) + "' est invalide"
|
||||
|
||||
|
||||
print(" ### qryy exist = ",{"email": str(email_dest),
|
||||
'valide': '1',
|
||||
'session_id':str(diction['session_id']),
|
||||
local_partner_owner_recid: str(my_partner['recid']),
|
||||
'email': str(email_dest)
|
||||
} )
|
||||
|
||||
|
||||
is_valide_email_in_related_collection = MYSY_GV.dbname[str(related_collection)].count_documents(
|
||||
{"email": str(email_dest),
|
||||
'valide': '1',
|
||||
'session_id':str(diction['session_id']),
|
||||
local_partner_owner_recid: str(my_partner['recid']),
|
||||
'_id': {
|
||||
'$in': list_inscription_id_Objectid},
|
||||
'email': str(email_dest)
|
||||
})
|
||||
|
||||
if (is_valide_email_in_related_collection <= 0):
|
||||
|
@ -7728,8 +7734,7 @@ def Push_Document_To_ENT_For_Inscrit(tab_files, Folder, diction):
|
|||
'valide': '1',
|
||||
'session_id': str(diction['session_id']),
|
||||
local_partner_owner_recid: str(my_partner['recid']),
|
||||
'_id': {
|
||||
'$in': list_inscription_id_Objectid},
|
||||
'email': str(email_dest)
|
||||
}, {'_id': 1})
|
||||
|
||||
tab_related_collection_id.append(str(is_valide_email_in_related_collection_data['_id']))
|
||||
|
|
|
@ -3855,7 +3855,7 @@ def Get_Entity_Question_List_With_Stat_For_Given_related_collection_id(diction):
|
|||
node['question_question'] = str(tmp['question'])
|
||||
node['class_id'] = str(retval['class_id'])
|
||||
|
||||
if( 'type' in tmp.key() ):
|
||||
if( 'type' in tmp.keys() ):
|
||||
if (str(tmp['type']) in ['note', 'entier']):
|
||||
node['question_type'] = "Moyenne"
|
||||
|
||||
|
|
Loading…
Reference in New Issue