Fix bugs in the graph method do_linechart, do_empty.

modules/graph_tools.py

@@ -55,7 +55,7 @@ def do_empty(db, selector, target=None):
         months = to_datetime(["%i-%02i" % (year, i) for i in xrange(1, 13)])
 
     df = DataFrame([0]*12*nyear, index=months)
-    ax = df.plot(legend=False, x_compat=True, ylim=(0, 100), ax=target)
+    ax = df.plot(legend=False, x_compat=True, ax=target)
     do_tick(ax)
 
     return ax
@@ -124,7 +124,7 @@ def do_linechart(publications, selector, target=None):
 
     setrows = db(query)
     if setrows.count() == 0:
-        return do_empty(db, selector)
+        return do_empty(db, selector, target=target)
 
     count = publications.id.count()
     rows = setrows.select(publications.submitted,
@@ -133,7 +133,7 @@ def do_linechart(publications, selector, target=None):
                           orderby=group_by)
 
     # build the  list of data points
-    data, y = [], 0.
+    data, y, prev_year = [], 0., None
 
     for row in rows:
         submitted = row.publications.submitted
@@ -145,15 +145,25 @@ def do_linechart(publications, selector, target=None):
         else:
             y = row[count]
 
-        # a continous line when month axis is selected
+        # a continuous line when month axis is selected
         if is_month:
             data.append([submitted[:7], y])
 
         # a step line for the year axis
+        # fill properly holes between year
         else:
             year = int(submitted[:4])
-            data.append(["%i-06" % (year-1), y])
-            data.append(["%i-06" % year, y])
+
+            if prev_year is not None and prev_year + 1 != year:
+                for x in xrange(prev_year+1, year):
+                    n = (y if is_cumu else 0.)
+                    data.append(["%i-01-01" % x, n])
+                    data.append(["%i-12-31" % x, n])
+
+            data.append(["%i-01-01" % year, y])
+            data.append(["%i-12-31" % year, y])
+
+            prev_year = year
 
     # instantiate the dataframe
     # the index is the time