diff --git a/flashcards/serializers.py b/flashcards/serializers.py index 9968fa7..8c3e9cc 100644 --- a/flashcards/serializers.py +++ b/flashcards/serializers.py @@ -122,7 +122,7 @@ class MaskFieldSerializer(serializers.Field): class FlashcardSerializer(ModelSerializer): is_hidden = BooleanField(read_only=True) - hide_reason = CharField(read_only=True) + # hide_reason = CharField(read_only=True) material_date = DateTimeField(default=now) mask = MaskFieldSerializer(allow_null=True) score = IntegerField(read_only=True) diff --git a/flashcards/tests/test_api.py b/flashcards/tests/test_api.py index 47ecd3b..c92bb2c 100644 --- a/flashcards/tests/test_api.py +++ b/flashcards/tests/test_api.py @@ -364,13 +364,6 @@ class SectionViewSetTest(APITestCase): self.assertEqual(response.status_code, HTTP_200_OK) self.assertNotEqual(response.data[0]['id'], 1) - def test_section_ordered_deck(self): - self.user.sections.add(self.section) - self.user.save() - response = self.client.get('/api/sections/1/ordered_deck/') - self.assertEqual(response.status_code, HTTP_200_OK) - - class UserFlashcardQuizTests(APITestCase): fixtures = ['testusers', 'testsections'] diff --git a/flashcards/views.py b/flashcards/views.py index 816f163..04b5920 100644 --- a/flashcards/views.py +++ b/flashcards/views.py @@ -38,7 +38,11 @@ class SectionViewSet(ReadOnlyModelViewSet): Gets flashcards for a section, excluding hidden cards. Returned in strictly chronological order (material date). """ - flashcards = Flashcard.cards_visible_to(request.user).filter(section=self.get_object()).all() + if 'hidden' in request.GET: + flashcards = Flashcard.objects + else: + flashcards = Flashcard.cards_visible_to(request.user) + flashcards = flashcards.filter(section=self.get_object()).all() return Response(FlashcardSerializer(flashcards, many=True).data) @detail_route(methods=['POST']) @@ -100,16 +104,6 @@ class SectionViewSet(ReadOnlyModelViewSet): serializer = FlashcardSerializer(qs, many=True) return Response(serializer.data) - @detail_route(methods=['GET'], permission_classes=[IsAuthenticated]) - def ordered_deck(self, request, pk): - """ - Get a chronological order by material_date of flashcards for a section. - This excludes hidden card. - """ - qs = request.user.get_deck(self.get_object()).order_by('-material_date') - serializer = FlashcardSerializer(qs, many=True) - return Response(serializer.data) - @detail_route(methods=['GET']) def feed(self, request, pk): """ @@ -265,7 +259,6 @@ class FlashcardViewSet(GenericViewSet, CreateModelMixin, RetrieveModelMixin): queryset = Flashcard.objects.all() serializer_class = FlashcardSerializer permission_classes = [IsAuthenticated, IsEnrolledInAssociatedSection] - # Override create in CreateModelMixin def create(self, request, *args, **kwargs): serializer = FlashcardSerializer(data=request.data) diff --git a/requirements.txt b/requirements.txt index 240382f..16e8f7f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,3 +13,4 @@ coverage django-rest-swagger pytz django-extensions +django-filter \ No newline at end of file