- fixed menus

- mathjax3 seems to be working fine - fixed finish_topics redirect working... with bugs...

- fixed menus
- mathjax3 seems to be working fine - fixed finish_topics redirect working... with bugs...
Miguel Barão
1 parent d187aad4
Showing 12 changed files with 73 additions and 81 deletions Show diff stats
BUGS.md
aprendizations/learnapp.py
aprendizations/serve.py
aprendizations/static/js/topic.js
aprendizations/student.py
aprendizations/templates/courses.html
aprendizations/templates/maintopics-table.html
aprendizations/templates/question.html
aprendizations/templates/rankings.html
aprendizations/templates/topic.html
package-lock.json
package.json
 # BUGS
+- nao esta a seguir o max_tries definido no ficheiro de dependencias.
+- no curso de linear algebra, as perguntas estao shuffled, mas nao deviam estar... nao esta a obedecer a keyword shuffle.
+- obter rankings por curso GET course=course_id
+- impedir que quando students.db não é encontrado, crie um ficheiro vazio.
 - classificacoes so devia mostrar os que ja fizeram alguma coisa
-- menu nao mostra as opcoes correctamente
-- mathjax nao esta a correr sobre o titulo e sobre as solucoes.
 - QFactory.generate() devia fazer run da gen_async, ou remover.
-- finish topic vai para a lista de cursos. devia ficar no mesmo curso.
 - marking all options right in a radio question breaks!
-- impedir que quando students.db não é encontrado, crie um ficheiro vazio.
 - opcao --prefix devia afectar a base de dados?
 - duplo clicks no botao "responder" dessincroniza as questões, ver debounce em https://stackoverflow.com/questions/20281546/how-to-prevent-calling-of-en-event-handler-twice-on-fast-clicks
 - quando termina topico devia apagar as perguntas todas (se falhar a gerar novo topico, aparecem perguntas do antigo)
@@ -16,8 +16,6 @@
 - permitir configuracao para escolher entre static files locais ou remotos
 - sqlalchemy.pool.impl.NullPool: Exception during reset or similar
 sqlite3.ProgrammingError: SQLite objects created in a thread can only be used in that same thread.
-
-- porque é que md() é usado nos templates e não directamente no codigo python?
 - templates question-*.html tem input hidden question_ref que não é usado. remover?
 - guardar o estado a meio de um nível.
 - safari as vezes envia dois gets no inicio do topico. nesses casos, a segunda pergunta não é actualizada no browser... o topico tem de ser gerado qd se escolhe o topico em main_topics. O get nao deve alterar o estado.
@@ -50,6 +48,9 @@ sqlite3.ProgrammingError: SQLite objects created in a thread can only be used in
 # FIXED
+- menu nao mostra as opcoes correctamente
+- finish topic vai para a lista de cursos. devia ficar no mesmo curso.
+- mathjax nao esta a correr sobre o titulo.
 - forgetting factor is hardcoded in student.py
 - add aprendizatons --version
 - se aluno abre dois tabs no browser, conseque navegar em simultaneo para perguntas diferentes. quando submete uma delas dá asneira. Tem de haver um campo hidden que tenha um céodigo único que indique qual a pergunta. do lado do servidor apnas há o codigo da pergunta corrente, se forem diferentes faz redirect para /.
@@ -268,6 +268,7 @@ class LearnApp(object):
             student.start_course(course)
         except Exception as e:
             logger.warning(f'"{uid}" could not start course "{course}": {e}')
+            raise
         else:
             logger.info(f'"{uid}" started course "{course}"')
@@ -452,6 +453,10 @@ class LearnApp(object):
         return self.online[uid]['state'].get_current_course_title()
     # ------------------------------------------------------------------------
+    def get_student_course_id(self, uid: str) -> str:
+        return self.online[uid]['state'].get_current_course_id()
+
+    # ------------------------------------------------------------------------
     # def get_title(self) -> str:
     #     # return self.deps.graph.get('title', '')
     #     return self.
@@ -471,15 +476,15 @@ class LearnApp(object):
         return self.courses
     # ------------------------------------------------------------------------
-    def get_rankings(self, uid: str) -> Iterable[Tuple[str, str, float, float]]:
+    def get_rankings(self, uid: str, course_id: str) -> Iterable[Tuple[str, str, float, float]]:
-        logger.info(f'User "{uid}" get rankings')
+        logger.info(f'User "{uid}" get rankings for {course_id}')
         with self.db_session() as s:
             students = s.query(Student.id, Student.name).all()
             # topic progress
             student_topics = s.query(StudentTopic.student_id,
-                                     StudentTopic.topic_id,
+                                     StudentTopic.topic_id,  # FIXME Filter topics of the course
                                      StudentTopic.level,
                                      StudentTopic.date).all()
             total_topics = s.query(Topic).count()
