devops/encoach_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed corporate from user.name to user.companyName

Browse Source 
Company name is now updateable
This commit is contained in:
Joao Ramos
2023-12-14 17:57:39 +00:00
parent a2b9ba17a7
commit 44454d1e05
6 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/UserCard.tsx
View File

@@ -48,7 +48,7 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
const [referralAgent, setReferralAgent] = useState(user.type === "corporate" ? user.corporateInformation?.referralAgent : undefined); const [referralAgent, setReferralAgent] = useState(user.type === "corporate" ? user.corporateInformation?.referralAgent : undefined);
const [companyName, setCompanyName] = useState( const [companyName, setCompanyName] = useState(
user.type === "corporate" user.type === "corporate"
? user.corporateInformation?.companyInformation.name ? user.corporateInformation?.companyInformation.companyName
: user.type === "agent" : user.type === "agent"
? user.agentInformation.companyName ? user.agentInformation.companyName
: undefined, : undefined,

2
src/dashboards/Admin.tsx
View File

@@ -48,7 +48,7 @@ export default function AdminDashboard({user}: Props) {
<div className="flex flex-col gap-1 items-start"> <div className="flex flex-col gap-1 items-start">
<span> <span>
{displayUser.type === "corporate" {displayUser.type === "corporate"
? displayUser.corporateInformation?.companyInformation?.name || displayUser.name ? displayUser.corporateInformation?.companyInformation?.companyName || displayUser.name
: displayUser.name} : displayUser.name}
</span> </span>
<span className="text-sm opacity-75">{displayUser.email}</span> <span className="text-sm opacity-75">{displayUser.email}</span>

2
src/dashboards/Agent.tsx
View File

@@ -51,7 +51,7 @@ export default function AgentDashboard({user}: Props) {
<div className="flex flex-col gap-1 items-start"> <div className="flex flex-col gap-1 items-start">
<span> <span>
{displayUser.type === "corporate" {displayUser.type === "corporate"
? displayUser.corporateInformation?.companyInformation?.name || displayUser.name ? displayUser.corporateInformation?.companyInformation?.companyName || displayUser.name
: displayUser.name} : displayUser.name}
</span> </span>
<span className="text-sm opacity-75">{displayUser.email}</span> <span className="text-sm opacity-75">{displayUser.email}</span>

2
src/interfaces/user.ts
View File

@@ -68,7 +68,7 @@ export interface AgentInformation {
} }
export interface CompanyInformation { export interface CompanyInformation {
name: string; companyName: string;
userAmount: number; userAmount: number;
} }

2
src/pages/(admin)/Lists/UserList.tsx
View File

@@ -294,7 +294,7 @@ export default function UserList({user, filters = []}: {user: User; filters?: ((
"underline text-mti-purple-light hover:text-mti-purple-dark transition ease-in-out duration-300 cursor-pointer", "underline text-mti-purple-light hover:text-mti-purple-dark transition ease-in-out duration-300 cursor-pointer",
)} )}
onClick={() => (PERMISSIONS.updateExpiryDate[row.original.type].includes(user.type) ? setSelectedUser(row.original) : null)}> onClick={() => (PERMISSIONS.updateExpiryDate[row.original.type].includes(user.type) ? setSelectedUser(row.original) : null)}>
{row.original.type === "corporate" ? row.original.corporateInformation?.companyInformation?.name || getValue() : getValue()} {row.original.type === "corporate" ? row.original.corporateInformation?.companyInformation?.companyName || getValue() : getValue()}
</div> </div>
), ),
}), }),

22
src/pages/payment-record.tsx
View File

@@ -115,7 +115,7 @@ const PaymentCreator = ({onClose, reload, showComission = false}: {onClose: () =
options={(users.filter((u) => u.type === "corporate") as CorporateUser[]).map((user) => ({ options={(users.filter((u) => u.type === "corporate") as CorporateUser[]).map((user) => ({
value: user.id, value: user.id,
meta: user, meta: user,
label: `${user.corporateInformation.companyInformation.name || user.name} - ${user.email}`, label: `${user.corporateInformation.companyInformation.companyName || user.name} - ${user.email}`,
}))} }))}
defaultValue={{value: "undefined", label: "Select an account"}} defaultValue={{value: "undefined", label: "Select an account"}}
onChange={(value) => setCorporate((value as any)?.meta ?? undefined)} onChange={(value) => setCorporate((value as any)?.meta ?? undefined)}
@@ -313,14 +313,16 @@ export default function PaymentRecord() {
}), }),
columnHelper.accessor("corporate", { columnHelper.accessor("corporate", {
header: "Corporate", header: "Corporate",
cell: (info) => ( cell: (info) => {
<div const user = users.find((x) => x.id === info.row.original.corporate) as CorporateUser;
className={clsx("underline text-mti-purple-light hover:text-mti-purple-dark transition ease-in-out duration-300 cursor-pointer")} return (
onClick={() => setSelectedUser(users.find((x) => x.id === info.row.original.corporate))}> <div
{(users.find((x) => x.id === info.row.original.corporate) as CorporateUser)?.corporateInformation.companyInformation.name || className={clsx("underline text-mti-purple-light hover:text-mti-purple-dark transition ease-in-out duration-300 cursor-pointer")}
(users.find((x) => x.id === info.row.original.corporate) as CorporateUser)?.name} onClick={() => setSelectedUser(user)}>
</div> {user?.corporateInformation.companyInformation.companyName || user?.name}
), </div>
);
},
}), }),
columnHelper.accessor("date", { columnHelper.accessor("date", {
header: "Date", header: "Date",
@@ -445,7 +447,7 @@ export default function PaymentRecord() {
options={(users.filter((u) => u.type === "corporate") as CorporateUser[]).map((user) => ({ options={(users.filter((u) => u.type === "corporate") as CorporateUser[]).map((user) => ({
value: user.id, value: user.id,
meta: user, meta: user,
label: `${user.corporateInformation.companyInformation.name || user.name} - ${user.email}`, label: `${user.corporateInformation.companyInformation.companyName || user.name} - ${user.email}`,
}))} }))}
onChange={(value) => setCorporate((value as any)?.meta ?? undefined)} onChange={(value) => setCorporate((value as any)?.meta ?? undefined)}
styles={{ styles={{