diff --git a/src/dashboards/Admin.tsx b/src/dashboards/Admin.tsx index b91291d7..c72550b0 100644 --- a/src/dashboards/Admin.tsx +++ b/src/dashboards/Admin.tsx @@ -260,7 +260,7 @@ export default function AdminDashboard({user}: Props) { /> setPage("inactiveCorporate")} - Icon={BsPerson} + Icon={BsBank} label="Inactive Corporate" value={ users.filter((x) => x.type === "corporate" && (x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate))) diff --git a/src/dashboards/Agent.tsx b/src/dashboards/Agent.tsx index dbfb56cc..3affaffe 100644 --- a/src/dashboards/Agent.tsx +++ b/src/dashboards/Agent.tsx @@ -40,9 +40,9 @@ export default function AgentDashboard({user}: Props) { const inactiveReferredCorporateFilter = (x: User) => referredCorporateFilter(x) && (x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate)); - const UserDisplay = (displayUser: User) => ( + const UserDisplay = ({ displayUser, allowClick = true }: {displayUser: User, allowClick?: boolean}) => (
setSelectedUser(displayUser)} + onClick={() => allowClick && setSelectedUser(displayUser)} className="flex w-full p-4 gap-4 items-center hover:bg-mti-purple-ultralight cursor-pointer transition ease-in-out duration-300"> {displayUser.name}
@@ -66,7 +66,7 @@ export default function AgentDashboard({user}: Props) { Back
-

Corporate ({users.filter(referredCorporateFilter).length})

+

Referred Corporate ({users.filter(referredCorporateFilter).length})

@@ -84,7 +84,7 @@ export default function AgentDashboard({user}: Props) { Back -

Inactive Corporate ({users.filter(inactiveReferredCorporateFilter).length})

+

Inactive Referred Corporate ({users.filter(inactiveReferredCorporateFilter).length})

@@ -117,15 +117,15 @@ export default function AgentDashboard({user}: Props) {
setPage("referredCorporate")} - Icon={BsPersonFill} - label="Corporate" + Icon={BsBank} + label="Referred Corporate" value={users.filter(referredCorporateFilter).length} color="purple" /> setPage("inactiveReferredCorporate")} - Icon={BsPersonFill} - label="Inactive Corporate" + Icon={BsBank} + label="Inactive Referred Corporate" value={users.filter(inactiveReferredCorporateFilter).length} color="rose" /> @@ -140,13 +140,13 @@ export default function AgentDashboard({user}: Props) {
- Latest Corporate + Latest Referred Corporate
{users .filter(referredCorporateFilter) .sort((a, b) => dateSorter(a, b, "desc", "registrationDate")) .map((x) => ( - + ))}
@@ -157,12 +157,12 @@ export default function AgentDashboard({user}: Props) { .filter(corporateFilter) .sort((a, b) => dateSorter(a, b, "desc", "registrationDate")) .map((x) => ( - + ))}
- Corporate expiring in 1 month + Referenced corporate expiring in 1 month
{users .filter( @@ -172,7 +172,7 @@ export default function AgentDashboard({user}: Props) { moment().isBefore(moment(x.subscriptionExpirationDate)), ) .map((x) => ( - + ))}
diff --git a/src/exams/pdf/group.test.report.tsx b/src/exams/pdf/group.test.report.tsx index 9b0d0405..4b865494 100644 --- a/src/exams/pdf/group.test.report.tsx +++ b/src/exams/pdf/group.test.report.tsx @@ -103,13 +103,13 @@ const GroupTestReport = ({ {title} - + Date of Test: {date} Candidate Information: - + Name: {name} ID: {id} Email: {email} @@ -193,10 +193,8 @@ const GroupTestReport = ({ ]} key={label} > - - {label} - - + {label} + ( - - + + Validity @@ -52,4 +57,4 @@ const TestReportFooter = () => ( ); -export default TestReportFooter; \ No newline at end of file +export default TestReportFooter; diff --git a/src/exams/pdf/test.report.tsx b/src/exams/pdf/test.report.tsx index 34ceddc7..acd14481 100644 --- a/src/exams/pdf/test.report.tsx +++ b/src/exams/pdf/test.report.tsx @@ -68,19 +68,19 @@ const TestReport = ({ {title} - + Date of Test: {date} Candidate Information: - + Name: {name} ID: {id} Email: {email} Gender: {gender} - + {testDetails - .filter(({ suggestions, evaluation }) => suggestions || evaluation) + .filter( + ({ suggestions, evaluation }) => suggestions || evaluation + ) .map(({ module, suggestions, evaluation }) => ( @@ -139,15 +141,11 @@ const TestReport = ({ {evaluation} {suggestions} - ))} - +