@@ -48,11 +48,10 @@ class WebApplication(tornado.web.Application):
             (r'/change_password', ChangePasswordHandler),
             (r'/question',      QuestionHandler),       # render question
             (r'/rankings',      RankingsHandler),       # rankings table
-            # (r'/topics',        TopicsHandler),         # show list of topics
             (r'/topic/(.+)',    TopicHandler),          # start topic
             (r'/file/(.+)',     FileHandler),           # serve file
             (r'/courses',       CoursesHandler),        # show list of courses
-            (r'/course/(.+)',   CourseHandler),         # show course topics
+            (r'/course/(.*)',   CourseHandler),         # show course topics
             (r'/',              RootHandler),           # redirects
         ]
         settings = {
@@ -96,12 +95,17 @@ class RankingsHandler(BaseHandler):
     @tornado.web.authenticated
     def get(self):
         uid = self.current_user
-        rankings = self.learn.get_rankings(uid)
+        current_course = self.learn.get_student_course_id(uid)
+        course_id = self.get_query_argument('course', default=current_course)
+        rankings = self.learn.get_rankings(uid, course_id)
         self.render('rankings.html',
                     appname=APP_NAME,
                     uid=uid,
                     name=self.learn.get_student_name(uid),
-                    rankings=rankings)
+                    rankings=rankings,
+                    course_id=course_id,
+                    course_title=self.learn.get_student_course_title(uid),  # FIXME get from course var
+                    )
 # ----------------------------------------------------------------------------
@@ -202,40 +206,25 @@ class CourseHandler(BaseHandler):
     @tornado.web.authenticated
     def get(self, course):
         uid = self.current_user
+        if course == '':
+            course = self.learn.get_student_course_id(uid)
         try:
             self.learn.start_course(uid, course)
         except KeyError:
             self.redirect('/courses')
-        # print('TITULO: ---------------->', self.learn.get_title())
         self.render('maintopics-table.html',
                     appname=APP_NAME,
                     uid=uid,
                     name=self.learn.get_student_name(uid),
                     state=self.learn.get_student_state(uid),
-                    title=self.learn.get_student_course_title(uid),
+                    course_title=self.learn.get_student_course_title(uid),
+                    course_id=self.learn.get_student_course_id(uid),
                     )
 # ----------------------------------------------------------------------------
-# /topics
-# Shows a list of topics and proficiency (stars, locked).
-# ----------------------------------------------------------------------------
-# class TopicsHandler(BaseHandler):
-#     @tornado.web.authenticated
-#     def get(self):
-#         uid = self.current_user
-#         self.render('maintopics-table.html',
-#                     appname=APP_NAME,
-#                     uid=uid,
-#                     name=self.learn.get_student_name(uid),
-#                     state=self.learn.get_student_state(uid),
-#                     title=self.learn.get_title(),
-#                     )
-
-
-# ----------------------------------------------------------------------------
 # /topic/...
 # Start a given topic
 # ----------------------------------------------------------------------------
@@ -253,6 +242,8 @@ class TopicHandler(BaseHandler):
                     appname=APP_NAME,
                     uid=uid,
                     name=self.learn.get_student_name(uid),
+                    # course_title=self.learn.get_student_course_title(uid),
+                    course_id=self.learn.get_student_course_id(uid),
                     )
@@ -55,7 +55,7 @@ function updateQuestion(response) {
         $('#submit, #comments, #solution').remove();
         $("#content").html(response["params"]["question"]).animateCSS('tada');
         $('#topic_progress').css('width', '100%').attr('aria-valuenow', 100);
-        setTimeout(function(){window.location.replace('/');}, 2000);
+        setTimeout(function(){window.location.replace('/course/');}, 2000);
         break;
     }
 }
@@ -137,7 +137,7 @@ function getFeedback(response) {
             $("#right").hide();
             $('#solution').html(params['solution']).animateCSS('flipInX');
             // MathJax.Hub.Queue(["Typeset", MathJax.Hub, "#solution"]);
-                    MathJax.typeset();
+            MathJax.typeset();
         });
         break;
@@ -232,6 +232,10 @@ class StudentState(object):
         return self.courses[self.current_course]['title']
     # ------------------------------------------------------------------------
+    def get_current_course_id(self) -> Optional[str]:
+        return self.current_course
+
+    # ------------------------------------------------------------------------
     def is_locked(self, topic: str) -> bool:
         return topic not in self.state
@@ -33,16 +33,16 @@
   </button>
   <div class="collapse navbar-collapse" id="navbarText">
