diff --git a/apps/notification/tasks.py b/apps/notification/tasks.py index 0e0ca590..1e82d59e 100644 --- a/apps/notification/tasks.py +++ b/apps/notification/tasks.py @@ -50,10 +50,10 @@ def draw_cert(path, email, first_name, last_name, x=None, y=900, color=(29, 115, @app.task def send_certificates(email=None, date_end=None, dry_run=False): - path_pattern = 'img/user-certificates/%d.jpg' - signed_path_pattern = 'img/signed-user-certificates/%d.jpg' + path_pattern = 'user-certificates/%d.jpg' + signed_path_pattern = 'signed-user-certificates/%d.jpg' if email: - fn = draw_cert(staticfiles_storage.path(signed_path_pattern % 1), email, 'Имя', 'Фамилия') + fn = draw_cert(os.path.join(settings.RESOURCES_ROOT, signed_path_pattern % 1), email, 'Имя', 'Фамилия') file = open(fn, 'rb') try: send_email('Грамота от Lil School', email, 'notification/email/certificate.html', @@ -85,14 +85,15 @@ def send_certificates(email=None, date_end=None, dry_run=False): file_names = [] un.certificate_number = un.certificate_number + 1 \ - if un.certificate_number and staticfiles_storage.exists(path_pattern % (un.certificate_number + 1)) \ + if un.certificate_number and os.path.isfile(os.path.join(settings.RESOURCES_ROOT, + path_pattern % (un.certificate_number + 1))) \ else 1 if un.user.child_filled: - fn = staticfiles_storage.path(signed_path_pattern % un.certificate_number) + fn = os.path.join(settings.RESOURCES_ROOT, signed_path_pattern % un.certificate_number) for child in un.user.childs.all(): file_names.append(draw_cert(fn, un.user.email, child.first_name, child.last_name)) else: - file_names.append(staticfiles_storage.path(signed_path_pattern % un.certificate_number)) + file_names.append(os.path.join(settings.RESOURCES_ROOT, signed_path_pattern % un.certificate_number)) files = [open(fn, 'rb') for fn in file_names] try: send_email('Грамота от Lil School', un.user.email, 'notification/email/certificate.html', diff --git a/project/settings.py b/project/settings.py index a56c9463..80af8675 100644 --- a/project/settings.py +++ b/project/settings.py @@ -329,7 +329,7 @@ CELERY_BEAT_SCHEDULE = { }, 'send_certificates': { 'task': 'apps.notification.tasks.send_certificates', - 'schedule': crontab(minute=0, hour=19), + 'schedule': crontab(minute=30, hour=19), 'args': (), }, 'sendgrid_update_recipients': { diff --git a/web/src/img/signed-user-certificates/1.jpg b/resources/signed-user-certificates/1.jpg similarity index 100% rename from web/src/img/signed-user-certificates/1.jpg rename to resources/signed-user-certificates/1.jpg diff --git a/web/src/img/signed-user-certificates/2.jpg b/resources/signed-user-certificates/2.jpg similarity index 100% rename from web/src/img/signed-user-certificates/2.jpg rename to resources/signed-user-certificates/2.jpg diff --git a/web/src/img/signed-user-certificates/3.jpg b/resources/signed-user-certificates/3.jpg similarity index 100% rename from web/src/img/signed-user-certificates/3.jpg rename to resources/signed-user-certificates/3.jpg diff --git a/web/src/img/signed-user-certificates/4.jpg b/resources/signed-user-certificates/4.jpg similarity index 100% rename from web/src/img/signed-user-certificates/4.jpg rename to resources/signed-user-certificates/4.jpg diff --git a/web/src/img/signed-user-certificates/5.jpg b/resources/signed-user-certificates/5.jpg similarity index 100% rename from web/src/img/signed-user-certificates/5.jpg rename to resources/signed-user-certificates/5.jpg diff --git a/web/src/img/signed-user-certificates/6.jpg b/resources/signed-user-certificates/6.jpg similarity index 100% rename from web/src/img/signed-user-certificates/6.jpg rename to resources/signed-user-certificates/6.jpg diff --git a/web/src/img/signed-user-certificates/7.jpg b/resources/signed-user-certificates/7.jpg similarity index 100% rename from web/src/img/signed-user-certificates/7.jpg rename to resources/signed-user-certificates/7.jpg diff --git a/web/src/img/signed-user-certificates/8.jpg b/resources/signed-user-certificates/8.jpg similarity index 100% rename from web/src/img/signed-user-certificates/8.jpg rename to resources/signed-user-certificates/8.jpg diff --git a/web/src/img/signed-user-certificates/9.jpg b/resources/signed-user-certificates/9.jpg similarity index 100% rename from web/src/img/signed-user-certificates/9.jpg rename to resources/signed-user-certificates/9.jpg diff --git a/web/src/img/user-certificates/1.jpg b/web/src/img/user-certificates/1.jpg deleted file mode 100644 index 8a939423..00000000 Binary files a/web/src/img/user-certificates/1.jpg and /dev/null differ diff --git a/web/src/img/user-certificates/2.jpg b/web/src/img/user-certificates/2.jpg deleted file mode 100644 index 85687bad..00000000 Binary files a/web/src/img/user-certificates/2.jpg and /dev/null differ diff --git a/web/src/img/user-certificates/3.jpg b/web/src/img/user-certificates/3.jpg deleted file mode 100644 index ae7f1f76..00000000 Binary files a/web/src/img/user-certificates/3.jpg and /dev/null differ diff --git a/web/src/img/user-certificates/4.jpg b/web/src/img/user-certificates/4.jpg deleted file mode 100644 index bc09d1ce..00000000 Binary files a/web/src/img/user-certificates/4.jpg and /dev/null differ diff --git a/web/src/img/user-certificates/5.jpg b/web/src/img/user-certificates/5.jpg deleted file mode 100644 index 3add7a60..00000000 Binary files a/web/src/img/user-certificates/5.jpg and /dev/null differ diff --git a/web/src/img/user-certificates/6.jpg b/web/src/img/user-certificates/6.jpg deleted file mode 100644 index cbbd4eaa..00000000 Binary files a/web/src/img/user-certificates/6.jpg and /dev/null differ diff --git a/web/src/img/user-certificates/7.jpg b/web/src/img/user-certificates/7.jpg deleted file mode 100644 index 203e09b8..00000000 Binary files a/web/src/img/user-certificates/7.jpg and /dev/null differ diff --git a/web/src/img/user-certificates/8.jpg b/web/src/img/user-certificates/8.jpg deleted file mode 100644 index 3c048f76..00000000 Binary files a/web/src/img/user-certificates/8.jpg and /dev/null differ diff --git a/web/src/img/user-certificates/9.jpg b/web/src/img/user-certificates/9.jpg deleted file mode 100644 index 34e8d728..00000000 Binary files a/web/src/img/user-certificates/9.jpg and /dev/null differ