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

Small fixes

Browse Source
This commit is contained in:
Tanner Collin 2022-05-05 20:26:56 +00:00
parent 67adbd277c
commit 500c5a42e1
4 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -534,7 +534,7 @@ class UserSerializer(serializers.ModelSerializer):
training = UserTrainingSerializer(many=True) training = UserTrainingSerializer(many=True)
member = MemberSerializer() member = MemberSerializer()
transactions = serializers.SerializerMethodField() transactions = serializers.SerializerMethodField()
interests = serializers.SerializerMethodField() interests = InterestSerializer(many=True)
door_code = serializers.SerializerMethodField() door_code = serializers.SerializerMethodField()
wifi_pass = serializers.SerializerMethodField() wifi_pass = serializers.SerializerMethodField()
app_version = serializers.SerializerMethodField() app_version = serializers.SerializerMethodField()
@ -565,13 +565,6 @@ class UserSerializer(serializers.ModelSerializer):
serializer.is_valid() serializer.is_valid()
return serializer.data return serializer.data
def get_interests(self, obj):
interests = models.Interest.objects.filter(
user=obj,
satisfied_by__isnull=True
)
return [x.course.id for x in interests]
def get_door_code(self, obj): def get_door_code(self, obj):
if not obj.member.paused_date and obj.cards.count(): if not obj.member.paused_date and obj.cards.count():
return secrets.DOOR_CODE return secrets.DOOR_CODE

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

@ -292,7 +292,7 @@ class SessionViewSet(Base, List, Retrieve, Create, Update):
try: try:
utils_email.send_interest_email(interest) utils_email.send_interest_email(interest)
except BaseException as e: except BaseException as e:
msg = 'Problem interest email: ' + str(e) msg = 'Problem sending interest email: ' + str(e)
logger.exception(msg) logger.exception(msg)
alert_tanner(msg) alert_tanner(msg)

2
webclient/src/Classes.js
View File

@ -139,7 +139,7 @@ function NewClassTableCourse(props) {
{user && {user &&
<div className='interest'> <div className='interest'>
{user.interests.includes(course.id) ? {user.interests.filter(x => !x.satisfied_by).map(x => x.course).includes(course.id) ?
'Interested ✅' 'Interested ✅'
: :
<Button <Button

4
webclient/src/Courses.js
View File

@ -111,7 +111,9 @@ export function Courses(props) {
<Link to={'/courses/'+x.id}>{x.name}</Link> <Link to={'/courses/'+x.id}>{x.name}</Link>
</Table.Cell> </Table.Cell>
<Table.Cell> <Table.Cell>
{x.num_interested} {!!x.num_interested &&
<>{x.num_interested} member{x.num_interested !== 1 && 's'}</>
}
</Table.Cell> </Table.Cell>
<Table.Cell> <Table.Cell>
{!!x.tags && x.tags.split(',').map(name => {!!x.tags && x.tags.split(',').map(name =>