diff --git a/Employee_Managment_App/src/components/EmployeeInfo.tsx b/Employee_Managment_App/src/components/EmployeeInfo.tsx index 897af33..4c37d80 100644 --- a/Employee_Managment_App/src/components/EmployeeInfo.tsx +++ b/Employee_Managment_App/src/components/EmployeeInfo.tsx @@ -87,9 +87,9 @@ const EmployeeInfo = (props: { employeeData?: EmployeeDetails; userInfo?: Employ let employeeData: EmployeeDetails = (routeEmployee as any) ?? (props.employeeData as any) ?? (userInfo as any) ?? (defaultEmployee as any) ?? defaultEmployeeData; // Format the date to the desired output const custom: Intl.DateTimeFormatOptions = { - day: 'numeric', // Displays day as a number (e.g., 1) - month: 'short', // Displays the short month name (e.g., Feb) - year: 'numeric' // Displays the full year (e.g., 2005) + day: 'numeric', + month: 'short', + year: 'numeric' }; // Normalize possible string dates to Date objects and guard for missing values @@ -100,8 +100,8 @@ const EmployeeInfo = (props: { employeeData?: EmployeeDetails; userInfo?: Employ ? new Date((employeeData as any).DOB) : null; - const dateOfJoining: string = dojDate ? dojDate.toLocaleDateString('en-GB', custom) : '-'; - const dob: string = dobDate ? dobDate.toLocaleDateString('en-GB', custom) : '-'; + const dateOfJoining: string = dojDate ? dojDate.toLocaleDateString('en-US', custom).replace(/,/g, ''): '-'; + const dob: string = dobDate ? dobDate.toLocaleDateString('en-US', custom).replace(/,/g, ''): '-'; const now = new Date(); let experienceYears = 0; @@ -329,7 +329,7 @@ const canSeePrivateTabs = /> -
+
{employeeData.Name}
{employeeData.Mail}
{employeeData.Designation}
diff --git a/Employee_Managment_App/src/components/Employees.tsx b/Employee_Managment_App/src/components/Employees.tsx index 35f6e9d..dae350c 100644 --- a/Employee_Managment_App/src/components/Employees.tsx +++ b/Employee_Managment_App/src/components/Employees.tsx @@ -217,7 +217,7 @@ const Employees = (props?: EmployeesProps) => { headerText="Date Joined" textAlign="Right" type="date" - format={{ type: 'date', format: "d MMM yyyy"}} + format={{ type: 'date', format: "MMM d yyyy"}} clipMode="EllipsisWithTooltip" width="150" /> diff --git a/Employee_Managment_App/src/components/Policies.css b/Employee_Managment_App/src/components/Policies.css index accbc6c..9b24eef 100644 --- a/Employee_Managment_App/src/components/Policies.css +++ b/Employee_Managment_App/src/components/Policies.css @@ -148,7 +148,7 @@ display: inline-flex; align-items: center; gap: 10px; - padding: 9px 14px; + padding: 5px 14px; border-radius: 999px; border: 1px solid var(--border); background: var(--surface); diff --git a/Employee_Managment_App/src/components/Policies.tsx b/Employee_Managment_App/src/components/Policies.tsx index 6313488..ae0429b 100644 --- a/Employee_Managment_App/src/components/Policies.tsx +++ b/Employee_Managment_App/src/components/Policies.tsx @@ -168,8 +168,8 @@ const Policies: React.FC = () => { - - + + diff --git a/Employee_Managment_App/src/index.css b/Employee_Managment_App/src/index.css index b14f234..ded6a88 100644 --- a/Employee_Managment_App/src/index.css +++ b/Employee_Managment_App/src/index.css @@ -58156,6 +58156,10 @@ ejs-sidebar { .e-leftfreeze .CardTable{ margin-left: 0px; } +.profile-content{ + display: ruby; + margin-left: 15px; +} td[aria-label=" is template cell column header Total"] .CardTable { margin-left: 20px; /* Adjust as needed */