26/12/2024 - 17h

master
cherif 2024-12-26 17:51:26 +01:00
parent 7b166ac272
commit 7046bb239f
6 changed files with 2024 additions and 21 deletions

View File

@ -1,12 +1,13 @@
<?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="25/12/2024 - 14h"> <list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="25/12/2024 - 22h30">
<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$/E_Sign_Document.py" beforeDir="false" afterPath="$PROJECT_DIR$/E_Sign_Document.py" 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$/Log/log_file.log" beforeDir="false" afterPath="$PROJECT_DIR$/Log/log_file.log" 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$/attached_file_mgt.py" beforeDir="false" afterPath="$PROJECT_DIR$/attached_file_mgt.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/partner_invoice.py" beforeDir="false" afterPath="$PROJECT_DIR$/partner_invoice.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ela_user_account.py" beforeDir="false" afterPath="$PROJECT_DIR$/ela_user_account.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/prj_common.py" beforeDir="false" afterPath="$PROJECT_DIR$/prj_common.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" />
@ -77,13 +78,6 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1680804787304</updated> <updated>1680804787304</updated>
</task> </task>
<task id="LOCAL-00372" summary="dddss">
<created>1723804083490</created>
<option name="number" value="00372" />
<option name="presentableId" value="LOCAL-00372" />
<option name="project" value="LOCAL" />
<updated>1723804083490</updated>
</task>
<task id="LOCAL-00373" summary="17/08/2024 - 20h55"> <task id="LOCAL-00373" summary="17/08/2024 - 20h55">
<created>1723920962711</created> <created>1723920962711</created>
<option name="number" value="00373" /> <option name="number" value="00373" />
@ -420,7 +414,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1735132675184</updated> <updated>1735132675184</updated>
</task> </task>
<option name="localTasksCounter" value="421" /> <task id="LOCAL-00421" summary="25/12/2024 - 22h30">
<created>1735161926240</created>
<option name="number" value="00421" />
<option name="presentableId" value="LOCAL-00421" />
<option name="project" value="LOCAL" />
<updated>1735161926243</updated>
</task>
<option name="localTasksCounter" value="422" />
<servers /> <servers />
</component> </component>
<component name="Vcs.Log.Tabs.Properties"> <component name="Vcs.Log.Tabs.Properties">
@ -462,7 +463,6 @@
</option> </option>
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="15/09/2024 - 18:00" />
<MESSAGE value="18/09/2024 - 21h" /> <MESSAGE value="18/09/2024 - 21h" />
<MESSAGE value="19/09/2024 - 20h" /> <MESSAGE value="19/09/2024 - 20h" />
<MESSAGE value="23/09/2024 - 17h" /> <MESSAGE value="23/09/2024 - 17h" />
@ -487,6 +487,7 @@
<MESSAGE value="14/12/2024 - 14h" /> <MESSAGE value="14/12/2024 - 14h" />
<MESSAGE value="24/12/2024 - 22h" /> <MESSAGE value="24/12/2024 - 22h" />
<MESSAGE value="25/12/2024 - 14h" /> <MESSAGE value="25/12/2024 - 14h" />
<option name="LAST_COMMIT_MESSAGE" value="25/12/2024 - 14h" /> <MESSAGE value="25/12/2024 - 22h30" />
<option name="LAST_COMMIT_MESSAGE" value="25/12/2024 - 22h30" />
</component> </component>
</project> </project>

View File

@ -7571,7 +7571,7 @@ def Get_Statgaire_List_Partner_with_filter(diction):
print(" #### recyclage_warning = ", str(recyclage_warning), " ### recyclage_warning_lead_time = ", str(recyclage_warning_lead_time)) #print(" #### recyclage_warning = ", str(recyclage_warning), " ### recyclage_warning_lead_time = ", str(recyclage_warning_lead_time))

File diff suppressed because it is too large Load Diff

View File

