16/08/23 - 22h
parent
5f27d89f40
commit
50dc603832
|
@ -1,8 +1,9 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ChangeListManager">
|
<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$/.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$/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$/Session_Formation.py" beforeDir="false" afterPath="$PROJECT_DIR$/Session_Formation.py" afterDir="false" />
|
||||||
</list>
|
</list>
|
||||||
|
@ -68,13 +69,6 @@
|
||||||
<option name="presentableId" value="Default" />
|
<option name="presentableId" value="Default" />
|
||||||
<updated>1680804787304</updated>
|
<updated>1680804787304</updated>
|
||||||
</task>
|
</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">
|
<task id="LOCAL-00022" summary="15/05/23 - 23h">
|
||||||
<created>1684182658305</created>
|
<created>1684182658305</created>
|
||||||
<option name="number" value="00022" />
|
<option name="number" value="00022" />
|
||||||
|
@ -411,7 +405,14 @@
|
||||||
<option name="project" value="LOCAL" />
|
<option name="project" value="LOCAL" />
|
||||||
<updated>1692102586763</updated>
|
<updated>1692102586763</updated>
|
||||||
</task>
|
</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 />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
<component name="Vcs.Log.Tabs.Properties">
|
<component name="Vcs.Log.Tabs.Properties">
|
||||||
|
@ -426,7 +427,6 @@
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="VcsManagerConfiguration">
|
<component name="VcsManagerConfiguration">
|
||||||
<MESSAGE value="12/07/23 - 21h" />
|
|
||||||
<MESSAGE value="16/07/23 - 21h" />
|
<MESSAGE value="16/07/23 - 21h" />
|
||||||
<MESSAGE value="16/07/23 - 22h" />
|
<MESSAGE value="16/07/23 - 22h" />
|
||||||
<MESSAGE value="22/07/2023 - 17h" />
|
<MESSAGE value="22/07/2023 - 17h" />
|
||||||
|
@ -451,6 +451,7 @@
|
||||||
<MESSAGE value="13/08/23 - 21h30" />
|
<MESSAGE value="13/08/23 - 21h30" />
|
||||||
<MESSAGE value="14/08/23 - 16h30" />
|
<MESSAGE value="14/08/23 - 16h30" />
|
||||||
<MESSAGE value="15/08/23 -14h" />
|
<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>
|
</component>
|
||||||
</project>
|
</project>
|
16
Activite.py
16
Activite.py
|
@ -399,6 +399,12 @@ Recuperation de la liste des activité d'une entité en se basant sur
|
||||||
- related_collection
|
- related_collection
|
||||||
- token (partner_recid)
|
- token (partner_recid)
|
||||||
- related_collection_recid (s'il est fourni)
|
- 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):
|
def Get_List_Entity_Activite(diction):
|
||||||
try:
|
try:
|
||||||
|
@ -481,6 +487,16 @@ def Get_List_Entity_Activite(diction):
|
||||||
for retval in MYSY_GV.dbname['activite'].find(data_cle):
|
for retval in MYSY_GV.dbname['activite'].find(data_cle):
|
||||||
user = retval
|
user = retval
|
||||||
user['id'] = str(val_tmp)
|
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
|
val_tmp = val_tmp + 1
|
||||||
RetObject.append(mycommon.JSONEncoder().encode(user))
|
RetObject.append(mycommon.JSONEncoder().encode(user))
|
||||||
|
|
||||||
|
|
6901
Log/log_file.log
6901
Log/log_file.log
File diff suppressed because it is too large
Load Diff
|
@ -625,6 +625,7 @@ def GetAllValideSessionPartner_List(diction):
|
||||||
|
|
||||||
coll_session = MYSY_GV.dbname['session_formation']
|
coll_session = MYSY_GV.dbname['session_formation']
|
||||||
|
|
||||||
|
filt_class_partner_recid = {'partner_owner_recid': str(my_partner['recid'])}
|
||||||
|
|
||||||
query = [
|
query = [
|
||||||
{'$lookup':
|
{'$lookup':
|
||||||
|
@ -632,6 +633,8 @@ def GetAllValideSessionPartner_List(diction):
|
||||||
'from': 'myclass',
|
'from': 'myclass',
|
||||||
'localField': 'class_internal_url',
|
'localField': 'class_internal_url',
|
||||||
'foreignField':'internal_url',
|
'foreignField':'internal_url',
|
||||||
|
'pipeline': [{'$match': filt_class_partner_recid}, {'$project': {'title': 1, 'domaine': 1,
|
||||||
|
'duration': 1, 'duration_unit': 1}}],
|
||||||
'as': 'myclass_collection'
|
'as': 'myclass_collection'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -640,11 +643,13 @@ def GetAllValideSessionPartner_List(diction):
|
||||||
RetObject = []
|
RetObject = []
|
||||||
cpt = 1
|
cpt = 1
|
||||||
for retVal in MYSY_GV.dbname['session_formation'].aggregate(query):
|
for retVal in MYSY_GV.dbname['session_formation'].aggregate(query):
|
||||||
|
if ('myclass_collection' in retVal.keys() and len(retVal['myclass_collection']) > 0):
|
||||||
val = {}
|
val = {}
|
||||||
val['id'] = str(cpt)
|
val['id'] = str(cpt)
|
||||||
cpt = cpt + 1
|
cpt = cpt + 1
|
||||||
val['class_internal_url'] = retVal['class_internal_url']
|
val['class_internal_url'] = retVal['class_internal_url']
|
||||||
val['code_session'] = retVal['code_session']
|
val['code_session'] = retVal['code_session']
|
||||||
|
|
||||||
val['session_etape'] = retVal['session_etape']
|
val['session_etape'] = retVal['session_etape']
|
||||||
val['session_status'] = retVal['session_status']
|
val['session_status'] = retVal['session_status']
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue