Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch user activity chart to 4-week intervals #135

Merged
merged 1 commit into from
Mar 20, 2018
Merged

Switch user activity chart to 4-week intervals #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/demo-data/users.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
date pushing commits (last day) pushing commits (last week) pushing commits (last month) using license
date pushing commits (last day) pushing commits (last week) pushing commits (last four weeks) using license
2017-09-25 104 184 235 330
2017-09-24 13 182 234 326
2017-09-23 12 181 238 325
Expand Down
14 changes: 7 additions & 7 deletions docs/users-activity.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ <h3>Users (Active/Using License)</h3>
"series":
[
"using license",
"pushing commits (last month)",
"pushing commits (last four weeks)",
"pushing commits (last week)",
"pushing commits (last day)"
],
"visibleSeries":
[
"using license",
"pushing commits (last month)"
"pushing commits (last four weeks)"
],
"slice": [0, 61]
},
Expand All @@ -41,14 +41,14 @@ <h3>Users (Active/Using License)</h3>
"series":
[
"using license",
"pushing commits (last month)",
"pushing commits (last four weeks)",
"pushing commits (last week)",
"pushing commits (last day)"
],
"visibleSeries":
[
"using license",
"pushing commits (last month)"
"pushing commits (last four weeks)"
],
"slice": [0, 106],
"default": true
Expand All @@ -64,14 +64,14 @@ <h3>Users (Active/Using License)</h3>
"series":
[
"using license",
"pushing commits (last month)",
"pushing commits (last four weeks)",
"pushing commits (last week)",
"pushing commits (last day)"
],
"visibleSeries":
[
"using license",
"pushing commits (last month)"
"pushing commits (last four weeks)"
]
}
]
Expand All @@ -81,7 +81,7 @@ <h3>Users (Active/Using License)</h3>
<i>Using license</i> shows how many GitHub Enterprise licenses were used at a given date.
</p>
<p>
<i>Pushing commits</i> corresponds to how many different people pushed commits to the appliance in the last month, week, or day.
<i>Pushing commits</i> corresponds to how many different people pushed commits to the appliance in the last four weeks, week, or day.
</p>
</div>
<div class="info-box">
Expand Down
22 changes: 11 additions & 11 deletions updater/reports/ReportUsers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
from .ReportDaily import *

# Lists how many users pushed commits vs. how many used a seat in the last day, week, and month
# Lists how many users pushed commits vs. how many used a seat in the last day, week, and four weeks
class ReportUsers(ReportDaily):
def name(self):
return "users"

def updateDailyData(self):
self.header, newData = self.parseData(self.executeQuery(self.query(self.yesterday())))
self.header, newData = self.parseData(self.executeQuery(self.query()))
self.data.extend(newData)
self.truncateData(self.timeRangeTotal())
self.sortDataByDate()
Expand Down Expand Up @@ -36,20 +36,20 @@ def usersUsingSeatSubquery(self):
users.suspended_at IS NULL'''

# Collects the number of pushing users and users using a seat
def query(self, date):
# Also compute the stats for a 7-day and a 30-day period
sevenDaysEarlier = date - datetime.timedelta(6)
thirtyDaysEarlier = date - datetime.timedelta(29)
def query(self):
oneDayAgo = self.yesterday()
oneWeekAgo = self.daysAgo(7)
fourWeeksAgo = self.daysAgo(28)

return '''
SELECT
"''' + str(date) + '''" AS date,
"''' + str(oneDayAgo) + '''" AS date,
usersPushingYesterday.count AS "pushing commits (last day)",
usersPushingLastWeek.count AS "pushing commits (last week)",
usersPushingLastMonth.count AS "pushing commits (last month)",
usersPushingLastFourWeeks.count AS "pushing commits (last four weeks)",
usersUsingSeat.count AS "using license"
FROM
(''' + self.usersPushingSubquery([date, date]) + ''') AS usersPushingYesterday,
(''' + self.usersPushingSubquery([sevenDaysEarlier, date]) + ''') AS usersPushingLastWeek,
(''' + self.usersPushingSubquery([thirtyDaysEarlier, date]) + ''') AS usersPushingLastMonth,
(''' + self.usersPushingSubquery([oneDayAgo, oneDayAgo]) + ''') AS usersPushingYesterday,
(''' + self.usersPushingSubquery([oneWeekAgo, oneDayAgo]) + ''') AS usersPushingLastWeek,
(''' + self.usersPushingSubquery([fourWeeksAgo, oneDayAgo]) + ''') AS usersPushingLastFourWeeks,
(''' + self.usersUsingSeatSubquery() + ''') AS usersUsingSeat'''