28/04/2024 - 22h

master
cherif 2024-04-28 21:23:26 +02:00
parent 70f097d1c2
commit a1056e8fc4
5 changed files with 2222 additions and 19 deletions

View File

@ -1,14 +1,12 @@
<?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="25/04/2024 - 19h"> <list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="27/04/2024 - 22h">
<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$/Dashbord_queries/inscription_tdb_qries.py" beforeDir="false" afterPath="$PROJECT_DIR$/Dashbord_queries/inscription_tdb_qries.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Dashbord_queries/common_tdb_qries.py" beforeDir="false" afterPath="$PROJECT_DIR$/Dashbord_queries/common_tdb_qries.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Dashbord_queries/ressources_humaines_tbd_qries.py" beforeDir="false" afterPath="$PROJECT_DIR$/Dashbord_queries/ressources_humaines_tbd_qries.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Dashbord_queries/factures_tbd_qries.py" beforeDir="false" afterPath="$PROJECT_DIR$/Dashbord_queries/factures_tbd_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$/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" /> <change beforePath="$PROJECT_DIR$/Session_Formation.py" beforeDir="false" afterPath="$PROJECT_DIR$/Session_Formation.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/partner_invoice.py" beforeDir="false" afterPath="$PROJECT_DIR$/partner_invoice.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/partner_order.py" beforeDir="false" afterPath="$PROJECT_DIR$/partner_order.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" />
@ -78,13 +76,6 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1680804787304</updated> <updated>1680804787304</updated>
</task> </task>
<task id="LOCAL-00230" summary="28/02/2024 - 21h30">
<created>1709152509358</created>
<option name="number" value="00230" />
<option name="presentableId" value="LOCAL-00230" />
<option name="project" value="LOCAL" />
<updated>1709152509359</updated>
</task>
<task id="LOCAL-00231" summary="29/02/2024 - 21h30"> <task id="LOCAL-00231" summary="29/02/2024 - 21h30">
<created>1709239297473</created> <created>1709239297473</created>
<option name="number" value="00231" /> <option name="number" value="00231" />
@ -421,7 +412,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1714065354319</updated> <updated>1714065354319</updated>
</task> </task>
<option name="localTasksCounter" value="279" /> <task id="LOCAL-00279" summary="27/04/2024 - 22h">
<created>1714248179438</created>
<option name="number" value="00279" />
<option name="presentableId" value="LOCAL-00279" />
<option name="project" value="LOCAL" />
<updated>1714248179439</updated>
</task>
<option name="localTasksCounter" value="280" />
<servers /> <servers />
</component> </component>
<component name="Vcs.Log.Tabs.Properties"> <component name="Vcs.Log.Tabs.Properties">
@ -463,7 +461,6 @@
</option> </option>
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="01/04/24 - 23h30" />
<MESSAGE value="01/04/24 - 23h50" /> <MESSAGE value="01/04/24 - 23h50" />
<MESSAGE value="2/04/24 - 20h30" /> <MESSAGE value="2/04/24 - 20h30" />
<MESSAGE value="03/04/24 - 21h30" /> <MESSAGE value="03/04/24 - 21h30" />
@ -488,6 +485,7 @@
<MESSAGE value="22/04/2024 - 17h30" /> <MESSAGE value="22/04/2024 - 17h30" />
<MESSAGE value="23/04/2024 - 14h06" /> <MESSAGE value="23/04/2024 - 14h06" />
<MESSAGE value="25/04/2024 - 19h" /> <MESSAGE value="25/04/2024 - 19h" />
<option name="LAST_COMMIT_MESSAGE" value="25/04/2024 - 19h" /> <MESSAGE value="27/04/2024 - 22h" />
<option name="LAST_COMMIT_MESSAGE" value="27/04/2024 - 22h" />
</component> </component>
</project> </project>

View File

@ -92,7 +92,8 @@ def Add_To_User_Dashbord(diction):
""" """
Verification des input acceptés Verification des input acceptés
""" """
field_list = ['token', "dashbord_internal_code", "default_filter", "title", 'type_event'] field_list = ['token', "dashbord_internal_code", "default_filter", "title", 'type_event',
'group_by']
incom_keys = diction.keys() incom_keys = diction.keys()
for val in incom_keys: for val in incom_keys:
@ -146,6 +147,11 @@ def Add_To_User_Dashbord(diction):
my_data['update_by'] = str(my_partner['_id']) my_data['update_by'] = str(my_partner['_id'])
my_data['partner_owner_recid'] = str(my_partner['recid']) my_data['partner_owner_recid'] = str(my_partner['recid'])
my_data['default_filter'] = str(diction['default_filter']) my_data['default_filter'] = str(diction['default_filter'])
if( "group_by" in diction.keys() ):
my_data['group_by'] = str(diction['group_by'])
else:
my_data['group_by'] = ""
my_data['title'] = str(diction['title']) my_data['title'] = str(diction['title'])
my_data['dashbord_internal_code'] = str(diction['dashbord_internal_code']) my_data['dashbord_internal_code'] = str(diction['dashbord_internal_code'])
my_data['valide'] = "1" my_data['valide'] = "1"

View File

@ -573,11 +573,12 @@ def Get_Qery_List_Quotation_Data_By_Periode(diction):
qery_match = {'$and': [{"partner_owner_recid": str(my_partner['recid'])}, qery_match = {'$and': [{"partner_owner_recid": str(my_partner['recid'])},
{"valide": '1'},filt_client_id, {"valide": '1'},filt_client_id, { 'is_validated': {'$exists': True}},
{ {
"order_header_type": "devis" "order_header_type": "devis"
}, },
{ {
'mysy_quotation_date': {'$gte': filt_periode_start_date_ISODATE, 'mysy_quotation_date': {'$gte': filt_periode_start_date_ISODATE,
'$lte': filt_periode_end_date_ISODATE} '$lte': filt_periode_end_date_ISODATE}

File diff suppressed because it is too large Load Diff

View File

@ -3980,7 +3980,7 @@ def Delete_List_SessionFormation(diction):
cpt = cpt + 1 cpt = cpt + 1
if( cpt > 1 ): if( cpt > 1 ):
return True, "("+str(cpt)+" sessions ont été correctement supprimées" return True, "("+str(cpt)+") sessions ont été correctement supprimées"
else: else:
return True, "La session a été correctement supprimée" return True, "La session a été correctement supprimée"