From 94be08a8695ac7a20c4a7fda74f61515eed7d408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ch=C3=A9rifBALDE?= Date: Sun, 3 Jul 2022 21:28:17 +0200 Subject: [PATCH] 03/07/22 - 20h30 --- class_mgt.py | 26 ++++++++++++++++++-------- wrapper.py | 2 -- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/class_mgt.py b/class_mgt.py index 4f4961e..34dbde6 100644 --- a/class_mgt.py +++ b/class_mgt.py @@ -16,6 +16,8 @@ import csv import pandas as pd from pymongo import ReturnDocument import GlobalVariable as MYSY_GV +from math import isnan + class JSONEncoder(json.JSONEncoder): def default(self, o): @@ -44,7 +46,7 @@ def add_class(diction): # field_list. ''' field_list = ['external_code', 'title', 'description', 'trainer', 'institut_formation', 'distantiel', 'presentiel', - 'price', 'url','duration','token', 'plus_produit', 'mots_cle','domaine', 'internal_url', 'zone_diffusion'] + 'price', 'url','duration', 'duration_unit', 'token', 'plus_produit', 'mots_cle','domaine', 'internal_url', 'zone_diffusion'] incom_keys = diction.keys() for val in incom_keys: if val not in field_list: @@ -148,7 +150,7 @@ def add_class(diction): if ("price" in diction.keys()): if diction['price']: - mydata['price'] = int(str(diction['price'])) + mydata['price'] = mycommon.tryFloat(str(diction['price'])) if ("url" in diction.keys()): if diction['url']: @@ -158,8 +160,6 @@ def add_class(diction): if diction['duration']: mydata['duration'] = float(str(diction['duration'])) - - if ("plus_produit" in diction.keys()): if diction['plus_produit']: mydata['plus_produit'] = diction['plus_produit'] @@ -184,6 +184,10 @@ def add_class(diction): mydata['domaine'] = diction['domaine'] + if ("duration_unit" in diction.keys()): + if diction['duration_unit']: + mydata['duration_unit'] = diction['duration_unit'] + if ("zone_diffusion" in diction.keys()): if diction['zone_diffusion']: @@ -374,7 +378,7 @@ def update_class(diction): if ("price" in diction.keys()): if( diction['price']): - mydata['price'] = int(str(diction['price'])) + mydata['price'] = mycommon.tryFloat(str(diction['price'])) if ("url" in diction.keys()): mydata['url'] = diction['url'] @@ -1423,7 +1427,8 @@ def add_class_mass(file=None, Folder=None, diction=None): for n in x: mydata = {} mydata['external_code'] = str(df['external_code'].values[n]) - mydata['title'] = str(df['domaine'].values[n]) + mydata['title'] = str(df['title'].values[n]) + mydata['domaine'] = str(df['domaine'].values[n]) mydata['description'] = str(df['description'].values[n]) mydata['trainer'] = str(df['trainer'].values[n]) mydata['institut_formation'] = str(df['institut_formation'].values[n]) @@ -1434,6 +1439,7 @@ def add_class_mass(file=None, Folder=None, diction=None): mydata['mots_cle'] = str(df['mots_cle'].values[n]) mydata['presentiel'] = str(df['presentiel'].values[n]) mydata['distantiel'] = str(df['distantiel'].values[n]) + mydata['price'] = str(df['price'].values[n]) ''' @@ -1458,8 +1464,12 @@ def add_class_mass(file=None, Folder=None, diction=None): if diction['token']: mydata['token'] = diction['token'] - print( mydata) - status, retval = add_class(mydata) + mydata['duration_unit'] = "jour" + + clean_dict = {k: mydata[k] for k in mydata if ( str(mydata[k]) != "nan") } + + print( clean_dict) + status, retval = add_class(clean_dict) if( status is False ): return status, retval diff --git a/wrapper.py b/wrapper.py index 0b771f4..518ad22 100644 --- a/wrapper.py +++ b/wrapper.py @@ -183,8 +183,6 @@ def get_all_class(diction): nb_formation_a_jouter = MYSY_GV.MAINPAGE_QUERY_LIMIT_ROW - len(tab_training_inzone) - print(" NB = tab_training_inzone : "+str(len(tab_training_inzone))) - print(" tab_training_inzone = ############# "+str(tab_training_inzone)) coll_name = MYSY_GV.dbname['myclass']