Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Show counts of at-risk users on Activity page. 

(imported from commit 4ce1ecf47259f3a95ddf9cbbc356fa0247044e0f)
This commit is contained in:
Steve Howell 2013-11-14 13:50:32 -05:00
parent bb0d18bc73
commit d4c0334b3b
2 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
analytics/views.py
View File

@ -37,6 +37,7 @@ def realm_summary_table(realm_minutes):
SELECT
realm.domain,
coalesce(user_counts.active_user_count, 0) active_user_count,
coalesce(at_risk_counts.at_risk_count, 0) at_risk_count,
(
SELECT
count(*)
@ -75,6 +76,36 @@ def realm_summary_table(realm_minutes):
GROUP BY realm_id
) user_counts
ON user_counts.realm_id = realm.id
LEFT OUTER JOIN
(
SELECT
realm_id,
count(*) at_risk_count
FROM (
SELECT
realm.id as realm_id,
up.email
FROM zerver_useractivity ua
JOIN zerver_userprofile up
ON up.id = ua.user_profile_id
JOIN zerver_realm realm
ON realm.id = up.realm_id
WHERE up.is_active
AND (not up.is_bot)
AND
ua.query in (
'/json/send_message',
'send_message_backend',
'/json/update_pointer'
)
GROUP by realm.id, up.email
HAVING max(last_visit) between
now() - interval '7 day' and
now() - interval '1 day'
) as at_risk_users
GROUP BY realm_id
) at_risk_counts
ON at_risk_counts.realm_id = realm.id
WHERE
realm.domain not in ('zulip.com', 'customer4.invalid', 'wdaher.com')
AND EXISTS (

6
templates/analytics/realm_summary_table.html
View File

@ -6,6 +6,7 @@
<tr>
<th>Domain</th>
<th>Active users</th>
<th>At-risk users</th>
<th>Total users</th>
<th>Bots</th>
<th>Hours per user</th>
@ -27,6 +28,11 @@
{{ row.active_user_count }}
</td>
{# At risk users #}
<td class="number">
{{ row.at_risk_count }}
</td>
{# Total users #}
<td class="number">
{{ row.user_profile_count }}