parent
2596ffa493
commit
df36473a87
|
@ -1,13 +1,11 @@
|
||||||
<?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="07/05/2025 - 20h">
|
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="08/05/2025 - 14h">
|
||||||
<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$/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$/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" />
|
||||||
<change beforePath="$PROJECT_DIR$/base_class_calcul_note.py" beforeDir="false" afterPath="$PROJECT_DIR$/base_class_calcul_note.py" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/base_class_calcul_note.py" beforeDir="false" afterPath="$PROJECT_DIR$/base_class_calcul_note.py" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/unite_enseignement_mgt.py" beforeDir="false" afterPath="$PROJECT_DIR$/unite_enseignement_mgt.py" afterDir="false" />
|
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
|
@ -84,13 +82,6 @@
|
||||||
<option name="presentableId" value="Default" />
|
<option name="presentableId" value="Default" />
|
||||||
<updated>1680804787304</updated>
|
<updated>1680804787304</updated>
|
||||||
</task>
|
</task>
|
||||||
<task id="LOCAL-00407" summary="13/10/2024 - 14h">
|
|
||||||
<created>1728819518236</created>
|
|
||||||
<option name="number" value="00407" />
|
|
||||||
<option name="presentableId" value="LOCAL-00407" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1728819518237</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00408" summary="13/10/2024 - sdf14h">
|
<task id="LOCAL-00408" summary="13/10/2024 - sdf14h">
|
||||||
<created>1728994141092</created>
|
<created>1728994141092</created>
|
||||||
<option name="number" value="00408" />
|
<option name="number" value="00408" />
|
||||||
|
@ -427,7 +418,14 @@
|
||||||
<option name="project" value="LOCAL" />
|
<option name="project" value="LOCAL" />
|
||||||
<updated>1746640393073</updated>
|
<updated>1746640393073</updated>
|
||||||
</task>
|
</task>
|
||||||
<option name="localTasksCounter" value="456" />
|
<task id="LOCAL-00456" summary="08/05/2025 - 14h">
|
||||||
|
<created>1746706061005</created>
|
||||||
|
<option name="number" value="00456" />
|
||||||
|
<option name="presentableId" value="LOCAL-00456" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1746706061005</updated>
|
||||||
|
</task>
|
||||||
|
<option name="localTasksCounter" value="457" />
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
<component name="Vcs.Log.Tabs.Properties">
|
<component name="Vcs.Log.Tabs.Properties">
|
||||||
|
@ -469,7 +467,6 @@
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="VcsManagerConfiguration">
|
<component name="VcsManagerConfiguration">
|
||||||
<MESSAGE value="16/01/2025 - 16h30" />
|
|
||||||
<MESSAGE value="17/01/2025 - 15:30" />
|
<MESSAGE value="17/01/2025 - 15:30" />
|
||||||
<MESSAGE value="18/01/2025 - 17h" />
|
<MESSAGE value="18/01/2025 - 17h" />
|
||||||
<MESSAGE value="20/01/2025 - 18h" />
|
<MESSAGE value="20/01/2025 - 18h" />
|
||||||
|
@ -494,6 +491,7 @@
|
||||||
<MESSAGE value="05/05/2025 - 20h" />
|
<MESSAGE value="05/05/2025 - 20h" />
|
||||||
<MESSAGE value="06/05/2025 - 20h" />
|
<MESSAGE value="06/05/2025 - 20h" />
|
||||||
<MESSAGE value="07/05/2025 - 20h" />
|
<MESSAGE value="07/05/2025 - 20h" />
|
||||||
<option name="LAST_COMMIT_MESSAGE" value="07/05/2025 - 20h" />
|
<MESSAGE value="08/05/2025 - 14h" />
|
||||||
|
<option name="LAST_COMMIT_MESSAGE" value="08/05/2025 - 14h" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
1987
Log/log_file.log
1987
Log/log_file.log
File diff suppressed because it is too large
Load Diff
|
@ -1510,8 +1510,8 @@ def GetAllValideSessionPartner_List(diction):
|
||||||
val = {}
|
val = {}
|
||||||
val['id'] = str(cpt)
|
val['id'] = str(cpt)
|
||||||
cpt = cpt + 1
|
cpt = cpt + 1
|
||||||
val['class_internal_url'] = retVal['myclass_collection']['class_internal_url']
|
val['class_internal_url'] = retVal['class_internal_url']
|
||||||
val['class_id'] = retVal['myclass_collection']['_id']
|
val['class_id'] = retVal['myclass_collection'][0]['_id']
|
||||||
val['_id'] = retVal['_id']
|
val['_id'] = retVal['_id']
|
||||||
val['code_session'] = retVal['code_session']
|
val['code_session'] = retVal['code_session']
|
||||||
|
|
||||||
|
@ -1861,7 +1861,8 @@ def GetAllValideSessionPartner_List_filter_like(diction):
|
||||||
'localField': 'class_internal_url',
|
'localField': 'class_internal_url',
|
||||||
'foreignField': 'internal_url',
|
'foreignField': 'internal_url',
|
||||||
'pipeline': [{'$match': { '$and' : [ filt_class_title, filt_class_internal_url, filt_class_external_code, {'partner_owner_recid':str(my_partner['recid'])} ]} }, {'$project': {'title': 1, 'domaine':1,
|
'pipeline': [{'$match': { '$and' : [ filt_class_title, filt_class_internal_url, filt_class_external_code, {'partner_owner_recid':str(my_partner['recid'])} ]} }, {'$project': {'title': 1, 'domaine':1,
|
||||||
'duration':1, 'duration_unit':1, 'external_code':1, 'recyclage_delai':1, '_id':1,
|
'duration':1, 'duration_unit':1, 'external_code':1,
|
||||||
|
'recyclage_delai':1, '_id':1,
|
||||||
'recyclage_periodicite':1,
|
'recyclage_periodicite':1,
|
||||||
'lms_class_code':1}}],
|
'lms_class_code':1}}],
|
||||||
'as': 'myclass_collection'
|
'as': 'myclass_collection'
|
||||||
|
@ -1875,12 +1876,13 @@ def GetAllValideSessionPartner_List_filter_like(diction):
|
||||||
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 ):
|
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['_id'] = retVal['_id']
|
val['_id'] = retVal['_id']
|
||||||
val['class_internal_url'] = retVal['class_internal_url']
|
val['class_internal_url'] = retVal['class_internal_url']
|
||||||
val['class_id'] = str(retVal['myclass_collection']['_id'])
|
val['class_id'] = str(retVal['myclass_collection'][0]['_id'])
|
||||||
val['code_session'] = retVal['code_session']
|
val['code_session'] = retVal['code_session']
|
||||||
|
|
||||||
if ("titre" in retVal.keys()):
|
if ("titre" in retVal.keys()):
|
||||||
|
|
|
@ -1032,6 +1032,19 @@ def Get_List_Evaluation_UE_Note_Classement_With_Filter(diction):
|
||||||
user['id'] = str(val_tmp)
|
user['id'] = str(val_tmp)
|
||||||
val_tmp = val_tmp + 1
|
val_tmp = val_tmp + 1
|
||||||
|
|
||||||
|
if ("jury_note" not in retval.keys()):
|
||||||
|
user['jury_note'] = ""
|
||||||
|
|
||||||
|
if ("jury_comment" not in retval.keys()):
|
||||||
|
user['jury_comment'] = ""
|
||||||
|
|
||||||
|
if ("jury_validation" not in retval.keys()):
|
||||||
|
user['jury_validation'] = ""
|
||||||
|
|
||||||
|
if ("jury_validation_champ_technique" not in retval.keys()):
|
||||||
|
user['jury_validation_champ_technique'] = ""
|
||||||
|
|
||||||
|
|
||||||
ue_id_code = ""
|
ue_id_code = ""
|
||||||
if( "ue_id" in retval.keys() ):
|
if( "ue_id" in retval.keys() ):
|
||||||
ue_id_data = MYSY_GV.dbname['unite_enseignement'].find_one({'_id':ObjectId(str(retval['ue_id'])),
|
ue_id_data = MYSY_GV.dbname['unite_enseignement'].find_one({'_id':ObjectId(str(retval['ue_id'])),
|
||||||
|
@ -1152,6 +1165,18 @@ def Get_List_Evaluation_Inscriptio_Note_Classement_With_Filter(diction):
|
||||||
user['id'] = str(val_tmp)
|
user['id'] = str(val_tmp)
|
||||||
val_tmp = val_tmp + 1
|
val_tmp = val_tmp + 1
|
||||||
|
|
||||||
|
if( "jury_note" not in retval.keys() ):
|
||||||
|
user['jury_note'] = ""
|
||||||
|
|
||||||
|
if ("jury_comment" not in retval.keys()):
|
||||||
|
user['jury_comment'] = ""
|
||||||
|
|
||||||
|
if ("jury_validation" not in retval.keys()):
|
||||||
|
user['jury_validation'] = ""
|
||||||
|
|
||||||
|
if ("jury_validation_champ_technique" not in retval.keys()):
|
||||||
|
user['jury_validation_champ_technique'] = ""
|
||||||
|
|
||||||
RetObject.append(mycommon.JSONEncoder().encode(user))
|
RetObject.append(mycommon.JSONEncoder().encode(user))
|
||||||
|
|
||||||
return True, RetObject
|
return True, RetObject
|
||||||
|
|
Loading…
Reference in New Issue