Merge branch 'dev' into 312-dev-export-json-as-zip

bin/metrics/corpora.sql → bin/metrics/global/corpora.sql

 WITH total AS (SELECT * from nodes n where n.typename = 30)
-    , sum AS (SELECT count(*) from total)
+    , sum AS (SELECT count(*) AS "TOTAL" from total)
     , increase AS (SELECT count(*) from total as t WHERE t.date >= date_trunc('month', current_date - interval '3' month))
 SELECT *,
-  (SELECT (100 * (SELECT * from increase) / (SELECT * from sum))) AS "LAST 3 MONTHS / TOTAL"
+  (SELECT TO_CHAR((ROUND(100 * NULLIF((SELECT * from increase),0) / NULLIF((SELECT * from sum), 0))), 'fm99%')  AS "CREATED LAST 3 MONTHS")
      FROM sum
 
 

bin/metrics/graphs.sql → bin/metrics/global/graphs.sql

 WITH total AS (SELECT * from nodes n where n.typename = 9)
-    , sum AS (SELECT count(*) from total)
+    , sum AS (SELECT count(*) AS "TOTAL" from total)
     , increase AS (SELECT count(*) from total as t WHERE t.date >= date_trunc('month', current_date - interval '3' month))
 SELECT *,
-  (SELECT (100 * (SELECT * from increase) / (SELECT * from sum))) AS "LAST 3 MONTHS / TOTAL"
+  (SELECT TO_CHAR((ROUND(100 * NULLIF((SELECT * from increase),0) / NULLIF((SELECT * from sum), 0))), 'fm99%')  AS "CREATED LAST 3 MONTHS")
      FROM sum
 

bin/metrics/phylo.sql → bin/metrics/global/phylo.sql

 WITH total AS (SELECT * from nodes n where n.typename = 90)
-    , sum AS (SELECT count(*) from total)
+    , sum AS (SELECT count(*) AS "TOTAL" from total)
     , increase AS (SELECT count(*) from total as t WHERE t.date >= date_trunc('month', current_date - interval '3' month))
 SELECT *,
-  (SELECT (100 * (SELECT * from increase) / (SELECT * from sum))) AS "LAST 3 MONTHS / TOTAL"
+  (SELECT TO_CHAR((ROUND(100 * NULLIF((SELECT * from increase),0) / NULLIF((SELECT * from sum), 0))), 'fm99%')  AS "CREATED LAST 3 MONTHS")
      FROM sum
 

bin/metrics/teams.sql → bin/metrics/global/teams.sql

 WITH total AS (SELECT * from nodes n where n.typename = 210)
-    , sum AS (SELECT count(*) from total)
+    , sum AS (SELECT count(*) AS "TOTAL" from total)
     , increase AS (SELECT count(*) from total as t WHERE t.date >= date_trunc('month', current_date - interval '3' month))
 SELECT *,
-  (SELECT (100 * (SELECT * from increase) / (SELECT * from sum))) AS "LAST 3 MONTHS / TOTAL"
+  (SELECT TO_CHAR((ROUND(100 * NULLIF((SELECT * from increase),0) / NULLIF((SELECT * from sum), 0))), 'fm99%')  AS "CREATED LAST 3 MONTHS")
      FROM sum
 
 

bin/metrics/users.sql → bin/metrics/global/users.sql

 WITH total AS (SELECT * from auth_user as A)
-    , sum AS (SELECT count(*) from total)
+    , sum AS (SELECT count(*) AS "TOTAL" from total)
     , increase AS (SELECT count(*) from total as t WHERE t.date_joined >= date_trunc('month', current_date - interval '3' month))
 SELECT *,
-  (SELECT (100 * (SELECT * from increase) / (SELECT * from sum))) AS "LAST 3 MONTHS / TOTAL"
+  (SELECT TO_CHAR((ROUND(100 * NULLIF((SELECT * from increase),0) / NULLIF((SELECT * from sum), 0))), 'fm99%')  AS "CREATED LAST 3 MONTHS")
      FROM sum
 
 

bin/metrics/histo/corpora.sql

+select count(*), date_trunc('month', n.date) from nodes n where n.typename = 30 group by 2 ORDER BY 2;
+
+

bin/metrics/histo/graphs.sql

+
+select count(*), date_trunc('month', n.date) from nodes n where n.typename = 9 group by 2 ORDER BY 2;
+

bin/metrics/histo/phylo.sql

+select count(*), date_trunc('month', n.date) from nodes n where n.typename = 90 group by 2 ORDER BY 2;
+

bin/metrics/histo/teams.sql

+
+select count(*), date_trunc('month', n.date) from nodes n where n.typename = 210 group by 2 ORDER BY 2;
+
+
+
+
+

bin/metrics/histo/users.sql

+
+select count(*), date_trunc('month', a.date_joined) from auth_user a group by 2;
+
+
+
+