12/10/204 - 18h

master
cherif 2024-10-12 17:57:59 +02:00
parent 482fed6536
commit 6f10281f23
5 changed files with 2062 additions and 32 deletions

View File

@ -5,7 +5,8 @@
<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$/lms_chamilo/mysy_lms.py" beforeDir="false" afterPath="$PROJECT_DIR$/lms_chamilo/mysy_lms.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Session_Formation.py" beforeDir="false" afterPath="$PROJECT_DIR$/Session_Formation.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/class_mgt.py" beforeDir="false" afterPath="$PROJECT_DIR$/class_mgt.py" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

View File

@ -735,20 +735,55 @@ def AddStagiairetoClass(diction):
"""
# Ajout de l'evenement dans l'historique
seulement dans le cas de la preinscription, car le log de la validation de l'inscription
est porté par la fonction 'acceptinscription..."
"""
now = str(datetime.now().strftime("%d/%m/%Y %H:%M:%S"))
#print(" ####### laaaa diction = ", diction)
if( diction['status'] == "0"):
# pour la collection 'inscription'
now = str(datetime.now().strftime("%d/%m/%Y %H:%M:%S"))
#print(" ####### laaaa diction = ", diction)
history_event_dict = {}
history_event_dict['token'] = mytoken
history_event_dict['related_collection'] = "inscription"
history_event_dict['related_collection_recid'] = str(inserted_id)
history_event_dict['action_date'] = str(now)
local_session_info = "Id Session : "+str(my_session_data['_id'])
if( "code_session" in my_session_data.keys() ):
local_session_info = local_session_info + ", Code Session : " + my_session_data["code_session"]
history_event_dict['action_description'] = "Preinscription à "+str(local_session_info)
local_status, local_retval = mycommon.Collection_Historique.Add_Historique_Event(history_event_dict)
if (local_status is False):
mycommon.myprint(
" WARNING : Impossible de logguer l'historique pour l'évènement : " + str(history_event_dict))
# Pour la collection session_formation
history_event_dict = {}
history_event_dict['token'] = mytoken
history_event_dict['related_collection'] = "session_formation"
history_event_dict['related_collection_recid'] = str(my_session_data['_id'])
history_event_dict['action_date'] = str(now)
local_inscrit_info = "Id Inscrit : " + str(inserted_id)
if ("email" in diction.keys()):
local_inscrit_info = local_inscrit_info + ", " + diction["email"]
if ("nom" in diction.keys()):
local_inscrit_info = local_inscrit_info + ", " + diction["nom"]
if ("prenom" in diction.keys()):
local_inscrit_info = local_inscrit_info + ", " + diction["prenom"]
history_event_dict['action_description'] = "Preinscription de " + str(local_inscrit_info)
local_status, local_retval = mycommon.Collection_Historique.Add_Historique_Event(history_event_dict)
if (local_status is False):
mycommon.myprint(
" WARNING : Impossible de logguer l'historique pour l'évènement : " + str(history_event_dict))
history_event_dict = {}
history_event_dict['token'] = mytoken
history_event_dict['related_collection'] = "inscription"
history_event_dict['related_collection_recid'] = str(inserted_id)
history_event_dict['action_date'] = str(now)
history_event_dict['action_description'] = "Creation "
local_status, local_retval = mycommon.Collection_Historique.Add_Historique_Event(history_event_dict)
if (local_status is False):
mycommon.myprint(
" WARNING : Impossible de logguer l'historique pour l'évènement : " + str(history_event_dict))
return True, " Le stagiaire à bien été créé. "+str(Warning_message)
@ -6634,6 +6669,54 @@ def AcceptAttendeeInscription(diction):
upsert=False,
)
"""
12/10/2024 - loguer les action dans l'historique général
"""
## Add to log history pour l'inscrit 'inscription'
now = str(datetime.now().strftime("%d/%m/%Y %H:%M:%S"))
history_event_dict = {}
history_event_dict['token'] = str(mytoken)
history_event_dict['related_collection'] = "inscription"
history_event_dict['related_collection_recid'] = str(diction['inscription_id'])
history_event_dict['action_date'] = str(now)
local_session_info = ""
if ("_id" in local_session.keys()):
local_session_info = "_Id Session : " + str(local_session["_id"])
if( "code_session" in local_session.keys() ):
local_session_info = local_session_info+ ", Code Session : "+local_session["code_session"]
history_event_dict['action_description'] = "Validation inscription à "+str(local_session_info)
local_status, local_retval = mycommon.Collection_Historique.Add_Historique_Event(history_event_dict)
if (local_status is False):
mycommon.myprint(
" WARNING : Impossible de logguer l'historique pour l'évènement : " + str(history_event_dict))
## Add to log history pour la session 'session_formation'
history_event_dict = {}
history_event_dict['token'] = str(mytoken)
history_event_dict['related_collection'] = "session_formation"
history_event_dict['related_collection_recid'] = str(local_session['_id'])
history_event_dict['action_date'] = str(now)
local_inscrit_info = ""
if ("_id" in local_inscription.keys()):
local_inscrit_info = "_Id Inscrit : " + str(local_inscription["_id"])
if ("email" in local_inscription.keys()):
local_inscrit_info = local_inscrit_info + ", " + local_inscription["email"]
if ("nom" in local_inscription.keys()):
local_inscrit_info = local_inscrit_info + ", " + local_inscription["nom"]
if ("prenom" in local_inscription.keys()):
local_inscrit_info = local_inscrit_info + ", " + local_inscription["prenom"]
history_event_dict['action_description'] = "Validation inscription de " + str(local_inscrit_info)
local_status, local_retval = mycommon.Collection_Historique.Add_Historique_Event(history_event_dict)
if (local_status is False):
mycommon.myprint(
" WARNING : Impossible de logguer l'historique pour l'évènement : " + str(history_event_dict))
@ -6870,7 +6953,35 @@ def DeleteAttendeeInscription(diction):
detlete_retval = MYSY_GV.dbname['inscription'].delete_one(
{'session_id': str(diction['session_id']), 'email': str(diction['email']),
'class_internal_url': str(diction['class_internal_url'])},
)
)
"""
## Add to log history
"""
now = str(datetime.now().strftime("%d/%m/%Y %H:%M:%S"))
# Pour la collection inscription
history_event_dict = {}
history_event_dict['token'] = mytoken
history_event_dict['related_collection'] = "inscription"
history_event_dict['related_collection_recid'] = str(local_inscription['_id'])
history_event_dict['action_date'] = str(now)
local_inscrit_info = "Id Inscrit : " + str(local_inscription['_id'])
if ("email" in local_inscription.keys()):
local_inscrit_info = local_inscrit_info + ", " + local_inscription["email"]
if ("nom" in local_inscription.keys()):
local_inscrit_info = local_inscrit_info + ", " + local_inscription["nom"]
if ("prenom" in local_inscription.keys()):
local_inscrit_info = local_inscrit_info + ", " + local_inscription["prenom"]
history_event_dict['action_description'] = "Suppresion de " + str(local_inscrit_info)
local_status, local_retval = mycommon.Collection_Historique.Add_Historique_Event(history_event_dict)
if (local_status is False):
mycommon.myprint(
" WARNING : Impossible de logguer l'historique pour l'évènement : " + str(history_event_dict))
return True, "L'inscription a été correctement supprimée"
@ -6917,10 +7028,7 @@ def Delete_List_AttendeeInscription(diction):
if diction['list_inscription_id']:
list_inscription_id = str(diction['list_inscription_id']).replace(",", ";").split(";")
data_mail = {}
for inscription_id in list_inscription_id :
# Verification que l'inscription existe et qu'elle est supprimable (donc status = 0 ou -1)
@ -6942,11 +7050,48 @@ def Delete_List_AttendeeInscription(diction):
3]) + " - Impossible de supprimer l'inscription de l'utilisateur "+str(ret_val2['email'])+" à la session "+str(ret_val2['session_id'])+". L'inscription doit être annulée ou à l'etat 'préinscrit' avant d'être supprimé")
return False, " Impossible de supprimer l'inscription de l'utilisateur "+str(ret_val2['email'])+" à la session "+str(ret_val2['session_id'])+". L'inscription doit être annulée ou à l'etat 'préinscrit' avant d'être supprimé"
now = str(datetime.now().strftime("%d/%m/%Y %H:%M:%S"))
for inscription_id in list_inscription_id:
ret_val2 = MYSY_GV.dbname['inscription'].find_one(
{'_id': ObjectId(str(inscription_id)), },
)
"""
## Add to log history
"""
# Pour la collection inscription
history_event_dict = {}
history_event_dict['token'] = mytoken
history_event_dict['related_collection'] = "inscription"
history_event_dict['related_collection_recid'] = str(ret_val2['_id'])
history_event_dict['action_date'] = str(now)
local_inscrit_info = "Id Inscrit : " + str(ret_val2['_id'])
if ("email" in ret_val2.keys()):
local_inscrit_info = local_inscrit_info + ", " + ret_val2["email"]
if ("nom" in ret_val2.keys()):
local_inscrit_info = local_inscrit_info + ", " + ret_val2["nom"]
if ("prenom" in ret_val2.keys()):
local_inscrit_info = local_inscrit_info + ", " + ret_val2["prenom"]
history_event_dict['action_description'] = "Suppression de " + str(local_inscrit_info)
local_status, local_retval = mycommon.Collection_Historique.Add_Historique_Event(history_event_dict)
if (local_status is False):
mycommon.myprint(
" WARNING : Impossible de logguer l'historique pour l'évènement : " + str(history_event_dict))
## pour finir on fait la suppression
detlete_retval = MYSY_GV.dbname['inscription'].delete_one(
{'_id': ObjectId(str(inscription_id)),},
)
return True, "La liste des inscriptions a été correctement supprimée"
except Exception as e:
@ -9333,12 +9478,43 @@ def Sent_Convention_Stagiaire_By_Email(tab_files, Folder, diction):
history_event_dict['related_collection'] = "inscription"
history_event_dict['related_collection_recid'] = str(diction['inscription_id'])
history_event_dict['action_date'] = str(now)
history_event_dict['action_description'] = "Convention envoyée par email à la liste : "+str(tab_emails_destinataire)
local_session_info = "Id Session : " + str(session_data['_id'])
if ("code_session" in session_data.keys()):
local_session_info = local_session_info + ", " + session_data["code_session"]
history_event_dict['action_description'] = "Convention envoyée par email à la liste : "+str(tab_emails_destinataire)+" pour la session "+str(local_session_info)
local_status, local_retval = mycommon.Collection_Historique.Add_Historique_Event(history_event_dict)
if (local_status is False):
mycommon.myprint(
" WARNING : Impossible de logguer l'historique pour l'évènement : " + str(history_event_dict))
# Pour la session
history_event_dict = {}
history_event_dict['token'] = diction['token']
history_event_dict['related_collection'] = "session_formation"
history_event_dict['related_collection_recid'] = str(session_data['_id'])
history_event_dict['action_date'] = str(now)
local_inscrit_info = "Id Inscrit : " + str(inscription_data['_id'])
if ("email" in inscription_data.keys()):
local_inscrit_info = local_inscrit_info + ", " + inscription_data["email"]
if ("nom" in inscription_data.keys()):
local_inscrit_info = local_inscrit_info + ", " + inscription_data["nom"]
if ("prenom" in inscription_data.keys()):
local_inscrit_info = local_inscrit_info + ", " + inscription_data["prenom"]
history_event_dict['action_description'] = "Convention envoyée par email à la liste : " + str(
tab_emails_destinataire)+" Pour l'inscrit "+str(local_inscrit_info)
local_status, local_retval = mycommon.Collection_Historique.Add_Historique_Event(history_event_dict)
if (local_status is False):
mycommon.myprint(
" WARNING : Impossible de logguer l'historique pour l'évènement : " + str(history_event_dict))
return True, "L'email a été correctement envoyé "
except Exception as e:
@ -9831,8 +10007,38 @@ def Sent_Convention_Individuelle_Stagiaire_By_Email(tab_files, Folder, diction):
history_event_dict['related_collection'] = "inscription"
history_event_dict['related_collection_recid'] = str(diction['inscription_id'])
history_event_dict['action_date'] = str(now)
local_session_info = "Id Session : " + str(session_data['_id'])
if ("code_session" in session_data.keys()):
local_session_info = local_session_info + ", " + session_data["code_session"]
history_event_dict['action_description'] = "Convention envoyée par email à la liste : " + str(
tab_emails_destinataire)
tab_emails_destinataire) + " pour la session " + str(local_session_info)
local_status, local_retval = mycommon.Collection_Historique.Add_Historique_Event(history_event_dict)
if (local_status is False):
mycommon.myprint(
" WARNING : Impossible de logguer l'historique pour l'évènement : " + str(history_event_dict))
# Pour la session
history_event_dict = {}
history_event_dict['token'] = diction['token']
history_event_dict['related_collection'] = "session_formation"
history_event_dict['related_collection_recid'] = str(session_data['_id'])
history_event_dict['action_date'] = str(now)
local_inscrit_info = "Id Inscrit : " + str(inscription_data['_id'])
if ("email" in inscription_data.keys()):
local_inscrit_info = local_inscrit_info + ", " + inscription_data["email"]
if ("nom" in inscription_data.keys()):
local_inscrit_info = local_inscrit_info + ", " + inscription_data["nom"]
if ("prenom" in inscription_data.keys()):
local_inscrit_info = local_inscrit_info + ", " + inscription_data["prenom"]
history_event_dict['action_description'] = "Convention envoyée par email à la liste : " + str(
tab_emails_destinataire) + " Pour l'inscrit " + str(local_inscrit_info)
local_status, local_retval = mycommon.Collection_Historique.Add_Historique_Event(history_event_dict)
if (local_status is False):
mycommon.myprint(
@ -11204,10 +11410,10 @@ def Sent_Convention_Stagiaire_By_Email_By_Partner_client(tab_files_name_full_pat
"""
# Ajout de l'evenement dans l'historique
"""
now = str(datetime.now().strftime("%d/%m/%Y %H:%M:%S"))
# L'action n'est loggué pour les envois reels (en prod)
if (send_in_production == 1):
now = str(datetime.now().strftime("%d/%m/%Y %H:%M:%S"))
history_event_dict = {}
history_event_dict['token'] = diction['token']
history_event_dict['related_collection'] = "partner_client"
@ -11220,6 +11426,61 @@ def Sent_Convention_Stagiaire_By_Email_By_Partner_client(tab_files_name_full_pat
mycommon.myprint(
" WARNING : Impossible de logguer l'historique pour l'évènement : " + str(history_event_dict))
# Recuperation des données du stagiaire
inscription_data = MYSY_GV.dbname['inscription'].find({'session_id': str(diction['session_id']),
'status': '1',
'partner_owner_recid': str(my_partner['recid']),
'client_rattachement_id': str(
diction['partner_client_id'])})
for inscription in inscription_data:
# Pour la collection inscription
history_event_dict = {}
history_event_dict['token'] = diction['token']
history_event_dict['related_collection'] = "inscription"
history_event_dict['related_collection_recid'] = str(inscription['_id'])
history_event_dict['action_date'] = str(now)
local_session_info = "Id Session : " + str(session_data['_id'])
if ("code_session" in session_data.keys()):
local_session_info = local_session_info + ", " + session_data["code_session"]
history_event_dict['action_description'] = "Convention envoyée par email à la liste : " + str(
tab_emails_destinataire)+" pour la session "+str(local_session_info)
local_status, local_retval = mycommon.Collection_Historique.Add_Historique_Event(history_event_dict)
if (local_status is False):
mycommon.myprint(
" WARNING : Impossible de logguer l'historique pour l'évènement : " + str(history_event_dict))
# Pour la collection session_formation
history_event_dict = {}
history_event_dict['token'] = diction['token']
history_event_dict['related_collection'] = "session_formation"
history_event_dict['related_collection_recid'] = str(session_data['_id'])
history_event_dict['action_date'] = str(now)
local_inscrit_info = "Id Inscrit : " + str(inscription['_id'])
if ("email" in inscription.keys()):
local_inscrit_info = local_inscrit_info + ", " + inscription["email"]
if ("nom" in inscription.keys()):
local_inscrit_info = local_inscrit_info + ", " + inscription["nom"]
if ("prenom" in inscription.keys()):
local_inscrit_info = local_inscrit_info + ", " + inscription["prenom"]
history_event_dict['action_description'] = "Convention envoyée par email à la liste : " + str(
tab_emails_destinataire) + " pour l'inscrit " + str(local_inscrit_info)
local_status, local_retval = mycommon.Collection_Historique.Add_Historique_Event(history_event_dict)
if (local_status is False):
mycommon.myprint(
" WARNING : Impossible de logguer l'historique pour l'évènement : " + str(history_event_dict))
return True, "L'email a été correctement envoyé "
except Exception as e:

File diff suppressed because one or more lines are too long

View File

@ -542,7 +542,11 @@ def Add_Update_SessionFormation(diction):
history_event_dict['related_collection'] = "session_formation"
history_event_dict['related_collection_recid'] = str(local_inserted_id)
history_event_dict['action_date'] = str(now)
history_event_dict['action_description'] = "Creation "
if( "session_id" in diction.keys() and diction['session_id']):
history_event_dict['action_description'] = "Mise à jour "
else:
history_event_dict['action_description'] = "Creation "
local_status, local_retval = mycommon.Collection_Historique.Add_Historique_Event(history_event_dict)
if (local_status is False):
mycommon.myprint(
@ -4266,10 +4270,35 @@ def Delete_SessionFormation(diction):
# Suppression de la session
deleted_session_qry = {'_id':ObjectId(str(session_id)), 'partner_owner_recid':str(partner_recid)}
session_data = MYSY_GV.dbname['session_formation'].find_one(deleted_session_qry)
"""
## Add to log history
"""
now = str(datetime.now().strftime("%d/%m/%Y %H:%M:%S"))
# Pour la collection inscription
history_event_dict = {}
history_event_dict['token'] = mytoken
history_event_dict['related_collection'] = "session_formation"
history_event_dict['related_collection_recid'] = str(session_data['_id'])
history_event_dict['action_date'] = str(now)
local_session_info = "Id Session : " + str(session_data['_id'])
if ("code_session" in session_data.keys()):
local_session_info = local_session_info + ", " + session_data["code_session"]
history_event_dict['action_description'] = "Suppresion de " + str(local_session_info)
local_status, local_retval = mycommon.Collection_Historique.Add_Historique_Event(history_event_dict)
if (local_status is False):
mycommon.myprint(
" WARNING : Impossible de logguer l'historique pour l'évènement : " + str(history_event_dict))
deleted_data = MYSY_GV.dbname['session_formation'].delete_many(deleted_session_qry)
mycommon.myprint(str(inspect.stack()[0][3]) + str(deleted_data.deleted_count)+" Document supprimé. La session_id " + str(
session_id) + " a été correctement supprimée ")
mycommon.myprint(
str(inspect.stack()[0][3]) + str(deleted_data.deleted_count) + " Document supprimé. La session_id " + str(
session_id) + " a été correctement supprimée ")
return True, "La session a été correctement supprimée"

View File

@ -85,7 +85,9 @@ def add_class(diction):
# recuperation des paramettre
mydata = {}
mytoken = ""
if ("token" in diction.keys()):
mytoken = diction['token']
if diction['token']:
mydata['token'] = diction['token']
@ -364,8 +366,6 @@ def add_class(diction):
mydata['suivi_eval'] = suivi_eval
prerequis = ""
if ("prerequis" in diction.keys()):
if diction['prerequis']:
@ -714,6 +714,26 @@ def add_class(diction):
)
if ret_val and ret_val['_id']:
# pour la collection 'myclass'
now = str(datetime.now().strftime("%d/%m/%Y %H:%M:%S"))
# print(" ####### laaaa diction = ", diction)
history_event_dict = {}
history_event_dict['token'] = mytoken
history_event_dict['related_collection'] = "myclass"
history_event_dict['related_collection_recid'] = str(ret_val['_id'])
history_event_dict['action_date'] = str(now)
history_event_dict['action_description'] = "Creation "
local_status, local_retval = mycommon.Collection_Historique.Add_Historique_Event(history_event_dict)
if (local_status is False):
mycommon.myprint(
" WARNING : Impossible de logguer l'historique pour l'évènement : " + str(history_event_dict))
#Indexation Title de la nouvelle formation ajoutée
training_to_index_title = {}
training_to_index_title['internal_url'] = mydata['internal_url']
@ -726,7 +746,6 @@ def add_class(diction):
print(" ### DEBUT indexation mot clée", )
eibdd.ela_index_class_key_word(mydata['external_code'], "keyword", user_recid)
return True, "La formation a bien été ajoutée", str(ret_val['_id'])
else:
mycommon.myprint(" Impossible d'ajouter la formation "+str(str(mydata['external_code'])))
@ -784,7 +803,9 @@ def update_class(diction):
mydata = {}
my_external_code = ""
mytoken = ""
if ("token" in diction.keys()):
mytoken = diction['token']
if diction['token']:
mydata['token'] = diction['token']
@ -1275,6 +1296,23 @@ def update_class(diction):
)
if (ret_val and ret_val['_id']):
# pour la collection 'myclass'
now = str(datetime.now().strftime("%d/%m/%Y %H:%M:%S"))
# print(" ####### laaaa diction = ", diction)
history_event_dict = {}
history_event_dict['token'] = mytoken
history_event_dict['related_collection'] = "myclass"
history_event_dict['related_collection_recid'] = str(ret_val['_id'])
history_event_dict['action_date'] = str(now)
history_event_dict['action_description'] = "Mise à jour "
local_status, local_retval = mycommon.Collection_Historique.Add_Historique_Event(history_event_dict)
if (local_status is False):
mycommon.myprint(
" WARNING : Impossible de logguer l'historique pour l'évènement : " + str(history_event_dict))
nb_doc = str(ret_val['_id'])
mycommon.myprint(
str(inspect.stack()[0][3]) + " - La formation a bin ete mise à jour =" + str(nb_doc))
@ -1389,6 +1427,23 @@ def disable_class(diction):
)
if (ret_val and ret_val['_id']):
# pour la collection 'myclass'
now = str(datetime.now().strftime("%d/%m/%Y %H:%M:%S"))
# print(" ####### laaaa diction = ", diction)
history_event_dict = {}
history_event_dict['token'] = str(diction['token'])
history_event_dict['related_collection'] = "myclass"
history_event_dict['related_collection_recid'] = str(ret_val['_id'])
history_event_dict['action_date'] = str(now)
history_event_dict['action_description'] = "Désactivation "
local_status, local_retval = mycommon.Collection_Historique.Add_Historique_Event(history_event_dict)
if (local_status is False):
mycommon.myprint(
" WARNING : Impossible de logguer l'historique pour l'évènement : " + str(history_event_dict))
nb_doc = str(ret_val['_id'])
mycommon.myprint(
str(inspect.stack()[0][3]) + " - La formation a bin ete mise à jour =" + str(nb_doc))
@ -1490,6 +1545,23 @@ def enable_class(diction):
)
if (ret_val and ret_val['_id']):
# pour la collection 'myclass'
now = str(datetime.now().strftime("%d/%m/%Y %H:%M:%S"))
# print(" ####### laaaa diction = ", diction)
history_event_dict = {}
history_event_dict['token'] = str(diction['token'])
history_event_dict['related_collection'] = "myclass"
history_event_dict['related_collection_recid'] = str(ret_val['_id'])
history_event_dict['action_date'] = str(now)
history_event_dict['action_description'] = "Réactivation "
local_status, local_retval = mycommon.Collection_Historique.Add_Historique_Event(history_event_dict)
if (local_status is False):
mycommon.myprint(
" WARNING : Impossible de logguer l'historique pour l'évènement : " + str(history_event_dict))
nb_doc = str(ret_val['_id'])
mycommon.myprint(
str(inspect.stack()[0][3]) + " - La formation a bien ete reactivée =" + str(nb_doc))
@ -1568,8 +1640,6 @@ def unlock_class(diction):
partner_recid = user_recid
if ("internal_url" in diction.keys()):
if diction['internal_url']:
my_internal_url = diction['internal_url']
@ -1589,6 +1659,23 @@ def unlock_class(diction):
)
if (ret_val and ret_val['_id']):
# pour la collection 'myclass'
now = str(datetime.now().strftime("%d/%m/%Y %H:%M:%S"))
# print(" ####### laaaa diction = ", diction)
history_event_dict = {}
history_event_dict['token'] = str(diction['token'])
history_event_dict['related_collection'] = "myclass"
history_event_dict['related_collection_recid'] = str(ret_val['_id'])
history_event_dict['action_date'] = str(now)
history_event_dict['action_description'] = "Déblocage "
local_status, local_retval = mycommon.Collection_Historique.Add_Historique_Event(history_event_dict)
if (local_status is False):
mycommon.myprint(
" WARNING : Impossible de logguer l'historique pour l'évènement : " + str(history_event_dict))
nb_doc = str(ret_val['_id'])
mycommon.myprint(
str(inspect.stack()[0][3]) + " - La formation a bien ete debloquée =" + str(nb_doc))
@ -1693,6 +1780,23 @@ def lock_class(diction):
)
if (ret_val and ret_val['_id']):
# pour la collection 'myclass'
now = str(datetime.now().strftime("%d/%m/%Y %H:%M:%S"))
# print(" ####### laaaa diction = ", diction)
history_event_dict = {}
history_event_dict['token'] = str(diction['token'])
history_event_dict['related_collection'] = "myclass"
history_event_dict['related_collection_recid'] = str(ret_val['_id'])
history_event_dict['action_date'] = str(now)
history_event_dict['action_description'] = "Verrouillage "
local_status, local_retval = mycommon.Collection_Historique.Add_Historique_Event(history_event_dict)
if (local_status is False):
mycommon.myprint(
" WARNING : Impossible de logguer l'historique pour l'évènement : " + str(history_event_dict))
nb_doc = str(ret_val['_id'])
mycommon.myprint(
str(inspect.stack()[0][3]) + " - La formation a bien ete verrouillée =" + str(nb_doc))
@ -1797,6 +1901,23 @@ def pusblish_class(diction):
'valide': '1'}, {"$set": mydata}, )
if (ret_val.matched_count > 0):
# pour la collection 'myclass'
now = str(datetime.now().strftime("%d/%m/%Y %H:%M:%S"))
# print(" ####### laaaa diction = ", diction)
history_event_dict = {}
history_event_dict['token'] = str(diction['token'])
history_event_dict['related_collection'] = "myclass"
history_event_dict['related_collection_recid'] = str(ret_val['_id'])
history_event_dict['action_date'] = str(now)
history_event_dict['action_description'] = "Formation publiée "
local_status, local_retval = mycommon.Collection_Historique.Add_Historique_Event(history_event_dict)
if (local_status is False):
mycommon.myprint(
" WARNING : Impossible de logguer l'historique pour l'évènement : " + str(history_event_dict))
nb_doc = str(my_internal_url)
mycommon.myprint(
str(inspect.stack()[0][3]) + " - La formation a bien ete publiée =" + str(nb_doc))
@ -1901,6 +2022,23 @@ def unpublish_class(diction):
'valide': '1'}, {"$set": mydata}, )
if (ret_val.matched_count > 0):
# pour la collection 'myclass'
now = str(datetime.now().strftime("%d/%m/%Y %H:%M:%S"))
# print(" ####### laaaa diction = ", diction)
history_event_dict = {}
history_event_dict['token'] = str(diction['token'])
history_event_dict['related_collection'] = "myclass"
history_event_dict['related_collection_recid'] = str(ret_val['_id'])
history_event_dict['action_date'] = str(now)
history_event_dict['action_description'] = "Formation dépubliée "
local_status, local_retval = mycommon.Collection_Historique.Add_Historique_Event(history_event_dict)
if (local_status is False):
mycommon.myprint(
" WARNING : Impossible de logguer l'historique pour l'évènement : " + str(history_event_dict))
nb_doc = str(my_internal_url)
mycommon.myprint(
str(inspect.stack()[0][3]) + " - La formation a bien ete depubliée =" + str(nb_doc))
@ -2206,8 +2344,6 @@ def get_class(diction):
retVal['website_partenaire'] = tmp_partenaire_data['website']
if ("description" in retVal.keys()):
tmp_str = retVal['description']
no_html = mycommon.cleanhtml(retVal['description'])
@ -5386,7 +5522,21 @@ def delete_Class(diction):
str(inspect.stack()[0][3]) + " - La formation a "+str(existe_Session_count)+" session(s) valide(s). Suppression impossible")
return False, " La formation a "+str(existe_Session_count)+" session(s) valide(s). Suppression impossible"
# pour la collection 'myclass'
now = str(datetime.now().strftime("%d/%m/%Y %H:%M:%S"))
# print(" ####### laaaa diction = ", diction)
history_event_dict = {}
history_event_dict['token'] = str(diction['token'])
history_event_dict['related_collection'] = "myclass"
history_event_dict['related_collection_recid'] = str(Myclass_Data['_id'])
history_event_dict['action_date'] = str(now)
history_event_dict['action_description'] = "Suppression Formation "+str(Myclass_Data['_id'])+", Code externe : "+str(Myclass_Data['external_code'])+", Titre :"+str(Myclass_Data['title'])
local_status, local_retval = mycommon.Collection_Historique.Add_Historique_Event(history_event_dict)
if (local_status is False):
mycommon.myprint(
" WARNING : Impossible de logguer l'historique pour l'évènement : " + str(history_event_dict))
delete_doc = MYSY_GV.dbname['myclass'].delete_many({'_id':ObjectId(str(diction['class_id'])),
'partner_owner_recid':str(my_partner['recid'])})
@ -5480,12 +5630,31 @@ def delete_list_Class(diction):
return False, "La formation avec le code externe "+str(Myclass_Data['external_code'])+" a "+str(existe_Session_count)+" session(s) valide(s). Suppression impossible"
now = str(datetime.now().strftime("%d/%m/%Y %H:%M:%S"))
for class_id in list_class_id :
# Receprer la liste des 'internal_url_"
Myclass_Data = MYSY_GV.dbname['myclass'].find_one({'_id':ObjectId(str(class_id)),
'partner_owner_recid':str(my_partner['recid'])})
# pour la collection 'myclass'
# print(" ####### laaaa diction = ", diction)
history_event_dict = {}
history_event_dict['token'] = str(diction['token'])
history_event_dict['related_collection'] = "myclass"
history_event_dict['related_collection_recid'] = str(Myclass_Data['_id'])
history_event_dict['action_date'] = str(now)
history_event_dict['action_description'] = "Suppression Formation " + str(
Myclass_Data['_id']) + ", Code externe : " + str(Myclass_Data['external_code']) + ", Titre :" + str(
Myclass_Data['title'])
local_status, local_retval = mycommon.Collection_Historique.Add_Historique_Event(history_event_dict)
if (local_status is False):
mycommon.myprint(
" WARNING : Impossible de logguer l'historique pour l'évènement : " + str(history_event_dict))
# Une formation va etre supprimée, maintenant il faut supprimer les champs associés dans la collection "elaindex"
qry_elaindex_to_delete = {"partner_owner_recid": str(my_partner['recid']),
"id_formation": str(Myclass_Data['external_code'])}
@ -5588,7 +5757,23 @@ def delete_Class_by_internal_url(diction):
str(inspect.stack()[0][3]) + " - La formation a "+str(existe_Session_count)+" session(s) valide(s). Suppression impossible")
return False, " La formation a "+str(existe_Session_count)+" session(s) valide(s). Suppression impossible"
# pour la collection 'myclass'
now = str(datetime.now().strftime("%d/%m/%Y %H:%M:%S"))
# print(" ####### laaaa diction = ", diction)
history_event_dict = {}
history_event_dict['token'] = str(diction['token'])
history_event_dict['related_collection'] = "myclass"
history_event_dict['related_collection_recid'] = str(Myclass_Data['_id'])
history_event_dict['action_date'] = str(now)
history_event_dict['action_description'] = "Suppression Formation " + str(
Myclass_Data['_id']) + ", Code externe : " + str(Myclass_Data['external_code']) + ", Titre :" + str(
Myclass_Data['title'])
local_status, local_retval = mycommon.Collection_Historique.Add_Historique_Event(history_event_dict)
if (local_status is False):
mycommon.myprint(
" WARNING : Impossible de logguer l'historique pour l'évènement : " + str(history_event_dict))
delete_doc = MYSY_GV.dbname['myclass'].delete_many({'_id':ObjectId(str(Myclass_Data['_id'])),
'partner_owner_recid':str(my_partner['recid'])})
@ -5863,6 +6048,25 @@ def Duplicate_Class(diction):
" Impossible de dupliquer la formation")
return False, " Impossible de dupliquer la formation "
Myclass_Data = MYSY_GV.dbname['myclass'].find_one({'_id':ObjectId(str(inserted.inserted_id)), 'partner_owner_recid':my_partner['recid']})
# pour la collection 'myclass'
now = str(datetime.now().strftime("%d/%m/%Y %H:%M:%S"))
# print(" ####### laaaa diction = ", diction)
history_event_dict = {}
history_event_dict['token'] = str(diction['token'])
history_event_dict['related_collection'] = "myclass"
history_event_dict['related_collection_recid'] = str(inserted['_id'])
history_event_dict['action_date'] = str(now)
history_event_dict['action_description'] = "Creation Formation avec duplication de la formation "+str(class_to_duplicate['_id'])+", Code externe : "+str(class_to_duplicate['external_code'])+", Titre : "+str(class_to_duplicate['title'])
local_status, local_retval = mycommon.Collection_Historique.Add_Historique_Event(history_event_dict)
if (local_status is False):
mycommon.myprint(
" WARNING : Impossible de logguer l'historique pour l'évènement : " + str(history_event_dict))
# Indexation Title de la nouvelle formation ajoutée
training_to_index_title = {}
training_to_index_title['internal_url'] = new_external_code['internal_url']
@ -5992,6 +6196,28 @@ def Duplicate_Class_from_internal_url(diction):
" Impossible de dupliquer la formation")
return False, " Impossible de dupliquer la formation "
Myclass_Data = MYSY_GV.dbname['myclass'].find_one(
{'_id': ObjectId(str(inserted.inserted_id)), 'partner_owner_recid': my_partner['recid']})
# pour la collection 'myclass'
now = str(datetime.now().strftime("%d/%m/%Y %H:%M:%S"))
# print(" ####### laaaa diction = ", diction)
history_event_dict = {}
history_event_dict['token'] = str(diction['token'])
history_event_dict['related_collection'] = "myclass"
history_event_dict['related_collection_recid'] = str(inserted['_id'])
history_event_dict['action_date'] = str(now)
history_event_dict['action_description'] = "Creation Formation avec duplication de la formation " + str(
class_to_duplicate['_id']) + ", Code externe : " + str(
class_to_duplicate['external_code']) + ", Titre : " + str(class_to_duplicate['title'])
local_status, local_retval = mycommon.Collection_Historique.Add_Historique_Event(history_event_dict)
if (local_status is False):
mycommon.myprint(
" WARNING : Impossible de logguer l'historique pour l'évènement : " + str(history_event_dict))
# Indexation Title de la nouvelle formation ajoutée
training_to_index_title = {}
training_to_index_title['internal_url'] = new_class['internal_url']
@ -6350,6 +6576,14 @@ def Add_Update_UE_To_Class(diction):
str(inspect.stack()[0][3]) + " L'identifiant de l'UE est invalide ")
return False, " L'identifiant de l'UE est invalide "
is_ue_exist_data = MYSY_GV.dbname['unite_enseignement'].find_one(
{'partner_owner_recid': my_partner['recid'],
'valide': '1',
'_id': ObjectId(str(diction['ue_id'])),
'locked': '0'
})
# Verifier que la formation est valide
is_class_exist_count = MYSY_GV.dbname['myclass'].count_documents(
{'partner_owner_recid': my_partner['recid'],
@ -6441,6 +6675,21 @@ def Add_Update_UE_To_Class(diction):
]
)
# pour la collection 'myclass'
now = str(datetime.now().strftime("%d/%m/%Y %H:%M:%S"))
# print(" ####### laaaa diction = ", diction)
history_event_dict = {}
history_event_dict['token'] = str(diction['token'])
history_event_dict['related_collection'] = "myclass"
history_event_dict['related_collection_recid'] = str(is_class_exist_data['_id'])
history_event_dict['action_date'] = str(now)
history_event_dict['action_description'] = "Mise à jour de l'Unité d'enseignement "+str(is_ue_exist_data['_id'])+", Code UE :"+str(is_ue_exist_data['code'])
local_status, local_retval = mycommon.Collection_Historique.Add_Historique_Event(history_event_dict)
if (local_status is False):
mycommon.myprint(
" WARNING : Impossible de logguer l'historique pour l'évènement : " + str(history_event_dict))
return True, " La compétence a été mise à jour"
@ -6476,6 +6725,24 @@ def Add_Update_UE_To_Class(diction):
)
# pour la collection 'myclass'
now = str(datetime.now().strftime("%d/%m/%Y %H:%M:%S"))
# print(" ####### laaaa diction = ", diction)
history_event_dict = {}
history_event_dict['token'] = str(diction['token'])
history_event_dict['related_collection'] = "myclass"
history_event_dict['related_collection_recid'] = str(is_class_exist_data['_id'])
history_event_dict['action_date'] = str(now)
history_event_dict['action_description'] = "Ajout de l'Unité d'enseignement " + str(
is_ue_exist_data['_id']) + ", Code UE :" + str(is_ue_exist_data['code'])
local_status, local_retval = mycommon.Collection_Historique.Add_Historique_Event(history_event_dict)
if (local_status is False):
mycommon.myprint(
" WARNING : Impossible de logguer l'historique pour l'évènement : " + str(history_event_dict))
return True, " L'UE a été correctement ajoutée à la formation "
@ -6551,6 +6818,14 @@ def Delete_UE_From_Class(diction):
str(inspect.stack()[0][3]) + " L'identifiant de l'UE est invalide ")
return False, " L'identifiant de l'UE est invalide "
is_ue_exist_data = MYSY_GV.dbname['unite_enseignement'].find_one(
{'partner_owner_recid': my_partner['recid'],
'valide': '1',
'_id': ObjectId(str(diction['ue_id'])),
'locked': '0'
})
# Verifier que la formation est valide
is_class_exist_count = MYSY_GV.dbname['myclass'].count_documents(
{'partner_owner_recid': my_partner['recid'],
@ -6571,6 +6846,26 @@ def Delete_UE_From_Class(diction):
'_id': ObjectId(str(diction['class_id']))})
if ("list_unite_enseignement" in is_class_exist_data.keys()):
# pour la collection 'myclass'
now = str(datetime.now().strftime("%d/%m/%Y %H:%M:%S"))
# print(" ####### laaaa diction = ", diction)
history_event_dict = {}
history_event_dict['token'] = str(diction['token'])
history_event_dict['related_collection'] = "myclass"
history_event_dict['related_collection_recid'] = str(is_class_exist_data['_id'])
history_event_dict['action_date'] = str(now)
history_event_dict['action_description'] = "Suppression de l'Unité d'enseignement " + str(
is_ue_exist_data['_id']) + ", Code UE :" + str(is_ue_exist_data['code'])
local_status, local_retval = mycommon.Collection_Historique.Add_Historique_Event(history_event_dict)
if (local_status is False):
mycommon.myprint(
" WARNING : Impossible de logguer l'historique pour l'évènement : " + str(history_event_dict))
delete = MYSY_GV.dbname['myclass'].update_one({'_id': ObjectId(str(diction['class_id'])),
'partner_owner_recid': str(
my_partner['recid']),