15/01/2023 - 22h

master
cherif 2023-01-15 22:11:34 +01:00
parent 2d13fb719a
commit 3c7b40fac1
5 changed files with 2774 additions and 23 deletions

View File

@ -5,11 +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$/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" />
<change beforePath="$PROJECT_DIR$/data_indexees.csv" beforeDir="false" afterPath="$PROJECT_DIR$/data_indexees.csv" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ela_output_test_file_pandas_2.txt" beforeDir="false" afterPath="$PROJECT_DIR$/ela_output_test_file_pandas_2.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/email_inscription_mgt.py" beforeDir="false" afterPath="$PROJECT_DIR$/email_inscription_mgt.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/prj_common.py" beforeDir="false" afterPath="$PROJECT_DIR$/prj_common.py" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -194,7 +191,14 @@
<option name="project" value="LOCAL" />
<updated>1673637362528</updated>
</task>
<option name="localTasksCounter" value="18" />
<task id="LOCAL-00018" summary="13/01/22 à 20h">
<created>1673777794415</created>
<option name="number" value="00018" />
<option name="presentableId" value="LOCAL-00018" />
<option name="project" value="LOCAL" />
<updated>1673777794415</updated>
</task>
<option name="localTasksCounter" value="19" />
<servers />
</component>
<component name="Vcs.Log.Tabs.Properties">

View File

@ -1396,7 +1396,7 @@ def MySyckeckEvaluationToken(diction):
if diction['class_internal_url']:
internal_url = diction['class_internal_url']
local_qry = {'class_internal_url':internal_url, '_id': ObjectId(eval_token), "eval_date":{"$exists":False} }
#local_qry = {'class_internal_url':internal_url, '_id': ObjectId(eval_token), "eval_date":{"$exists":False} }
#print(" ### local_qry =",local_qry)
tmp_count = MYSY_GV.dbname['inscription'].count_documents({'class_internal_url':internal_url,

File diff suppressed because it is too large Load Diff

View File

@ -127,24 +127,23 @@ def Add_Update_SessionFormation(diction):
if ("adresse" in diction.keys()):
if diction['adresse']:
mydata['adresse'] = diction['adresse']
else:
mydata['adresse'] = " "
if ("code_postal" in diction.keys()):
if diction['code_postal']:
## Verifier si le CP n'est composé que de "0", au quel cas il s'agit d'une formation en ligne.
local_cp = str(diction['code_postal']).replace("0","").strip()
if( local_cp == ""):
mydata['code_postal'] = "0"
else:
mydata['code_postal'] = diction['code_postal']
mydata['code_postal'] = diction['code_postal']
else:
mydata['code_postal'] = ""
if ("ville" in diction.keys()):
if diction['ville']:
mydata['ville'] = diction['ville']
else:
mydata['ville'] = ""
if ("attestation_certif" in diction.keys()):
if diction['attestation_certif']:
@ -640,7 +639,7 @@ def Add_Update_SessionFormation_mass(file=None, Folder=None, diction=None):
local_code_session = str(df['code_session'].values[n]).strip()
mydata['code_session'] = local_code_session
local_adresse = ""
local_adresse = " "
if ("adresse" in df.keys()):
if (str(df['adresse'].values[n])):
local_adresse = str(df['adresse'].values[n]).strip()
@ -657,8 +656,8 @@ def Add_Update_SessionFormation_mass(file=None, Folder=None, diction=None):
distantiel = ""
if ("distantiel" in df.keys()):
if (str(df['distantiel'].values[n])):
distanciel = str(df['distantiel'].values[n]).strip()
mydata['distantiel'] = distanciel
distantiel = str(df['distantiel'].values[n]).strip()
mydata['distantiel'] = distantiel
presentiel = ""
if ("presentiel" in df.keys()):

View File

@ -1722,7 +1722,6 @@ def get_class(diction):
tmp_str = retVal['description']
no_html = mycommon.cleanhtml(retVal['description'])
text_size = text_size + len(str(no_html))
print(" text_size description = ", len(str(no_html)), " text_size = ", text_size)
if (len(retVal['description']) > MYSY_GV.MAX_CARACT_DETAIL):
retVal['description'] = tmp_str[:MYSY_GV.MAX_CARACT_DETAIL] + " ..."
@ -1731,7 +1730,7 @@ def get_class(diction):
tmp_str = retVal['objectif']
no_html = mycommon.cleanhtml(retVal['objectif'])
text_size = text_size + len(str(no_html))
print(" text_size objectif = ", len(str(no_html)), " text_size = ", text_size)
if (len(retVal['objectif']) > MYSY_GV.MAX_CARACT_DETAIL):
retVal['objectif'] = tmp_str[:MYSY_GV.MAX_CARACT_DETAIL] + " ..."
@ -1740,10 +1739,7 @@ def get_class(diction):
tmp_str = retVal['programme']
no_html = mycommon.cleanhtml( retVal['programme'])
text_size = text_size + len(str(no_html))
print("----")
print(str(no_html))
print(" ----")
print(" text_size programme = ", len(str(no_html)), " text_size = ", text_size)
if (len(retVal['programme']) > MYSY_GV.MAX_CARACT_DETAIL):
retVal['programme'] = tmp_str[:MYSY_GV.MAX_CARACT_DETAIL] + " ..."