From 0a11f60513a6ff4fba359186812c2adadfbcb3bd Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Sat, 3 Sep 2011 20:13:06 +0000 Subject: [PATCH] share chart population into a shared fct --- www/js/ppastats.js | 141 ++++++++++++++++------------------------------------- 1 file changed, 41 insertions(+), 100 deletions(-) diff --git a/www/js/ppastats.js b/www/js/ppastats.js index e0bd70e..6424708 100644 --- a/www/js/ppastats.js +++ b/www/js/ppastats.js @@ -1,10 +1,41 @@ +function ppastats_chart(ddts) { + var data_chart = []; + var max_date = null; + var min_date = null; + + $.each(ddts, function(i, item) { + var tm = item["time"]; + var d = new Date(tm[0], tm[1]-1, tm[2]); + var entry = [d, item["value"]]; + data_chart.push(entry); + + if (max_date == null || max_date < d) { + max_date = d; + } + + if (min_date == null || min_date > d) { + min_date = d; + } + }); + + var plot1 = $.jqplot ('chart', [data_chart], { + axes: { + xaxis: { + renderer:$.jqplot.DateAxisRenderer, + tickOptions:{formatString:'%Y/%m/%d'}, + min: min_date, + max: max_date + }, + yaxis: { + min: 0 + } + }, + series: [{lineWidth:1,showMarker:false}] + }); +} + function ppastats_pkg() { $(document).ready(function() { - var data_chart = []; - var ddts = data["ddts"]; - var max_date = null; - var min_date = null; - $("#ppa_owner").html(data["ppa_owner"]); $("#ppa_name").html(data["ppa_name"]); $("#pkg_name").html(data["name"]); @@ -14,45 +45,13 @@ function ppastats_pkg() { $("#versions").append("
  • "+v+"
  • "); }); - - $.each(ddts, function(i, item) { - var tm = item["time"]; - var d = new Date(tm[0], tm[1]-1, tm[2], 0, 0, 0, 0); - var entry = [d, item["value"]]; - data_chart.push(entry); - - if (max_date == null || max_date < d) { - max_date = d; - } - - if (min_date == null || min_date > d) { - min_date = d; - } - }); - - var plot1 = $.jqplot ('chart', [data_chart], { - axes: { - xaxis: { - renderer:$.jqplot.DateAxisRenderer, - tickOptions:{formatString:'%Y/%m/%d'}, - min: min_date, - max: max_date - }, - yaxis: { - min: 0 - } - }, - series: [{lineWidth:1,showMarker:false}] - }); + + ppastats_chart(data["ddts"]); }); } function ppastats_ver() { $(document).ready(function() { - var data_chart = []; - var ddts = data["ddts"]; - var max_date = null; - var min_date = null; var pkg_url = data["pkg_name"]+".html"; $("#ppa_owner").html(data["ppa_owner"]); @@ -60,88 +59,30 @@ function ppastats_ver() { $("#pkg_name").html(""+data["pkg_name"]+""); $("#version").append(" "+data["name"]); - $.each(ddts, function(i, item) { - var tm = item["time"]; - var d = new Date(tm[0], tm[1]-1, tm[2], 0, 0, 0, 0); - var entry = [d, item["value"]]; - data_chart.push(entry); - - if (max_date == null || max_date < d) { - max_date = d; - } - - if (min_date == null || min_date > d) { - min_date = d; - } - }); - $.each(data["distros"], function(i, distro) { $.each(distro["archs"], function(i, arch) { $("#distros").append("
  • "+distro["name"]+"_"+arch["name"]+": "+arch["count"]+" d) { - min_date = d; - } - }); - $.each(data["packages"], function(i, item) { var url = item["name"]+".html"; $("#pkgs").append("
  • "+item["name"]+": "+item["count"]+"
  • "); }); - var plot1 = $.jqplot ('chart', [data_chart], { - axes: { - xaxis: { - renderer:$.jqplot.DateAxisRenderer, - tickOptions:{formatString:'%Y/%m/%d'}, - min: min_date, - max: max_date - }, - yaxis: { - min: 0 - } - }, - series: [{lineWidth:1,showMarker:false}] - }); + ppastats_chart(data["ddts"]); }); } -- 2.7.4