diff --git a/flashcards/models.py b/flashcards/models.py index 0e1de5a..3fad286 100644 --- a/flashcards/models.py +++ b/flashcards/models.py @@ -54,7 +54,8 @@ class UserFlashcard(Model): 3. A user has a flashcard hidden from them """ user = ForeignKey('User') - mask = MaskField(max_length=255, null=True, blank=True, default=None, help_text="The user-specific mask on the card") + mask = MaskField(max_length=255, null=True, blank=True, default=None, + help_text="The user-specific mask on the card") pulled = DateTimeField(blank=True, null=True, default=None, help_text="When the user pulled the card") flashcard = ForeignKey('Flashcard') unpulled = DateTimeField(blank=True, null=True, default=None, help_text="When the user unpulled this card") @@ -194,11 +195,12 @@ class Section(Model): @property def lecture_times(self): - return ', '.join(map(lambda x: '%s %s' % (x.weekday_letter, x.short_start_time), self.lectureperiod_set.all())) + lecture_periods = self.lectureperiod_set.all() + return ''.join(map(lambda x: x.weekday_letter, lecture_periods)) + ' ' + lecture_periods[0].short_start_time @property def long_name(self): - return '%s (%s) (%s)' % (self.course_title, self.instructor, self.lecture_times) + return '%s %s (%s)' % (self.course_title, self.lecture_times, self.instructor) @property def short_name(self): @@ -208,6 +210,7 @@ class Section(Model): return '%s %s: %s (%s %s)' % ( self.department_abbreviation, self.course_num, self.course_title, self.instructor, self.quarter) + class LecturePeriod(Model): """ A lecture period for a section diff --git a/flashcards/serializers.py b/flashcards/serializers.py index 3bbe8df..b6dfd46 100644 --- a/flashcards/serializers.py +++ b/flashcards/serializers.py @@ -70,6 +70,7 @@ class LecturePeriodSerializer(ModelSerializer): class SectionSerializer(ModelSerializer): lectures = LecturePeriodSerializer(source='lectureperiod_set', many=True, read_only=True) + lecture_times = CharField() short_name = CharField() long_name = CharField() diff --git a/flashcards/views.py b/flashcards/views.py index 73503eb..48f6038 100644 --- a/flashcards/views.py +++ b/flashcards/views.py @@ -78,7 +78,7 @@ class SectionViewSet(ReadOnlyModelViewSet): def search(self, request): query = request.GET.get('q', None) if not query: return Response('[]') - qs = Section.search(query.split(' '))[:8] + qs = Section.search(query.split(' '))[:20] serializer = SectionSerializer(qs, many=True) return Response(serializer.data)