From 4426ba577098c82bbd44d91af00ab1e294572be7 Mon Sep 17 00:00:00 2001 From: Horilla Date: Thu, 1 Feb 2024 13:07:27 +0530 Subject: [PATCH] [UPDT] EMPLOYEE: Employee str updated with badge id --- employee/models.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/employee/models.py b/employee/models.py index bbafd6872..cb0c32081 100644 --- a/employee/models.py +++ b/employee/models.py @@ -281,7 +281,8 @@ class Employee(models.Model): last_name = ( self.employee_last_name if self.employee_last_name is not None else "" ) - return f"{self.employee_first_name} {last_name}" + badge_id = ((f"({self.badge_id})") if self.badge_id is not None else "") + return f"{self.employee_first_name} {last_name} {badge_id}" def check_online(self): """ @@ -700,3 +701,12 @@ class DisciplinaryAction(models.Model): def __str__(self) -> str: return f"{self.action}" + + +class EmployeeGeneralSetting(models.Model): + """ + EmployeeGeneralSetting + """ + + badge_id_prefix = models.CharField(max_length=5, default="PEP") + company_id = models.ForeignKey(Company,null=True,on_delete=models.CASCADE)