From 689d755de2d3e321ec16510c76bd55231985fad6 Mon Sep 17 00:00:00 2001
From: Andrew Brown <drusepth@gmail.com>
Date: Thu, 29 Sep 2016 00:57:27 +0200
Subject: [PATCH] Fix graphs

---
 app/views/admin/characters.html.erb |  2 +-
 app/views/admin/items.html.erb      | 10 ++++------
 app/views/admin/locations.html.erb  |  8 +++-----
 app/views/admin/universes.html.erb  |  2 +-
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/app/views/admin/characters.html.erb b/app/views/admin/characters.html.erb
index 050207f8a..2be1d05ac 100644
--- a/app/views/admin/characters.html.erb
+++ b/app/views/admin/characters.html.erb
@@ -16,7 +16,7 @@
 	</div>
 	<div class="col s4">
 		<h2>Character privacy</h1>
-		<%= pie_chart Character.group(:privacy).count() %>
+		<%= pie_chart Character.where.not(privacy: "").group(:privacy).count() %>
 	</div>
 </div>
 
diff --git a/app/views/admin/items.html.erb b/app/views/admin/items.html.erb
index 08b66b1ff..681193b3f 100644
--- a/app/views/admin/items.html.erb
+++ b/app/views/admin/items.html.erb
@@ -7,18 +7,16 @@
 
 <div class="row">
 	<div class="col s4">
-		<h2>Items per user</h1>
-		<%# bar_chart User.joins(:items).group("items.user_id").count() %>
-		TODO
+		<h2>Characters per user</h1>
+		<%= column_chart User.joins(:items).group(:user_id).count().group_by { |n| n.last }.each_with_object({}) { |(content_count, ids), h| h[content_count] = ids.count } %>
 	</div>
 	<div class="col s4">
 		<h2>Items per universe</h1>
-		<%# bar_chart Universe.joins(:items).group("items.universe_id").count() %>
-		TODO
+		<%= column_chart Universe.joins(:items).group(:universe_id).count().group_by { |n| n.last }.each_with_object({}) { |(content_count, ids), h| h[content_count] = ids.count } %>
 	</div>
 	<div class="col s4">
 		<h2>Item privacy</h1>
-		<%= pie_chart Item.group(:privacy).count() %>
+		<%= pie_chart Item.where.not(privacy: "").group(:privacy).count() %>
 	</div>
 </div>
 
diff --git a/app/views/admin/locations.html.erb b/app/views/admin/locations.html.erb
index 3cbbcc5da..ad40ed188 100644
--- a/app/views/admin/locations.html.erb
+++ b/app/views/admin/locations.html.erb
@@ -8,17 +8,15 @@
 <div class="row">
 	<div class="col s4">
 		<h2>Locations per user</h1>
-		<%# bar_chart User.joins(:locations).group("locations.user_id").count() %>
-		TODO
+		<%= column_chart User.joins(:locations).group(:user_id).count().group_by { |n| n.last }.each_with_object({}) { |(content_count, ids), h| h[content_count] = ids.count } %>
 	</div>
 	<div class="col s4">
 		<h2>Locations per universe</h1>
-		<%# bar_chart Universe.joins(:locations).group("locations.universe_id").count() %>
-		TODO
+		<%= column_chart Universe.joins(:locations).group(:universe_id).count().group_by { |n| n.last }.each_with_object({}) { |(content_count, ids), h| h[content_count] = ids.count } %>
 	</div>
 	<div class="col s4">
 		<h2>Location privacy</h1>
-		<%= pie_chart Location.group(:privacy).count() %>
+		<%= pie_chart Location.where.not(privacy: "").group(:privacy).count() %>
 	</div>
 </div>
 
diff --git a/app/views/admin/universes.html.erb b/app/views/admin/universes.html.erb
index b64293ea1..cd64c324e 100644
--- a/app/views/admin/universes.html.erb
+++ b/app/views/admin/universes.html.erb
@@ -12,7 +12,7 @@
 	</div>
 	<div class="col s6">
 		<h2>Privacy per universe</h2>
-		<%= pie_chart Universe.group(:privacy) %>
+		<%= pie_chart Universe.where.not(privacy: "").group(:privacy).count() %>
 	</div>
 </div>