110swag / flashy-backend

Download as
Browse Code ยป

Commit fe0d3701626a4916f0947942424d57aaadd79ef9

Authored by Andrew Buss
1 parent 21835759b7
Exists in master

changed some things for autocomplete

Showing 3 changed files with 8 additions and 4 deletions Side-by-side Diff

flashcards/models.py View file @ fe0d370
... ... @@ -54,7 +54,8 @@
54 54 3. A user has a flashcard hidden from them
55 55 """
56 56 user = ForeignKey('User')
57   - mask = MaskField(max_length=255, null=True, blank=True, default=None, help_text="The user-specific mask on the card")
  57 + mask = MaskField(max_length=255, null=True, blank=True, default=None,
  58 + help_text="The user-specific mask on the card")
58 59 pulled = DateTimeField(blank=True, null=True, default=None, help_text="When the user pulled the card")
59 60 flashcard = ForeignKey('Flashcard')
60 61 unpulled = DateTimeField(blank=True, null=True, default=None, help_text="When the user unpulled this card")
61 62  
... ... @@ -194,11 +195,12 @@
194 195  
195 196 @property
196 197 def lecture_times(self):
197   - return ', '.join(map(lambda x: '%s %s' % (x.weekday_letter, x.short_start_time), self.lectureperiod_set.all()))
  198 + lecture_periods = self.lectureperiod_set.all()
  199 + return ''.join(map(lambda x: x.weekday_letter, lecture_periods)) + ' ' + lecture_periods[0].short_start_time
198 200  
199 201 @property
200 202 def long_name(self):
201   - return '%s (%s) (%s)' % (self.course_title, self.instructor, self.lecture_times)
  203 + return '%s %s (%s)' % (self.course_title, self.lecture_times, self.instructor)
202 204  
203 205 @property
204 206 def short_name(self):
... ... @@ -207,6 +209,7 @@
207 209 def __unicode__(self):
208 210 return '%s %s: %s (%s %s)' % (
209 211 self.department_abbreviation, self.course_num, self.course_title, self.instructor, self.quarter)
  212 +
210 213  
211 214 class LecturePeriod(Model):
212 215 """
flashcards/serializers.py View file @ fe0d370
... ... @@ -70,6 +70,7 @@
70 70  
71 71 class SectionSerializer(ModelSerializer):
72 72 lectures = LecturePeriodSerializer(source='lectureperiod_set', many=True, read_only=True)
  73 + lecture_times = CharField()
73 74 short_name = CharField()
74 75 long_name = CharField()
75 76  
flashcards/views.py View file @ fe0d370
... ... @@ -78,7 +78,7 @@
78 78 def search(self, request):
79 79 query = request.GET.get('q', None)
80 80 if not query: return Response('[]')
81   - qs = Section.search(query.split(' '))[:8]
  81 + qs = Section.search(query.split(' '))[:20]
82 82 serializer = SectionSerializer(qs, many=True)
83 83 return Response(serializer.data)
84 84