110swag / flashy-backend

Authored by Rohan Rangray 2015-05-25 14:05:11 -0700

Exists in master

Showing 2 changed files with 13 additions and 2 deletions Side-by-side Diff

...	...	@@ -99,7 +99,7 @@
99	99	}
100	100
101	101	def to_representation(self, value):
102		- return dumps(list(self._make_mask(value)))
	102	+ return map(list, self._make_mask(value))
103	103
104	104	def to_internal_value(self, value):
105	105	if not isinstance(value, list):

...	...	@@ -18,10 +18,12 @@
18	18	from django.core.mail import send_mail
19	19	from django.contrib.auth import authenticate
20	20	from django.contrib.auth.tokens import default_token_generator
	21	+from django.db.models import Count, F
21	22	from rest_framework.status import HTTP_204_NO_CONTENT, HTTP_201_CREATED, HTTP_200_OK
22	23	from rest_framework.response import Response
23	24	from rest_framework.exceptions import AuthenticationFailed, NotAuthenticated, ValidationError, PermissionDenied
24	25	from simple_email_confirmation import EmailAddress
	26	+from math import e
25	27
26	28
27	29	class SectionViewSet(ReadOnlyModelViewSet):
...	...	@@ -374,7 +376,16 @@
374	376	raise ValidationError("No matching flashcard found in your decks")
375	377
376	378	user_flashcard = user_flashcard_filter.order_by('?').first()
377		- # user_flashcard = user_flashcard_filter.annotate(spaced=F())
	379	+ """
	380	+ user_flashcard_pks = user_flashcard_filter.values('pk')
	381	+ quiz_filter = UserFlashcardQuiz.filter(
	382	+ user_flashcard__in=user_flashcard_pks
	383	+ ).annotate(
	384	+ revise_count=Count('user_flashcard')
	385	+ ).annotate(
	386	+
	387	+ )
	388	+ """
378	389	mask = user_flashcard.get_mask().get_random_blank()
379	390	user_flashcard_quiz = UserFlashcardQuiz(user_flashcard=user_flashcard,
380	391	blanked_word=user_flashcard.flashcard.text[slice(*mask)])