23/09/2024 - 17h

master
cherif 2024-09-23 17:38:37 +02:00
parent bd1eb71267
commit 39e6be33f8
4 changed files with 7033 additions and 13 deletions

View File

@ -1,9 +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="18/09/2024 - 21h">
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="19/09/2024 - 20h">
<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$/base_partner_catalog_config.py" beforeDir="false" afterPath="$PROJECT_DIR$/base_partner_catalog_config.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" />
@ -74,13 +75,6 @@
<option name="presentableId" value="Default" />
<updated>1680804787304</updated>
</task>
<task id="LOCAL-00349" summary="11/07/2024 - 13h14">
<created>1720853546536</created>
<option name="number" value="00349" />
<option name="presentableId" value="LOCAL-00349" />
<option name="project" value="LOCAL" />
<updated>1720853546538</updated>
</task>
<task id="LOCAL-00350" summary="13/07/2024 - 22h">
<created>1720900252716</created>
<option name="number" value="00350" />
@ -417,7 +411,14 @@
<option name="project" value="LOCAL" />
<updated>1726686298939</updated>
</task>
<option name="localTasksCounter" value="398" />
<task id="LOCAL-00398" summary="19/09/2024 - 20h">
<created>1726770477810</created>
<option name="number" value="00398" />
<option name="presentableId" value="LOCAL-00398" />
<option name="project" value="LOCAL" />
<updated>1726770477810</updated>
</task>
<option name="localTasksCounter" value="399" />
<servers />
</component>
<component name="Vcs.Log.Tabs.Properties">
@ -459,7 +460,6 @@
</option>
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="17/08/2024 - 20h55" />
<MESSAGE value="18/08/2024 - 16h55" />
<MESSAGE value="18/08/2024 - 21h55" />
<MESSAGE value="20/08/2024 - 13h55" />
@ -484,6 +484,7 @@
<MESSAGE value="12/09/2024 - 13:00" />
<MESSAGE value="15/09/2024 - 18:00" />
<MESSAGE value="18/09/2024 - 21h" />
<option name="LAST_COMMIT_MESSAGE" value="18/09/2024 - 21h" />
<MESSAGE value="19/09/2024 - 20h" />
<option name="LAST_COMMIT_MESSAGE" value="19/09/2024 - 20h" />
</component>
</project>

File diff suppressed because it is too large Load Diff

View File

@ -107,7 +107,13 @@ def Add_Update_Partner_Catalog_Pub_Config(diction):
Verification des input acceptés
"""
field_list = ['token', '_id','logo', 'message_1_txt', 'theme_id', 'banniere_img', 'message_2_txt',
'message_3_txt']
'message_3_txt', 'message_1_color', 'message_1_gras', 'message_2_color', 'message_2_gras',
'message_3_color', 'message_3_gras','message_1_taille', 'message_2_taille', 'message_3_taille',
'indicateur_1_txt', 'indicateur_1_taille','indicateur_1_color', 'indicateur_1_gras',
'indicateur_2_txt', 'indicateur_2_taille', 'indicateur_2_color', 'indicateur_2_gras',
'indicateur_3_txt', 'indicateur_3_taille', 'indicateur_3_color', 'indicateur_3_gras',
'indicateur_4_txt', 'indicateur_4_taille', 'indicateur_4_color', 'indicateur_4_gras',
]
incom_keys = diction.keys()
for val in incom_keys:
@ -232,7 +238,7 @@ def Get_Partner_Catalog_Pub_Config(diction):
data_cle['valide'] = "1"
data_cle['locked'] = "0"
print(" ### data_cle = ", data_cle)
#print(" ### data_cle = ", data_cle)
RetObject = []
val_tmp = 0

View File

@ -6394,14 +6394,58 @@ def Get_Partner_Data_From_Subdomain(diction):
if (config_partner_catalog_data and "message_1_txt" in config_partner_catalog_data.keys()):
user['catalog_pub_message_1_txt'] = config_partner_catalog_data['message_1_txt']
user['catalog_pub_message_1_taille'] = ""
if (config_partner_catalog_data and "message_1_taille" in config_partner_catalog_data.keys()):
user['catalog_pub_message_1_taille'] = config_partner_catalog_data['message_1_taille']
user['catalog_pub_message_1_color'] = ""
if (config_partner_catalog_data and "message_1_color" in config_partner_catalog_data.keys()):
user['catalog_pub_message_1_color'] = config_partner_catalog_data['message_1_color']
user['catalog_pub_message_1_gras'] = ""
if (config_partner_catalog_data and "message_1_gras" in config_partner_catalog_data.keys()):
user['catalog_pub_message_1_gras'] = config_partner_catalog_data['message_1_gras']
user['catalog_pub_message_2_txt'] = ""
if (config_partner_catalog_data and "message_2_txt" in config_partner_catalog_data.keys()):
user['catalog_pub_message_2_txt'] = config_partner_catalog_data['message_2_txt']
user['catalog_pub_message_2_taille'] = ""
if (config_partner_catalog_data and "message_2_taille" in config_partner_catalog_data.keys()):
user['catalog_pub_message_2_taille'] = config_partner_catalog_data['message_2_taille']
user['catalog_pub_message_2_color'] = ""
if (config_partner_catalog_data and "message_2_color" in config_partner_catalog_data.keys()):
user['catalog_pub_message_2_color'] = config_partner_catalog_data['message_2_color']
user['catalog_pub_message_2_gras'] = ""
if (config_partner_catalog_data and "message_2_gras" in config_partner_catalog_data.keys()):
user['catalog_pub_message_2_gras'] = config_partner_catalog_data['message_2_gras']
user['catalog_pub_message_3_txt'] = ""
if (config_partner_catalog_data and "message_3_txt" in config_partner_catalog_data.keys()):
user['catalog_pub_message_3_txt'] = config_partner_catalog_data['message_3_txt']
user['catalog_pub_message_3_taille'] = ""
if (config_partner_catalog_data and "message_3_taille" in config_partner_catalog_data.keys()):
user['catalog_pub_message_3_taille'] = config_partner_catalog_data['message_3_taille']
user['catalog_pub_message_3_color'] = ""
if (config_partner_catalog_data and "message_3_color" in config_partner_catalog_data.keys()):
user['catalog_pub_message_3_color'] = config_partner_catalog_data['message_3_color']
user['catalog_pub_message_3_gras'] = ""
if (config_partner_catalog_data and "message_3_gras" in config_partner_catalog_data.keys()):
user['catalog_pub_message_3_gras'] = config_partner_catalog_data['message_3_gras']
user['catalog_pub_banniere_img'] = ""
if (config_partner_catalog_data and "banniere_img" in config_partner_catalog_data.keys()):