20/12/2023 - 18h

master
cherif 2023-12-20 18:07:44 +01:00
parent 6055a03850
commit 79308bd98b
4 changed files with 5558 additions and 16 deletions

View File

@ -1,8 +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="18/12/2023 - 18:00">
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="18/12/2023 - 22:00">
<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$/Session_Formation.py" beforeDir="false" afterPath="$PROJECT_DIR$/Session_Formation.py" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
@ -73,13 +75,6 @@
<option name="presentableId" value="Default" />
<updated>1680804787304</updated>
</task>
<task id="LOCAL-00128" summary="08/10/2023 - 22h40">
<created>1696798642665</created>
<option name="number" value="00128" />
<option name="presentableId" value="LOCAL-00128" />
<option name="project" value="LOCAL" />
<updated>1696798642666</updated>
</task>
<task id="LOCAL-00129" summary="17/10/2023 - 22h40">
<created>1697571685666</created>
<option name="number" value="00129" />
@ -416,7 +411,14 @@
<option name="project" value="LOCAL" />
<updated>1702919463869</updated>
</task>
<option name="localTasksCounter" value="177" />
<task id="LOCAL-00177" summary="18/12/2023 - 22:00">
<created>1702933100879</created>
<option name="number" value="00177" />
<option name="presentableId" value="LOCAL-00177" />
<option name="project" value="LOCAL" />
<updated>1702933100880</updated>
</task>
<option name="localTasksCounter" value="178" />
<servers />
</component>
<component name="Vcs.Log.Tabs.Properties">
@ -431,7 +433,6 @@
</option>
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="17/11/2023 - 16h" />
<MESSAGE value="18/11/2023 - 17h00" />
<MESSAGE value="20/11/2023 - 21h00" />
<MESSAGE value="22/11/2023 - 23h00" />
@ -456,6 +457,7 @@
<MESSAGE value="15/12/2023 - 18h" />
<MESSAGE value="16/12/2023 - 23h12" />
<MESSAGE value="18/12/2023 - 18:00" />
<option name="LAST_COMMIT_MESSAGE" value="18/12/2023 - 18:00" />
<MESSAGE value="18/12/2023 - 22:00" />
<option name="LAST_COMMIT_MESSAGE" value="18/12/2023 - 22:00" />
</component>
</project>

View File

@ -5487,7 +5487,7 @@ def DeleteImage_Stagiaire_v2(diction=None):
print(" ### recordClassImage_v2 :L'image a été correctement supprimée ")
#print(" ### recordClassImage_v2 :L'image a été correctement supprimée ")
return True, "L'image a été correctement supprimée"
@ -5622,7 +5622,7 @@ def Get_Statgaire_List_Partner_with_filter(diction):
}
}
]
print("#### Get_Statgaire_List_Partner_with_filter : query = ", query)
print("#### Get_Statgaire_List_Partner_with_filter laa 01 : query = ", query)
RetObject = []
cpt = 1
for retVal in MYSY_GV.dbname['inscription'].aggregate(query):
@ -5677,12 +5677,12 @@ def Get_Statgaire_List_Partner_with_filter(diction):
client_rattachement_id = ""
client_rattachement_nom = ""
# Si il a un client rattacher, recuperation des information du client
# Si il a un client rattacher, recuperation des information du client
#print(" ### retVal = ", retVal )
if( "client_rattachement_id" in retVal.keys()):
if( retVal['client_rattachement_id'] and str(retVal['client_rattachement_id'] ) != 'undefined'):
client_retval = MYSY_GV.dbname['partner_client'].find_one({'id':ObjectId( retVal['client_rattachement_id']),
client_retval = MYSY_GV.dbname['partner_client'].find_one({'_id':ObjectId( retVal['client_rattachement_id']),
'valide':'1', 'locked':'0'})
if( client_retval is not None):

File diff suppressed because it is too large Load Diff

View File

@ -576,7 +576,7 @@ def GetSessionFormation(diction):
'from': 'myclass',
'localField': 'class_internal_url',
'foreignField': 'internal_url',
'pipeline': [{'$project': {'title': 1, 'lms_class_code':1}}],
'pipeline': [{'$project': {'title': 1, 'lms_class_code':1, 'external_code':1}}],
'as': 'myclass'
}
}
@ -594,6 +594,7 @@ def GetSessionFormation(diction):
nb_val = nb_val + 1
title = ""
lms_class_code = ""
class_external_code = ""
if ('myclass' in retval.keys() and len(retval['myclass']) > 0):
if( "title" in retval['myclass'][0].keys()):
@ -602,8 +603,14 @@ def GetSessionFormation(diction):
if ("lms_class_code" in retval['myclass'][0].keys()):
lms_class_code = retval['myclass'][0]['lms_class_code']
if ("external_code" in retval['myclass'][0].keys()):
class_external_code = retval['myclass'][0]['external_code']
user['title'] = title
user['lms_class_code'] = lms_class_code
user['class_external_code'] = class_external_code
formateur_nom_prenom = ""
# Si il y a un code formateur_id, alors on va recuperer les nom et prenom du formation
if( "formateur_id" in retval.keys() and retval['formateur_id']):