Skip to content
This repository has been archived by the owner on Jul 1, 2023. It is now read-only.

Bugfix b10 #43

Merged
merged 3 commits into from
May 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions features.txt
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ bugfix-b6: AddInstructor and AddTA checks
bugfix-b7: adjust Final PDF generation
bugfix-b8: saving passwords to database
bugfix-b9: get internships deadline check & frontend styling bugfix
bugfix-b10: Tooltips



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
Select,
MenuItem,
Typography,
Tooltip
} from "@mui/material";
import ChangeCircleIcon from "@mui/icons-material/ChangeCircle";

Expand Down Expand Up @@ -101,9 +102,11 @@ export default function AssignToAnInstructorButton({

return (
<div>
<IconButton onClick={handleClickOpen}>
<ChangeCircleIcon></ChangeCircleIcon>
</IconButton>
<Tooltip title="Assign to an Instructor">
<IconButton onClick={handleClickOpen}>
<ChangeCircleIcon></ChangeCircleIcon>
</IconButton>
</Tooltip>
{error && <div>{error.message}</div>}
{availableInstructors && (
<Dialog
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Button, IconButton, Modal, TextField } from "@mui/material";
import { Button, IconButton, Modal, TextField, Tooltip } from "@mui/material";
import EditIcon from "@mui/icons-material/Edit";
import { useState } from "react";
import axios from "axios";
Expand Down Expand Up @@ -56,13 +56,15 @@ export default function ChangeInstructorDetailsButton({
};
return (
<>
<IconButton
onClick={() => {
setOpen(true);
}}
>
<EditIcon></EditIcon>
</IconButton>
<Tooltip title="Change Instructor Details">
<IconButton
onClick={() => {
setOpen(true);
}}
>
<EditIcon></EditIcon>
</IconButton>
</Tooltip>
<Modal
sx={{
display: "flex",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { IconButton } from "@mui/material";
import { IconButton, Tooltip } from "@mui/material";
import EditIcon from '@mui/icons-material/Edit';

export default function ChangeInternshipDetailsButton() {
return <IconButton><EditIcon></EditIcon></IconButton>;
return <Tooltip title="Change Internship Details"><IconButton><EditIcon></EditIcon></IconButton></Tooltip>;
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IconButton } from "@mui/material";
import { IconButton, Tooltip } from "@mui/material";
import CloseIcon from "@mui/icons-material/Close";

import axios from "axios";
Expand All @@ -25,8 +25,10 @@ export default function DeleteInstructorButton({
};

return (
<Tooltip title="Delete Instructor">
<IconButton onClick={handleDeleteInstructor}>
<CloseIcon color="error"></CloseIcon>
</IconButton>
</Tooltip>
);
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IconButton } from "@mui/material";
import { IconButton, Tooltip } from "@mui/material";
import CloseIcon from "@mui/icons-material/Close";

import axios from "axios";
Expand All @@ -25,8 +25,10 @@ export default function DeleteInternshipButton({
};

return (
<Tooltip title="Delete Internship">
<IconButton onClick={handleDeleteInternship}>
<CloseIcon color="error"></CloseIcon>
</IconButton>
</Tooltip>
);
}
4 changes: 3 additions & 1 deletion frontend/src/components/Instructor/Instructor.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IconButton, Card, ListItem, ListItemText, Stack } from "@mui/material";
import { IconButton, Card, ListItem, ListItemText, Tooltip, Stack } from "@mui/material";
import { useEffect, useState } from "react";
import { useNavigate } from "react-router-dom";
import ChangeInstructorDetailsButton from "../ChangeInstructorDetailsButton/ChangeInstructorDetailsButton";
Expand Down Expand Up @@ -50,13 +50,15 @@ export default function Instructor({ instructor, refreshInstructors }) {
instructor={instructor}
refreshInstructors={refreshInstructors}
/>
<Tooltip title="See Assigned Internships">
<IconButton
onClick={() => {
navigate(`/instructors/${instructor.id}`);
}}
>
<VisibilityIcon></VisibilityIcon>
</IconButton>
</Tooltip>
<DeleteInstructorButton
instructorId={instructor.id}
refreshInstructors={refreshInstructors}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useContext } from "react";
import { useNavigate } from "react-router-dom";
import { UserContext } from "../../contexts/UserContext";
import { IconButton } from "@mui/material";
import { IconButton, Tooltip } from "@mui/material";
import { InternshipIDContext } from "../../contexts/InternshipIDContext";

import VisibilityIcon from '@mui/icons-material/Visibility';
Expand Down Expand Up @@ -45,5 +45,5 @@ export default function SeeSubmissionButton({
}
};

return <IconButton onClick={redirectToSubmissionPage}><VisibilityIcon></VisibilityIcon></IconButton>;
return <Tooltip title="See Submission"><IconButton onClick={redirectToSubmissionPage}><VisibilityIcon></VisibilityIcon></IconButton></Tooltip>;
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IconButton, Dialog, Typography } from "@mui/material";
import { IconButton, Dialog, Typography, Tooltip } from "@mui/material";
import UploadIcon from "@mui/icons-material/Upload";
import { useState } from "react";
import axios from "axios";
Expand Down Expand Up @@ -40,13 +40,15 @@ export default function UploadCompanyEvaluationFormButton({

return (
<>
<IconButton
onClick={() => {
setOpen(true);
}}
>
<UploadIcon></UploadIcon>
</IconButton>
<Tooltip title="Upload Company Evaluation Form">
<IconButton
onClick={() => {
setOpen(true);
}}
>
<UploadIcon></UploadIcon>
</IconButton>
</Tooltip>
<Dialog
open={open}
onClose={() => {
Expand Down