migrate update

feature/fix_generate_pass
Andrey 8 years ago
parent f54864c225
commit 01b69553b7
  1. 3
      courses/api.py
  2. 2
      finance/models.py

@ -29,17 +29,18 @@ class CourseProgressApi:
@staticmethod @staticmethod
def get_next(course_token: str, lesson_list: list): def get_next(course_token: str, lesson_list: list):
""" """
:param course_token: :param course_token:
:param lesson_list: :param lesson_list:
:return: следующий урок для прохождения и требует ли он валидации :return: следующий урок для прохождения и требует ли он валидации
""" """
course = Course.objects.get(token=course_token) course = Course.objects.get(token=course_token)
acc = [] acc = []
include_lesson = True include_lesson = True
for lesson in course.get_lesson_list(): for lesson in course.get_lesson_list():
if not lesson.token in lesson_list and include_lesson: if not lesson.token in lesson_list and include_lesson:
acc.append((lesson.token, lesson.is_hm)) acc.append((lesson.token, lesson.is_hm))
break
else: else:
include_lesson = True include_lesson = True

@ -18,7 +18,7 @@ class Bill(models.Model):
return '%s: %s' % (self.id, self.user) return '%s: %s' % (self.id, self.user)
def get_full_price(self): def get_full_price(self):
return sum([i.price for i in self.invoice_set.all()]) return sum([i.price for i in self.invoice_set.all() if not i.price is None])
class Meta: class Meta:
verbose_name = 'Счет' verbose_name = 'Счет'

Loading…
Cancel
Save