-    <ul class="navbar-nav mr-auto">
-      <li class="nav-item active">
-        <a class="nav-link" href="#">Cursos<span class="sr-only">(actual)</span></a>
-      </li>
-    </ul>
+    <div class="navbar-nav mr-auto">
+      <a class="nav-item nav-link active" href="#">Cursos <span class="sr-only">(actual)</span></a>
+      <a class="nav-item nav-link disabled" href="#">Tópicos</a>
+      <a class="nav-item nav-link disabled" href="#" tabindex="-1" aria-disabled="true">Classificação</a>
+    </div>
     <ul class="navbar-nav">
       <li class="nav-item dropdown">
         <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-          <i class="fas fa-user" aria-hidden="true"></i>
+          <i class="fas fa-user-graduate" aria-hidden="true"></i>
           <span id="name">{{ escape(name) }}</span>
           <span class="caret"></span>
         </a>
@@ -62,7 +62,7 @@
   {% for k,v in courses.items() %}
-    <a href="/course/{{k}}" class="card text-dark mb-3">
+    <a href="/course/{{k}}" class="card text-dark mb-3" style="width: 18rem;">
       <div class="card-body">
         <h6 class="card-title">{{ v['title'] }}</h6>
       </div>
@@ -33,22 +33,16 @@
   </button>
   <div class="collapse navbar-collapse" id="navbarText">
-    <ul class="navbar-nav mr-auto">
-      <li class="nav-item">
-        <a class="nav-link" href="/courses">Cursos</a>
-      </li>
-      <li class="nav-item active">
-        <a class="nav-link" href="#">Tópicos<span class="sr-only">(actual)</span></a>
-      </li>
-      <li class="nav-item">
-        <a class="nav-link" href="/rankings">Classificação</a>
-      </li>
-    </ul>
+    <div class="navbar-nav mr-auto">
+      <a class="nav-item nav-link" href="/courses">Cursos</a>
+      <a class="nav-item nav-link active" href="#">Tópicos <span class="sr-only">(actual)</span></a>
+      <a class="nav-item nav-link" href="/rankings?course={{course_id}}">Classificação</a>
+    </div>
     <ul class="navbar-nav">
       <li class="nav-item dropdown">
         <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-          <i class="fas fa-user" aria-hidden="true"></i>
+          <i class="fas fa-user-graduate" aria-hidden="true"></i>
           <span id="name">{{ escape(name) }}</span>
           <span class="caret"></span>
         </a>
@@ -66,7 +60,7 @@
   <div id="notifications"></div>
-  <h4>{{ title }}</h4>
+  <h4>{{ course_title }}</h4>
   <table class="table table-hover">
     <thead>
 {% autoescape %}
-<h2 class="page-header">{{ question['title'] }}</h4>
+<h2 class="page-header">{{ md(question['title']) }}</h4>
 <div id="text">
     {{ md(question['text']) }}
@@ -33,19 +33,16 @@
   </button>
   <div class="collapse navbar-collapse" id="navbarText">
-    <ul class="navbar-nav mr-auto">
-      <li class="nav-item">
-        <a class="nav-link" href="/">Tópicos</a>
-      </li>
-      <li class="nav-item active">
-        <a class="nav-link" href="/rankings">Classificação<span class="sr-only">(current)</span></a>
-      </li>
-    </ul>
+    <div class="navbar-nav mr-auto">
+      <a class="nav-item nav-link" href="/courses">Cursos <span class="sr-only">(actual)</span></a>
+      <a class="nav-item nav-link" href="/course/{{course_id}}">Tópicos</a>
+      <a class="nav-item nav-link active" href="#">Classificação</a>
+    </div>
     <ul class="navbar-nav">
       <li class="nav-item dropdown">
         <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-          <i class="fas fa-user" aria-hidden="true"></i>
+          <i class="fas fa-user-graduate" aria-hidden="true"></i>
           <span id="name">{{ escape(name) }}</span>
           <span class="caret"></span>
         </a>
@@ -60,7 +57,7 @@
 </nav>
 <!-- ===================================================================== -->
 <div class="container">
-<h4>Classificação geral</h4>
+<h4>{{course_title}}</h4>
 <table class="table table-hover">
   <col width="100">
   <thead>
@@ -87,8 +84,8 @@
           <td> <!-- student name -->
             {{ ' '.join(r[1].split()[n] for n in (0,-1)) }}
             &nbsp;
-            {{ '<i class="fas fa-brain fa-2x text-success" title="Mais de 75% de respostas correctas"></i>' if r[3] > 0.75 else '' }}
-            {{ '<i class="fas fa-frown text-secondary" title="Menos de 50% de respostas correctas" ></i>' if 0.0 < r[3] < 0.5 else '' }}
+            {{ '<i class="far fa-thumbs-up text-success" title="Mais de 75% de respostas correctas"></i>' if r[3] > 0.75 else '' }}
+            {{ '<i class="fas fa-bug" title="Menos de 50% de respostas correctas" ></i>' if 0.0 < r[3] < 0.5 else '' }}
           </td>
           <td> <!-- progress -->
             <div class="progress">
