From 7b01fd7b653dff4d85ab81eb85b8c3a8aff0ae43 Mon Sep 17 00:00:00 2001
From: Matt Lott <mattlott@live.com>
Date: Wed, 25 Nov 2015 14:23:35 -0800
Subject: [PATCH 1/3] Add course name to victory modal
---
app/locale/en.coffee | 3 +++
.../play/level/modal/hero-victory-modal.jade | 12 ++++++++----
app/views/play/level/modal/HeroVictoryModal.coffee | 5 +++++
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/app/locale/en.coffee b/app/locale/en.coffee
index 849a982cd..98dd2aabf 100644
--- a/app/locale/en.coffee
+++ b/app/locale/en.coffee
@@ -221,7 +221,10 @@
years: "years"
play_level:
+ completed_level: "Completed Level:"
+ course: "Course:"
done: "Done"
+ next_level: "Next Level:"
next_game: "Next game"
show_menu: "Show game menu"
home: "Home" # Not used any more, will be removed soon.
diff --git a/app/templates/play/level/modal/hero-victory-modal.jade b/app/templates/play/level/modal/hero-victory-modal.jade
index e440a2e06..ba5188fa1 100644
--- a/app/templates/play/level/modal/hero-victory-modal.jade
+++ b/app/templates/play/level/modal/hero-victory-modal.jade
@@ -12,16 +12,20 @@ block modal-body-content
#victory-text= victoryText
if isCourseLevel
+ if currentCourseName
+ p
+ span.spr.level-title(data-i18n="play_level.course")
+ span.level-name= currentCourseName
.container-fluid
.row
.col-md-6
if currentLevelName
- .level-title Completed Level:
- .level-name= currentLevelName
+ .level-title(data-i18n="play_level.completed_level")
+ .level-name= currentLevelName.replace('Course: ', '')
.col-md-6
if nextLevelName
- .level-title Next Level:
- .level-name= nextLevelName
+ .level-title(data-i18n="play_level.next_level")
+ .level-name= nextLevelName.replace('Course: ', '')
br
#level-feedback
diff --git a/app/views/play/level/modal/HeroVictoryModal.coffee b/app/views/play/level/modal/HeroVictoryModal.coffee
index ae8e54ca9..7698e9fe0 100644
--- a/app/views/play/level/modal/HeroVictoryModal.coffee
+++ b/app/views/play/level/modal/HeroVictoryModal.coffee
@@ -11,6 +11,7 @@ LadderSubmissionView = require 'views/play/common/LadderSubmissionView'
AudioPlayer = require 'lib/AudioPlayer'
User = require 'models/User'
utils = require 'core/utils'
+Course = require 'models/Course'
Level = require 'models/Level'
LevelFeedback = require 'models/LevelFeedback'
@@ -65,6 +66,9 @@ module.exports = class HeroVictoryModal extends ModalView
if @level.get('type', true) is 'course' and nextLevel = @level.get('nextLevel')
@nextLevel = new Level().setURL "/db/level/#{nextLevel.original}/version/#{nextLevel.majorVersion}"
@nextLevel = @supermodel.loadModel(@nextLevel, 'level').model
+ if @courseID
+ @course = new Course().setURL "/db/course/#{@courseID}"
+ @course = @supermodel.loadModel(@course, 'course').model
if @level.get('type', true) in ['course', 'course-ladder']
@saveReviewEventually = _.debounce(@saveReviewEventually, 2000)
@loadExistingFeedback()
@@ -210,6 +214,7 @@ module.exports = class HeroVictoryModal extends ModalView
c.showReturnToCourse = not c.showLeaderboard and not me.get('anonymous') and @level.get('type', true) in ['course', 'course-ladder']
c.isCourseLevel = @level.get('type', true) in ['course']
+ c.currentCourseName = @course?.get('name')
c.currentLevelName = @level?.get('name')
c.nextLevelName = @nextLevel?.get('name')
From 848680181f5490f783028976773e093020c73719 Mon Sep 17 00:00:00 2001
From: Matt Lott <mattlott@live.com>
Date: Wed, 25 Nov 2015 14:53:31 -0800
Subject: [PATCH 2/3] Remove paypal DRR analytics group
---
.../analytics/mongodb/queries/insertPerDayAnalytics.js | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/scripts/analytics/mongodb/queries/insertPerDayAnalytics.js b/scripts/analytics/mongodb/queries/insertPerDayAnalytics.js
index f154e4805..14fb5cf22 100644
--- a/scripts/analytics/mongodb/queries/insertPerDayAnalytics.js
+++ b/scripts/analytics/mongodb/queries/insertPerDayAnalytics.js
@@ -101,10 +101,10 @@ try {
}
}
- log("Getting monthly recurring revenue counts...");
+ log("Getting recurring revenue counts...");
var recurringRevenueCounts = getRecurringRevenueCounts(startDay);
// printjson(recurringRevenueCounts);
- log("Inserting monthly recurring revenue counts...");
+ log("Inserting recurring revenue counts...");
for (var event in recurringRevenueCounts) {
for (var day in recurringRevenueCounts[event]) {
if (today === day) continue; // Never save data for today because it's incomplete
@@ -674,9 +674,9 @@ function getRecurringRevenueCounts(startDay) {
dailyRevenueCounts['DRR monthly subs'][day] += doc.amount
}
else if (doc.service === 'paypal') {
- if (!dailyRevenueCounts['DRR paypal']) dailyRevenueCounts['DRR paypal'] = {};
- if (!dailyRevenueCounts['DRR paypal'][day]) dailyRevenueCounts['DRR paypal'][day] = 0;
- dailyRevenueCounts['DRR paypal'][day] += doc.amount
+ 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
}
// else {
// // printjson(doc);
From e7acf9c798abca3e8dbef4cc2752d79c529c26e8 Mon Sep 17 00:00:00 2001
From: Matt Lott <mattlott@live.com>
Date: Wed, 25 Nov 2015 16:33:27 -0800
Subject: [PATCH 3/3] :bug:Fix local env analytics log event URL
Found another one @basicer
---
app/core/Tracker.coffee | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/core/Tracker.coffee b/app/core/Tracker.coffee
index 3724aa612..85de8e552 100644
--- a/app/core/Tracker.coffee
+++ b/app/core/Tracker.coffee
@@ -128,7 +128,7 @@ module.exports = class Tracker
console.error "Analytics post failed!"
else
request = @supermodel.addRequestResource 'log_event', {
- url: '/db/analytics_log_event/-/log_event'
+ url: '/db/analytics.log.event/-/log_event'
data: {event: event, properties: properties}
method: 'POST'
}, 0