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

Manually assign axis in dataset and add RFC live data

Browse Source
This commit is contained in:
Maximilian Grundke
2018-04-11 14:10:38 +02:00
parent c4af08e73a
commit 44d3ebd408
2 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/statistics_graphs.js
View File

@ -13,14 +13,13 @@ $(document).ready(function () {
var groups;
var buildChartGroups = function() {
initialData = initialData.sort(function (a, b) {return a.data - b.data});
return _.map(initialData, function(element, index) {
return _.map(initialData, function(element) {
return {
content: element.name + (element.unit ? ' [' + element.unit + ']' : ''),
id: element.key,
visible: false,
options: {
yAxisOrientation: index >= initialData.length / 2 ? 'right' : 'left'
yAxisOrientation: element.axis ? element.axis : 'left'
}
};
});
@ -46,7 +45,6 @@ $(document).ready(function () {
},
end: vis.moment(),
legend: true,
shaded: true,
start: CHART_START
});
};

40
app/helpers/statistics_helper.rb
View File

@ -135,13 +135,49 @@ module StatisticsHelper
key: 'submissions_per_minute',
name: t('statistics.entries.exercises.submissions_per_minute'),
data: (Submission.where('created_at >= ?', DateTime.now - 1.hours).count.to_f / 60).round(2),
unit: '/min'
unit: '/min',
axis: 'right'
}
]
end
def rfc_activity_live_data
[]
[
{
key: 'rfcs',
name: t('activerecord.models.request_for_comment.other'),
data: RequestForComment.count,
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',
name: t('statistics.entries.request_for_comments.percent_solved'),
data: (100.0 / RequestForComment.count * RequestForComment.where(solved: true).count).round(1),
unit: '%',
axis: 'right'
},
{
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: '%',
axis: 'right'
},
{
key: 'percent_unsolved',
name: t('statistics.entries.request_for_comments.percent_unsolved'),
data: (100.0 / RequestForComment.count * RequestForComment.unsolved.count).round(1),
unit: '%',
axis: 'right'
}
]
end
end