17/11/2023 - 16h

master
cherif 2023-11-17 16:04:46 +01:00
parent bc916dd226
commit 9d3887bf7d
5 changed files with 1675 additions and 7 deletions

View File

@ -2,11 +2,11 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="15/11/2023 - 21h">
<change afterPath="$PROJECT_DIR$/base_partner_session_step.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/GlobalVariable.py" beforeDir="false" afterPath="$PROJECT_DIR$/GlobalVariable.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$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/base_specific_fields.py" beforeDir="false" afterPath="$PROJECT_DIR$/base_specific_fields.py" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

View File

@ -538,3 +538,9 @@ Les types de location pour une session (intra ou extra ou autre)
"""
TRAINING_LOCATION_TYPE = ['intra', 'extra', 'autre', '']
"""
Gestion des champs spécifique : Type de champs autorisé
"""
SPECIFIC_FIELD_TYPE = ['float', 'string']

File diff suppressed because it is too large Load Diff

View File

@ -871,7 +871,7 @@ def GetAllValideSessionPartner_List(diction):
'localField': 'class_internal_url',
'foreignField':'internal_url',
'pipeline': [{'$match': filt_class_partner_recid}, {'$project': {'title': 1, 'domaine': 1,
'duration': 1, 'duration_unit': 1, 'external_code':1}}],
'duration': 1, 'duration_unit': 1, 'external_code':1, 'published':1}}],
'as': 'myclass_collection'
}
}
@ -945,6 +945,7 @@ def GetAllValideSessionPartner_List(diction):
val['prix_session'] = retVal['prix_session']
val['title'] = retVal['myclass_collection'][0]['title']
val['class_published'] = retVal['myclass_collection'][0]['published']
val['domaine'] = retVal['myclass_collection'][0]['domaine']
val['class_external_code'] = retVal['myclass_collection'][0]['external_code']

View File

@ -105,7 +105,7 @@ def Add_specific_field(diction):
if diction['field_type']:
field_type = diction['field_type']
if (str(field_type) not in ['float', 'string']):
if (str(field_type) not in MYSY_GV.SPECIFIC_FIELD_TYPE):
mycommon.myprint(
str(inspect.stack()[0][3]) + " - La valeur '" + str(
field_type) + "' n'est pas autorisée pour la personnalisation ")
@ -174,8 +174,8 @@ def Add_specific_field(diction):
if(str(field_name_val_saisie).isalnum() is False ):
mycommon.myprint(
str(inspect.stack()[0][3]) + " - La valeur '" + str(
field_name_val_saisie) + "' n'est pas alphanumérique ")
return False, " La valeur '" + str(field_name_val_saisie) + "' n'est pas alphanumérique ",
field_name_val_saisie) + "' contient des caractères non alphanumériques ")
return False, " La valeur '" + str(field_name_val_saisie) + "' contient des caractères non alphanumériques ",
data['field_name'] = field_name
@ -329,7 +329,7 @@ def Update_specific_field(diction):
if ("field_type" in diction.keys()):
field_type = diction['field_type']
if (str(field_type) not in ['float', 'string']):
if (str(field_type) not in MYSY_GV.SPECIFIC_FIELD_TYPE ):
mycommon.myprint(
str(inspect.stack()[0][3]) + " - La valeur '" + str(
field_type) + "' n'est pas autorisée pour la personnalisation ")