introduced "Failed" status for instructor
polite wording for member
master
Adrian Dmitra 9 months ago
parent 9a4760aef5
commit 8315aa7b5d
  1. 3
      apiserver/apiserver/api/serializers.py
  2. 6
      webclient/src/Classes.js
  3. 6
      webclient/src/InstructorClasses.js

@ -569,6 +569,7 @@ class TrainingSerializer(serializers.ModelSerializer):
'Waiting for payment', 'Waiting for payment',
'Withdrawn', 'Withdrawn',
'Rescheduled', 'Rescheduled',
'Failed',
'No-show', 'No-show',
'Attended', 'Attended',
'Confirmed' 'Confirmed'
@ -1076,4 +1077,4 @@ class MyLoginSerializer(LoginSerializer):
if not user: if not user:
raise ValidationError(dict(password='Incorrect password. Check caps lock.')) raise ValidationError(dict(password='Incorrect password. Check caps lock.'))
return user return user

@ -669,7 +669,8 @@ export function ClassDetail(props) {
{clazz.instructor !== user.id && {clazz.instructor !== user.id &&
(userTraining ? (userTraining ?
<div> <div>
<p>Status: {userTraining.attendance_status}</p> { userTraining.attendance_status !== 'Failed' && <p>Status: {userTraining.attendance_status}</p>}
{ userTraining.attendance_status === 'Failed' && <p>Status: Attempted</p>}
<p> <p>
{userTraining.attendance_status === 'Withdrawn' ? {userTraining.attendance_status === 'Withdrawn' ?
<Button loading={loading} onClick={() => handleToggle('Waiting for payment')}> <Button loading={loading} onClick={() => handleToggle('Waiting for payment')}>
@ -750,5 +751,4 @@ export function ClassDetail(props) {
} }
</Container> </Container>
); );
}; };

@ -116,6 +116,10 @@ function AttendanceRow(props) {
Rescheduled Rescheduled
</Button> </Button>
<Button {...makeProps('Failed')}>
Failed
</Button>
<Button {...makeProps('No-show')}> <Button {...makeProps('No-show')}>
No-show No-show
</Button> </Button>
@ -495,4 +499,4 @@ export function InstructorClassList(props) {
} }
</div> </div>
); );
}; };
Loading…
Cancel
Save