From c4e1babedbd6a37ac8662bb4677fbdfd5789e874 Mon Sep 17 00:00:00 2001 From: Ralf Teusner Date: Wed, 23 May 2018 15:47:00 +0200 Subject: [PATCH 1/8] add creation of folder '/log/whenever' to deployment --- config/deploy.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/deploy.rb b/config/deploy.rb index 1fac842e..3e3765c9 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -19,6 +19,7 @@ namespace :deploy do within release_path do execute :cp, '-r', 'vendor/assets/images/', 'public/assets/' execute :cp, '-r', 'vendor/assets/javascripts/ace', 'public/assets/' + execute :mkdir, '/log/whenever' end end end From c11fd43519e0b4c393a7f0b214a234be81602251 Mon Sep 17 00:00:00 2001 From: Ralf Teusner Date: Wed, 23 May 2018 16:03:28 +0200 Subject: [PATCH 2/8] uncommented creation of whenever dir again. --- config/deploy.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/deploy.rb b/config/deploy.rb index 3e3765c9..2212b3d7 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -19,7 +19,7 @@ namespace :deploy do within release_path do execute :cp, '-r', 'vendor/assets/images/', 'public/assets/' execute :cp, '-r', 'vendor/assets/javascripts/ace', 'public/assets/' - execute :mkdir, '/log/whenever' + #execute :mkdir, '/log/whenever' #release path seems to be the wrong place end end end From 72d652831aca839ab88e261308340193943bda92 Mon Sep 17 00:00:00 2001 From: Ralf Teusner Date: Fri, 25 May 2018 09:20:19 +0200 Subject: [PATCH 3/8] cleanup deploy.rb --- config/deploy.rb | 8 -------- 1 file changed, 8 deletions(-) diff --git a/config/deploy.rb b/config/deploy.rb index 2212b3d7..9a350b5c 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -19,16 +19,8 @@ namespace :deploy do within release_path do execute :cp, '-r', 'vendor/assets/images/', 'public/assets/' execute :cp, '-r', 'vendor/assets/javascripts/ace', 'public/assets/' - #execute :mkdir, '/log/whenever' #release path seems to be the wrong place end end end end -namespace :whenever do - task :update_crontab do - run 'bundle exec whenever --update-crontab' - end -end - -after 'deploy', 'whenever:update_crontab' From b45dd8e94da052933fea7e546db2be33b205cf5b Mon Sep 17 00:00:00 2001 From: Ralf Teusner Date: Fri, 25 May 2018 09:28:38 +0200 Subject: [PATCH 4/8] create whenever_log_folder --- config/deploy.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/config/deploy.rb b/config/deploy.rb index 9a350b5c..c6e4c720 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -22,5 +22,13 @@ namespace :deploy do end end end + + task :create_whenever_log_dir do + within release_path do + execute :mkdir, 'log/whenever' + end + end + end +after :deploy, 'deploy:create_whenever_log_dir' From 1741cf9f8ecfc82933a5698b73d5dc1bf093c96b Mon Sep 17 00:00:00 2001 From: Ralf Teusner Date: Fri, 25 May 2018 09:32:52 +0200 Subject: [PATCH 5/8] create logdir for whenever (correct this time) --- config/deploy.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/config/deploy.rb b/config/deploy.rb index c6e4c720..bd536016 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -24,11 +24,12 @@ namespace :deploy do end task :create_whenever_log_dir do - within release_path do - execute :mkdir, 'log/whenever' + on roles(:all) do + within release_path do + execute :mkdir, 'log/whenever' + end end end - end after :deploy, 'deploy:create_whenever_log_dir' From 76883bbf6068c702b29efc999f28b18aeeda2fde Mon Sep 17 00:00:00 2001 From: Ralf Teusner Date: Fri, 25 May 2018 09:59:40 +0200 Subject: [PATCH 6/8] create logdir only if it does not exist yet. --- config/deploy.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/deploy.rb b/config/deploy.rb index bd536016..0e5b0be5 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -26,7 +26,7 @@ namespace :deploy do task :create_whenever_log_dir do on roles(:all) do within release_path do - execute :mkdir, 'log/whenever' + execute :mkdir, '-p' 'log/whenever' end end end From 5c4ea86c8ea368b3f3a3c9fdfd76d28551bd35ba Mon Sep 17 00:00:00 2001 From: Maximilian Grundke Date: Fri, 25 May 2018 09:59:50 +0200 Subject: [PATCH 7/8] Fix finishing rate for zero users/submissions --- app/views/exercises/statistics.html.slim | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/exercises/statistics.html.slim b/app/views/exercises/statistics.html.slim index 6d967885..211cc862 100644 --- a/app/views/exercises/statistics.html.slim +++ b/app/views/exercises/statistics.html.slim @@ -9,7 +9,9 @@ h1 = @exercise = row(label: '.finishing_rate') do p == @exercise.finishers.count ? "#{t('shared.out_of', maximum_value: @exercise.users.distinct.count, value: @exercise.finishers.count)} #{t('exercises.statistics.external_users')}" : empty - p = progress_bar((100.0 / @exercise.users.distinct.count * @exercise.finishers.count).round(2)) + - finishers_count = @exercise.users.distinct.count + - finishers_percentage = finishers_count == 0 ? 0 : (100.0 / finishers_count * @exercise.finishers.count).round(2) + p = progress_bar(finishers_percentage) = row(label: '.average_score') do p == @exercise.average_score ? t('shared.out_of', maximum_value: @exercise.maximum_score, value: @exercise.average_score.round(2)) : empty From 9b748ab3afc7b3977fa20ba3b9be685962b62c62 Mon Sep 17 00:00:00 2001 From: Ralf Teusner Date: Fri, 25 May 2018 10:01:43 +0200 Subject: [PATCH 8/8] commas do help... --- config/deploy.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/deploy.rb b/config/deploy.rb index 0e5b0be5..21cfe8d8 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -26,7 +26,7 @@ namespace :deploy do task :create_whenever_log_dir do on roles(:all) do within release_path do - execute :mkdir, '-p' 'log/whenever' + execute :mkdir, '-p', 'log/whenever' end end end