Merge branch 'master' into dev

Miguel Barão
2 parents 8548cb5b ea60c949
Showing 1 changed file with 9 additions and 6 deletions Show diff stats
aprendizations/learnapp.py
@@ -579,21 +579,24 @@ class LearnApp(object):
                          all())
         # compute percentage of right answers
-        perf: Dict[str, float] = {uid: right.get(uid, 0.0)/total[uid]
-                                  for uid in total}
+        perf: Dict[str, float] = {u: right.get(u, 0.0)/total[u]
+                                  for u in total}
         # compute topic progress
         now = datetime.now()
         goals = self.courses[course_id]['goals']
         prog: DefaultDict[str, float] = defaultdict(int)
-        for uid, topic, level, date in student_topics:
+        for u, topic, level, date in student_topics:
             if topic in goals:
                 date = datetime.strptime(date, "%Y-%m-%d %H:%M:%S.%f")
-                prog[uid] += level**(now - date).days / len(goals)
+                prog[u] += level**(now - date).days / len(goals)
-        rankings = [(uid, name, prog[uid], perf.get(uid, 0.0))
-                    for uid, name in students if uid != '0' and uid in prog]
+        ghostuser = len(uid) <= 2  # ghosts are invisible to students
+        rankings = [(u, name, prog[u], perf.get(u, 0.0))
+                    for u, name in students
+                    if u in prog
+                    and (len(u) > 2 or ghostuser) and u != '0' ]
         rankings.sort(key=lambda x: x[2], reverse=True)
         return rankings