Skip to content

Commit

Permalink
Update .prettierrc and StudentTable.jsx
Browse files Browse the repository at this point in the history
  • Loading branch information
Sagargupta16 committed Jan 29, 2024
1 parent 78aaf2e commit ece787c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"trailingComma": "none",
"bracketSpacing": true,
"arrowParens": "always",
"endOfLine": "lf",
"endOfLine": "auto",
"jsxSingleQuote": false,
"quoteProps": "as-needed",
"proseWrap": "always",
Expand Down
30 changes: 8 additions & 22 deletions client/src/components/Student/StudentTable.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ const StudentTable = () => {
className="role-dropdown"
value={params.data.role}
onChange={(event) => handleRoleChange(event, params.data)}
disabled={user.id === params.data.id}
disabled={user.id === params.data._id}
>
<option value="student">Student</option>
<option value="placementCoordinator">PC</option>
Expand All @@ -115,6 +115,11 @@ const StudentTable = () => {
const fetchData = useCallback(async () => {
try {
const response = await getStudents();
response.data.users.forEach((student) => {
if (student.role === 'student') student.role = 'Student';
else if (student.role === 'placementCoordinator') student.role = 'PC';
else if (student.role === 'admin') student.role = 'Admin';
});
setStudents(response.data.users);
} catch (error) {
console.error('Error fetching students:', error);
Expand Down Expand Up @@ -149,16 +154,6 @@ const StudentTable = () => {
generateColumn(null, 'Verify', 55, 'left', false, false, verifyButtonRenderer)
]);

const roleColumn = generateColumn(
'role',
'Role',
100,
'left',
false,
false,
user.role === 'admin' ? roleDropdownRenderer : null
);

const academicColumn = [
generateNestedColumn('Grades', [
generateNestedColumn('PG', [generateColumn('pg.cgpa', 'CGPA', 85), generateColumn('pg.percentage', '%', 85)]),
Expand All @@ -172,26 +167,17 @@ const StudentTable = () => {

const columnDefinitions = [
...(user.role === 'admin' || user.role === 'placementCoordinator' ? [actionsColumn] : []),
...(user.role === 'admin' ? [roleColumn] : []),
generateColumn('role', 'Role', 100, 'left', false, false, user.role === 'admin' ? roleDropdownRenderer : null),
generateColumn('rollNo', 'Roll No', 100, 'left'),
generateColumn('name', 'Name', 130, 'left'),
generateColumn('email', 'Email', 250),
generateColumn('placed', 'Placed?', 80),
...(user.role === 'admin' || user.role === 'placementCoordinator' ? academicColumn : [])
];

const mapStudentData = (student) => {
return {
...student,
id: student._id
};
};

const rowData = students.map(mapStudentData);

return (
<>
<AgGridTable rowData={rowData} columnDefinitions={columnDefinitions} fetchData={fetchData} />
<AgGridTable rowData={students} columnDefinitions={columnDefinitions} fetchData={fetchData} />
{selectedStudent &&
modelRenderer(
isModalOpen,
Expand Down

0 comments on commit ece787c

Please sign in to comment.