16/01/2024 - 19h

master
cherif 2024-01-16 18:41:25 +01:00
parent 580595e607
commit 8dfff81431
6 changed files with 3227 additions and 21 deletions

View File

@ -1,13 +1,13 @@
<?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="15/01/2024 - 17h00">
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="15/01/2024 - 22h">
<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" />
<change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/partners.py" beforeDir="false" afterPath="$PROJECT_DIR$/partners.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ressources_humaines.py" beforeDir="false" afterPath="$PROJECT_DIR$/ressources_humaines.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/apprenant_mgt.py" beforeDir="false" afterPath="$PROJECT_DIR$/apprenant_mgt.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/class_mgt.py" beforeDir="false" afterPath="$PROJECT_DIR$/class_mgt.py" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -77,13 +77,6 @@
<option name="presentableId" value="Default" />
<updated>1680804787304</updated>
</task>
<task id="LOCAL-00147" summary="14/11/2023 - 12h">
<created>1699961714532</created>
<option name="number" value="00147" />
<option name="presentableId" value="LOCAL-00147" />
<option name="project" value="LOCAL" />
<updated>1699961714533</updated>
</task>
<task id="LOCAL-00148" summary="14/11/2023 - 20h">
<created>1699990605958</created>
<option name="number" value="00148" />
@ -420,7 +413,14 @@
<option name="project" value="LOCAL" />
<updated>1705335099151</updated>
</task>
<option name="localTasksCounter" value="196" />
<task id="LOCAL-00196" summary="15/01/2024 - 22h">
<created>1705352583884</created>
<option name="number" value="00196" />
<option name="presentableId" value="LOCAL-00196" />
<option name="project" value="LOCAL" />
<updated>1705352583884</updated>
</task>
<option name="localTasksCounter" value="197" />
<servers />
</component>
<component name="Vcs.Log.Tabs.Properties">
@ -435,7 +435,6 @@
</option>
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="14/12/2023 - 08h30" />
<MESSAGE value="14/12/2023 - 16h16" />
<MESSAGE value="14/12/2023 - 21h" />
<MESSAGE value="14/12/2023 - 22h" />
@ -460,6 +459,7 @@
<MESSAGE value="11/01/24 - 21h30" />
<MESSAGE value="12/01/24 - 16h30" />
<MESSAGE value="15/01/2024 - 17h00" />
<option name="LAST_COMMIT_MESSAGE" value="15/01/2024 - 17h00" />
<MESSAGE value="15/01/2024 - 22h" />
<option name="LAST_COMMIT_MESSAGE" value="15/01/2024 - 22h" />
</component>
</project>

View File

@ -6029,6 +6029,7 @@ def Get_Statgaire_List_Partner_with_filter(diction):
query = [{'$match':{ '$and' : [ filt_class_internal_url, filt_session_id, filt_email, filt_nom, filt_client_nom, {'partner_owner_recid':str(partner_recid)}] } },
{'$sort': {'_id': -1}},
{'$lookup':
{
'from': 'myclass',

File diff suppressed because it is too large Load Diff

View File

@ -961,6 +961,7 @@ def GetAllValideSessionPartner_List(diction):
filt_class_partner_recid = {'partner_owner_recid': str(my_partner['recid'])}
query = [{'$match': {'partner_owner_recid':str(my_partner['recid'])}},
{ '$sort': {'_id': -1}},
{'$lookup':
{
'from': 'myclass',
@ -1194,6 +1195,7 @@ def GetAllValideSessionPartner_List_filter_like(diction):
coll_session = MYSY_GV.dbname['session_formation']
query = [ {'$match':{ '$and' : [ filt_code_session,{'partner_owner_recid':str(my_partner['recid'])}] }} ,
{'$sort': {'_id': -1}},
{'$lookup':
{
'from': 'myclass',

View File

@ -721,7 +721,7 @@ def Get_List_Partner_Apprenant(diction):
val_tmp = 1
for val in MYSY_GV.dbname['apprenant'].find({'partner_owner_recid': str(my_partner['recid']),
'valide': '1',
'locked': '0'}):
'locked': '0'}).sort([("_id", pymongo.DESCENDING), ]):
user = val
user['id'] = str(val_tmp)
val_tmp = val_tmp + 1
@ -795,7 +795,7 @@ def Get_Apprenant_List_Partner_with_filter(diction):
filt_class_partner_recid = {'partner_owner_recid': str(my_partner['recid'])}
query = [{'$match': {'$and': [filt_email, filt_nom, filt_prenom, {'partner_owner_recid': str(my_partner['recid'])}]}},
{'$sort': {'_id': -1}},
]
print("#### Get_Apprenant_List_Partner_with_filter laa 01 : query = ", query)
RetObject = []

View File

@ -2358,7 +2358,7 @@ def get_partner_class(diction):
filt_external_code, filt_title, filt_internal_url]},
{ 'indexed':0, 'indexed_desc':0,
'indexed_obj':0, 'indexed_title':0, }
):
).sort([("_id", pymongo.DESCENDING), ]):
#print(" #### retVal = ", retVal)
if ("title" not in retVal.keys()):
@ -2434,6 +2434,11 @@ def get_partner_class(diction):
retVal['class_level_description'] = class_level_description
# Recuperer le nombre de session pour cette formation
nb_session_formation_count = MYSY_GV.dbname['session_formation'].count_documents({'class_internal_url':str(retVal['internal_url']),
'valide':'1',
'partner_owner_recid':str(my_partner['recid'])})
retVal['nb_session_formation'] = nb_session_formation_count
user = retVal
user['id'] = str(val_tmp)
@ -2618,8 +2623,8 @@ def find_partner_class_like(diction):
{'partner_owner_recid': user_recid},
filt_external_code, filt_title, filt_internal_url]},
{'programme':0, 'objectif': 0, 'indexed': 0, 'indexed_desc': 0,
'indexed_obj': 0, 'indexed_title': 0, 'description':0}
):
'indexed_obj': 0, 'indexed_title': 0, }
).sort([("_id", pymongo.DESCENDING), ]):
#mycommon.myprint(str(retVal))
user = retVal
if ("title" not in retVal.keys()):
@ -2661,8 +2666,14 @@ def find_partner_class_like(diction):
if ("lms_class_code" not in retVal.keys()):
retVal['lms_class_code'] = "0"
# Recuperer le nombre de session pour cette formation
nb_session_formation_count = MYSY_GV.dbname['session_formation'].count_documents(
{'class_internal_url': str(retVal['internal_url']),
'valide': '1',
'partner_owner_recid': str(my_partner['recid'])})
retVal['nb_session_formation'] = nb_session_formation_count
user['id'] = str(val_tmp)
@ -2836,7 +2847,7 @@ def get_partner_class_external_code(diction):
{'partner_owner_recid': user_recid},
filt_external_code, filt_title, filt_internal_url]},
{'external_code':1, 'internal_url':1},
).sort([("external_code",pymongo.ASCENDING),]):
).sort([("external_code",pymongo.ASCENDING),]).sort([("_id", pymongo.DESCENDING), ]):
# mycommon.myprint(str(retVal))
user = retVal
user['id'] = str(val_tmp)