diff --git a/wrapper.py b/wrapper.py index 6879566..c7d1eee 100644 --- a/wrapper.py +++ b/wrapper.py @@ -187,6 +187,15 @@ def get_all_class(diction): # "MYSY_GV.MAINPAGE_QUERY_LIMIT_ROW = "+str(MYSY_GV.MAINPAGE_QUERY_LIMIT_ROW)+" len(tab_training_inzone) = "+ # str(len(tab_training_inzone) )) + alread_found = [] + #print(str(tab_training_inzone)) + for val in tab_training_inzone: + stud_obj = json.loads(val) + json_obj = json.dumps(stud_obj) + if( stud_obj['external_code'] ): + alread_found.append(str(stud_obj['external_code'])) + #print(" stud_obj = "+str(stud_obj['external_code'])) + """ Travail à faire : @@ -197,13 +206,22 @@ def get_all_class(diction): """ - sdsqqs + print(" alread_found = "+str(alread_found)) coll_name = MYSY_GV.dbname['myclass'] val_tmp = len(tab_training_inzone) insertObject = [] - - for x in coll_name.find({ "$or": [ {'valide':'1', 'locked':'0', 'isalaune':'1', 'published':'1'}, { 'coeur': 1, 'published':'1' } ] }, + """ + ORIG FOR + for x in coll_name.find({ "$or": [ {'valide':'1', 'locked':'0', 'isalaune':'1', 'published':'1'}, { 'coeur': 1, 'published':'1' } ] }, + {"_id": 0, "indexed": 0, "indexed_desc": 0, "indexed_obj": 0, "indexed_title": 0, + "valide": 0, "locked": 0, }).\ + """ + for x in coll_name.find( + {"$and": [{"$or": [{'valide': '1', 'locked': '0', 'isalaune': '1', 'published': '1'}, + {'coeur': 1, 'published': '1'}]}, + {'external_code': {'$nin': alread_found}} + ]}, {"_id": 0, "indexed": 0, "indexed_desc": 0, "indexed_obj": 0, "indexed_title": 0, "valide": 0, "locked": 0, }).\ limit(nb_formation_a_jouter).\ @@ -344,7 +362,7 @@ def get_training_in_user_zone(diction): user = x user['id'] = str(val_tmp) - print(" dans:get_training_in_user_zone return user = "+str(user['title'])) + #print(" dans:get_training_in_user_zone return user = "+str(user['title'])) insertObject.append(JSONEncoder().encode(user)) val_tmp = val_tmp + 1