Chart: total number of organizations and teams

docs/_data/navigation.yml

@@ -25,6 +25,11 @@
       url: "/repos-total"
 - title: "Organizations"
   url: "/org-owners"
+  subnavigation:
+    - title: "Owners"
+      url: "/org-owners"
+    - title: "Total"
+      url: "/org-total"
 - title: "Housekeeping"
   url: "/housekeeping-git-traffic"
   subnavigation:

docs/demo-data/org-history.tsv

@@ -0,0 +1,13 @@
+date	total	teams
+2017-09-25	923	579
+2017-09-24	926	575
+2017-09-23	930	578
+2017-09-22	929	574
+2017-09-21	928	572
+2017-09-20	927	566
+2017-09-19	926	556
+2017-09-18	924	548
+2017-09-17	922	541
+2017-09-16	918	533
+2017-09-15	916	524
+2017-09-14	909	511

docs/org-total.html

@@ -0,0 +1,35 @@
+---
+layout: default
+title: Organizations
+permalink: /org-total
+---
+
+<h3>Organizations (Total)</h3>
+
+<div class="row">
+	<div class="col-main">
+		<div class="chart-container">
+			<canvas
+				class="chart"
+				data-url="{{ site.dataURL }}/org-history.tsv"
+				data-type="history"
+				data-config='{
+					"series": [
+						"total",
+						"teams"
+					],
+					"visibleSeries": [
+						"total"
+					]
+				}'
+				></canvas>
+		</div>
+	</div>
+	<div class="col-aside">
+		<div class="info-box">
+			<p>
+				The number of organizations in total, and the number of teams in total.
+			</p>
+		</div>
+	</div>
+</div>

updater/reports/ReportOrgHistory.py

@@ -0,0 +1,55 @@
+from .ReportDaily import *
+
+# Lists the total number of organizations
+class ReportOrgHistory(ReportDaily):
+	def name(self):
+		return "org-history"
+
+	def updateDailyData(self):
+		newHeader, newData = self.parseData(
+			self.executeQuery(self.query())
+		)
+		self.header = newHeader if newHeader else self.header
+		self.data.extend(newData)
+		self.truncateData(self.timeRangeTotal())
+		self.sortDataByDate()
+
+	# Collects the number of organizations
+	def subquery(self, userType):
+		query = '''
+			SELECT
+				COUNT(*) AS count
+			FROM
+				users
+			WHERE
+				users.type = "Organization"
+			AND
+				users.login <> "github-enterprise"
+			'''
+
+		return query
+
+	# Collects the number of teams
+	def totalTeamsQuery(self, userType):
+		query = '''
+			SELECT
+				COUNT(*) AS count
+			FROM
+				teams
+			'''
+
+		return query
+
+	# Collects the number of organizations in total, and the number of teams in total
+	def query(self):
+		query = '''
+			SELECT
+				"''' + str(self.yesterday()) + '''" AS date,
+				total.count AS total,
+				teamsTotal.count AS teams
+			FROM
+				(''' + self.subquery(None) + ''') AS total,
+				(''' + self.totalTeamsQuery(None) + ''') AS teamsTotal
+			'''
+
+		return query

updater/update-stats.py

@@ -14,6 +14,7 @@
 from reports.ReportGitRequests import *
 from reports.ReportGitVersions import *
 from reports.ReportOrgCollaboration import *
+from reports.ReportOrgHistory import *
 from reports.ReportOrgOwners import *
 from reports.ReportPRByOrg import *
 from reports.ReportPRByRepo import *
@@ -77,6 +78,7 @@ def main():
 	ReportGitRequests(configuration, dataDirectory, metaStats).update()
 	ReportGitVersions(configuration, dataDirectory, metaStats).update()
 	ReportOrgCollaboration(configuration, dataDirectory, metaStats).update()
+	ReportOrgHistory(configuration, dataDirectory, metaStats).update()
 	ReportOrgOwners(configuration, dataDirectory, metaStats).update()
 	ReportPRByOrg(configuration, dataDirectory, metaStats).update()
 	ReportPRByRepo(configuration, dataDirectory, metaStats).update()