12/04/2024 - 15h05
parent
12ea821678
commit
fc9d7e5f02
|
@ -1,9 +1,11 @@
|
||||||
<?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="10/04/2024 - 22h50">
|
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="11/04/2024 - 17h02">
|
||||||
<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$/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$/class_mgt.py" beforeDir="false" afterPath="$PROJECT_DIR$/class_mgt.py" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/module_editique.py" beforeDir="false" afterPath="$PROJECT_DIR$/module_editique.py" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/ressources_humaines.py" beforeDir="false" afterPath="$PROJECT_DIR$/ressources_humaines.py" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/ressources_humaines.py" beforeDir="false" afterPath="$PROJECT_DIR$/ressources_humaines.py" afterDir="false" />
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
|
@ -74,13 +76,6 @@
|
||||||
<option name="presentableId" value="Default" />
|
<option name="presentableId" value="Default" />
|
||||||
<updated>1680804787304</updated>
|
<updated>1680804787304</updated>
|
||||||
</task>
|
</task>
|
||||||
<task id="LOCAL-00217" summary="09/02/24 - 22h">
|
|
||||||
<created>1707512374459</created>
|
|
||||||
<option name="number" value="00217" />
|
|
||||||
<option name="presentableId" value="LOCAL-00217" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1707512374460</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00218" summary="09/02/24 - 22hqsdsq">
|
<task id="LOCAL-00218" summary="09/02/24 - 22hqsdsq">
|
||||||
<created>1707599836404</created>
|
<created>1707599836404</created>
|
||||||
<option name="number" value="00218" />
|
<option name="number" value="00218" />
|
||||||
|
@ -417,7 +412,14 @@
|
||||||
<option name="project" value="LOCAL" />
|
<option name="project" value="LOCAL" />
|
||||||
<updated>1712781951219</updated>
|
<updated>1712781951219</updated>
|
||||||
</task>
|
</task>
|
||||||
<option name="localTasksCounter" value="266" />
|
<task id="LOCAL-00266" summary="11/04/2024 - 17h02">
|
||||||
|
<created>1712847771191</created>
|
||||||
|
<option name="number" value="00266" />
|
||||||
|
<option name="presentableId" value="LOCAL-00266" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1712847771191</updated>
|
||||||
|
</task>
|
||||||
|
<option name="localTasksCounter" value="267" />
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
<component name="Vcs.Log.Tabs.Properties">
|
<component name="Vcs.Log.Tabs.Properties">
|
||||||
|
@ -459,7 +461,6 @@
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="VcsManagerConfiguration">
|
<component name="VcsManagerConfiguration">
|
||||||
<MESSAGE value="ddd" />
|
|
||||||
<MESSAGE value="ddds" />
|
<MESSAGE value="ddds" />
|
||||||
<MESSAGE value="10/03/24 - 21h" />
|
<MESSAGE value="10/03/24 - 21h" />
|
||||||
<MESSAGE value="11/03/2024 - 15h" />
|
<MESSAGE value="11/03/2024 - 15h" />
|
||||||
|
@ -484,6 +485,7 @@
|
||||||
<MESSAGE value="09/04/2024 - 23h50" />
|
<MESSAGE value="09/04/2024 - 23h50" />
|
||||||
<MESSAGE value="10/04/2024 - 11h50" />
|
<MESSAGE value="10/04/2024 - 11h50" />
|
||||||
<MESSAGE value="10/04/2024 - 22h50" />
|
<MESSAGE value="10/04/2024 - 22h50" />
|
||||||
<option name="LAST_COMMIT_MESSAGE" value="10/04/2024 - 22h50" />
|
<MESSAGE value="11/04/2024 - 17h02" />
|
||||||
|
<option name="LAST_COMMIT_MESSAGE" value="11/04/2024 - 17h02" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
5019
Log/log_file.log
5019
Log/log_file.log
File diff suppressed because one or more lines are too long
|
@ -3401,7 +3401,7 @@ def add_class_mass(file=None, Folder=None, diction=None):
|
||||||
|
|
||||||
clean_dict = {k: mydata[k] for k in mydata if ( str(mydata[k]) != "nan") }
|
clean_dict = {k: mydata[k] for k in mydata if ( str(mydata[k]) != "nan") }
|
||||||
|
|
||||||
status, retval = add_class(clean_dict)
|
status, retval, class_id = add_class(clean_dict)
|
||||||
|
|
||||||
if( status is False ):
|
if( status is False ):
|
||||||
return status, retval
|
return status, retval
|
||||||
|
|
|
@ -740,6 +740,7 @@ def Init_And_Update_courrier_template_tracking_With_Partner_Data(my_partner):
|
||||||
key_data['valide'] = "1"
|
key_data['valide'] = "1"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
new_retval_data = MYSY_GV.dbname['courrier_template_tracking'].find_one_and_update(key_data,
|
new_retval_data = MYSY_GV.dbname['courrier_template_tracking'].find_one_and_update(key_data,
|
||||||
{"$set": new_data},
|
{"$set": new_data},
|
||||||
upsert=True,
|
upsert=True,
|
||||||
|
@ -792,6 +793,14 @@ def Editic_Log_History_Action(my_partner, courrier_template_data, related_collec
|
||||||
if( "courrier_template_type_document_ref_interne" in courrier_template_data.keys() ):
|
if( "courrier_template_type_document_ref_interne" in courrier_template_data.keys() ):
|
||||||
courrier_template_type_document_ref_interne = courrier_template_data['courrier_template_type_document_ref_interne']
|
courrier_template_type_document_ref_interne = courrier_template_data['courrier_template_type_document_ref_interne']
|
||||||
|
|
||||||
|
|
||||||
|
local_qry = {'partner_owner_recid':str(my_partner['recid']),
|
||||||
|
'valide':'1',
|
||||||
|
'locked':'0',
|
||||||
|
'courrier_template_type_document_ref_interne':str(courrier_template_type_document_ref_interne)}
|
||||||
|
|
||||||
|
print(" ### 0123 local_qry = ", local_qry)
|
||||||
|
|
||||||
courrier_template_tracking_id = ""
|
courrier_template_tracking_id = ""
|
||||||
courrier_template_tracking_data = MYSY_GV.dbname['courrier_template_tracking'].find_one({'partner_owner_recid':str(my_partner['recid']),
|
courrier_template_tracking_data = MYSY_GV.dbname['courrier_template_tracking'].find_one({'partner_owner_recid':str(my_partner['recid']),
|
||||||
'valide':'1',
|
'valide':'1',
|
||||||
|
@ -799,7 +808,7 @@ def Editic_Log_History_Action(my_partner, courrier_template_data, related_collec
|
||||||
'courrier_template_type_document_ref_interne':str(courrier_template_type_document_ref_interne)})
|
'courrier_template_type_document_ref_interne':str(courrier_template_type_document_ref_interne)})
|
||||||
if(courrier_template_tracking_data is None ):
|
if(courrier_template_tracking_data is None ):
|
||||||
mycommon.myprint(
|
mycommon.myprint(
|
||||||
" WARNING impossible de recuperer le 'courrier_template_tracking' ")
|
" WARNING impossible de recuperer le 'courrier_template_tracking' 11 ")
|
||||||
return True, " WARNING impossible de récuperer le 'courrier_template_tracking' "
|
return True, " WARNING impossible de récuperer le 'courrier_template_tracking' "
|
||||||
|
|
||||||
|
|
||||||
|
@ -862,7 +871,7 @@ def Editic_Log_History_Action_From_courrier_template_type_document_ref_interne(m
|
||||||
'locked':'0',
|
'locked':'0',
|
||||||
'courrier_template_type_document_ref_interne':str(courrier_template_type_document_ref_interne)}
|
'courrier_template_type_document_ref_interne':str(courrier_template_type_document_ref_interne)}
|
||||||
|
|
||||||
#print(" #### qry = ,", qry)
|
print(" #### qry = ,", qry)
|
||||||
|
|
||||||
courrier_template_tracking_data = MYSY_GV.dbname['courrier_template_tracking'].find_one({'partner_owner_recid':str(my_partner['recid']),
|
courrier_template_tracking_data = MYSY_GV.dbname['courrier_template_tracking'].find_one({'partner_owner_recid':str(my_partner['recid']),
|
||||||
'valide':'1',
|
'valide':'1',
|
||||||
|
@ -870,7 +879,7 @@ def Editic_Log_History_Action_From_courrier_template_type_document_ref_interne(m
|
||||||
'courrier_template_type_document_ref_interne':str(courrier_template_type_document_ref_interne)})
|
'courrier_template_type_document_ref_interne':str(courrier_template_type_document_ref_interne)})
|
||||||
if(courrier_template_tracking_data is None ):
|
if(courrier_template_tracking_data is None ):
|
||||||
mycommon.myprint(
|
mycommon.myprint(
|
||||||
" WARNING impossible de recuperer le 'courrier_template_tracking' ")
|
" WARNING impossible de recuperer le 'courrier_template_tracking' 12 ")
|
||||||
return True, " WARNING impossible de récuperer le 'courrier_template_tracking' "
|
return True, " WARNING impossible de récuperer le 'courrier_template_tracking' "
|
||||||
|
|
||||||
else:
|
else:
|
||||||
|
@ -908,7 +917,7 @@ def Editic_Log_History_Action_From_courrier_template_type_document_ref_interne(m
|
||||||
history_data_to_log['target_collection_recid'] = local_target_collection_recid
|
history_data_to_log['target_collection_recid'] = local_target_collection_recid
|
||||||
|
|
||||||
|
|
||||||
#print( "#### history_data_to_log = ", history_data_to_log)
|
print( "#### history_data_to_log = ", history_data_to_log)
|
||||||
MYSY_GV.dbname['courrier_template_tracking_history'].insert_one(history_data_to_log)
|
MYSY_GV.dbname['courrier_template_tracking_history'].insert_one(history_data_to_log)
|
||||||
|
|
||||||
return True, " L'évènement Editique a été correctement enregistré "
|
return True, " L'évènement Editique a été correctement enregistré "
|
||||||
|
|
|
@ -2488,7 +2488,7 @@ def Add_Ressource_Humaine_mass(file=None, Folder=None, diction=None):
|
||||||
df['civilite'].values[n]) + "- est invalide. Les valeurs autorisées : 'm', 'mme', 'neutre' "
|
df['civilite'].values[n]) + "- est invalide. Les valeurs autorisées : 'm', 'mme', 'neutre' "
|
||||||
|
|
||||||
|
|
||||||
mydata['civilite'] = str(civilite).lower()
|
mydata['civilite'] = str(civilite).lower().strip()
|
||||||
|
|
||||||
|
|
||||||
ville = ""
|
ville = ""
|
||||||
|
|
Loading…
Reference in New Issue