From 1b98d466b7cdfa6a99b16284acc022069b017b09 Mon Sep 17 00:00:00 2001 From: regularmute <93884347+Regularmute@users.noreply.github.com> Date: Thu, 25 Apr 2024 18:28:38 +0300 Subject: [PATCH] Rename variables student -> studentNumber for clarity --- .../TimeLogsPage/InstructorTimeLogsPage.jsx | 9 ++++----- .../TimeLogsPage/TimeLogsSelectForm.jsx | 18 +++++++++--------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/frontend/src/components/TimeLogsPage/InstructorTimeLogsPage.jsx b/frontend/src/components/TimeLogsPage/InstructorTimeLogsPage.jsx index 5370f6c..a99ef63 100644 --- a/frontend/src/components/TimeLogsPage/InstructorTimeLogsPage.jsx +++ b/frontend/src/components/TimeLogsPage/InstructorTimeLogsPage.jsx @@ -10,7 +10,7 @@ import groupManagementService from '../../services/groupManagement' import timeLogsService from '../../services/timeLogs' const InstructorTimeLogsPage = () => { - const [selectedStudent, setSelectedStudent] = useState(null) + const [selectedStudentNumber, setSelectedStudentNumber] = useState(null) const [allStudents, setAllStudents] = useState([]) const [allLogs, setAllLogs] = useState(null) const [selectedGroup, setSelectedGroup] = useState(null) @@ -76,7 +76,7 @@ const InstructorTimeLogsPage = () => { const isLogs = (logs) => logs && logs.length > 0 const logsByStudent = - isLogs(allLogs) && allLogs.filter((log) => log.studentNumber === selectedStudent) + isLogs(allLogs) && allLogs.filter((log) => log.studentNumber === selectedStudentNumber) if (isLoading) return return ( @@ -87,10 +87,9 @@ const InstructorTimeLogsPage = () => { selectedGroup={selectedGroup} handleGroupChange={setSelectedGroup} students={allStudents} - selectedStudent={selectedStudent} - handleStudentChange={setSelectedStudent} + selectedStudentNumber={selectedStudentNumber} + handleStudentNumberChange={setSelectedStudentNumber} /> -
{selectedStudent}
{selectedGroup &&
{selectedGroup.name}
}
diff --git a/frontend/src/components/TimeLogsPage/TimeLogsSelectForm.jsx b/frontend/src/components/TimeLogsPage/TimeLogsSelectForm.jsx index 3240233..f02bc12 100644 --- a/frontend/src/components/TimeLogsPage/TimeLogsSelectForm.jsx +++ b/frontend/src/components/TimeLogsPage/TimeLogsSelectForm.jsx @@ -5,7 +5,7 @@ import Select from '@material-ui/core/Select' export const TimeLogsSelectForm = ({ groups, selectedGroup, handleGroupChange, - students, selectedStudent, handleStudentChange }) => { + students, selectedStudentNumber, handleStudentNumberChange }) => { const GroupSelectWrapper = ({ label, children }) => (
{label} @@ -24,7 +24,7 @@ export const TimeLogsSelectForm = ({ value={selectedGroup} onChange={(e) => { handleGroupChange(e.target.value) - handleStudentChange(null) + handleStudentNumberChange(null) }} > {groups.map((group) => ( @@ -53,15 +53,15 @@ export const TimeLogsSelectForm = ({ const StudentSelect = ({ selectedGroup, students, - selectedStudent, - handleStudentChange + selectedStudentNumber, + handleStudentNumberChange }) => { return (