07/01/24 - 12h30

master
cherif 2024-01-07 12:11:39 +01:00
parent 434ed94ba8
commit c639317f31
3 changed files with 1151 additions and 57 deletions

View File

@ -1,12 +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="05/01/24 - 20h30">
<change afterPath="$PROJECT_DIR$/Dashbord_queries/inscription_tdb_qries.py" afterDir="false" />
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="06/01/24 - 20h30">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Dashbord_queries/formation_tbd_qries.py" beforeDir="false" afterPath="$PROJECT_DIR$/Dashbord_queries/formation_tbd_qries.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Dashbord_queries/inscription_tdb_qries.py" beforeDir="false" afterPath="$PROJECT_DIR$/Dashbord_queries/inscription_tdb_qries.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$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -76,13 +74,6 @@
<option name="presentableId" value="Default" />
<updated>1680804787304</updated>
</task>
<task id="LOCAL-00141" summary="09/11/2023 - 23h">
<created>1699567383854</created>
<option name="number" value="00141" />
<option name="presentableId" value="LOCAL-00141" />
<option name="project" value="LOCAL" />
<updated>1699567383855</updated>
</task>
<task id="LOCAL-00142" summary="sdds">
<created>1699654387810</created>
<option name="number" value="00142" />
@ -419,7 +410,14 @@
<option name="project" value="LOCAL" />
<updated>1704482897223</updated>
</task>
<option name="localTasksCounter" value="190" />
<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>
<option name="localTasksCounter" value="191" />
<servers />
</component>
<component name="Vcs.Log.Tabs.Properties">
@ -434,7 +432,6 @@
</option>
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="07/12/2023 - 11h30" />
<MESSAGE value="07/12/2023 - 21h30" />
<MESSAGE value="08/12/2023 - 22h30" />
<MESSAGE value="11/12/2023 - 20h30" />
@ -459,6 +456,7 @@
<MESSAGE value="04/01/2024 - 22h30" />
<MESSAGE value="5555" />
<MESSAGE value="05/01/24 - 20h30" />
<option name="LAST_COMMIT_MESSAGE" value="05/01/24 - 20h30" />
<MESSAGE value="06/01/24 - 20h30" />
<option name="LAST_COMMIT_MESSAGE" value="06/01/24 - 20h30" />
</component>
</project>

View File

