Merge branch 'dev' into 'master'

Dev

See merge request !449
remotes/origin/autodeploy
Andrey 8 years ago
commit efbe234f56
  1. 2
      lms/celery.py
  2. 3
      progress/tasks.py

@ -25,7 +25,7 @@ app.conf.beat_schedule = {
'task': 'finance.tasks.periodic_billing' 'task': 'finance.tasks.periodic_billing'
}, },
'statistic_teachers': { 'statistic_teachers': {
'schedule': crontab(minute='*/2'), 'schedule': crontab(hour='16', minute='0'),
'task': 'progress.tasks.statistic_teachers' 'task': 'progress.tasks.statistic_teachers'
} }
} }

@ -41,7 +41,8 @@ def add_next_lesson(progress):
def statistic_teachers(): def statistic_teachers():
file_dir = "%s/analytics/teachers/" % (settings.MEDIA_ROOT,) file_dir = "%s/analytics/teachers/" % (settings.MEDIA_ROOT,)
os.makedirs(os.path.dirname(file_dir), exist_ok=True) os.makedirs(os.path.dirname(file_dir), exist_ok=True)
path = '%s%s.csv' % (file_dir, timezone.now().strftime('%Y-%m-%d__%H-%M')) # TODO Почему-то при выставлении расширения всё ломается
path = '%s%s' % (file_dir, timezone.now().strftime('%Y-%m-%d__%H-%M'))
progresses = ProgressLesson.objects.filter(status='wait') progresses = ProgressLesson.objects.filter(status='wait')

Loading…
Cancel
Save