16/08/23 - 22h

master
cherif 2023-08-16 22:49:41 +02:00
parent 5f27d89f40
commit 50dc603832
4 changed files with 6985 additions and 62 deletions

View File

@ -1,8 +1,9 @@
<?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/08/23 -14h">
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="15/08/23 - 20h">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Activite.py" beforeDir="false" afterPath="$PROJECT_DIR$/Activite.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>
@ -68,13 +69,6 @@
<option name="presentableId" value="Default" />
<updated>1680804787304</updated>
</task>
<task id="LOCAL-00021" summary="15/05/23 - 23h">
<created>1684159880527</created>
<option name="number" value="00021" />
<option name="presentableId" value="LOCAL-00021" />
<option name="project" value="LOCAL" />
<updated>1684159880527</updated>
</task>
<task id="LOCAL-00022" summary="15/05/23 - 23h">
<created>1684182658305</created>
<option name="number" value="00022" />
@ -411,7 +405,14 @@
<option name="project" value="LOCAL" />
<updated>1692102586763</updated>
</task>
<option name="localTasksCounter" value="70" />
<task id="LOCAL-00070" summary="15/08/23 - 20h">
<created>1692122709241</created>
<option name="number" value="00070" />
<option name="presentableId" value="LOCAL-00070" />
<option name="project" value="LOCAL" />
<updated>1692122709241</updated>
</task>
<option name="localTasksCounter" value="71" />
<servers />
</component>
<component name="Vcs.Log.Tabs.Properties">
@ -426,7 +427,6 @@
</option>
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="12/07/23 - 21h" />
<MESSAGE value="16/07/23 - 21h" />
<MESSAGE value="16/07/23 - 22h" />
<MESSAGE value="22/07/2023 - 17h" />
@ -451,6 +451,7 @@
<MESSAGE value="13/08/23 - 21h30" />
<MESSAGE value="14/08/23 - 16h30" />
<MESSAGE value="15/08/23 -14h" />
<option name="LAST_COMMIT_MESSAGE" value="15/08/23 -14h" />
<MESSAGE value="15/08/23 - 20h" />
<option name="LAST_COMMIT_MESSAGE" value="15/08/23 - 20h" />
</component>
</project>

View File

