Add student count to course's classes, prevent empty add student

This commit is contained in:
2022-01-30 00:04:44 +00:00
parent 8f56a74a55
commit a914171cb3
5 changed files with 149 additions and 6 deletions

View File

@@ -137,6 +137,8 @@ export function CourseDetail(props) {
});
}, []);
const now = new Date().toISOString();
return (
<Container>
{!error ?
@@ -170,21 +172,32 @@ export function CourseDetail(props) {
<Table.HeaderCell>Time</Table.HeaderCell>
<Table.HeaderCell>Instructor</Table.HeaderCell>
<Table.HeaderCell>Cost</Table.HeaderCell>
<Table.HeaderCell>Students</Table.HeaderCell>
</Table.Row>
</Table.Header>
<Table.Body>
{course.sessions.length ?
course.sessions.sort((a, b) => a.datetime < b.datetime ? 1 : -1).slice(0,10).map(x =>
<Table.Row key={x.id}>
<Table.Row key={x.id} active={x.datetime < now || x.is_cancelled}>
<Table.Cell>
<Link to={'/classes/'+x.id}>
{moment.utc(x.datetime).tz('America/Edmonton').format('ll')}
&nbsp;{moment.utc(x.datetime).tz('America/Edmonton').format('ll')}
</Link>
</Table.Cell>
<Table.Cell>{x.is_cancelled ? 'Cancelled' : moment.utc(x.datetime).tz('America/Edmonton').format('LT')}</Table.Cell>
<Table.Cell>{getInstructor(x)}</Table.Cell>
<Table.Cell>{x.cost === '0.00' ? 'Free' : '$'+x.cost}</Table.Cell>
<Table.Cell>
{!!x.max_students ?
x.max_students <= x.student_count ?
'Full'
:
x.student_count + ' / ' + x.max_students
:
x.student_count
}
</Table.Cell>
</Table.Row>
)
:

View File

@@ -209,7 +209,11 @@ export function InstructorClassAttendance(props) {
/>
</Form.Field>
<Form.Button loading={loading} error={error.non_field_errors}>
<Form.Button
loading={loading}
error={error.non_field_errors}
disabled={!input.member_id}
>
Submit
</Form.Button>
</Form>