17/01/2025 - 15:30

master
cherif 2025-01-17 15:38:56 +01:00
parent 005926cc98
commit 43a9ef8a79
5 changed files with 6076 additions and 21 deletions

View File

@ -1,15 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="04/01/2025 - 14h48"> <list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="16/01/2025 - 16h30">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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$/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$/Log/log_file.log" beforeDir="false" afterPath="$PROJECT_DIR$/Log/log_file.log" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Session_Formation_Sequence.py" beforeDir="false" afterPath="$PROJECT_DIR$/Session_Formation_Sequence.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/attached_file_mgt.py" beforeDir="false" afterPath="$PROJECT_DIR$/attached_file_mgt.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/base_partner_session_step.py" beforeDir="false" afterPath="$PROJECT_DIR$/base_partner_session_step.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/partner_client.py" beforeDir="false" afterPath="$PROJECT_DIR$/partner_client.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/partners.py" beforeDir="false" afterPath="$PROJECT_DIR$/partners.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/tools_cherif/tools_cherif.py" beforeDir="false" afterPath="$PROJECT_DIR$/tools_cherif/tools_cherif.py" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -80,13 +77,6 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1680804787304</updated> <updated>1680804787304</updated>
</task> </task>
<task id="LOCAL-00379" summary="ss">
<created>1724424786372</created>
<option name="number" value="00379" />
<option name="presentableId" value="LOCAL-00379" />
<option name="project" value="LOCAL" />
<updated>1724424786373</updated>
</task>
<task id="LOCAL-00380" summary="ddd"> <task id="LOCAL-00380" summary="ddd">
<created>1724497994599</created> <created>1724497994599</created>
<option name="number" value="00380" /> <option name="number" value="00380" />
@ -423,7 +413,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1735999170271</updated> <updated>1735999170271</updated>
</task> </task>
<option name="localTasksCounter" value="428" /> <task id="LOCAL-00428" summary="16/01/2025 - 16h30">
<created>1737042254589</created>
<option name="number" value="00428" />
<option name="presentableId" value="LOCAL-00428" />
<option name="project" value="LOCAL" />
<updated>1737042254590</updated>
</task>
<option name="localTasksCounter" value="429" />
<servers /> <servers />
</component> </component>
<component name="Vcs.Log.Tabs.Properties"> <component name="Vcs.Log.Tabs.Properties">
@ -465,7 +462,6 @@
</option> </option>
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="05/10/2024 - 12h" />
<MESSAGE value="05/10/2024 - 18h30" /> <MESSAGE value="05/10/2024 - 18h30" />
<MESSAGE value="07/10/2024 - 20h30" /> <MESSAGE value="07/10/2024 - 20h30" />
<MESSAGE value="12/10/204 - 18h" /> <MESSAGE value="12/10/204 - 18h" />
@ -490,6 +486,7 @@
<MESSAGE value="31/12/2024 - 12h30" /> <MESSAGE value="31/12/2024 - 12h30" />
<MESSAGE value="03/01/2025 - 17h30" /> <MESSAGE value="03/01/2025 - 17h30" />
<MESSAGE value="04/01/2025 - 14h48" /> <MESSAGE value="04/01/2025 - 14h48" />
<option name="LAST_COMMIT_MESSAGE" value="04/01/2025 - 14h48" /> <MESSAGE value="16/01/2025 - 16h30" />
<option name="LAST_COMMIT_MESSAGE" value="16/01/2025 - 16h30" />
</component> </component>
</project> </project>

View File

@ -876,4 +876,6 @@ VOICE_INSTRUCTION_ANNULATION = ["annuler", "annulle", "refus", "refuser"]
""" """
Gestion du context de connexion d'un partenaire Gestion du context de connexion d'un partenaire
""" """
PARTNER_ACCOUNT_CONNEXION_CONTEXT_VALUES = ['mysy_session_display_view', 'mysy_menu_gauche_reduit'] PARTNER_ACCOUNT_CONNEXION_CONTEXT_VALUES = ['mysy_session_display_view',
'mysy_menu_gauche_reduit',
'mysy_catalog_data_row_grouped_by']

File diff suppressed because it is too large Load Diff

View File

