diff --git a/app/templates/admin/analytics.jade b/app/templates/admin/analytics.jade index 09165a4a7..7e11f4262 100644 --- a/app/templates/admin/analytics.jade +++ b/app/templates/admin/analytics.jade @@ -71,7 +71,7 @@ block content a(href='#enrollments-table') Enrollments h3#active-classes-graph Active Classes 90 days - .small Active class: 12+ students in a classroom, with 6+ who played in last 30 days. + .small Active class: 12+ students in a classroom, with 6+ who played in last 30 days. Played == 'Started Level' analytics event. .small Paid student: user.coursePrepaidID set and prepaid.properties.trialRequestID NOT set .small Trial student: user.coursePrepaidID set and prepaid.properties.trialRequestID set .small Paid class: at least one paid student in the classroom diff --git a/scripts/analytics/mongodb/queries/insertAnalyticsActiveClasses.js b/scripts/analytics/mongodb/queries/insertAnalyticsActiveClasses.js index b1a5401cd..b26e89af1 100644 --- a/scripts/analytics/mongodb/queries/insertAnalyticsActiveClasses.js +++ b/scripts/analytics/mongodb/queries/insertAnalyticsActiveClasses.js @@ -134,7 +134,6 @@ function getActiveClassCounts(startDay) { } // printjson(userPlayedMap); - log("Calculate number of active members per classroom per day per event type.."); var classDayTypeMap = {}; for (var classroom in classroomUsersMap) { diff --git a/scripts/analytics/mongodb/queries/insertAnalyticsRecurringRevenue.js b/scripts/analytics/mongodb/queries/insertAnalyticsRecurringRevenue.js index b67d3a514..4a057b999 100644 --- a/scripts/analytics/mongodb/queries/insertAnalyticsRecurringRevenue.js +++ b/scripts/analytics/mongodb/queries/insertAnalyticsRecurringRevenue.js @@ -72,28 +72,28 @@ function getRecurringRevenueCounts(startDay) { else if (doc.productID && doc.productID.indexOf('gems_') === 0) { if (!dailyRevenueCounts['DRR gems']) dailyRevenueCounts['DRR gems'] = {}; if (!dailyRevenueCounts['DRR gems'][day]) dailyRevenueCounts['DRR gems'][day] = 0; - dailyRevenueCounts['DRR gems'][day] += doc.amount + dailyRevenueCounts['DRR gems'][day] += doc.amount; } else if (doc.productID === 'custom' || doc.service === 'external' || doc.service === 'invoice') { if (!dailyRevenueCounts['DRR school sales']) dailyRevenueCounts['DRR school sales'] = {}; if (!dailyRevenueCounts['DRR school sales'][day]) dailyRevenueCounts['DRR school sales'][day] = 0; - dailyRevenueCounts['DRR school sales'][day] += doc.amount + dailyRevenueCounts['DRR school sales'][day] += doc.amount; } else if (doc.service === 'stripe' && doc.gems === 42000) { if (!dailyRevenueCounts['DRR yearly subs']) dailyRevenueCounts['DRR yearly subs'] = {}; if (!dailyRevenueCounts['DRR yearly subs'][day]) dailyRevenueCounts['DRR yearly subs'][day] = 0; - dailyRevenueCounts['DRR yearly subs'][day] += doc.amount + dailyRevenueCounts['DRR yearly subs'][day] += doc.amount; } else if (doc.service === 'stripe') { // Catches prepaids, and assumes all are type terminal_subscription if (!dailyRevenueCounts['DRR monthly subs']) dailyRevenueCounts['DRR monthly subs'] = {}; if (!dailyRevenueCounts['DRR monthly subs'][day]) dailyRevenueCounts['DRR monthly subs'][day] = 0; - dailyRevenueCounts['DRR monthly subs'][day] += doc.amount + dailyRevenueCounts['DRR monthly subs'][day] += doc.amount; } else if (doc.service === 'paypal') { if (!dailyRevenueCounts['DRR monthly subs']) dailyRevenueCounts['DRR monthly subs'] = {}; if (!dailyRevenueCounts['DRR monthly subs'][day]) dailyRevenueCounts['DRR monthly subs'][day] = 0; - dailyRevenueCounts['DRR monthly subs'][day] += doc.amount + dailyRevenueCounts['DRR monthly subs'][day] += doc.amount; } // else { // // printjson(doc);