From adac2a906149bd1ca0d7174d9d516262320afd85 Mon Sep 17 00:00:00 2001 From: Andrey Date: Fri, 4 May 2018 12:41:38 +0300 Subject: [PATCH 1/5] =?UTF-8?q?=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B8=D0=BF=D0=B8=D1=81=D1=8B=D0=B2=D0=B0=D1=82=D1=8C=20?= =?UTF-8?q?=D0=BA=D0=BB=D1=8E=D1=87=20=D0=B4=D0=BB=D1=8F=20=D0=BC=D0=B0?= =?UTF-8?q?=D1=82=D1=87=D0=B8=D0=BD=D0=B3=D0=B0=20=D0=BA=20=D0=BF=D0=BB?= =?UTF-8?q?=D0=B0=D1=82=D0=B5=D0=B6=D0=B0=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- finance/views.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/finance/views.py b/finance/views.py index 31aeff0..5098d8d 100644 --- a/finance/views.py +++ b/finance/views.py @@ -143,8 +143,6 @@ class InvoiceDetailView(APIView): key = request.JSON.get('key', None) pay_count = int(request.JSON.get('pay_count', '1')) - print(key) - if bill_id is None: return Response("Не передан id счёта", status=400) From b382383743b3d3c9c5237d10e615099bc3cae254 Mon Sep 17 00:00:00 2001 From: Andrey Date: Fri, 4 May 2018 13:08:33 +0300 Subject: [PATCH 2/5] =?UTF-8?q?=D0=92=D1=8B=D1=81=D1=82=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D1=8F=D0=B5=D1=82=D1=81=D1=8F=20=D0=BF=D1=80=D0=B5=D0=BF=D0=BE?= =?UTF-8?q?=D0=B4=20=D0=BA=20=D0=BA=D1=83=D1=80=D1=81=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- courses/tasks.py | 4 ++-- courses/views.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/courses/tasks.py b/courses/tasks.py index 9384958..877bb36 100644 --- a/courses/tasks.py +++ b/courses/tasks.py @@ -2,12 +2,12 @@ from progress.models import ProgressLesson, Progress from django.contrib.auth import get_user_model -def add_lesson(user_out_key: str, course_token: str, lesson_token: str, teacher_key: str, is_hm: bool): +def add_lesson(user_out_key: str, course_token: str, lesson_token: str, is_hm: bool): p = Progress.objects.get(course_token=course_token, user__out_key=user_out_key) ProgressLesson.objects.get_or_create( progress=p, lesson_token=lesson_token, - checker=get_user_model().objects.get(out_key=(teacher_key if is_hm else user_out_key)), + checker=get_user_model().objects.get(out_key=(p.teacher if is_hm else user_out_key)), ) \ No newline at end of file diff --git a/courses/views.py b/courses/views.py index 0964098..ee75638 100644 --- a/courses/views.py +++ b/courses/views.py @@ -258,6 +258,6 @@ class LessonDetail(APIView): return Response("Permission denied", status=403) # TODO Задача для селери - add_lesson(request.user.out_key, course.token, lesson.token, course.get_teacher(), lesson.is_hm) + add_lesson(request.user.out_key, course.token, lesson.token, lesson.is_hm) return Response(l, status=200) From ff270c2fbbff11c9412583df0ad6cf06aa2c4189 Mon Sep 17 00:00:00 2001 From: Andrey Date: Fri, 4 May 2018 13:15:22 +0300 Subject: [PATCH 3/5] =?UTF-8?q?=D0=92=D1=8B=D1=81=D1=82=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D1=8F=D0=B5=D1=82=D1=81=D1=8F=20=D0=BF=D1=80=D0=B5=D0=BF=D0=BE?= =?UTF-8?q?=D0=B4=20=D0=BA=20=D0=BA=D1=83=D1=80=D1=81=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- courses/tasks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/courses/tasks.py b/courses/tasks.py index 877bb36..7477419 100644 --- a/courses/tasks.py +++ b/courses/tasks.py @@ -9,5 +9,5 @@ def add_lesson(user_out_key: str, course_token: str, lesson_token: str, is_hm: b ProgressLesson.objects.get_or_create( progress=p, lesson_token=lesson_token, - checker=get_user_model().objects.get(out_key=(p.teacher if is_hm else user_out_key)), + checker=get_user_model().objects.get(out_key=(p.teacher.out_key if is_hm else user_out_key)), ) \ No newline at end of file From 42432cf9f7e4345ccb2d96d6126b5e85ab3ac272 Mon Sep 17 00:00:00 2001 From: Andrey Date: Mon, 7 May 2018 14:10:00 +0300 Subject: [PATCH 4/5] =?UTF-8?q?=D0=92=D1=8B=D1=81=D1=82=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D1=8F=D0=B5=D1=82=D1=81=D1=8F=20=D0=BF=D1=80=D0=B5=D0=BF=D0=BE?= =?UTF-8?q?=D0=B4=20=D0=BA=20=D0=BA=D1=83=D1=80=D1=81=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- finance/models.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/finance/models.py b/finance/models.py index e824ea3..2edf8fe 100755 --- a/finance/models.py +++ b/finance/models.py @@ -17,7 +17,9 @@ logger_business_rules = logging.getLogger('business_rules') class Bill(models.Model): course_token = models.UUIDField(verbose_name="Токен курса", editable=False) user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name='Плательщик', related_name='bill_user') - opener = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name='Ответственный сотрудник', null=True) + opener = models.ForeignKey( + settings.AUTH_USER_MODEL, verbose_name='Ответственный сотрудник', null=True, blank=True, + on_delete=models.SET_NULL) comment = models.TextField(verbose_name='Комментарий продавца', help_text='Будет показано пользователю', blank=True, editable=False) description = models.TextField(verbose_name='Внутренняя заметка', blank=True) From 9e5f28060ebfecf3830dc433404df36ab9e534af Mon Sep 17 00:00:00 2001 From: Andrey Date: Mon, 7 May 2018 14:13:06 +0300 Subject: [PATCH 5/5] =?UTF-8?q?=D0=92=D1=8B=D1=81=D1=82=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D1=8F=D0=B5=D1=82=D1=81=D1=8F=20=D0=BF=D1=80=D0=B5=D0=BF=D0=BE?= =?UTF-8?q?=D0=B4=20=D0=BA=20=D0=BA=D1=83=D1=80=D1=81=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- finance/migrations/0011_auto_20180507_1412.py | 22 +++++++++++++++++++ .../migrations/0014_auto_20180507_1412.py | 20 +++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 finance/migrations/0011_auto_20180507_1412.py create mode 100644 progress/migrations/0014_auto_20180507_1412.py diff --git a/finance/migrations/0011_auto_20180507_1412.py b/finance/migrations/0011_auto_20180507_1412.py new file mode 100644 index 0000000..e11255a --- /dev/null +++ b/finance/migrations/0011_auto_20180507_1412.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.6 on 2018-05-07 14:12 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('finance', '0010_auto_20180412_1628'), + ] + + operations = [ + migrations.AlterField( + model_name='bill', + name='opener', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='Ответственный сотрудник'), + ), + ] diff --git a/progress/migrations/0014_auto_20180507_1412.py b/progress/migrations/0014_auto_20180507_1412.py new file mode 100644 index 0000000..07cf083 --- /dev/null +++ b/progress/migrations/0014_auto_20180507_1412.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.6 on 2018-05-07 14:12 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('progress', '0013_progresslesson_dif_check_timestamps'), + ] + + operations = [ + migrations.AlterField( + model_name='progresslesson', + name='last_update', + field=models.DateTimeField(auto_now_add=True, verbose_name='Дата последней сдачи'), + ), + ]