diff --git a/base/messages.py b/base/messages.py index 4e15d59..c98e0e0 100644 --- a/base/messages.py +++ b/base/messages.py @@ -150,11 +150,13 @@ SUCCESS_CODE = { "3038": "Status has been changed successfully.", # notification read "3039": "Notification read successfully", + # start article "3040": "Start article successfully", # complete article "3041": "Article completed successfully", # submit assessment successfully "3042": "Assessment completed successfully", + # read article "3043": "Read article card successfully", # remove guardian code request "3044": "Remove guardian code request successfully", diff --git a/junior/models.py b/junior/models.py index 180b425..12d8476 100644 --- a/junior/models.py +++ b/junior/models.py @@ -167,7 +167,8 @@ class JuniorArticle(models.Model): Survey Options model """ # associated junior with the task - junior = models.OneToOneField(Junior, on_delete=models.CASCADE, related_name='juniors_article', verbose_name='Junior') + junior = models.OneToOneField(Junior, on_delete=models.CASCADE, related_name='juniors_article', + verbose_name='Junior') article = models.ForeignKey(Article, on_delete=models.CASCADE, related_name='junior_articles_details') # article completed""" is_completed = models.BooleanField(default=False) @@ -184,7 +185,8 @@ class JuniorArticleCard(models.Model): Survey Options model """ # associated junior with the task - junior = models.ForeignKey(Junior, on_delete=models.CASCADE, related_name='juniors_article_card', verbose_name='Junior') + junior = models.ForeignKey(Junior, on_delete=models.CASCADE, related_name='juniors_article_card', + verbose_name='Junior') article = models.ForeignKey(Article, on_delete=models.CASCADE, related_name='junior_articles_detail') article_card = models.ForeignKey(ArticleCard, on_delete=models.CASCADE, related_name='junior_article_card') diff --git a/junior/views.py b/junior/views.py index 8f4e53d..b41d2aa 100644 --- a/junior/views.py +++ b/junior/views.py @@ -260,7 +260,8 @@ class RemoveJuniorAPIView(views.APIView): junior_id = self.request.GET.get('id') guardian = Guardian.objects.filter(user__email=self.request.user).last() # fetch junior query - junior_queryset = Junior.objects.filter(id=junior_id, guardian_code__icontains=str(guardian.guardian_code)).last() + junior_queryset = Junior.objects.filter(id=junior_id, + guardian_code__icontains=str(guardian.guardian_code)).last() if junior_queryset: # use RemoveJuniorSerializer serializer serializer = RemoveJuniorSerializer(junior_queryset, data=request.data, partial=True)