26/07/2024 - 12h

master
cherif 2024-07-26 14:30:43 +02:00
parent ef539f1492
commit 8cfff6e486
5 changed files with 4021 additions and 12 deletions

View File

@ -2,7 +2,11 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="23/07/2024 - 12h"> <list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="23/07/2024 - 12h">
<change beforePath="$PROJECT_DIR$/module_editique.py" beforeDir="false" afterPath="$PROJECT_DIR$/module_editique.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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$/email_mgt.py" beforeDir="false" afterPath="$PROJECT_DIR$/email_mgt.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.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" />
@ -72,13 +76,6 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1680804787304</updated> <updated>1680804787304</updated>
</task> </task>
<task id="LOCAL-00309" summary="21/05/2024 - 21h">
<created>1716318314386</created>
<option name="number" value="00309" />
<option name="presentableId" value="LOCAL-00309" />
<option name="project" value="LOCAL" />
<updated>1716318314387</updated>
</task>
<task id="LOCAL-00310" summary="sdsqq"> <task id="LOCAL-00310" summary="sdsqq">
<created>1716399333864</created> <created>1716399333864</created>
<option name="number" value="00310" /> <option name="number" value="00310" />
@ -415,7 +412,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1721725653358</updated> <updated>1721725653358</updated>
</task> </task>
<option name="localTasksCounter" value="358" /> <task id="LOCAL-00358" summary="23/07/2024 - 12h">
<created>1721725677746</created>
<option name="number" value="00358" />
<option name="presentableId" value="LOCAL-00358" />
<option name="project" value="LOCAL" />
<updated>1721725677746</updated>
</task>
<option name="localTasksCounter" value="359" />
<servers /> <servers />
</component> </component>
<component name="Vcs.Log.Tabs.Properties"> <component name="Vcs.Log.Tabs.Properties">

View File

@ -130,8 +130,15 @@ def AddStagiairetoClass(diction):
'locked':'0', 'locked':'0',
'partner_owner_recid':str(my_partner['recid'])}) 'partner_owner_recid':str(my_partner['recid'])})
mydata = {} mydata = {}
# Initialisation des champs non envoyés à vide
for val in field_list:
if val not in diction.keys():
mydata[str(val)] = ""
# Initialisation des champs non envoyés à vide # Initialisation des champs non envoyés à vide
for val in field_list: for val in field_list:
if val not in diction.keys(): if val not in diction.keys():
@ -321,13 +328,14 @@ def AddStagiairetoClass(diction):
""" """
11/07/2024 - si j'ai un client_client, mais pas de client facturé, alors on fait : client_facturé = client_client 11/07/2024 - si j'ai un client_client, mais pas de client facturé, alors on fait : client_facturé = client_client
""" """
if (len(str(mydata['facture_client_rattachement_id']).strip()) <= 1 and len(str(mydata['client_rattachement_id']).strip()) > 3):
if ("facture_client_rattachement_id" in mydata.keys() and len(str(mydata['facture_client_rattachement_id']).strip()) <= 1 and len(str(mydata['client_rattachement_id']).strip()) > 3):
mydata['facture_client_rattachement_id'] = str(mydata['client_rattachement_id']) mydata['facture_client_rattachement_id'] = str(mydata['client_rattachement_id'])
""" """
11/07/2024 - si j'ai un client facture , mais pas de client_client, alors on fait : client_client = client_facturé 11/07/2024 - si j'ai un client facture , mais pas de client_client, alors on fait : client_client = client_facturé
""" """
if (len(str(mydata['client_rattachement_id']).strip()) <= 1 and len( if ("client_rattachement_id" in mydata.keys() and len(str(mydata['client_rattachement_id']).strip()) <= 1 and len(
str(mydata['facture_client_rattachement_id']).strip()) > 3): str(mydata['facture_client_rattachement_id']).strip()) > 3):
mydata['client_rattachement_id'] = str(mydata['facture_client_rattachement_id']) mydata['client_rattachement_id'] = str(mydata['facture_client_rattachement_id'])

File diff suppressed because it is too large Load Diff

View File

@ -1648,6 +1648,7 @@ def EmailDemandeInfoClass( diction):
return False, " Impossible de récupérer le modèle de courrier 'CLASS_INFO_REQUEST' (2) " return False, " Impossible de récupérer le modèle de courrier 'CLASS_INFO_REQUEST' (2) "
sujet_doc_Template = jinja2.Template(str(courrier_template_data['sujet'])) sujet_doc_Template = jinja2.Template(str(courrier_template_data['sujet']))
sujetHtml = sujet_doc_Template.render(params=body_company_data["params"]) sujetHtml = sujet_doc_Template.render(params=body_company_data["params"])

View File

@ -605,7 +605,7 @@ sans utilisation de critère ni de tag
def recherche_text_simple(): def recherche_text_simple():
# On recupere le corps (payload) de la requete # On recupere le corps (payload) de la requete
payload = mycommon.strip_dictionary (request.form.to_dict()) payload = mycommon.strip_dictionary (request.form.to_dict())
#print(" ### payload = ", payload) print(" ### recherche_text_simple : payload = ", payload)
status, result = wp.recherche_text_simple(payload) status, result = wp.recherche_text_simple(payload)
return jsonify(status=status, message=result) return jsonify(status=status, message=result)