htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor helper methods

Browse Source
This commit is contained in:
Maximilian Grundke
2018-04-24 11:10:00 +02:00
parent 5d49431a79
commit 64a09390c6
1 changed files with 13 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
app/helpers/statistics_helper.rb
View File

@ -81,45 +81,11 @@ module StatisticsHelper
end end
def rfc_statistics def rfc_statistics
[ rfc_activity_data + [
{
key: 'rfcs',
name: t('activerecord.models.request_for_comment.other'),
data: RequestForComment.count,
url: request_for_comments_path
},
{
key: 'percent_solved',
name: t('statistics.entries.request_for_comments.percent_solved'),
data: (100.0 / RequestForComment.count * RequestForComment.where(solved: true).count).round(1),
unit: '%',
url: request_for_comments_path + '?q%5Bsolved_not_eq%5D=0'
},
{
key: 'percent_soft_solved',
name: t('statistics.entries.request_for_comments.percent_soft_solved'),
data: (100.0 / RequestForComment.count * RequestForComment.unsolved.where(full_score_reached: true).count).round(1),
unit: '%',
url: request_for_comments_path
},
{
key: 'percent_unsolved',
name: t('statistics.entries.request_for_comments.percent_unsolved'),
data: (100.0 / RequestForComment.count * RequestForComment.unsolved.count).round(1),
unit: '%',
url: request_for_comments_path + '?q%5Bsolved_not_eq%5D=1'
},
{ {
key: 'comments', key: 'comments',
name: t('activerecord.models.comment.other'), name: t('activerecord.models.comment.other'),
data: Comment.count data: Comment.count
},
{
key: 'rfcs_with_comments',
name: t('statistics.entries.request_for_comments.with_comments'),
data: RequestForComment.joins('join "submissions" s on s.id = request_for_comments.submission_id
join "files" f on f.context_id = s.id and f.context_type = \'Submission\'
join "comments" c on c.file_id = f.id').group('request_for_comments.id').count.size
} }
] ]
end end
@ -143,41 +109,41 @@ module StatisticsHelper
] ]
end end
def rfc_activity_live_data def rfc_activity_data(from=DateTime.new(0), to=DateTime.now)
[ [
{ {
key: 'rfcs', key: 'rfcs',
name: t('activerecord.models.request_for_comment.other'), name: t('activerecord.models.request_for_comment.other'),
data: RequestForComment.count, data: RequestForComment.in_range(from, to).count,
url: request_for_comments_path url: request_for_comments_path
}, },
{
key: 'rfcs_with_comments',
name: t('statistics.entries.request_for_comments.with_comments'),
data: RequestForComment.joins('join "submissions" s on s.id = request_for_comments.submission_id
join "files" f on f.context_id = s.id and f.context_type = \'Submission\'
join "comments" c on c.file_id = f.id').group('request_for_comments.id').count.size
},
{ {
key: 'percent_solved', key: 'percent_solved',
name: t('statistics.entries.request_for_comments.percent_solved'), name: t('statistics.entries.request_for_comments.percent_solved'),
data: (100.0 / RequestForComment.count * RequestForComment.where(solved: true).count).round(1), data: (100.0 / RequestForComment.in_range(from, to).count * RequestForComment.in_range(from, to).where(solved: true).count).round(1),
unit: '%', unit: '%',
axis: 'right' axis: 'right'
}, },
{ {
key: 'percent_soft_solved', key: 'percent_soft_solved',
name: t('statistics.entries.request_for_comments.percent_soft_solved'), name: t('statistics.entries.request_for_comments.percent_soft_solved'),
data: (100.0 / RequestForComment.count * RequestForComment.unsolved.where(full_score_reached: true).count).round(1), data: (100.0 / RequestForComment.in_range(from, to).count * RequestForComment.in_range(from, to).unsolved.where(full_score_reached: true).count).round(1),
unit: '%', unit: '%',
axis: 'right' axis: 'right'
}, },
{ {
key: 'percent_unsolved', key: 'percent_unsolved',
name: t('statistics.entries.request_for_comments.percent_unsolved'), name: t('statistics.entries.request_for_comments.percent_unsolved'),
data: (100.0 / RequestForComment.count * RequestForComment.unsolved.count).round(1), data: (100.0 / RequestForComment.in_range(from, to).count * RequestForComment.in_range(from, to).unsolved.count).round(1),
unit: '%', unit: '%',
axis: 'right' axis: 'right'
},
{
key: 'rfcs_with_comments',
name: t('statistics.entries.request_for_comments.with_comments'),
data: RequestForComment.in_range(from, to).joins('join "submissions" s on s.id = request_for_comments.submission_id
join "files" f on f.context_id = s.id and f.context_type = \'Submission\'
join "comments" c on c.file_id = f.id').group('request_for_comments.id').count.size
} }
] ]
end end