Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Knock out three more google charts #418

Merged
merged 1 commit into from
Jan 19, 2025
+158 −141
Merged

Knock out three more google charts #418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 52 additions & 50 deletions freezing/web/templates/explore/team_weekly_points.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,62 +1,64 @@
{% extends "base.html" %}
{% block head %}
{% block foot %}
<link rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/c3/0.7.20/c3.css"
integrity="sha384-ztqQYuF0ztQOO26+6hbRTtSQ6HGLosUJRQI9kx0L9OpJiESTtsiriiQNqwBIBl9a"
crossorigin="anonymous">
<script src="https://cdnjs.cloudflare.com/ajax/libs/d3/5.8.0/d3.min.js"
integrity="sha384-Nth41CoN2s0hj2li43h7cs5a1J0zroMLa7ugSGFSdWJMF1OuKrJwZaritPHBnk3E"
crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/c3/0.7.20/c3.min.js"
integrity="sha384-xOzJ6ocROuPNeY/PUgXyXgiPyvvePCiWVkKXro4Lb1gWoGJOtrJw+zrpf3NBx1B5"
crossorigin="anonymous"></script>
<script type="text/javascript">
// Load the Visualization API and the corechart package.
google.charts.load('visualization', '1.0', {'packages':['corechart']});

// Set a callback to run when the Google Visualization API is loaded.
google.charts.setOnLoadCallback(drawPointsChart);
//google.charts.setOnLoadCallback(drawMileageChart);

// Callback that creates and populates a data table,
// instantiates the pie chart, passes in the data and
// draws it.

function drawPointsChart() {

$.ajax({
url: "/chartdata/team_weekly_points",
dataType: "json"
}).done(function(jsonData) {

// Create our data table out of JSON data loaded from server.
var data = new google.visualization.DataTable(jsonData);
/*
var data = google.visualization.arrayToDataTable([
['Week No.', 'Team 1', 'Team 2'],
['Week 9', 750.2168827056885, 992.3467163443565],
['Week 10', 502.17876356840134, 511.0094782114029],
]);
*/
console.log(data);

// Instantiate and draw our chart, passing in some options.
var chart = new google.visualization.ColumnChart(document.getElementById('chart_team_weekly_points'));
var width = $('#chart_team_weekly_points').width();

var options = {
'title': 'Team Weekly Points',
'width': width,
'height': 800,
'vAxis': {title: "Points"},
legend: {position: 'none'},
chartArea: {left: 150, top: 50, width: width - 200, height: 700}
};


chart.draw(data, options);
});

}

$(() => {
$.ajax({
url: "/chartdata/team_weekly_points",
dataType: "json"
}).done(function (jsonData) {
c3.generate({
bindto: '#chart_team_weekly_points',
bar: {
},
data: {
x: 'x',
columns: [
jsonData.x,
...jsonData.teams.map(id => jsonData[id])
],
type: 'bar',
},
axis: {
x: {
tick: {
format: d => "Week " + d,
}
}
},
bar: {
width: {
ratio: 0.75,
}
},
tooltip: {
format: {
value: (value) => Math.round(value),
}
},
legend: {
show: false
}
});
});
});
</script>
{% endblock %}
{% block content %}
<h1>
Team Weekly Points
</h1>
<!--Div that will hold our leaderboard chart-->
<div id="chart_team_weekly_points" class="g-chart">
<div id="chart_team_weekly_points" style="width:100%; height: 480px">
<svg width="48"
height="48"
viewBox="0 0 24 24"
Expand Down
99 changes: 71 additions & 28 deletions freezing/web/templates/user/rides.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,52 @@
<link rel="stylesheet" href="/css/leaflet-gesture-handling.min.css" />
<script src="/js/leaflet-gesture-handling.min.js"></script>
<script src="/js/ride-map.js"></script>
<link rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/c3/0.7.20/c3.css"
integrity="sha384-ztqQYuF0ztQOO26+6hbRTtSQ6HGLosUJRQI9kx0L9OpJiESTtsiriiQNqwBIBl9a"
crossorigin="anonymous">
<script src="https://cdnjs.cloudflare.com/ajax/libs/d3/5.8.0/d3.min.js"
integrity="sha384-Nth41CoN2s0hj2li43h7cs5a1J0zroMLa7ugSGFSdWJMF1OuKrJwZaritPHBnk3E"
crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/c3/0.7.20/c3.min.js"
integrity="sha384-xOzJ6ocROuPNeY/PUgXyXgiPyvvePCiWVkKXro4Lb1gWoGJOtrJw+zrpf3NBx1B5"
crossorigin="anonymous"></script>
<script type="text/javascript">
// Load the Visualization API and the corechart package.
google.load('visualization', '1.0', {'packages':['corechart']});

function drawDailyPointsChart() {
$.ajax({
url: "/chartdata/user_daily_points/{{ session.get('athlete_id') }}",
dataType: "json"
}).done(function(jsonData) {
drawPointsChart(jsonData, 'chart_user_daily_points', 'Daily Points');
c3.generate({
bindto: '#chart_user_daily_points',
bar: {
},
data: {
x: 'x',
columns:
[
['x', ...jsonData.days.map(d => d.slice(0, 10))],
['points', ...jsonData.points],
],
type: 'bar',
},
axis: {
x: {
type: 'timeseries',
tick: {
format: "%m/%d",
}
}
},
tooltip: {
format: {
value: (value) => Math.round(value),
}
},
legend: {
show: false
}
});
});
}

Expand All @@ -34,30 +70,37 @@
url: "/chartdata/user_weekly_points/{{ session.get('athlete_id') }}",
dataType: "json"
}).done(function(jsonData) {
drawPointsChart(jsonData, 'chart_user_weekly_points', 'Weekly Points');
c3.generate({
bindto: '#chart_user_weekly_points',
bar: {
},
data: {
x: 'x',
columns:
[
['x', ...jsonData.weeks],
['points', ...jsonData.points],
],
type: 'bar',
},
axis: {
x: {
tick: {
format: d => "Week " + d,
}
}
},
tooltip: {
format: {
value: (value) => Math.round(value),
}
},
legend: {
show: false
}
});
});
}

function drawPointsChart(jsonData, element, title) {
// Create our data table out of JSON data loaded from server.
var data = new google.visualization.DataTable(jsonData);

// Instantiate and draw our chart, passing in some options.
var width = $('#' + element).width();
var height = 320;
var chart = new google.visualization.ColumnChart(document.getElementById(element));

var options = {
'title': title,
'width': width,
'height': height,
'vAxis': {title: "Points"},
legend: {position: 'none'},
chartArea: {left: 75, width: width - 100, top: 50, height: height - 110}
};
chart.draw(data, options);
}

</script>
{% endblock %}
{% block content %}
Expand Down Expand Up @@ -109,7 +152,7 @@ <h2 class="clearfix">
</table>
</div>
<div role="tabpanel" class="tab-pane" id="daily">
<div id="chart_user_daily_points" class="g-chart">
<div id="chart_user_daily_points" style="width:100%; height: 480px">
<svg width="48"
height="48"
viewBox="0 0 24 24"
Expand All @@ -121,7 +164,7 @@ <h2 class="clearfix">
</div>
</div>
<div role="tabpanel" class="tab-pane" id="weekly">
<div id="chart_user_weekly_points" class="g-chart">
<div id="chart_user_weekly_points" style="width:100%; height: 480px">
<svg width="48"
height="48"
viewBox="0 0 24 24"
Expand Down
Loading
Loading