05/11/2023 - 17h

master
cherif 2023-11-05 17:28:14 +01:00
parent 58b5ad4e4e
commit 0202fe0369
3 changed files with 2161 additions and 17 deletions

View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="23/10/2023 - 16h">
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="30/10/23 - 16h">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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$/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" />
@ -74,13 +74,6 @@
<option name="presentableId" value="Default" />
<updated>1680804787304</updated>
</task>
<task id="LOCAL-00089" summary="28/08/23 - 19h30">
<created>1693331416912</created>
<option name="number" value="00089" />
<option name="presentableId" value="LOCAL-00089" />
<option name="project" value="LOCAL" />
<updated>1693331416913</updated>
</task>
<task id="LOCAL-00090" summary="30/08/23 - 14h">
<created>1693397579848</created>
<option name="number" value="00090" />
@ -417,7 +410,14 @@
<option name="project" value="LOCAL" />
<updated>1698067991141</updated>
</task>
<option name="localTasksCounter" value="138" />
<task id="LOCAL-00138" summary="30/10/23 - 16h">
<created>1698679792176</created>
<option name="number" value="00138" />
<option name="presentableId" value="LOCAL-00138" />
<option name="project" value="LOCAL" />
<updated>1698679792177</updated>
</task>
<option name="localTasksCounter" value="139" />
<servers />
</component>
<component name="Vcs.Log.Tabs.Properties">
@ -432,7 +432,6 @@
</option>
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="25/09/2023 - 16h40" />
<MESSAGE value="26/09/23 - 19h" />
<MESSAGE value="26/09/23 - 23h" />
<MESSAGE value="28/09/23 - 23h" />
@ -457,6 +456,7 @@
<MESSAGE value="22/10/2023 - 22h" />
<MESSAGE value="23/10/2023 - 13h" />
<MESSAGE value="23/10/2023 - 16h" />
<option name="LAST_COMMIT_MESSAGE" value="23/10/2023 - 16h" />
<MESSAGE value="30/10/23 - 16h" />
<option name="LAST_COMMIT_MESSAGE" value="30/10/23 - 16h" />
</component>
</project>

File diff suppressed because it is too large Load Diff

View File

@ -43,7 +43,7 @@ def Add_specific_field(diction):
try:
diction = mycommon.strip_dictionary(diction)
field_list = ['related_collection', 'field_type', 'is_mandatory', 'field_label', 'field_name',
'is_displayed','field_value', 'token']
'is_displayed','field_value', 'token', 'is_public']
incom_keys = diction.keys()
for val in incom_keys:
@ -125,6 +125,20 @@ def Add_specific_field(diction):
return False, " La valeur '" + str(is_mandatory) + "' n'est pas autorisée pour la personnalisation",
data['is_mandatory'] = is_mandatory
is_public = ""
if ("is_public" in diction.keys()):
if diction['is_public']:
is_public = diction['is_public']
if (str(is_public) not in ['0', '1']):
mycommon.myprint(
str(inspect.stack()[0][3]) + " - La valeur '" + str(
is_public) + "' n'est pas autorisée pour la personnalisation ")
return False, " La valeur '" + str(is_public) + "' n'est pas autorisée pour la personnalisation",
data['is_public'] = is_public
field_label = ""
if ("field_label" in diction.keys()):
if diction['field_label']:
@ -220,7 +234,7 @@ def Update_specific_field(diction):
try:
diction = mycommon.strip_dictionary(diction)
field_list = ['related_collection', 'field_type', 'is_mandatory', 'field_label', 'field_name',
'is_displayed', 'field_value', '_id', 'token']
'is_displayed', 'field_value', '_id', 'token', 'is_public']
incom_keys = diction.keys()
for val in incom_keys:
@ -233,7 +247,7 @@ def Update_specific_field(diction):
Verification des champs obligatoires
"""
field_list_obligatoire = ['related_collection', 'field_type', 'is_mandatory', 'field_name',
'_id', 'token']
'_id', 'token', ]
for val in field_list_obligatoire:
if val not in diction:
@ -334,6 +348,18 @@ def Update_specific_field(diction):
return False, " La valeur '" + str(is_mandatory) + "' n'est pas autorisée pour la personnalisation",
data['is_mandatory'] = is_mandatory
is_public = ""
if ("is_public" in diction.keys()):
is_public = diction['is_public']
if (str(is_public) not in ['0', '1']):
mycommon.myprint(
str(inspect.stack()[0][3]) + " - La valeur '" + str(
is_public) + "' n'est pas autorisée pour la personnalisation ")
return False, " La valeur '" + str(is_public) + "' n'est pas autorisée pour la personnalisation",
data['is_public'] = is_public
field_label = ""
if ("field_label" in diction.keys()):
field_label = diction['field_label']
@ -456,7 +482,7 @@ def get_given_specific_field(diction):
data_cle['valide'] = "1"
data_cle['locked'] = "0"
print(" ### data_cle = ", data_cle)
#print(" ### data_cle = ", data_cle)
RetObject = []
val_tmp = 1
@ -564,7 +590,7 @@ def delete_given_specific_field(diction):
Verification qu'il n'existe aucun enregistrement avec une valeur pour ce champ
"""
local_qry = { str(personnalized_field_data['field_name']) : { '$exists' : True, '$ne': "" } }
print(" #### delete_given_specific_field local_qry = ", local_qry)
#print(" #### delete_given_specific_field local_qry = ", local_qry)
is_record_exist_count = MYSY_GV.dbname[str(personnalized_field_data['related_collection'])].count_documents(local_qry)
if( is_record_exist_count > 0 ):