13/01/22 à 20h
parent
b7dafe3de6
commit
6895afacae
|
@ -3,6 +3,11 @@
|
|||
<component name="ChangeListManager">
|
||||
<list default="true" id="1122d9e2-679f-46d6-8c4f-97e9ae4041b5" name="Changes" comment="09/01/22 à 11h">
|
||||
<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$/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" />
|
||||
|
|
|
@ -627,9 +627,19 @@ def SendPre_InscriptionEmail(diction):
|
|||
data_mail['email'] = local_session[0]['email']
|
||||
data_mail['date_du'] = local_session[0]['date_du']
|
||||
data_mail['date_au'] = local_session[0]['date_au']
|
||||
data_mail['adresse'] = local_session[0]['adresse']
|
||||
data_mail['employeur'] = local_session[0]['employeur']
|
||||
data_mail['telephone'] = local_session[0]['telephone']
|
||||
|
||||
|
||||
if ("adresse" in local_session[0].keys()):
|
||||
if local_session[0]['adresse']:
|
||||
data_mail['adresse'] = local_session[0]['adresse']
|
||||
|
||||
if ("employeur" in local_session[0].keys()):
|
||||
if local_session[0]['employeur']:
|
||||
data_mail['employeur'] = local_session[0]['employeur']
|
||||
|
||||
if ("telephone" in local_session[0].keys()):
|
||||
if local_session[0]['telephone']:
|
||||
data_mail['telephone'] = local_session[0]['telephone']
|
||||
|
||||
|
||||
|
||||
|
|
11538
Log/log_file.log
11538
Log/log_file.log
File diff suppressed because it is too large
Load Diff
|
@ -41,7 +41,7 @@ def Add_Update_SessionFormation(diction):
|
|||
field_list = ['token', 'date_debut', 'date_fin', 'nb_participant', 'formation_session_id', 'adresse',
|
||||
'code_postal', 'ville', 'formateur', 'code_session',
|
||||
'class_internal_url', 'session_status', 'date_debut_inscription', 'date_fin_inscription',
|
||||
'attestation_certif', "distantiel", "presentiel"]
|
||||
'attestation_certif', "distantiel", "presentiel", "prix_session"]
|
||||
incom_keys = diction.keys()
|
||||
for val in incom_keys:
|
||||
if val not in field_list:
|
||||
|
@ -118,6 +118,12 @@ def Add_Update_SessionFormation(diction):
|
|||
if diction['nb_participant']:
|
||||
mydata['nb_participant'] = diction['nb_participant']
|
||||
|
||||
|
||||
if ("prix_session" in diction.keys()):
|
||||
if diction['prix_session']:
|
||||
mydata['prix_session'] = diction['prix_session']
|
||||
|
||||
|
||||
if ("adresse" in diction.keys()):
|
||||
if diction['adresse']:
|
||||
mydata['adresse'] = diction['adresse']
|
||||
|
@ -229,10 +235,10 @@ def Add_Update_SessionFormation(diction):
|
|||
mycommon.myprint(
|
||||
str(inspect.stack()[0][
|
||||
3]) + " - Impossible de créer/mettre à jour la session de formation : La date de debut de sessions " + str(
|
||||
diction['date_debut']) +" est antirieure à la date du jour ")
|
||||
diction['date_debut']) +" est antérieure à la date du jour ")
|
||||
|
||||
return False, " - Impossible de créer/mettre à jour la session de formation : La date de debut de sessions " + str(
|
||||
diction['date_debut']) +" est antirieure à la date du jour "
|
||||
diction['date_debut']) +" est antérieure à la date du jour "
|
||||
|
||||
|
||||
# Fin Controle de cohérence sur les dates
|
||||
|
@ -527,7 +533,7 @@ def Add_Update_SessionFormation_mass(file=None, Folder=None, diction=None):
|
|||
'''
|
||||
field_list = ['date_debut', 'date_fin', 'nb_participant', 'adresse', 'code_postal', 'ville',
|
||||
'session_status', 'date_debut_inscription', 'date_fin_inscription', 'attestation', 'formateur',
|
||||
'code_session', "distantiel", "presentiel"]
|
||||
'code_session', "distantiel", "presentiel", "prix_session"]
|
||||
|
||||
# Controle du nombre de lignes dans le fichier.
|
||||
total_rows = len(df)
|
||||
|
@ -615,6 +621,19 @@ def Add_Update_SessionFormation_mass(file=None, Folder=None, diction=None):
|
|||
|
||||
mydata['nb_participant'] = str(new_participants)
|
||||
|
||||
prix_session = "0"
|
||||
if ("prix_session" in df.keys()):
|
||||
if (str(df['prix_session'].values[n])):
|
||||
prix_session = str(df['prix_session'].values[n]).strip()
|
||||
|
||||
local_status, new_prix_session = mycommon.IsFloat(prix_session)
|
||||
if (local_status is False):
|
||||
mycommon.myprint(
|
||||
str(inspect.stack()[0][3]) + " Le champs 'prix_session' de ligne " + str(n) + " est incorrecte.")
|
||||
return False, " Le champs prix_session de ligne " + str(n) + " est incorrecte. "
|
||||
|
||||
mydata['prix_session'] = str(new_prix_session)
|
||||
|
||||
local_code_session = ""
|
||||
if ("code_session" in df.keys()):
|
||||
if (str(df['code_session'].values[n])):
|
||||
|
@ -715,9 +734,7 @@ def Add_Update_SessionFormation_mass(file=None, Folder=None, diction=None):
|
|||
mydata['date_debut_inscription']) +
|
||||
" est posterieure à la date de fin des inscriptions " + str(mydata['date_fin_inscription']) + " pour la ligne "+str(n)+" ")
|
||||
|
||||
return False, " Impossible de créer la session de formation : La date debut des inscriptions " + str(
|
||||
mydata['date_debut_inscription']) + \
|
||||
" est posterieure à la date de fin des inscriptions" + str(mydata['date_fin_inscription']) + " pour la ligne "+str(n)+" "
|
||||
return False, " Impossible de créer la session de formation :La date de fin des inscriptions est antérieure à la date de début des inscriptions pour la ligne "+str(n)+" "
|
||||
|
||||
mydata['token'] = str(my_token)
|
||||
mydata['class_internal_url'] = str(class_internal_url)
|
||||
|
|
23
class_mgt.py
23
class_mgt.py
|
@ -103,7 +103,7 @@ def add_class(diction):
|
|||
part_status, part_pack, part_pack_nb_training_auto = mycommon.Partner_Get_pack_nbTraining(user_recid)
|
||||
if( part_status is False):
|
||||
mycommon.myprint(str(inspect.stack()[0][3]) + " - Impossible de recuperer le pack et le nombre de formation du partenaire")
|
||||
return False, " Les informations d'identification sont incorrectes"
|
||||
return False, "Votre pack / abonnement ne permet pas créer les formations. Verifiez votre abonnement "
|
||||
"""
|
||||
Recuperation du nombre de formations actif de ce partner
|
||||
"""
|
||||
|
@ -113,6 +113,7 @@ def add_class(diction):
|
|||
inspect.stack()[0][3]) + " - Impossible de recuperer le pack et le nombre de formation du partenaire")
|
||||
return False, " Les informations d'identification sont incorrectes"
|
||||
|
||||
|
||||
if( mycommon.tryInt(part_nb_active_training) >= mycommon.tryInt(part_pack_nb_training_auto) ):
|
||||
mycommon.myprint(str(
|
||||
inspect.stack()[0][3]) + " - Vous avez atteint le nombre maximum de formation autorisé")
|
||||
|
@ -913,7 +914,7 @@ def update_class(diction):
|
|||
if (part_status is False):
|
||||
mycommon.myprint(str(inspect.stack()[0][
|
||||
3]) + " - Impossible de recuperer le pack et le nombre de formation du partenaire")
|
||||
return False, " Les informations d'identification sont incorrectes"
|
||||
return False, "Votre pack / abonnement ne permet pas créer les formations. Verifiez votre abonnement "
|
||||
|
||||
|
||||
coll_pack = MYSY_GV.dbname['pack']
|
||||
|
@ -1689,6 +1690,8 @@ def get_class(diction):
|
|||
" internal_url = "+str(my_internal_url)+
|
||||
" filt_title = "+str(filt_title))
|
||||
|
||||
text_size = 0
|
||||
|
||||
for retVal in coll_name.find({'valide':'1','locked':'0','internal_url':internal_url, 'published':'1'},
|
||||
{"_id": 0, "indexed": 0, "indexed_desc": 0, "indexed_obj": 0, "indexed_title": 0,
|
||||
"valide": 0, "locked": 0, "partner_owner_recid": 0, }
|
||||
|
@ -1717,18 +1720,30 @@ def get_class(diction):
|
|||
|
||||
if ("description" in retVal.keys()):
|
||||
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] + " ..."
|
||||
|
||||
|
||||
if ("objectif" in retVal.keys()):
|
||||
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] + " ..."
|
||||
|
||||
|
||||
if ("programme" in retVal.keys()):
|
||||
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] + " ..."
|
||||
|
||||
|
@ -1738,7 +1753,7 @@ def get_class(diction):
|
|||
if (len(retVal['pedagogie']) > MYSY_GV.MAX_CARACT_DETAIL):
|
||||
retVal['pedagogie'] = tmp_str[:MYSY_GV.MAX_CARACT_DETAIL] + " ..."
|
||||
|
||||
|
||||
retVal["text_size"] = str(text_size)
|
||||
#mycommon.myprint(" #### "+str(retVal))
|
||||
user = retVal
|
||||
RetObject.append(JSONEncoder().encode(user))
|
||||
|
@ -2465,7 +2480,7 @@ def add_class_mass(file=None, Folder=None, diction=None):
|
|||
if (part_status is False):
|
||||
mycommon.myprint(str(
|
||||
inspect.stack()[0][3]) + " - Impossible de recuperer le pack et le nombre de formations du partenaire")
|
||||
return False, " Les informations d'identification sont incorrectes"
|
||||
return False, "Votre pack / abonnement ne permet pas créer les formations. Verifiez votre abonnement "
|
||||
|
||||
"""
|
||||
Recuperation du nombre de formations actif de ce partner
|
||||
|
|
|
@ -2633,4 +2633,12 @@ def get_List_domaine_metier():
|
|||
except Exception as e:
|
||||
exc_type, exc_obj, exc_tb = sys.exc_info()
|
||||
print(str(inspect.stack()[0][3]) + " -" + str(e) + " - ERRORRRR AT Line : " + str(exc_tb.tb_lineno))
|
||||
return False, "Impossible de recuperer la liste des domaines et metiers"
|
||||
return False, "Impossible de recuperer la liste des domaines et metiers"
|
||||
|
||||
|
||||
|
||||
|
||||
def cleanhtml(raw_html):
|
||||
CLEANR = re.compile('<.*?>')
|
||||
cleantext = re.sub(CLEANR, '', raw_html).replace(" ", "")
|
||||
return cleantext
|
||||
|
|
Loading…
Reference in New Issue