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

Use sane default values

Browse Source
This commit is contained in:
Maximilian Grundke
2018-04-24 16:58:31 +02:00
parent 15519ae599
commit dd55b1faee
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/rfc_activity_history.js
View File

@ -8,8 +8,6 @@ $(document).ready(function () {
var graph;
var groups;
var params = new URLSearchParams(window.location.search.slice(1));
var buildChartGroups = function() {
return _.map(chartData, function(element) {
return {
@ -39,12 +37,13 @@ $(document).ready(function () {
style: 'circle'
},
legend: true,
start: params.get('from'),
end: params.get('to')
start: $('#from-date')[0].value,
end: $('#to-date')[0].value
});
};
var refreshData = function(callback) {
var params = new URLSearchParams(window.location.search.slice(1));
var jqxhr = $.ajax('rfc-activity-history.json', {
dataType: 'json',
data: {from: params.get('from'), to: params.get('to'), interval: params.get('interval')},

6
app/controllers/statistics_controller.rb
View File

@ -37,9 +37,9 @@ class StatisticsController < ApplicationController
respond_to do |format|
format.html { render 'rfc_activity_history' }
format.json do
interval = params[:interval] || 'year'
from = DateTime.strptime(params[:from], '%Y-%M-%D') rescue DateTime.new(0)
to = DateTime.strptime(params[:to], '%Y-%M-%D') rescue DateTime.now
interval = params[:interval].to_s.nil? ? 'year' : params[:interval]
from = DateTime.strptime(params[:from], '%Y-%m-%d') rescue DateTime.new(0)
to = DateTime.strptime(params[:to], '%Y-%m-%d') rescue DateTime.now
render(json: ranged_rfc_data(interval, from, to))
end
end