master
cherif 2024-03-10 14:49:49 +01:00
parent 40cff9ddc9
commit 9f183fd518
3 changed files with 2447 additions and 16 deletions

View File

@ -1,14 +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="07/03/2024 - 22h30">
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="ddd">
<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$/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$/Session_Formation.py" beforeDir="false" afterPath="$PROJECT_DIR$/Session_Formation.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/apprenant_mgt.py" beforeDir="false" afterPath="$PROJECT_DIR$/apprenant_mgt.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/prj_common.py" beforeDir="false" afterPath="$PROJECT_DIR$/prj_common.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ressources_humaines.py" beforeDir="false" afterPath="$PROJECT_DIR$/ressources_humaines.py" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -78,13 +74,6 @@
<option name="presentableId" value="Default" />
<updated>1680804787304</updated>
</task>
<task id="LOCAL-00190" summary="06/01/24 - 20h30">
<created>1704570649680</created>
<option name="number" value="00190" />
<option name="presentableId" value="LOCAL-00190" />
<option name="project" value="LOCAL" />
<updated>1704570649680</updated>
</task>
<task id="LOCAL-00191" summary="08/01/24 - 22h30">
<created>1704750040591</created>
<option name="number" value="00191" />
@ -421,7 +410,14 @@
<option name="project" value="LOCAL" />
<updated>1709847739474</updated>
</task>
<option name="localTasksCounter" value="239" />
<task id="LOCAL-00239" summary="ddd">
<created>1710064628260</created>
<option name="number" value="00239" />
<option name="presentableId" value="LOCAL-00239" />
<option name="project" value="LOCAL" />
<updated>1710064628261</updated>
</task>
<option name="localTasksCounter" value="240" />
<servers />
</component>
<component name="Vcs.Log.Tabs.Properties">
@ -436,7 +432,6 @@
</option>
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="06/02/2024 -20h" />
<MESSAGE value="08/02/2024 -20h" />
<MESSAGE value="09/02/24 - 22h" />
<MESSAGE value="09/02/24 - 22hqsdsq" />
@ -461,6 +456,7 @@
<MESSAGE value="06/03/2024 - 22h15" />
<MESSAGE value="ssdqs" />
<MESSAGE value="07/03/2024 - 22h30" />
<option name="LAST_COMMIT_MESSAGE" value="07/03/2024 - 22h30" />
<MESSAGE value="ddd" />
<option name="LAST_COMMIT_MESSAGE" value="ddd" />
</component>
</project>

File diff suppressed because it is too large Load Diff

View File

@ -1420,6 +1420,7 @@ def Get_List_Ressource_Humaine_with_filter(diction):
new_myquery = [{'$match': find_qry},
{"$addFields": {"ressource_humaine_Id": {"$toString": "$_id"}}},
{'$sort': {'_id': 1}},
{'$lookup':
{
'from': 'ressource_humaine_affectation',
@ -1836,6 +1837,14 @@ def Get_Given_Ressource_Humaine(diction):
user = retval
user['id'] = str(val_tmp)
val_tmp = val_tmp + 1
if ("civilite" not in retval.keys()):
user['civilite'] = ""
elif (retval['civilite'] not in MYSY_GV.CIVILITE):
# la civilité n'est pas une de celle autorisée, alors je renvoie vide
user['civilite'] = ""
"""
Si l'employé a un superieur_hierarchie_id, alors on va aller récupérer son nom et prenom.
ce superieur est une ressource humaime
@ -1910,6 +1919,7 @@ def Get_Given_Ressource_Humaine(diction):
RetObject.append(mycommon.JSONEncoder().encode(user))
#print(" ### RetObject = ", RetObject)