Merge pull request #32 from shankari/gamification

Scale all the scores down by 10 to make the game more meaningful

Author: shankari

CFC_WebApp/clients/choice/front/ionic-tabs-myapp.js

@@ -92,7 +92,7 @@ angular.module('e-mission-choice', ['ionic'])
 
     $timeout(function() {
       $scope.$broadcast('scroll.refreshComplete');
-    }, 1000);
+    }, 10000);
   }
 })
 

CFC_WebApp/clients/gamified/front/client.gamified.display.js

@@ -15,7 +15,7 @@ angular.module('e-mission-gamified', ['ionic'])
          $timeout(function() {
             console.log("timed out, closing popup");
             alertPopup.close(); //close the popup after 3 seconds for some reason
-         }, 5000);
+         }, 10000);
     }
     $scope.displayScore = function() {
         // alert("displayScore called");
@@ -32,10 +32,10 @@ angular.module('e-mission-gamified', ['ionic'])
 
         data = [{'title': 'Score',
                 'subtitle': 'Number of points',
-                'ranges': [1000, 10000, 100000],
+                'ranges': [100, 1000, 10000],
                 'measures': [prevScore, currScore],
-                'submarkers': range(200, 800, 200).concat(range(2000, 8000, 2000)).concat(range(20000, 80000, 20000)),
-                'markers': [1000, 10000, 100000]
+                'submarkers': range(20, 80, 20).concat(range(200, 800, 200)).concat(range(2000, 8000, 2000)),
+                'markers': [100, 1000, 10000]
                }];
 
         console.log("data = "+JSON.stringify(data));

CFC_WebApp/clients/gamified/gamified.py

@@ -96,15 +96,15 @@ def updateScore(user_uuid):
     setScores(user, prevScore, newScore)
 
 def getLevel(score):
-  if score < 1000:
+  if score < 100:
     level = 1
+    sublevel = math.floor(score / 20) + 1
+  elif score < 1000:
+    level = 2
     sublevel = math.floor(score / 200) + 1
   elif score < 10000:
-    level = 2
-    sublevel = math.floor(score / 2000) + 1
-  elif score < 100000:
     level = 3
-    sublevel = math.floor(score / 20000) + 1
+    sublevel = math.floor(score / 2000) + 1
   else:
     # Off the charts, stay at the top image
     level = 3

CFC_WebApp/tests/client_tests/TestGamified.py

@@ -117,14 +117,15 @@ def testUpdateScore(self):
     def testGetLevel(self):
         self.assertEqual(gamified.getLevel(0), (1, 1))
         self.assertEqual(gamified.getLevel(11.0), (1, 1))
-        self.assertEqual(gamified.getLevel(100), (1, 1))
-        self.assertEqual(gamified.getLevel(199.0), (1, 1))
-        self.assertEqual(gamified.getLevel(200), (1, 2))
-        self.assertEqual(gamified.getLevel(201.0), (1, 2))
-        self.assertEqual(gamified.getLevel(999), (1, 5))
-        self.assertEqual(gamified.getLevel(1000), (2, 1))
-        self.assertEqual(gamified.getLevel(9999.0), (2, 5))
-        self.assertEqual(gamified.getLevel(10000), (3, 1))
+        self.assertEqual(gamified.getLevel(21.0), (1, 2))
+        self.assertEqual(gamified.getLevel(100), (2, 1))
+        self.assertEqual(gamified.getLevel(199.0), (2, 1))
+        self.assertEqual(gamified.getLevel(200), (2, 2))
+        self.assertEqual(gamified.getLevel(201.0), (2, 2))
+        self.assertEqual(gamified.getLevel(999), (2, 5))
+        self.assertEqual(gamified.getLevel(1000), (3, 1))
+        self.assertEqual(gamified.getLevel(9999.0), (3, 5))
+        self.assertEqual(gamified.getLevel(10000), (3, 5))
         self.assertEqual(gamified.getLevel(100000), (3, 5))
 
     def testGetFileName(self):