diff --git a/Session_Formation.py b/Session_Formation.py index bca4d60..d8eb302 100644 --- a/Session_Formation.py +++ b/Session_Formation.py @@ -37,7 +37,8 @@ def Add_Update_SessionFormation(diction): # Ici on doit mettre tous les champs possible (obligatoire ou non) de la BDD dans la liste # field_list. ''' - field_list = ['token', 'date_debut', 'date_fin', 'nb_participant', 'formation_session_id', 'class_internal_url',] + field_list = ['token', 'date_debut', 'date_fin', 'nb_participant', 'formation_session_id', 'adresse', + 'class_internal_url', 'session_status', 'date_debut_inscription', 'date_fin_inscription'] incom_keys = diction.keys() for val in incom_keys: if val not in field_list: @@ -67,8 +68,8 @@ def Add_Update_SessionFormation(diction): class_internal_url = "" if ("class_internal_url" in diction.keys()): if diction['class_internal_url']: - mydata['class_internal_url'] = diction['formation_session_id'] - query_key['class_internal_url'] = diction['formation_session_id'] + mydata['class_internal_url'] = diction['class_internal_url'] + query_key['class_internal_url'] = diction['class_internal_url'] class_internal_url = diction['class_internal_url'] @@ -97,6 +98,23 @@ def Add_Update_SessionFormation(diction): if diction['nb_participant']: mydata['nb_participant'] = diction['nb_participant'] + if ("adresse" in diction.keys()): + if diction['adresse']: + mydata['adresse'] = diction['adresse'] + + if ("session_status" in diction.keys()): + if diction['session_status']: + mydata['session_status'] = diction['session_status'] + + if ("date_debut_inscription" in diction.keys()): + if diction['date_debut_inscription']: + mydata['date_debut_inscription'] = diction['date_debut_inscription'] + + if ("date_fin_inscription" in diction.keys()): + if diction['date_fin_inscription']: + mydata['date_fin_inscription'] = diction['date_fin_inscription'] + + mydata['date_update'] = str(datetime.now()) mydata['valide'] = "1" @@ -137,7 +155,7 @@ def GetSessionFormation(diction): for val in incom_keys: if val not in field_list: mycommon.myprint(str(inspect.stack()[0][ - 3]) + " - Creation partner account : Le champ '" + val + "' n'est pas autorisé, Creation partenaire annulée") + 3]) + " - Le champ '" + val + "' n'est pas autorisé, Creation partenaire annulée") return False, "de recuperer la liste des stagiaires . Toutes les informations fournies ne sont pas valables" """ @@ -170,7 +188,7 @@ def GetSessionFormation(diction): formation_session_id = "" if ("formation_session_id" in diction.keys()): if diction['formation_session_id']: - formation_session_id = diction['session_id'] + formation_session_id = diction['formation_session_id'] coll_session = MYSY_GV.dbname['session_formation'] myquery = {} @@ -178,9 +196,11 @@ def GetSessionFormation(diction): myquery['class_internal_url'] = class_internal_url + #print(" ##### myquery = "+str(myquery)) RetObject = [] for retval in coll_session.find(myquery): + #print(" ##### retval = " + str(retval)) RetObject.append(mycommon.JSONEncoder().encode(retval)) return True, RetObject