From 01b69553b7a3d9ed07d7da66e9ca6d9edebc96c4 Mon Sep 17 00:00:00 2001 From: Andrey Date: Mon, 19 Feb 2018 23:05:54 +0300 Subject: [PATCH] migrate update --- courses/api.py | 3 ++- finance/models.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/courses/api.py b/courses/api.py index adfabd9..ec5a738 100644 --- a/courses/api.py +++ b/courses/api.py @@ -29,17 +29,18 @@ class CourseProgressApi: @staticmethod def get_next(course_token: str, lesson_list: list): """ - :param course_token: :param lesson_list: :return: следующий урок для прохождения и требует ли он валидации """ + course = Course.objects.get(token=course_token) acc = [] include_lesson = True for lesson in course.get_lesson_list(): if not lesson.token in lesson_list and include_lesson: acc.append((lesson.token, lesson.is_hm)) + break else: include_lesson = True diff --git a/finance/models.py b/finance/models.py index f6ca8d5..9516873 100755 --- a/finance/models.py +++ b/finance/models.py @@ -18,7 +18,7 @@ class Bill(models.Model): return '%s: %s' % (self.id, self.user) 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: verbose_name = 'Счет'