@ -999,6 +999,11 @@ 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() == "" ):
# 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': ''}
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'}}

View File

@ -853,7 +853,7 @@ def get_user_account(diction):
RetObject = [] RetObject = []
for retVal in coll_name.find({'token': str(token_value), 'locked': '0', 'active':'1'}): for retVal in coll_name.find({'token': str(token_value), 'locked': '0', 'active':'1'}):
mycommon.myprint(retVal) #mycommon.myprint(retVal)
user = retVal user = retVal
RetObject.append(JSONEncoder().encode(user)) RetObject.append(JSONEncoder().encode(user))
@ -954,7 +954,7 @@ def change_user_pwd(diction):
coll_name = MYSY_GV.dbname['user_account'] coll_name = MYSY_GV.dbname['user_account']
print(" le recid = "+user_recid+" mydata = "+str(mydata)) #print(" le recid = "+user_recid+" mydata = "+str(mydata))
ret_val = coll_name.find_one_and_update({'recid': user_recid, 'locked': '0', 'active':'1', 'pwd':pwd}, ret_val = coll_name.find_one_and_update({'recid': user_recid, 'locked': '0', 'active':'1', 'pwd':pwd},
{"$set": mydata}, {"$set": mydata},
return_document=ReturnDocument.AFTER return_document=ReturnDocument.AFTER
@ -1060,7 +1060,7 @@ def Reset_user_pwd_by_token(diction):
coll_name = MYSY_GV.dbname['user_account'] coll_name = MYSY_GV.dbname['user_account']
print(" le recid = "+user_recid+" mydata = "+str(mydata)) #print(" le recid = "+user_recid+" mydata = "+str(mydata))
ret_val = coll_name.find_one_and_update({'recid': user_recid, 'locked': '0', 'active':'1'}, ret_val = coll_name.find_one_and_update({'recid': user_recid, 'locked': '0', 'active':'1'},
{"$set": mydata}, {"$set": mydata},
upsert=False, upsert=False,
@ -1217,7 +1217,7 @@ def change_uer_email(diction):
coll_name = MYSY_GV.dbname['user_account'] coll_name = MYSY_GV.dbname['user_account']
print(" le recid = "+user_recid+" mydata = "+str(mydata)) #print(" le recid = "+user_recid+" mydata = "+str(mydata))
ret_val = coll_name.find_one_and_update({'recid': user_recid, 'locked': '0'}, ret_val = coll_name.find_one_and_update({'recid': user_recid, 'locked': '0'},
{"$set": mydata}, {"$set": mydata},
return_document=ReturnDocument.AFTER return_document=ReturnDocument.AFTER
@ -1695,7 +1695,7 @@ def get_user_recherche_history(diction):
RetObject = [] RetObject = []
local_id = 0 local_id = 0
for retVal in coll_name.find(query, {"_id": 0, "valide":0, "user_recid":0}): for retVal in coll_name.find(query, {"_id": 0, "valide":0, "user_recid":0}):
mycommon.myprint(retVal) #mycommon.myprint(retVal)
user = retVal user = retVal
user['id'] = str(local_id) user['id'] = str(local_id)
local_id = local_id + 1 local_id = local_id + 1

View File

@ -262,7 +262,7 @@ def check_token_validity(email="", token=""):
try : try :
coll_token = MYSY_GV.dbname['partner_token'] coll_token = MYSY_GV.dbname['partner_token']
print(" check_token_validity token == "+str(token)) #print(" check_token_validity token == "+str(token))
tmp_count = coll_token.count_documents({ 'token': str(token), 'valide': '1'}) tmp_count = coll_token.count_documents({ 'token': str(token), 'valide': '1'})
if (tmp_count <= 0): if (tmp_count <= 0):
myprint( str(inspect.stack()[0][3]) +" La session de connexion n'est pas valide") myprint( str(inspect.stack()[0][3]) +" La session de connexion n'est pas valide")