fd

files/routes/admin.py

@@ -1149,29 +1149,13 @@ def chart(v):
 	day_cutoffs = [today_cutoff - day * i for i in range(days)]
 	day_cutoffs.insert(0, calendar.timegm(now))
 
+	daily_times = [time.strftime("%d", time.gmtime(day_cutoffs[i + 1])) for i in range(len(day_cutoffs) - 1)][2:][::-1]
+
 	daily_signups = [g.db.query(User).filter(User.created_utc < day_cutoffs[i], User.created_utc > day_cutoffs[i + 1]).count() for i in range(len(day_cutoffs) - 1)][2:][::-1]
 
-	post_stats = [g.db.query(Submission).filter(Submission.created_utc < day_cutoffs[i],
-														  Submission.created_utc > day_cutoffs[i + 1],
-														  Submission.is_banned == False
-														  ).count()
-				   for i in range(len(day_cutoffs) - 1)][2:][::-1]
+	post_stats = [g.db.query(Submission).filter(Submission.created_utc < day_cutoffs[i], Submission.created_utc > day_cutoffs[i + 1], Submission.is_banned == False).count() for i in range(len(day_cutoffs) - 1)][2:][::-1]
 
-	comment_stats = [g.db.query(Comment).filter(Comment.created_utc < day_cutoffs[i],
-															 Comment.created_utc > day_cutoffs[i + 1],
-															 Comment.is_banned == False,
-															 Comment.author_id != 1
-															 ).count()
-					  for i in range(len(day_cutoffs) - 1)][2:][::-1]
-
-	for d in daily_signups:
-		print(d)
-		return "sex"
-	# create multiple charts
-	daily_signups = [d["signups"] for d in daily_signups]
-	post_stats = [d["posts"] for d in post_stats]
-	comment_stats = [d["comments"] for d in comment_stats]
-	daily_times = [d["date"] for d in daily_signups]
+	comment_stats = [g.db.query(Comment).filter(Comment.created_utc < day_cutoffs[i], Comment.created_utc > day_cutoffs[i + 1],Comment.is_banned == False, Comment.author_id != 1).count() for i in range(len(day_cutoffs) - 1)][2:][::-1]
 
 	# create multiple charts
 	signup_chart = plt.subplot2grid((20, 4), (0, 0), rowspan=5, colspan=4)