Merge pull request #146 from SmoFlaDru/dev-benno

Fix bug preventing auto increment column from working.

Author: Bensge

spybot/models.py

@@ -140,7 +140,7 @@ class Meta:
 
 
 class TSUserActivity(DebuggableModel):
-    id = models.IntegerField(primary_key=True)
+    id = models.AutoField(primary_key=True)
     tsuser = models.ForeignKey(TSUser, models.DO_NOTHING, db_column='tsuserid', blank=True, null=True)  # Field name made lowercase.
     start_time = models.DateTimeField(db_column='starttime', blank=True, null=True)  # Field name made lowercase.
     end_time = models.DateTimeField(db_column='endtime', blank=True, null=True)  # Field name made lowercase.

spybot/visualization.py

@@ -56,7 +56,8 @@ def time_of_day_histogram():
         cursor.execute("""
             SELECT TO_CHAR(datetime, 'HH24') AS hour, AVG(activity_hours) AS amplitude
             FROM HourlyActivity
-            GROUP BY hour;
+            GROUP BY hour
+            ORDER BY hour;
         """)
         return cursor.fetchall()