Merge branch 'dev'

Miguel Barão
2 parents e55079ef 6c5a961a
Showing 4 changed files with 30 additions and 44 deletions Show diff stats
BUGS.md
aprendizations/learnapp.py
aprendizations/templates/rankings.html
mypy.ini
-# BUGS
+# Bugs and Wishlist
+
+## BUGS
 - nao esta a respeitar o numero de tentativas `max_tries`.
 - se na especificacao de um curso, a referencia do topico nao existir como
   directorio, rebenta.
 - internal server error ao fazer logout no macos python3.8
-- GET can get filtered by browser cache
 - topicos chapter devem ser automaticamente completos assim que as dependencias
   são satisfeitas. Nao devia ser necessario (ou possivel?) clicar neles.
 - topicos do tipo learn deviam por defeito nao ser randomizados e assumir
@@ -23,11 +24,11 @@
 - shift-enter não está a funcionar
 - default prefix should be obtained from each course (yaml conf)?
-# TODO
+## TODO
-- shuffle das perguntas dentro de um topico
 - alterar tabelas para incluir email de recuperacao de password (e outros
   avisos)
+- shuffle das perguntas dentro de um topico
 - registar `last_seen` e remover os antigos de cada vez que houver um login.
 - indicar qtos topicos faltam (>=50%) para terminar o curso.
 - ao fim de 3 tentativas com password errada, envia email com nova password.
@@ -50,8 +51,9 @@
   mais falhadas, tempo médio por pergunta.
 - normalizar com perguntations.
-# FIXED
+## FIXED
+- rankings rebenta se nunhum aluno tiver feito nenhum topico.
 - templates question-*.html tem input hidden question_ref que não é usado.
   remover?
 - goals se forem do tipo chapter deve importar todas as dependencias do chapter.
@@ -288,7 +288,9 @@ class LearnApp():
             logger.info('User "%s" finished "%s" (level=%.2f)',
                         uid, topic_id, level)
-            query = select(StudentTopic).where(StudentTopic.student_id == uid).where(StudentTopic.topic_id == topic_id)
+            query = select(StudentTopic) \
+                    .where(StudentTopic.student_id == uid) \
+                    .where(StudentTopic.topic_id == topic_id)
             with Session(self._engine, future=True) as session:
                 student_topic = session.execute(query).scalar_one_or_none()
@@ -599,9 +601,9 @@ class LearnApp():
         return self.courses[course_id]
     # ------------------------------------------------------------------------
-    def get_rankings(self, uid: str, course_id: str) -> Iterable[Tuple[str, str, float, float]]:
+    def get_rankings(self, uid: str, cid: str) -> List[Tuple[str, str, float]]:
         '''
-        Returns rankings for a certain course_id.
+        Returns rankings for a certain cid (course_id).
         User where uid have <=2 chars are considered ghosts are hidden from
         the rankings. This is so that there can be users for development or
         testing purposes, which are not real users.
@@ -609,16 +611,13 @@ class LearnApp():
         This should be modified to have a "visible" flag
         '''
-        logger.info('User "%s" rankings for "%s"', uid, course_id)
+        logger.info('User "%s" rankings for "%s"', uid, cid)
+        query_students = select(Student.id, Student.name)
+        query_student_topics = select(StudentTopic.student_id,
+                                    StudentTopic.topic_id,
+                                    StudentTopic.level,
+                                    StudentTopic.date)
         with Session(self._engine, future=True) as session:
-            query_students = select(Student.id, Student.name)
-            query_student_topics = select(StudentTopic.student_id,
-                                        StudentTopic.topic_id,
-                                        StudentTopic.level,
-                                        StudentTopic.date)
-            query_total = select(Answer.student_id, func.count(Answer.ref))
-            query_right = select(Answer.student_id, func.count(Answer.ref)) \
-                          .where(Answer.grade == 1.0)
             # all students in the database  FIXME only with answers of this course
             students = session.execute(query_students).all()
@@ -626,28 +625,17 @@ class LearnApp():
             # topic levels  FIXME only topics of this course
             student_topics = session.execute(query_student_topics).all()
-            # answer performance
-
-            # FIXME this does not work when nobody has done anything...
-            # FIXME row to dict seems to be deprecated in 1.4+
-            total = dict(session.execute(query_total).all())
-            right = dict(session.execute(query_right).all())
-
-        # compute percentage of right answers
-        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']
+        goals = self.courses[cid]['goals']
         progress: DefaultDict[str, float] = defaultdict(int)
-        for student, topic, level, date in student_topics:
+        for student, topic, level, datestr in student_topics:
             if topic in goals:
-                date = datetime.strptime(date, "%Y-%m-%d %H:%M:%S.%f")
+                date = datetime.strptime(datestr, "%Y-%m-%d %H:%M:%S.%f")
                 progress[student] += level**(now - date).days / len(goals)
-        return sorted(((u, name, progress[u], perf.get(u, 0.0))
+        return sorted(((u, name, progress[u])
                        for u, name in students
                        if u in progress and (len(u) > 2 or len(uid) <= 2)),
                        key=lambda x: x[2], reverse=True)
@@ -61,7 +61,6 @@
     <tr>
       <th scope="col" class="text-center">Posição</th>
       <th scope="col">Aluno</th>
-      <th scope="col"></th>
       <th scope="col">Progresso</th>
     </tr>
   </thead>
@@ -76,9 +75,6 @@
       <td> <!-- student name -->
         {{ ' '.join(r[1].split()[n] for n in (0,-1)) }}
       </td>
-      <td> <!-- nice -->
-        {{ '<i class="far fa-thumbs-up text-success" title="Mais de 75% de respostas correctas"></i>' if r[3] > 0.75 else '' }}
-      </td>
       <td> <!-- progress -->
         <div class="progress" style="height: 24px;">
           <div class="progress-bar" role="progressbar" style="width: {{ 100*r[2] }}%;" aria-valuenow="{{round(100*r[2])}}%" aria-valuemin="0" aria-valuemax="100">{{round(100*r[2])}}%</div>
@@ -2,14 +2,14 @@
 python_version = 3.9
 plugins = sqlalchemy.ext.mypy.plugin
-[mypy-pygments.*]
-ignore_missing_imports = True
+; [mypy-pygments.*]
+; ignore_missing_imports = True
-[mypy-networkx.*]
-ignore_missing_imports = True
+; [mypy-networkx.*]
+; ignore_missing_imports = True
-[mypy-bcrypt.*]
-ignore_missing_imports = True
+; [mypy-bcrypt.*]
+; ignore_missing_imports = True
-[mypy-mistune.*]
-ignore_missing_imports = True
+; [mypy-mistune.*]
+; ignore_missing_imports = True