ammar/zod-backend
1
0
Fork 0
mirror of https://github.com/HamzaSha1/zod-backend.git synced 2025-11-26 08:34:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #187 from KiwiTechLLC/sprint4

Browse Source 
task points
This commit is contained in:
dilipshrivastwa-kiwi
2023-08-10 19:06:32 +05:30
committed by GitHub
parent 80dffb7942 fbd6f9ece5
commit a479f3cb62
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
junior/serializers.py
View File

@ -182,10 +182,11 @@ class JuniorDetailListSerializer(serializers.ModelSerializer):
data = JuniorPoints.objects.filter(junior=obj).last() data = JuniorPoints.objects.filter(junior=obj).last()
if data: if data:
return data.position return data.position
return 99999
def get_points(self, obj): def get_points(self, obj):
data = sum(JuniorTask.objects.filter(junior=obj, task_status=COMPLETED).values_list('points', flat=True)) data = JuniorPoints.objects.filter(junior=obj).last()
return data if data:
return data.total_points
return NUMBER['zero']
def get_in_progress_task(self, obj): def get_in_progress_task(self, obj):
data = JuniorTask.objects.filter(junior=obj, task_status=IN_PROGRESS).count() data = JuniorTask.objects.filter(junior=obj, task_status=IN_PROGRESS).count()
@ -210,7 +211,7 @@ class JuniorDetailListSerializer(serializers.ModelSerializer):
class Meta(object): class Meta(object):
"""Meta info""" """Meta info"""
model = Junior model = Junior
fields = ['id', 'email', 'first_name', 'last_name', 'country_code', 'phone', 'gender', 'dob', fields = ['id', 'email', 'first_name', 'last_name', 'country_code', 'country_name', 'phone', 'gender', 'dob',
'guardian_code', 'referral_code','is_active', 'is_complete_profile', 'created_at', 'image', 'guardian_code', 'referral_code','is_active', 'is_complete_profile', 'created_at', 'image',
'updated_at', 'assigned_task','points', 'pending_task', 'in_progress_task', 'completed_task', 'updated_at', 'assigned_task','points', 'pending_task', 'in_progress_task', 'completed_task',
'requested_task', 'rejected_task', 'position', 'is_invited', 'guardian_code_status'] 'requested_task', 'rejected_task', 'position', 'is_invited', 'guardian_code_status']