@@ -49,16 +49,16 @@
     </button>
     <div class="collapse navbar-collapse" id="navbarText">
-        <ul class="navbar-nav mr-auto">
-            <li class="nav-item">
-                <a class="nav-link" href="/">Tópicos</a>
-            </li>
-        </ul>
+        <div class="navbar-nav mr-auto">
+            <a class="nav-item nav-link" href="/courses">Cursos</a>
+            <a class="nav-item nav-link active" href="/course/{{course_id}}">Tópicos <span class="sr-only">(actual)</span></a>
+            <a class="nav-item nav-link" href="/rankings?course={{course_id}}">Classificação</a>
+        </div>
         <ul class="navbar-nav">
             <li class="nav-item dropdown">
                 <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                    <i class="fas fa-user" aria-hidden="true"></i>
+                    <i class="fas fa-user-graduate" aria-hidden="true"></i>
                     <span id="name">{{ escape(name) }}</span>
                     <span class="caret"></span>
                 </a>
@@ -131,9 +131,9 @@
             }
         },
         "@fortawesome/fontawesome-free": {
-            "version": "5.10.2",
-            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.10.2.tgz",
-            "integrity": "sha512-9pw+Nsnunl9unstGEHQ+u41wBEQue6XPBsILXtJF/4fNN1L3avJcMF/gGF86rIjeTAgfLjTY9ndm68/X4f4idQ=="
+            "version": "5.11.2",
+            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.11.2.tgz",
+            "integrity": "sha512-XiUPoS79r1G7PcpnNtq85TJ7inJWe0v+b5oZJZKb0pGHNIV6+UiNeQWiFGmuQ0aj7GEhnD/v9iqxIsjuRKtEnQ=="
         },
         "ansi-styles": {
             "version": "3.2.1",
@@ -154,9 +154,9 @@
             }
         },
         "codemirror": {
-            "version": "5.48.4",
-            "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.48.4.tgz",
-            "integrity": "sha512-pUhZXDQ6qXSpWdwlgAwHEkd4imA0kf83hINmUEzJpmG80T/XLtDDEzZo8f6PQLuRCcUQhmzqqIo3ZPTRaWByRA=="
+            "version": "5.49.0",
+            "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.49.0.tgz",
+            "integrity": "sha512-Hyzr0HToBdZpLBN9dYFO/KlJAsKH37/cXVHPAqa+imml0R92tb9AkmsvjnXL+SluEvjjdfkDgRjc65NG5jnMYA=="
         },
         "color-convert": {
             "version": "1.9.3",
@@ -2,8 +2,8 @@
     "description": "Javascript libraries required to run the server",
     "email": "mjsb@uevora.pt",
     "dependencies": {
-        "@fortawesome/fontawesome-free": "^5",
-        "codemirror": "^5.48",
+        "@fortawesome/fontawesome-free": "^5.11.2",
+        "codemirror": "^5.49.0",
         "mathjax": "^3",
         "mdbootstrap": "^4.8.10"
     },
	@@ -55,7 +55,7 @@ function updateQuestion(response) {		@@ -55,7 +55,7 @@ function updateQuestion(response) {
55	$('#submit, #comments, #solution').remove();	55	$('#submit, #comments, #solution').remove();
56	$("#content").html(response["params"]["question"]).animateCSS('tada');	56	$("#content").html(response["params"]["question"]).animateCSS('tada');
57	$('#topic_progress').css('width', '100%').attr('aria-valuenow', 100);	57	$('#topic_progress').css('width', '100%').attr('aria-valuenow', 100);
58	- setTimeout(function(){window.location.replace('/');}, 2000);	58	+ setTimeout(function(){window.location.replace('/course/');}, 2000);
59	break;	59	break;
60	}	60	}
61	}	61	}
	@@ -137,7 +137,7 @@ function getFeedback(response) {		@@ -137,7 +137,7 @@ function getFeedback(response) {
137	$("#right").hide();	137	$("#right").hide();
138	$('#solution').html(params['solution']).animateCSS('flipInX');	138	$('#solution').html(params['solution']).animateCSS('flipInX');
139	// MathJax.Hub.Queue(["Typeset", MathJax.Hub, "#solution"]);	139	// MathJax.Hub.Queue(["Typeset", MathJax.Hub, "#solution"]);
140	- MathJax.typeset();	140	+ MathJax.typeset();
141		141
142	});	142	});
143	break;	143	break;
1	{% autoescape %}	1	{% autoescape %}
2		2
3	-<h2 class="page-header">{{ question['title'] }}</h4>	3	+<h2 class="page-header">{{ md(question['title']) }}</h4>
4		4
5	<div id="text">	5	<div id="text">
6	{{ md(question['text']) }}	6	{{ md(question['text']) }}