modified task description field, modified check answer api and create task api

This commit is contained in:
abutalib-kiwi
2023-09-08 16:14:29 +05:30
parent b084b255dc
commit 1e97d7bd6b
5 changed files with 27 additions and 10 deletions

View File

@ -0,0 +1,18 @@
# Generated by Django 4.2.2 on 2023-09-08 10:41
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('guardian', '0021_guardian_is_deleted'),
]
operations = [
migrations.AlterField(
model_name='juniortask',
name='task_description',
field=models.CharField(blank=True, max_length=500, null=True),
),
]

View File

@ -97,7 +97,7 @@ class JuniorTask(models.Model):
"""task details"""
task_name = models.CharField(max_length=100)
"""task description"""
task_description = models.CharField(max_length=500)
task_description = models.CharField(max_length=500, null=True, blank=True)
"""points of the task"""
points = models.IntegerField(default=TASK_POINTS)
"""last date of the task"""

View File

@ -208,14 +208,13 @@ class CreateTaskAPIView(viewsets.ModelViewSet):
junior_data = Junior.objects.filter(id__in=junior_ids,
guardian_code__contains=[guardian.guardian_code]
).select_related('auth')
if junior_data:
if not junior_data:
return custom_error_response(ERROR_CODE['2047'], response_status=status.HTTP_400_BAD_REQUEST)
for junior in junior_data:
index = junior.guardian_code.index(guardian.guardian_code)
status_index = junior.guardian_code_status[index]
if status_index == str(NUMBER['three']):
return custom_error_response(ERROR_CODE['2078'], response_status=status.HTTP_400_BAD_REQUEST)
else:
return custom_error_response(ERROR_CODE['2047'], response_status=status.HTTP_400_BAD_REQUEST)
# use TaskSerializer serializer
serializer = TaskSerializer(context={"guardian": guardian, "image": image_data,

View File

@ -643,7 +643,7 @@ class CheckAnswerAPIView(viewsets.ModelViewSet):
answer_id = self.request.GET.get('answer_id')
current_page = self.request.GET.get('current_page')
queryset = self.get_queryset()
submit_ans = SurveyOption.objects.filter(id=answer_id).last()
submit_ans = SurveyOption.objects.filter(id=answer_id, is_answer=True).last()
junior_article_points = JuniorArticlePoints.objects.filter(junior__auth=self.request.user,
question=queryset)
if submit_ans: