Validation 19/02/22 - 15h31

master
ChérifBALDE 2022-02-19 15:24:47 +01:00 committed by cherif
parent fa33a46065
commit 5c9f94504a
2 changed files with 21 additions and 7 deletions

View File

@ -154,7 +154,7 @@ def add_class(diction):
mydata['mots_cle'] = diction['mots_cle']
mydata['active'] = '1'
mydata['valide'] = '1'
mydata['locked'] = '0'
mydata['indexed'] = '0'
mydata['indexed_title'] = '0'
@ -171,7 +171,7 @@ def add_class(diction):
#mycommon.myprint(" TMP = " + str(tmp))
if (tmp > 0):
mycommon.myprint(str(inspect.stack()[0][3])+" -la formation avec l'external code " + str(mydata['external_code']) + "' existe deja, impossible de créer le compte partenaire ")
return False, "la formation avec l'external code " + str(mydata['external_code']) + "' existe deja, impossible de créer le compte partenaire "
return False, "la formation avec l'external code " + str(mydata['external_code']) + "' existe deja. Impossible de créer la formation "
coll_name.insert_one(mydata)
@ -799,6 +799,11 @@ def get_class(diction):
if diction['external_code']:
external_code_crit['external_code'] = diction['external_code']
title_crit = {}
if ("title" in diction.keys()):
if diction['title']:
title_crit['title'] = diction['title']
coll_name = dbname['myclass']
@ -833,9 +838,18 @@ def get_class(diction):
if ("external_code" in diction.keys()):
filt_external_code = {'external_code':{'$regex':str(diction['external_code'])}}
filt_title = {}
if ("title" in diction.keys()):
filt_title = {'title': {'$regex': str(diction['title'])}}
print(" #### avant requete get partner_owner_recid ="+str(user_recid)+
" filt_external_code = "+str(filt_external_code)+
" filt_title = "+str(filt_title))
for retVal in coll_name.find(({"$and": [ {'valide':'1'},{'locked':'0'},
{'partner_owner_recid':user_recid} ,filt_external_code ]})):
{'partner_owner_recid':user_recid} ,filt_external_code, filt_title ]})):
mycommon.myprint(str(retVal))
user = retVal
RetObject.append(JSONEncoder().encode(user))
@ -948,7 +962,7 @@ def add_class_mass(file=None, Folder=None, diction=None):
# Verification que les noms des colonne sont bien corrects"
'''
field_list = ['external_code', 'title', 'description', 'trainer', 'institut_formation', 'distantiel', 'presentiel',
'price', 'domaine', 'url','duree_formation','partner_mail', 'plus_produit', 'mots_cle']
'price', 'domaine', 'url','duree_formation', 'plus_produit', 'mots_cle']
total_rows = len(df)
@ -962,7 +976,7 @@ def add_class_mass(file=None, Folder=None, diction=None):
x = range(0, total_rows)
print(" Domaine ===> Code formation ")
for n in x:
mydata = {}
mydata['external_code'] = str(df['external_code'].values[n])
@ -977,7 +991,6 @@ def add_class_mass(file=None, Folder=None, diction=None):
mydata['mots_cle'] = str(df['mots_cle'].values[n])
mydata['distantiel'] = str(df['distantiel'].values[n])
mydata['presentiel'] = str(df['presentiel'].values[n])
mydata['partner_mail'] = "empty"
if ("token" in diction.keys()):
if diction['token']:

View File

@ -157,7 +157,7 @@ def add_update_user_objectif():
# On recupere le corps (payload) de la requete
payload = request.form.to_dict()
print(" ### payload = ",payload)
status, retval = eua.add_update_user_objectif(payload)
status, retval = eua.add_update_user_objectif(payload)
return jsonify(status=status, message=retval)
@ -238,6 +238,7 @@ def get_class():
# On recupere le corps (payload) de la requete
payload = request.form.to_dict()
print(" ### payload = ",str(payload)+" IP requester = "+str(request.remote_addr))
status, retval = cm.get_class(payload)
return jsonify(status=status, message=retval)