@ -1000,14 +1000,17 @@ def Get_List_object_owner_collection_Stored_Files_With_Filter(diction):
filt_type_document = {} filt_type_document = {}
if ("filter_type_document" in diction.keys() and diction['filter_type_document'] ): if ("filter_type_document" in diction.keys() and diction['filter_type_document'] ):
if( str(diction['filter_type_document']).strip().lower() == "autre" or str(diction['filter_type_document']).strip().lower() == "" ): if( str(diction['filter_type_document']).strip().lower() == "alltypedocument" ):
# Il faut faire une recherche sur touts les types de document, ca reviens à laisser le filtre vide, a ne rien filtrer
filt_type_document = {}
elif( str(diction['filter_type_document']).strip().lower() == "autre" or str(diction['filter_type_document']).strip().lower() == "" ):
# Si la valeur du type de document est 'autre' ou vide, alors filtre sur tous les document avec la valeur 'type_document' = '' # Si la valeur du type de document est 'autre' ou vide, alors filtre sur tous les document avec la valeur 'type_document' = ''
filt_type_document = {'type_document': ''} filt_type_document = {'type_document': ''}
else: else:
filt_type_document = {'type_document': {'$regex': "^"+str(diction['filter_type_document'])+"$", "$options": 'i'}} filt_type_document = {'type_document': {'$regex': "^"+str(diction['filter_type_document'])+"$", "$options": 'i'}}
filt_date_create_start_date = "" filt_date_create_start_date = ""
if ("date_create_start_date" in diction.keys() and diction['date_create_start_date']): if ("date_create_start_date" in diction.keys() and diction['date_create_start_date']):
filt_date_create_start_date = str(diction['date_create_start_date'])[0:10] filt_date_create_start_date = str(diction['date_create_start_date'])[0:10]

View File

@ -47,7 +47,8 @@ def Add_Update_Partner_session_step(diction):
""" """
Verification des input acceptés Verification des input acceptés
""" """
field_list = ['token', 'session_step_name', 'session_step_sequence', 'session_step_comment'] field_list = ['token', 'session_step_name', 'session_step_sequence', 'session_step_comment',
'session_step_color']
incom_keys = diction.keys() incom_keys = diction.keys()
for val in incom_keys: for val in incom_keys:
@ -95,6 +96,11 @@ def Add_Update_Partner_session_step(diction):
if( "session_step_comment" in diction.keys()): if( "session_step_comment" in diction.keys()):
my_data['session_step_comment'] = str(diction['session_step_comment']) my_data['session_step_comment'] = str(diction['session_step_comment'])
if ("session_step_color" in diction.keys()):
my_data['session_step_color'] = str(diction['session_step_color'])
else:
my_data['session_step_color'] = "#e0e0e0"
my_data['valide'] = "1" my_data['valide'] = "1"
my_data['locked'] = "0" my_data['locked'] = "0"
my_data['date_update'] = str(datetime.now()) my_data['date_update'] = str(datetime.now())
@ -260,6 +266,14 @@ def Get_List_Partner_Or_Default_session_step(diction):
[("session_step_sequence", pymongo.ASCENDING)]): [("session_step_sequence", pymongo.ASCENDING)]):
user = New_retVal user = New_retVal
user['id'] = str(val_tmp) user['id'] = str(val_tmp)
if( "session_step_comment" not in user.keys() ):
user['session_step_comment'] = ""
if ("session_step_color" not in user.keys()):
user['session_step_color'] = "#e0e0e0"
val_tmp = val_tmp + 1 val_tmp = val_tmp + 1
RetObject.append(mycommon.JSONEncoder().encode(user)) RetObject.append(mycommon.JSONEncoder().encode(user))
@ -337,6 +351,13 @@ def Get_List_Partner_session_step(diction):
user = New_retVal user = New_retVal
user['id'] = str(val_tmp) user['id'] = str(val_tmp)
if ("session_step_comment" not in user.keys()):
user['session_step_comment'] = ""
if ("session_step_color" not in user.keys()):
user['session_step_color'] = "#e0e0e0"
val_tmp = val_tmp + 1 val_tmp = val_tmp + 1
RetObject.append(mycommon.JSONEncoder().encode(user)) RetObject.append(mycommon.JSONEncoder().encode(user))
@ -409,6 +430,13 @@ def Get_Given_Partner_session_step(diction):
for New_retVal in MYSY_GV.dbname['base_partner_session_step'].find({'partner_owner_recid':str(my_partner['recid']), 'valide':'1', for New_retVal in MYSY_GV.dbname['base_partner_session_step'].find({'partner_owner_recid':str(my_partner['recid']), 'valide':'1',
'locked':'0', 'session_step_name':str(diction['session_step_name'])}): 'locked':'0', 'session_step_name':str(diction['session_step_name'])}):
user = New_retVal user = New_retVal
if ("session_step_comment" not in user.keys()):
user['session_step_comment'] = ""
if ("session_step_color" not in user.keys()):
user['session_step_color'] = "#e0e0e0"
param_retval_value = str(New_retVal['session_step_sequence']) param_retval_value = str(New_retVal['session_step_sequence'])
@ -420,6 +448,12 @@ def Get_Given_Partner_session_step(diction):
{'partner_owner_recid': "default", 'valide': '1', {'partner_owner_recid': "default", 'valide': '1',
'locked': '0', 'session_step_name': str(diction['session_step_name'])}): 'locked': '0', 'session_step_name': str(diction['session_step_name'])}):
user = New_retVal user = New_retVal
if ("session_step_comment" not in user.keys()):
user['session_step_comment'] = ""
if ("session_step_color" not in user.keys()):
user['session_step_color'] = "#e0e0e0"
param_retval_value = str(New_retVal['session_step_sequence']) param_retval_value = str(New_retVal['session_step_sequence'])
retval_json = {} retval_json = {}