From bcce50dc5f171de38aac47ee7cb21a2084fa2de1 Mon Sep 17 00:00:00 2001
From: jbohman <joelboh@gmail.com>
Date: Wed, 8 Sep 2010 23:23:38 +0200
Subject: [PATCH] The graph now displays all data

The graph is updated as more and more data is returned from a query
which contains alot of data.
---
 logsandra/controllers/graph.py      |   2 +-
 logsandra/public/loading.gif        | Bin 0 -> 673 bytes
 logsandra/templates/graph_view.html |  36 ++++++++++++++++++++--------
 3 files changed, 27 insertions(+), 11 deletions(-)
 create mode 100644 logsandra/public/loading.gif

diff --git a/logsandra/controllers/graph.py b/logsandra/controllers/graph.py
index b030af7..f3b6814 100644
--- a/logsandra/controllers/graph.py
+++ b/logsandra/controllers/graph.py
@@ -28,7 +28,7 @@ def ajax(self):
         if 'next' in request.GET and request.GET['next']:
             column_next = long(request.GET['next'])
 
-        return {'result': log_entries.get_date_count(keyword, column_next=column_next)}
+        return {'result': log_entries.get_date_count(keyword, column_next=column_next, column_count=250)}
         
     def error(self):
         return 'Error, could not parse date'
diff --git a/logsandra/public/loading.gif b/logsandra/public/loading.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d0bce1542342e912da81a2c260562df172f30d73
GIT binary patch
literal 673
zcmZ?wbhEHb6krfw_{6~Q|Nnmm28Kh24mmkF0U1e2Nli^nlO|14{Lk&@8WQa67~pE8
zXTZz|lvDgC<y@4SSdyBeP@Y+mp^%uBSdo*Tn4*`NmzK|<_>+Z`3#dv5h=E26FfcG1
zbL_hF&)}42ws10s6^G;;cE1^EoUR)U5A70}d2pLv!jVIT7j&Z~EblI3x0K*v_sV|m
z0kj3v921Z^em#l`(k(o@H$3ZdDRc@9NidXDNbqrumReCGv$gd8+e8WW28HVqkJ_9i
zH>s*<31KtHjANIPvi2#*6BEu%3Dak5O_t&NBI)<h(<yPr>H?V$TxT}#l{vOTn<?_G
z_#ejR!~8}oQ>5naXTfF^&~Hhq+NX@#Ccc>y7T?;vjI&jdhsDsPJyAw*m0Qz>i}K7#
zL9w50<qa%!r20=RDYEpz>Ng{fT}A5JUe8lRK1h7_Y2;BWJDd=c6f&i?Wv5(5q?6|P
zQw{>maxZP<537OA37Uk}7@%_$4o$EWe_Zl>&#id|lE-BpDC#+Fn|msJ%_2h{Hg1vP
z#N8WAzfWasG}yq|xqE)DrWaOofX=z|?*pgc%{ig5vl!pqDlC|q&~Z0$&Rvsft&VO-
z4MZj+%-+Vx%W}v;V76hyp=;+R;x+~t^Q%*xuFTQAF2})fSfTHDAs>sO!OBw`)&)o$
c0!CNZt))x~rAZP^^P&YOFfdqy5)K#u0POD40{{R3

literal 0
HcmV?d00001

diff --git a/logsandra/templates/graph_view.html b/logsandra/templates/graph_view.html
index a0c121c..fe4ba70 100644
--- a/logsandra/templates/graph_view.html
+++ b/logsandra/templates/graph_view.html
@@ -5,23 +5,39 @@
 <script type="text/javascript">
     google.load("visualization", "1", {packages:["corechart"]});
     google.setOnLoadCallback(drawChart);
-    function drawChart() {
-        $.getJSON('{{ url(controller='graph', action='ajax') }}', {'keyword': "{{ c.keyword }}"}, function(result) {
-            var data = new google.visualization.DataTable();
-            data.addColumn('string', 'Date');
-            data.addColumn('number', 'Count');
-            data.addRows(result.result[0])
-            data.sort({column: 0});
-
-            var chart = new google.visualization.AreaChart(document.getElementById('chart_div'));
-            chart.draw(data, {width: 800, height: 480, title: ''});
+
+    function updateChart(keyword, next, data, chart) {
+        jQuery.getJSON('{{ url(controller='graph', action='ajax') }}', {'keyword': keyword, 'next': next}, function(result) {
+            if(result.result[0].length > 0) { 
+                data.addRows(result.result[0])
+                data.sort({column: 0});
+                chart.draw(data, {width: 800, height: 480, title: ''});
+                updateChart(keyword, result.result[1], data, chart)
+            } else {
+                jQuery('#loading_div').html('');
+                return true;
+            }
         });
     }
+
+    function drawChart() {
+        var data = new google.visualization.DataTable();
+        data.addColumn('string', 'Date');
+        data.addColumn('number', 'Count');
+
+        var chart = new google.visualization.AreaChart(document.getElementById('chart_div'));
+
+        updateChart({{ c.keyword }}, '', data, chart);
+
+        jQuery('#loading_div').html('<img src="{{ url('/loading.gif') }}" />');
+    }
 </script>
 {% endblock %}
 
 {% block content %}
 
+<div id="loading_div"></div>
+
 <div id="chart_div"></div>
 
 {% endblock %}