@ -399,6 +399,12 @@ Recuperation de la liste des activité d'une entité en se basant sur
- related_collection
- token (partner_recid)
- related_collection_recid (s'il est fourni)
/!\ : apres avoir recuperer les info, on va ajouter 1 : 'retard'
calcul du retard = deadline - date_day:
>= pas en retard
< 0 : en de tard de X jours
-
"""
def Get_List_Entity_Activite(diction):
try:
@ -481,6 +487,16 @@ def Get_List_Entity_Activite(diction):
for retval in MYSY_GV.dbname['activite'].find(data_cle):
user = retval
user['id'] = str(val_tmp)
retard = "0"
if( "deadline" in retval.keys() ):
local_status = mycommon.CheckisDate(retval['deadline'])
if( local_status is not False ):
mytoday = datetime.today().strftime("%d/%m/%Y")
retard = (datetime.strptime(str(retval['deadline']), '%d/%m/%Y') - datetime.strptime(str(mytoday), '%d/%m/%Y')).days
user['retard'] = str(retard)
val_tmp = val_tmp + 1
RetObject.append(mycommon.JSONEncoder().encode(user))

File diff suppressed because it is too large Load Diff

View File

@ -625,6 +625,7 @@ def GetAllValideSessionPartner_List(diction):
coll_session = MYSY_GV.dbname['session_formation']
filt_class_partner_recid = {'partner_owner_recid': str(my_partner['recid'])}
query = [
{'$lookup':
@ -632,6 +633,8 @@ def GetAllValideSessionPartner_List(diction):
'from': 'myclass',
'localField': 'class_internal_url',
'foreignField':'internal_url',
'pipeline': [{'$match': filt_class_partner_recid}, {'$project': {'title': 1, 'domaine': 1,
'duration': 1, 'duration_unit': 1}}],
'as': 'myclass_collection'
}
}
@ -640,79 +643,81 @@ def GetAllValideSessionPartner_List(diction):
RetObject = []
cpt = 1
for retVal in MYSY_GV.dbname['session_formation'].aggregate(query):
val = {}
val['id'] = str(cpt)
cpt = cpt + 1
val['class_internal_url'] = retVal['class_internal_url']
val['code_session'] = retVal['code_session']
val['session_etape'] = retVal['session_etape']
val['session_status'] = retVal['session_status']
if ('myclass_collection' in retVal.keys() and len(retVal['myclass_collection']) > 0):
val = {}
val['id'] = str(cpt)
cpt = cpt + 1
val['class_internal_url'] = retVal['class_internal_url']
val['code_session'] = retVal['code_session']
val['date_debut'] = retVal['date_debut'][0:10]
val['date_fin'] = retVal['date_fin'][0:10]
val['date_debut_inscription'] = retVal['date_debut_inscription'][0:10]
val['date_fin_inscription'] = retVal['date_fin_inscription'][0:10]
val['session_etape'] = retVal['session_etape']
val['session_status'] = retVal['session_status']
val['distantiel'] = retVal['distantiel']
val['formateur'] = retVal['formateur']
val['date_debut'] = retVal['date_debut'][0:10]
val['date_fin'] = retVal['date_fin'][0:10]
val['date_debut_inscription'] = retVal['date_debut_inscription'][0:10]
val['date_fin_inscription'] = retVal['date_fin_inscription'][0:10]
nb_participant = "0"
if( "nb_participant" in retVal.keys()):
nb_participant = retVal['nb_participant']
val['distantiel'] = retVal['distantiel']
val['formateur'] = retVal['formateur']
val['nb_participant'] = nb_participant
nb_participant = "0"
if( "nb_participant" in retVal.keys()):
nb_participant = retVal['nb_participant']
val['nb_participant'] = nb_participant
val['presentiel'] = retVal['presentiel']
val['prix_session'] = retVal['prix_session']
val['presentiel'] = retVal['presentiel']
val['prix_session'] = retVal['prix_session']
val['title'] = retVal['myclass_collection'][0]['title']
val['domaine'] = retVal['myclass_collection'][0]['domaine']
val['title'] = retVal['myclass_collection'][0]['title']
val['domaine'] = retVal['myclass_collection'][0]['domaine']
if( str(retVal['myclass_collection'][0]['duration_unit']) == "heure"):
val['duration_concat'] = str(retVal['myclass_collection'][0]['duration'])+" h"
if( str(retVal['myclass_collection'][0]['duration_unit']) == "heure"):
val['duration_concat'] = str(retVal['myclass_collection'][0]['duration'])+" h"
elif (str(retVal['myclass_collection'][0]['duration_unit']) == "jour"):
val['duration_concat'] = str(retVal['myclass_collection'][0]['duration']) + " j"
elif (str(retVal['myclass_collection'][0]['duration_unit']) == "jour"):
val['duration_concat'] = str(retVal['myclass_collection'][0]['duration']) + " j"
elif (str(retVal['myclass_collection'][0]['duration_unit']) == "semaine"):
val['duration_concat'] = str(retVal['myclass_collection'][0]['duration']) + " s"
elif (str(retVal['myclass_collection'][0]['duration_unit']) == "semaine"):
val['duration_concat'] = str(retVal['myclass_collection'][0]['duration']) + " s"
elif (str(retVal['myclass_collection'][0]['duration_unit']) == "mois"):
val['duration_concat'] = str(retVal['myclass_collection'][0]['duration']) + " m"
elif (str(retVal['myclass_collection'][0]['duration_unit']) == "mois"):
val['duration_concat'] = str(retVal['myclass_collection'][0]['duration']) + " m"
elif (str(retVal['myclass_collection'][0]['duration_unit']) == "annee"):
val['duration_concat'] = str(retVal['myclass_collection'][0]['duration']) + " a"
elif (str(retVal['myclass_collection'][0]['duration_unit']) == "annee"):
val['duration_concat'] = str(retVal['myclass_collection'][0]['duration']) + " a"
elif (str(retVal['myclass_collection'][0]['duration_unit']) == "user_rythme"):
val['duration_concat'] = str(retVal['myclass_collection'][0]['duration']) + " u"
elif (str(retVal['myclass_collection'][0]['duration_unit']) == "user_rythme"):
val['duration_concat'] = str(retVal['myclass_collection'][0]['duration']) + " u"
else :
val['duration_concat'] = str(retVal['myclass_collection'][0]['duration']) + " ?"
else :
val['duration_concat'] = str(retVal['myclass_collection'][0]['duration']) + " ?"
val['duration'] = str(retVal['myclass_collection'][0]['duration'])
val['duration_unit'] = retVal['myclass_collection'][0]['duration_unit']
val['duration'] = str(retVal['myclass_collection'][0]['duration'])
val['duration_unit'] = retVal['myclass_collection'][0]['duration_unit']
## Recuperation du nombre d'inscrits
Count_Inscrit = MYSY_GV.dbname['inscription'].count_documents({'session_id':str(retVal['code_session']), 'class_internal_url':str(retVal['class_internal_url']),
'status':"1"})
val['nb_inscrit'] = str(Count_Inscrit)
## Recuperation du nombre d'inscrits
Count_Inscrit = MYSY_GV.dbname['inscription'].count_documents({'session_id':str(retVal['code_session']), 'class_internal_url':str(retVal['class_internal_url']),
'status':"1"})
val['nb_inscrit'] = str(Count_Inscrit)
## Recuperation du nombre de preinscrits
Count_Preinscrit = MYSY_GV.dbname['inscription'].count_documents(
{'session_id': str(retVal['code_session']), 'class_internal_url': str(retVal['class_internal_url']),
'status': "0"})
## Recuperation du nombre de preinscrits
Count_Preinscrit = MYSY_GV.dbname['inscription'].count_documents(
{'session_id': str(retVal['code_session']), 'class_internal_url': str(retVal['class_internal_url']),
'status': "0"})
val['nb_preinscrit'] = str(Count_Preinscrit)
val['nb_preinscrit'] = str(Count_Preinscrit)
taux_replissage = "0"
if( str(nb_participant) != "0"):
taux_replissage = round(int(mycommon.tryInt(Count_Inscrit)) / int(mycommon.tryInt(nb_participant)), 2)
taux_replissage = "0"
if( str(nb_participant) != "0"):
taux_replissage = round(int(mycommon.tryInt(Count_Inscrit)) / int(mycommon.tryInt(nb_participant)), 2)
val['taux_replissage'] = str(taux_replissage)
val['taux_replissage'] = str(taux_replissage)
RetObject.append(mycommon.JSONEncoder().encode(val))
RetObject.append(mycommon.JSONEncoder().encode(val))
return True, RetObject