Skip to content
This repository has been archived by the owner on Sep 1, 2020. It is now read-only.

Commit

Permalink
Add check hover pie
Browse files Browse the repository at this point in the history
  • Loading branch information
jarus committed Mar 10, 2013
1 parent d8e3c15 commit cd6ebb4
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 11 deletions.
38 changes: 37 additions & 1 deletion krprj/worshipmap/static/lib/kirchenreich/dashboard.js
@@ -1,4 +1,14 @@
var kr = {}; if (kr === undefined) {
var kr = {};
}

kr.colors = {
yellow: '#ffc40d',
blue: '#049cdb',
red: '#9d261d',
green: '#46a546'
};

kr.plot = {}; kr.plot = {};
kr.plot.pie = function(target, data) { kr.plot.pie = function(target, data) {
$.plot($(target), data, { $.plot($(target), data, {
Expand All @@ -23,3 +33,29 @@ kr.plot.pie = function(target, data) {
} }
}); });
}; };

kr.plot.onCheckHover = function(event, check){
var _data;
if (check === undefined) {
_data = $(this).data();
} else {
_data = $(check).data();
}

var data = [{
label: 'Reached',
data: _data.reached,
color: kr.colors.green
}, {
label: 'Pending',
data: _data.pending,
color: kr.colors.red
}];
kr.plot.pie('#check_plot', data);
};

$(document).ready(function() {
$("tr.kr_check").hover(kr.plot.onCheckHover);
kr.plot.onCheckHover({}, $("tr.kr_check").first());
});

45 changes: 35 additions & 10 deletions krprj/worshipmap/templates/dashboard.html
Expand Up @@ -20,22 +20,22 @@
var krunite_ratio = [{ var krunite_ratio = [{
label: 'OpenStreetMap', label: 'OpenStreetMap',
data: {{ osm_count }}, data: {{ osm_count }},
color: '#ffc40d' color: kr.colors.yellow
}, { }, {
label: 'Wikipedia', label: 'Wikipedia',
data: {{ wikipedia_count }}, data: {{ wikipedia_count }},
color: '#049cdb' color: kr.colors.blue
}]; }];
kr.plot.pie('#pie1', krunite_ratio); kr.plot.pie('#kirchenreich_plot', krunite_ratio);


var osm_ratio = [{ var osm_ratio = [{
label: 'Ways', label: 'Ways',
data: {{ osm_type.W }}, data: {{ osm_type.W }},
color: '#ffc40d' color: kr.colors.yellow
}, { }, {
label: 'Nodes', label: 'Nodes',
data: {{ osm_type.N }}, data: {{ osm_type.N }},
color: '#049cdb' color: kr.colors.blue
}] }]
kr.plot.pie('#osm_ratio_plot', osm_ratio); kr.plot.pie('#osm_ratio_plot', osm_ratio);
</script> </script>
Expand All @@ -46,10 +46,14 @@
<div class="page-header"> <div class="page-header">
<h1>Dashboard</h1> <h1>Dashboard</h1>
</div> </div>
<div class="row">
<div class="span12"><h2>Database status</h2>
</div>
</div>
<div class="row"> <div class="row">
<div class="span1"></div> <div class="span1"></div>
<div class="span8" style="text-align: right"> <div class="span8" style="text-align: right">
<h2>Kirchenreich.org</h2> <h3>Kirchenreich.org</h2>
<div class="state-box"> <div class="state-box">
<p id="value">{{ osm_count|intcomma }}</p> <p id="value">{{ osm_count|intcomma }}</p>
<p id="help">OpenStreetMap places</p> <p id="help">OpenStreetMap places</p>
Expand All @@ -66,7 +70,7 @@ <h2>Kirchenreich.org</h2>
</div> </div>
</div> </div>
<div class="span2"> <div class="span2">
<div id="pie1" style="height: 200px"></div> <div id="kirchenreich_plot" style="height: 200px"></div>
</div> </div>
<div class="span1"></div> <div class="span1"></div>
</div> </div>
Expand All @@ -76,7 +80,7 @@ <h2>Kirchenreich.org</h2>
<div id="osm_ratio_plot" style="height: 200px"></div> <div id="osm_ratio_plot" style="height: 200px"></div>
</div> </div>
<div class="span8"> <div class="span8">
<h2>OpenStreetMap</h2> <h3>OpenStreetMap</h2>
<div class="state-box"> <div class="state-box">
<p id="value">{{ ref_need_update|intcomma }} / {{ ref_count|intcomma }}</p> <p id="value">{{ ref_need_update|intcomma }} / {{ ref_count|intcomma }}</p>
<p id="help">References need update</p> <p id="help">References need update</p>
Expand All @@ -92,10 +96,10 @@ <h2>OpenStreetMap</h2>
</div> </div>
<div class="span1"></div> <div class="span1"></div>
</div> </div>
<div class="row"> <div class="row">
<div class="span3"></div> <div class="span3"></div>
<div class="span8"> <div class="span8">
<h2>Wikipedia</h2> <h3>Wikipedia</h2>
<div class="state-box"> <div class="state-box">
<p id="value">{{ wikipedia_count|intcomma }}</p> <p id="value">{{ wikipedia_count|intcomma }}</p>
<p id="help">Wikipedia articles</p> <p id="help">Wikipedia articles</p>
Expand All @@ -107,5 +111,26 @@ <h2>Wikipedia</h2>
</div> </div>
<div class="span1"></div> <div class="span1"></div>
</div> </div>
<div class="row">
<div class="span12"><h2>Quality checks</h2></div>
</div>
<div class="row">
<div class="span1"></div>
<div class="span6">
<table class="table table-bordered">
<tbody>
{% for check in checks %}
<tr class="kr_check" data-reached="{{ check.reached }}" data-pending="{{ check.pending }}">
<td>{{ check.description }}</td>
<td>{{ check.percent_reached}}% ({{ check.reached|intcomma }})</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
<div class="span2">
<div id="check_plot" style="height: 200px"></div>
</div>
</div>
</div> </div>
{% endblock %} {% endblock %}

0 comments on commit cd6ebb4

Please sign in to comment.