tanner/spaceport
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Enforce capitalization of class / session status

Browse Source
This commit is contained in:
Tanner Collin
2020-02-07 01:11:09 +00:00
parent 202dc1f999
commit 18e7c6c77d
6 changed files with 36 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apiserver/apiserver/api/serializers.py
View File

@@ -242,12 +242,12 @@ class CardSerializer(serializers.ModelSerializer):
class TrainingSerializer(serializers.ModelSerializer):
attendance_status = serializers.ChoiceField([
'waiting for payment',
'withdrawn',
'rescheduled',
'no-show',
'attended',
'confirmed'
'Waiting for payment',
'Withdrawn',
'Rescheduled',
'No-show',
'Attended',
'Confirmed'
])
session = serializers.PrimaryKeyRelatedField(queryset=models.Session.objects.all())
student_name = serializers.SerializerMethodField()
@@ -266,7 +266,7 @@ class TrainingSerializer(serializers.ModelSerializer):
class StudentTrainingSerializer(TrainingSerializer):
attendance_status = serializers.ChoiceField(['waiting for payment', 'withdrawn'])
attendance_status = serializers.ChoiceField(['Waiting for payment', 'Withdrawn'])
class SessionSerializer(serializers.ModelSerializer):
@@ -283,7 +283,7 @@ class SessionSerializer(serializers.ModelSerializer):
read_only_fields = ['old_instructor', 'instructor']
def get_student_count(self, obj):
return len([x for x in obj.students.all() if x.attendance_status != 'withdrawn'])
return len([x for x in obj.students.all() if x.attendance_status != 'Withdrawn'])
def get_course_name(self, obj):
return obj.course.name

9
apiserver/apiserver/api/views.py
View File

@@ -183,6 +183,7 @@ class TrainingViewSet(Base, Retrieve, Create, Update):
return serializers.StudentTrainingSerializer
# TODO: turn these into @actions
# TODO: check if full
def perform_create(self, serializer):
session_id = self.request.data['session']
status = self.request.data['attendance_status']
@@ -192,16 +193,16 @@ class TrainingViewSet(Base, Retrieve, Create, Update):
raise exceptions.ValidationError('You have already registered')
if self.request.user == session.instructor:
raise exceptions.ValidationError('You are teaching this session')
if status == 'waiting for payment' and session.cost == 0:
status = 'confirmed'
if status == 'Waiting for payment' and session.cost == 0:
status = 'Confirmed'
serializer.save(user=self.request.user, attendance_status=status)
def perform_update(self, serializer):
session_id = self.request.data['session']
status = self.request.data['attendance_status']
session = get_object_or_404(models.Session, id=session_id)
if status == 'waiting for payment' and session.cost == 0:
status = 'confirmed'
if status == 'Waiting for payment' and session.cost == 0:
status = 'Confirmed'
serializer.save(attendance_status=status)