@ -125,22 +125,27 @@ def Get_Qery_Inscription_By_Session_By_Periode(diction):
filt_session_end_date_ISODATE_work = filt_session_end_date_ISODATE
"""
qery_match = {'$and': [ {"partner_owner_recid":str(my_partner['recid']) }, {"valide":'1'},
{"apprenant_id": { "$exists": True } },
{"status":{"$ne":"-1"}},
{ 'mysy_date_debut_session': { '$gte': filt_session_start_date_ISODATE,
'$lte': filt_session_end_date_ISODATE } } , ]}
'$lte': filt_session_end_date_ISODATE } },
]}
"""
qery_match = {'$and': [{"partner_owner_recid": str(my_partner['recid'])}, {"valide": '1'},
{"apprenant_id": {"$exists": True}},
]}
"""
#print(" ### qery_match = ", qery_match)
pipe_qry = ([
{"$addFields": {
"mysy_date_debut_session": {
'$dateFromString': {
'dateString': '$date_debut',
'dateString': '$date_du',
'format': "%d/%m/%Y"
}
}
@ -176,9 +181,7 @@ def Get_Qery_Inscription_By_Session_By_Periode(diction):
'as': 'session_formation_collection'
}
},
{
'$unwind': '$session_formation_collection'
},
# ---
{
"$lookup": {
@ -191,9 +194,7 @@ def Get_Qery_Inscription_By_Session_By_Periode(diction):
"as": "myclass_collection"
}
},
{
"$unwind": "$myclass_collection"
},
# --
# ---
@ -225,9 +226,7 @@ def Get_Qery_Inscription_By_Session_By_Periode(diction):
'as': 'apprenant_collection'
}
},
{
'$unwind': '$apprenant_collection'
},
])
@ -248,15 +247,17 @@ def Get_Qery_Inscription_By_Session_By_Periode(diction):
},
"""
#print(" ### Get_Qery_Inscription_By_Session_By_Periode ici pipe_qry = ", pipe_qry)
print(" ### Get_Qery_Inscription_By_Session_By_Periode ici pipe_qry = ", pipe_qry)
cpt = 0
tab_lines_inscription_data = []
for retval in MYSY_GV.dbname['inscription'].aggregate(pipe_qry):
"""
del retval['_id']
del retval['session_formation_collection']['_id']
del retval['apprenant_collection']['_id']
del retval['myclass_collection']['_id']
"""
tab_lines_inscription_data.append(retval)
#print(str(cpt)+" ### retval = ", retval)
@ -301,31 +302,35 @@ def Format_Inscription_Data(tab_diction):
node_inscrit = {}
node_inscrit['inscription_status'] = val['status']
if("apprenant_id" in val.keys() ):
node_inscrit['apprenant_id'] = val['apprenant_id']
else:
node_inscrit['apprenant_id'] = ""
# Recuperation des données d'un apprenant (donc apprenant_id)
if( "apprenant_id" in val.keys() and str(val['apprenant_id']).strip() != "" and "apprenant_collection" in val.keys()):
if( "civilite" in val['apprenant_collection'].keys() and val['apprenant_collection']['civilite']):
node_inscrit['civilite'] = val['apprenant_collection']['civilite']
if( "civilite" in val['apprenant_collection'][0].keys() and val['apprenant_collection'][0]['civilite']):
node_inscrit['civilite'] = val['apprenant_collection'][0]['civilite']
else:
node_inscrit['civilite'] = ""
if ("nom" in val['apprenant_collection'].keys() and val['apprenant_collection']['nom']):
node_inscrit['nom'] = val['apprenant_collection']['nom']
if ("nom" in val['apprenant_collection'][0].keys() and val['apprenant_collection'][0]['nom']):
node_inscrit['nom'] = val['apprenant_collection'][0]['nom']
else:
node_inscrit['nom'] = ""
if ("prenom" in val['apprenant_collection'].keys() and val['apprenant_collection']['prenom']):
node_inscrit['prenom'] = val['apprenant_collection']['prenom']
if ("prenom" in val['apprenant_collection'][0].keys() and val['apprenant_collection'][0]['prenom']):
node_inscrit['prenom'] = val['apprenant_collection'][0]['prenom']
else:
node_inscrit['prenom'] = ""
if ("email" in val['apprenant_collection'].keys() and val['apprenant_collection']['email']):
node_inscrit['email'] = val['apprenant_collection']['email']
if ("email" in val['apprenant_collection'][0].keys() and val['apprenant_collection'][0]['email']):
node_inscrit['email'] = val['apprenant_collection'][0]['email']
else:
node_inscrit['email'] = ""
if ("telephone" in val['apprenant_collection'].keys() and val['apprenant_collection']['telephone']):
node_inscrit['telephone'] = val['apprenant_collection']['telephone']
if ("telephone" in val['apprenant_collection'][0].keys() and val['apprenant_collection'][0]['telephone']):
node_inscrit['telephone'] = val['apprenant_collection'][0]['telephone']
else:
node_inscrit['telephone'] = ""
@ -360,55 +365,55 @@ def Format_Inscription_Data(tab_diction):
# Récuperation des données de la session à la quelle la personne est inscrite
if( "session_formation_collection" in val.keys() ):
if ("code_session" in val['session_formation_collection'].keys() and val['session_formation_collection']['code_session']):
node_inscrit['session_code_session'] = val['session_formation_collection']['code_session']
if ("code_session" in val['session_formation_collection'][0].keys() and val['session_formation_collection'][0]['code_session']):
node_inscrit['session_code_session'] = val['session_formation_collection'][0]['code_session']
else:
node_inscrit['session_code_session'] = ""
if ("class_internal_url" in val['session_formation_collection'].keys() and val['session_formation_collection']['class_internal_url']):
node_inscrit['session_class_internal_url'] = val['session_formation_collection']['class_internal_url']
if ("class_internal_url" in val['session_formation_collection'][0].keys() and val['session_formation_collection'][0]['class_internal_url']):
node_inscrit['session_class_internal_url'] = val['session_formation_collection'][0]['class_internal_url']
if ("date_debut" in val['session_formation_collection'].keys() and val['session_formation_collection']['date_debut']):
node_inscrit['session_date_debut'] = val['session_formation_collection']['date_debut']
if ("date_debut" in val['session_formation_collection'][0].keys() and val['session_formation_collection'][0]['date_debut']):
node_inscrit['session_date_debut'] = val['session_formation_collection'][0]['date_debut']
else:
node_inscrit['session_date_debut'] = ""
if ("date_fin" in val['session_formation_collection'].keys() and val['session_formation_collection']['date_fin']):
node_inscrit['session_date_fin'] = val['session_formation_collection']['date_debut']
if ("date_fin" in val['session_formation_collection'][0].keys() and val['session_formation_collection'][0]['date_fin']):
node_inscrit['session_date_fin'] = val['session_formation_collection'][0]['date_debut']
else:
node_inscrit['session_date_fin'] = ""
if ("distantiel" in val['session_formation_collection'].keys() and val['session_formation_collection']['distantiel']):
node_inscrit['session_distantiel'] = val['session_formation_collection']['distantiel']
if ("distantiel" in val['session_formation_collection'][0].keys() and val['session_formation_collection'][0]['distantiel']):
node_inscrit['session_distantiel'] = val['session_formation_collection'][0]['distantiel']
else:
node_inscrit['session_distantiel'] = ""
if ("presentiel" in val['session_formation_collection'].keys() and val['session_formation_collection']['presentiel']):
node_inscrit['session_presentiel'] = val['session_formation_collection']['presentiel']
if ("presentiel" in val['session_formation_collection'][0].keys() and val['session_formation_collection'][0]['presentiel']):
node_inscrit['session_presentiel'] = val['session_formation_collection'][0]['presentiel']
else:
node_inscrit['session_presentiel'] = ""
# Récuperation des données de la formation attachée a la session
if ("myclass_collection" in val.keys()):
if ("external_code" in val['myclass_collection'].keys() and val['myclass_collection']['external_code']):
node_inscrit['session_class_external_code'] = val['myclass_collection']['external_code']
if ("external_code" in val['myclass_collection'][0].keys() and val['myclass_collection'][0]['external_code']):
node_inscrit['session_class_external_code'] = val['myclass_collection'][0]['external_code']
else:
node_inscrit['session_class_external_code'] = ""
if ("external_code" in val['myclass_collection'].keys() and val['myclass_collection']['external_code']):
node_inscrit['session_class_external_code'] = val['myclass_collection']['external_code']
if ("external_code" in val['myclass_collection'][0].keys() and val['myclass_collection'][0]['external_code']):
node_inscrit['session_class_external_code'] = val['myclass_collection'][0]['external_code']
else:
node_inscrit['session_class_external_code'] = ""
if ("title" in val['myclass_collection'].keys() and val['myclass_collection']['title']):
node_inscrit['session_class_title'] = val['myclass_collection']['title']
if ("title" in val['myclass_collection'][0].keys() and val['myclass_collection'][0]['title']):
node_inscrit['session_class_title'] = val['myclass_collection'][0]['title']
else:
node_inscrit['session_class_title'] = ""
if ("internal_url" in val['myclass_collection'].keys() and val['myclass_collection']['internal_url']):
node_inscrit['session_class_internal_url'] = val['myclass_collection']['internal_url']
if ("internal_url" in val['myclass_collection'][0].keys() and val['myclass_collection'][0]['internal_url']):
node_inscrit['session_class_internal_url'] = val['myclass_collection'][0]['internal_url']
else:
node_inscrit['session_class_internal_url'] = ""

File diff suppressed because it is too large Load Diff