Commit fe44f16085e529d9a8a31758f110c519bab14500
1 parent
8fc000ea2a
Exists in
master
remove ordered_deck, allow filtering by hidden to flashcard list
Showing 4 changed files with 7 additions and 20 deletions Side-by-side Diff
flashcards/serializers.py
View file @
fe44f16
| ... | ... | @@ -122,7 +122,7 @@ |
| 122 | 122 | |
| 123 | 123 | class FlashcardSerializer(ModelSerializer): |
| 124 | 124 | is_hidden = BooleanField(read_only=True) |
| 125 | - hide_reason = CharField(read_only=True) | |
| 125 | + # hide_reason = CharField(read_only=True) | |
| 126 | 126 | material_date = DateTimeField(default=now) |
| 127 | 127 | mask = MaskFieldSerializer(allow_null=True) |
| 128 | 128 | score = IntegerField(read_only=True) |
flashcards/tests/test_api.py
View file @
fe44f16
| ... | ... | @@ -364,13 +364,6 @@ |
| 364 | 364 | self.assertEqual(response.status_code, HTTP_200_OK) |
| 365 | 365 | self.assertNotEqual(response.data[0]['id'], 1) |
| 366 | 366 | |
| 367 | - def test_section_ordered_deck(self): | |
| 368 | - self.user.sections.add(self.section) | |
| 369 | - self.user.save() | |
| 370 | - response = self.client.get('/api/sections/1/ordered_deck/') | |
| 371 | - self.assertEqual(response.status_code, HTTP_200_OK) | |
| 372 | - | |
| 373 | - | |
| 374 | 367 | class UserFlashcardQuizTests(APITestCase): |
| 375 | 368 | fixtures = ['testusers', 'testsections'] |
| 376 | 369 |
flashcards/views.py
View file @
fe44f16
| ... | ... | @@ -38,7 +38,11 @@ |
| 38 | 38 | Gets flashcards for a section, excluding hidden cards. |
| 39 | 39 | Returned in strictly chronological order (material date). |
| 40 | 40 | """ |
| 41 | - flashcards = Flashcard.cards_visible_to(request.user).filter(section=self.get_object()).all() | |
| 41 | + if 'hidden' in request.GET: | |
| 42 | + flashcards = Flashcard.objects | |
| 43 | + else: | |
| 44 | + flashcards = Flashcard.cards_visible_to(request.user) | |
| 45 | + flashcards = flashcards.filter(section=self.get_object()).all() | |
| 42 | 46 | return Response(FlashcardSerializer(flashcards, many=True).data) |
| 43 | 47 | |
| 44 | 48 | @detail_route(methods=['POST']) |
| ... | ... | @@ -100,16 +104,6 @@ |
| 100 | 104 | serializer = FlashcardSerializer(qs, many=True) |
| 101 | 105 | return Response(serializer.data) |
| 102 | 106 | |
| 103 | - @detail_route(methods=['GET'], permission_classes=[IsAuthenticated]) | |
| 104 | - def ordered_deck(self, request, pk): | |
| 105 | - """ | |
| 106 | - Get a chronological order by material_date of flashcards for a section. | |
| 107 | - This excludes hidden card. | |
| 108 | - """ | |
| 109 | - qs = request.user.get_deck(self.get_object()).order_by('-material_date') | |
| 110 | - serializer = FlashcardSerializer(qs, many=True) | |
| 111 | - return Response(serializer.data) | |
| 112 | - | |
| 113 | 107 | @detail_route(methods=['GET']) |
| 114 | 108 | def feed(self, request, pk): |
| 115 | 109 | """ |
| ... | ... | @@ -265,7 +259,6 @@ |
| 265 | 259 | queryset = Flashcard.objects.all() |
| 266 | 260 | serializer_class = FlashcardSerializer |
| 267 | 261 | permission_classes = [IsAuthenticated, IsEnrolledInAssociatedSection] |
| 268 | - | |
| 269 | 262 | # Override create in CreateModelMixin |
| 270 | 263 | def create(self, request, *args, **kwargs): |
| 271 | 264 | serializer = FlashcardSerializer(data=request.data) |