CLERC/Reskreen
6
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects 1 Releases 1 Wiki Activity

Ajout de la prise en charge des last_name identique

Browse Source
This commit is contained in:
Ambulance Clerc
2023-05-15 08:52:57 +02:00
parent e98f0058d5
commit 085baa830e
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mycaldav/models.py
View File

@@ -235,6 +235,16 @@ class cls_caldav_client():
self.format_data_event(event) self.format_data_event(event)
return return
def get_lastName_with_MC(self,search):
print(f"search équipage 1: {search}")
user = User.objects.get(username=f"mc{search}@clerc.ch")
last_name = user.last_name
all_user_with_same_last_name = User.objects.filter(last_name=last_name)
if len(all_user_with_same_last_name) > 1:
print(f"Multiple last_name found {last_name}")
last_name = f"{user.first_name[0]}. {last_name}"
return last_name
def format_data_event(self,event): def format_data_event(self,event):
summary = event.vobject_instance.vevent.summary.value summary = event.vobject_instance.vevent.summary.value
if Key_separator not in summary: if Key_separator not in summary:
@@ -250,9 +260,8 @@ class cls_caldav_client():
if "MC" not in equipage[0]: # check équipage 1 if "MC" not in equipage[0]: # check équipage 1
team_1 = equipage[0].strip().replace('#', '') team_1 = equipage[0].strip().replace('#', '')
try: try:
print(f"search équipage 1: {team_1}") last_name = self.get_lastName_with_MC(team_1)
user = User.objects.get(username=f"mc{team_1}@clerc.ch").last_name equipage[0] = equipage[0].replace(team_1, f"MC{team_1} {last_name}")
equipage[0] = equipage[0].replace(team_1, f"MC{team_1} {user}")
updated = True updated = True
except : except :
print(f"Error: mc{team_1}@clerc.ch @{summary}") print(f"Error: mc{team_1}@clerc.ch @{summary}")
@@ -264,9 +273,8 @@ class cls_caldav_client():
elif "MC" not in equipage[1]: # check équipage 2 elif "MC" not in equipage[1]: # check équipage 2
team_2 = equipage[1].strip().replace('#','') team_2 = equipage[1].strip().replace('#','')
try: try:
print(f"search équipage 2: {team_2}") last_name = self.get_lastName_with_MC(team_2)
user = User.objects.get(username=f"mc{team_2}@clerc.ch").last_name equipage[1] = equipage[1].replace(team_2, f"MC{team_2} {last_name}")
equipage[1] = equipage[1].replace(team_2, f"MC{team_2} {user}")
updated = True updated = True
except : except :
print(f"Error: mc{team_2}@clerc.ch @{summary}") print(f"Error: mc{team_2}@clerc.ch @{summary}")