Merge pull request #150 from Web-Team-IITI-Gymkhana/tpc-member-fix

tpc member fix
Web-Team-IITI-Gymkhana · Aug 11, 2024 · bb0a2b0 · bb0a2b0
2 parents c797716 + 71057cd
commit bb0a2b0
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 65 deletions.
diff --git a/src/app/(routes)/admin/jobs/[jobId]/page.tsx b/src/app/(routes)/admin/jobs/[jobId]/page.tsx
@@ -1163,7 +1163,7 @@ const JobDetailPage = ({ params }: { params: { jobId: string } }) => {
                   <div className="text-center font-semibold">
                     <PersonIcon sx={{ fontSize: 80 }} className="mx-auto" />
                     <br />
-                    {coordinator.tpcMember.user.name}
+                    {coordinator.tpcMember.student.user.name}
                   </div>
                   <div>
                     <div>
@@ -1172,15 +1172,15 @@ const JobDetailPage = ({ params }: { params: { jobId: string } }) => {
                     </div>
                     <div>
                       <span className="font-semibold">Department : </span>
-                      {coordinator.tpcMember.department}
+                      {coordinator.tpcMember.student.program.department}
                     </div>
                     <div>
                       <span className="font-semibold">Email : </span>
-                      {coordinator.tpcMember.user.email}
+                      {coordinator.tpcMember.student.user.email}
                     </div>
                     <div>
                       <span className="font-semibold">Contact : </span>
-                      {coordinator.tpcMember.user.contact}
+                      {coordinator.tpcMember.student.user.contact}
                     </div>
                   </div>
                 </div>
@@ -1415,14 +1415,14 @@ const JobDetailPage = ({ params }: { params: { jobId: string } }) => {
                       </div>
                     )}
                   </div>
-                  <Separator className="my-4" />
+                  {/* <Separator className="my-4" /> */}
                   <div className="flex justify-between mt-2 mb-4">
                     <Button color="primary" onClick={() => { setApprovalModal(!approvalModal); getApprovals(salaryIndex) }} >Current Approvals</Button>
                     <div className="flex justify-end">
                       {facultyDropDown[salaryIndex] && (<button
                         className="bg-blue-500 text-white p-2 mr-4 rounded  hover:bg-blue-600 transition duration-200"
                         onClick={() => submitApproval(salaryIndex)}
-                      >
+                        >
                         Submit Request
                       </button>)}
                       <Button
@@ -1440,6 +1440,7 @@ const JobDetailPage = ({ params }: { params: { jobId: string } }) => {
                       </Button>
                     </div>
                   </div>
+                  <Separator className="my-8" />
                   {approvalModal && (
                     <div className="fixed inset-0 flex items-center justify-center z-30 bg-gray-800 bg-opacity-10">
                       <div className="bg-white rounded-lg shadow-lg w-3/4 md:w-1/2 lg:w-1/3">

diff --git a/src/app/(routes)/recruiter/jobs/[jobID]/page.tsx b/src/app/(routes)/recruiter/jobs/[jobID]/page.tsx
@@ -522,7 +522,7 @@ const JobDetailPage = ({ params }: { params: { jobID: string } }) => {
                   <div className="text-center font-semibold">
                     <PersonIcon sx={{ fontSize: 80 }} className="mx-auto" />
                     <br />
-                    {coordinator.tpcMember.user.name}
+                    {coordinator.tpcMember.student.user.name}
                   </div>
                   <div>
                     <div>
@@ -531,15 +531,15 @@ const JobDetailPage = ({ params }: { params: { jobID: string } }) => {
                     </div>
                     <div>
                       <span className="font-semibold">Department : </span>
-                      {coordinator.tpcMember.department}
+                      {coordinator.tpcMember.student.program.department}
                     </div>
                     <div>
                       <span className="font-semibold">Email : </span>
-                      {coordinator.tpcMember.user.email}
+                      {coordinator.tpcMember.student.user.email}
                     </div>
                     <div>
                       <span className="font-semibold">Contact : </span>
-                      {coordinator.tpcMember.user.contact}
+                      {coordinator.tpcMember.student.user.contact}
                     </div>
                   </div>
                 </div>

diff --git a/src/app/(routes)/student/job/[jobId]/page.tsx b/src/app/(routes)/student/job/[jobId]/page.tsx
@@ -286,11 +286,11 @@ const JobPage = ({ params }: { params: { jobId: string } }) => {
             <TableBody>
               {jobData?.jobCoordinators.map((coordinator, index) => (
                 <TableRow key={index}>
-                  <TableCell>{coordinator.tpcMember.user.name}</TableCell>
+                  <TableCell>{coordinator.tpcMember.student.user.name}</TableCell>
                   <TableCell>{coordinator.role}</TableCell>
-                  <TableCell>{coordinator.tpcMember.department}</TableCell>
-                  <TableCell>{coordinator.tpcMember.user.email}</TableCell>
-                  <TableCell>{coordinator.tpcMember.user.contact}</TableCell>
+                  <TableCell>{coordinator.tpcMember.student.program.department}</TableCell>
+                  <TableCell>{coordinator.tpcMember.student.user.email}</TableCell>
+                  <TableCell>{coordinator.tpcMember.student.user.contact}</TableCell>
                 </TableRow>
               ))}
             </TableBody>

diff --git a/src/components/Admin/AddForms.tsx b/src/components/Admin/AddForms.tsx
@@ -12,7 +12,7 @@ const JobCoordinatorForm = ({ jobId }: { jobId: string }) => {
   const [role, setRole] = useState("PRIMARY");
   const [loading, setLoading] = useState(true);
   const options = tpcMembers?.map((member) => ({
-    label: `${member.user.name} ${member.user.email}`,
+    label: `${member.student.user.name} ${member.student.user.email}`,
     value: member.id,
   }));
   const jobRoleOptions = [
@@ -71,7 +71,7 @@ const JobCoordinatorForm = ({ jobId }: { jobId: string }) => {
               isSearchable
               className="mb-4 text-sm font-normal"
             />
-            {coordinator && coordinator.user.name}
+            {coordinator && coordinator.student.user.name}
           </div>
           {coordinator && (
             <div>
@@ -81,15 +81,15 @@ const JobCoordinatorForm = ({ jobId }: { jobId: string }) => {
               </div>
               <div>
                 <span className="font-semibold">Department : </span>
-                {coordinator.department}
+                {coordinator.student.program.department}
               </div>
               <div>
                 <span className="font-semibold">Email : </span>
-                {coordinator.user.email}
+                {coordinator.student.user.email}
               </div>
               <div>
                 <span className="font-semibold">Contact : </span>
-                {coordinator.user.contact}
+                {coordinator.student.user.contact}
               </div>
               <Select
                 options={jobRoleOptions}

diff --git a/src/components/Admin/types.tsx b/src/components/Admin/types.tsx
@@ -1,27 +1,32 @@
-export interface JobCoordinatorFC {
+
+interface Program {
   id: string;
-  role: string;
-  tpcMember: {
-    id: string;
-    department: string;
-    role: string;
-    user: {
-      id: string;
-      email: string;
-      name: string;
-      contact: string;
-    };
-  };
+  branch: string;
+  course: string;
+  year: string;
+  department: string;
+}
+
+interface User {
+  id: string;
+  name: string;
+  email: string;
+  contact: string;
+}
+
+interface Student {
+  id: string;
+  program: Program;
+  user: User;
 }
 
 export interface TPCMember {
   id: string;
-  department: string;
   role: string;
-  user: {
-    id: string;
-    name: string;
-    email: string;
-    contact: string;
-  };
+  student: Student; 
+}
+export interface JobCoordinatorFC {
+  id: string;
+  role: string;
+  tpcMember: TPCMember;
 }
diff --git a/src/components/NewTableComponent/NewJobModal.tsx b/src/components/NewTableComponent/NewJobModal.tsx
@@ -570,7 +570,7 @@ const JobModal = ({
                     <div className="text-center font-semibold">
                       <PersonIcon sx={{ fontSize: 80 }} className="mx-auto" />
                       <br />
-                      {coordinator.tpcMember.user.name}
+                      {coordinator.tpcMember.student.user.name}
                     </div>
                     <div>
                       <div>
@@ -579,15 +579,15 @@ const JobModal = ({
                       </div>
                       <div>
                         <span className="font-semibold">Department : </span>
-                        {coordinator.tpcMember.department}
+                        {coordinator.tpcMember.student.program.department}
                       </div>
                       <div>
                         <span className="font-semibold">Email : </span>
-                        {coordinator.tpcMember.user.email}
+                        {coordinator.tpcMember.student.user.email}
                       </div>
                       <div>
                         <span className="font-semibold">Contact : </span>
-                        {coordinator.tpcMember.user.contact}
+                        {coordinator.tpcMember.student.user.contact}
                       </div>
                     </div>
                   </div>

diff --git a/src/helpers/recruiter/types.ts b/src/helpers/recruiter/types.ts
@@ -1,3 +1,5 @@
+import { TPCMember } from "@/components/Admin/types";
+
 export interface ApplicationFC {
   id: string;
   student: {
@@ -110,17 +112,7 @@ export interface JobDetailFC {
     {
       id: string;
       role: string;
-      tpcMember: {
-        id: string;
-        department: string;
-        role: string;
-        user: {
-          id: string;
-          email: string;
-          name: string;
-          contact: string;
-        };
-      };
+      tpcMember: TPCMember;
     },
   ];
   events: [

diff --git a/src/helpers/student/types.ts b/src/helpers/student/types.ts
@@ -1,3 +1,5 @@
+import { TPCMember } from "@/components/Admin/types";
+
 export interface OnCampusOffers {
   id: string;
   status: string;
@@ -237,17 +239,7 @@ export interface Job {
   jobCoordinators: {
     id: string;
     role: string;
-    tpcMember: {
-      id: string;
-      department: string;
-      role: string;
-      user: {
-        id: string;
-        email: string;
-        name: string;
-        contact: string;
-      };
-    };
+    tpcMember: TPCMember
   }[];
 
   events: {