mirror of
https://github.com/UniversityOfHelsinkiCS/ohtuilmo.git
synced 2026-10-12 19:03:41 +03:00
Rename variables student -> studentNumber for clarity
This commit is contained in:
@@ -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 <LoadingSpinner />
|
||||
return (
|
||||
@@ -87,10 +87,9 @@ const InstructorTimeLogsPage = () => {
|
||||
selectedGroup={selectedGroup}
|
||||
handleGroupChange={setSelectedGroup}
|
||||
students={allStudents}
|
||||
selectedStudent={selectedStudent}
|
||||
handleStudentChange={setSelectedStudent}
|
||||
selectedStudentNumber={selectedStudentNumber}
|
||||
handleStudentNumberChange={setSelectedStudentNumber}
|
||||
/>
|
||||
<div>{selectedStudent}</div>
|
||||
{selectedGroup && <div>{selectedGroup.name}</div>}
|
||||
</div>
|
||||
<div id='timelog-rows'>
|
||||
|
||||
@@ -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 }) => (
|
||||
<div style={{ padding: 20 }}>
|
||||
<Typography variant="caption">{label}</Typography>
|
||||
@@ -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 (
|
||||
<Select
|
||||
data-cy="student-selector"
|
||||
value={selectedStudent}
|
||||
value={selectedStudentNumber}
|
||||
onChange={(e) => {
|
||||
handleStudentChange(e.target.value)
|
||||
handleStudentNumberChange(e.target.value)
|
||||
}}
|
||||
disabled={!selectedGroup}
|
||||
>
|
||||
@@ -87,15 +87,15 @@ export const TimeLogsSelectForm = ({
|
||||
selectedGroup={selectedGroup}
|
||||
handleGroupChange={handleGroupChange}
|
||||
groups={groups}
|
||||
handleStudentChange={handleStudentChange}
|
||||
handleStudentNumberChange={handleStudentNumberChange}
|
||||
/>
|
||||
</GroupSelectWrapper>
|
||||
{selectedGroup &&
|
||||
<StudentSelectWrapper label="Select student">
|
||||
<StudentSelect
|
||||
selectedGroup={selectedGroup}
|
||||
selectedStudent={selectedStudent}
|
||||
handleStudentChange={handleStudentChange}
|
||||
selectedStudentNumber={selectedStudentNumber}
|
||||
handleStudentNumberChange={handleStudentNumberChange}
|
||||
students={students}
|
||||
/>
|
||||
</StudentSelectWrapper>
|
||||
|
||||
Reference in New Issue
Block a user