110swag / flashy-backend

Download as
Browse Code ยป

Commit 1f74d60b267ebbfeda462dba8a9569b660ad0bf2

Authored by Andrew Buss
1 parent cf248fe509
Exists in master

add material week number

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

flashcards/models.py View file @ 1f74d60
... ... @@ -10,6 +10,7 @@
10 10 from django.db import IntegrityError
11 11 from django.db.models import *
12 12 from django.utils.timezone import now, make_aware
  13 +from flashy.settings import QUARTER_START
13 14 from simple_email_confirmation import SimpleEmailConfirmationUserMixin
14 15 from fields import MaskField
15 16 from cached_property import cached_property
... ... @@ -187,6 +188,10 @@
187 188 class Meta:
188 189 # By default, order by most recently pushed
189 190 ordering = ['-pushed']
  191 +
  192 + @property
  193 + def material_week_num(self):
  194 + return (self.material_date-QUARTER_START).days/7+1
190 195  
191 196 def is_hidden_from(self, user):
192 197 """
flashcards/serializers.py View file @ 1f74d60
... ... @@ -125,6 +125,7 @@
125 125 is_hidden = SerializerMethodField()
126 126 is_in_deck = SerializerMethodField()
127 127 # hide_reason = CharField(read_only=True)
  128 + material_week_num = IntegerField(read_only=True)
128 129 material_date = DateTimeField(default=now)
129 130 mask = MaskFieldSerializer(allow_null=True)
130 131 score = FloatField(read_only=True)