- links in the sidebar start new topic

Miguel Barão
1 parent 065611f7
Showing 5 changed files with 18 additions and 8 deletions Show diff stats
BUGS.md
app.py
knowledge.py
serve.py
templates/topics.html
  
 BUGS:
  
-- topicos no sidebar devem ser links para iniciar um topico acessivel. os inacessiveis devem estar inactivos.
 - tabs em textarea nao funcionam correctamente (insere 1 espaco em vez de 4)
 - reportar comentarios após submeter.
+- os topicos locked devem estar inactivos no sidebar.
 - textarea deve mostrar no html os valores iniciais de ans, se existir
 - detect questions in questions.yaml without ref -> error ou generate default.
 - error if demo.yaml has no topics
@@ -21,6 +21,7 @@ TODO:
  
 FIXED:
  
+- topicos no sidebar devem ser links para iniciar um topico acessivel.
 - logs inicio de topico
 - indicar o topico actual no sidebar
 - reload da página rebenta o estado.
@@ -141,6 +141,11 @@ class LearnApp(object):
  
         return q['grade']
  
+    # ------------------------------------------------------------------------
+    # Start new topic
+    # ------------------------------------------------------------------------
+    def start_topic(self, uid, topic):
+        self.online[uid]['state'].start_topic(topic)
  
     # ------------------------------------------------------------------------
     # Fill db table 'Topic' with topics from the graph if not already there.
@@ -39,13 +39,15 @@ class Knowledge(object):
     # Start a new topic. If not provided, selects the first with level < 0.8
     # If all levels > 0.8, will stay in the last one forever...
     # ------------------------------------------------------------------------
-    def start_topic(self, topic=None):
-        if topic is None:
+    def start_topic(self, topic=''):
+        print(f'knowledge.start_topic "{topic}"')
+        if not topic:
             for topic in self.topic_sequence:
                 unlocked = topic in self.state
                 needs_work = unlocked and self.state[topic]['level'] < 0.8
                 factory = self.depgraph.node[topic]['factory']
-                if needs_work and factory:
+                print(f'{topic}, unlocked={unlocked}, needs_work={needs_work}')
+                if factory and (not unlocked or needs_work):
                     break
                 # logger.info(f'{self.student} skipped topic "{topic}"')
         else:
@@ -53,7 +55,7 @@ class Knowledge(object):
             # FIXME if factory is empty???
  
         self.current_topic = topic
-        logger.info(f'User "{self.student}" topic set to "{topic}"')
+        logger.info(f'User "{self.student}" topic = "{topic}"')
  
         # generate question instances for current topic
         questionlist = self.depgraph.node[topic]['questions']
@@ -120,6 +120,8 @@ class LearnHandler(BaseHandler):
     @tornado.web.authenticated
     def get(self):
         uid = self.current_user
+        topic = self.get_query_argument('topic', default='')
+        self.learn.start_topic(uid, topic)
         self.render('learn.html',
             uid=uid,
             name=self.learn.get_student_name(uid),
@@ -204,7 +206,7 @@ class QuestionHandler(BaseHandler):
             }
  
     @tornado.web.authenticated
-    def get(self):
+    def get(self, topic=''):
         self.write(self.new_question(self.current_user))
  
     # handles answer posted
@@ -8,14 +8,14 @@
         {% if t[0] == current_topic %}
         <li class="active">    <!-- class="active" class="disabled" -->
  
-            <a> {{ gettopicname(t[0]) }}<br>
+            <a href="#"> {{ gettopicname(t[0]) }}<br>
             {{ round(t[1]*5)*'<i class="fa fa-star text-success" aria-hidden="true"></i>' + round(5-t[1]*5)*'<i class="fa fa-star-o" aria-hidden="true"></i>' }}
             </a>
  
         {% else %}
         <li>    <!-- class="active" class="disabled" -->
  
-            <a href="#"> {{ gettopicname(t[0]) }}<br>
+            <a href="/?topic={{ t[0] }}"> {{ gettopicname(t[0]) }}<br>
             {{ round(t[1]*5)*'<i class="fa fa-star text-success" aria-hidden="true"></i>' + round(5-t[1]*5)*'<i class="fa fa-star-o" aria-hidden="true"></i>' }}
             </a>
1	1
2	2	BUGS:
3	3
4		-- topicos no sidebar devem ser links para iniciar um topico acessivel. os inacessiveis devem estar inactivos.
5	4	- tabs em textarea nao funcionam correctamente (insere 1 espaco em vez de 4)
6	5	- reportar comentarios após submeter.
	6	+- os topicos locked devem estar inactivos no sidebar.
7	7	- textarea deve mostrar no html os valores iniciais de ans, se existir
8	8	- detect questions in questions.yaml without ref -> error ou generate default.
9	9	- error if demo.yaml has no topics
...	...	@@ -21,6 +21,7 @@ TODO:
21	21
22	22	FIXED:
23	23
	24	+- topicos no sidebar devem ser links para iniciar um topico acessivel.
24	25	- logs inicio de topico
25	26	- indicar o topico actual no sidebar
26	27	- reload da página rebenta o estado.
...	...
...	...	@@ -141,6 +141,11 @@ class LearnApp(object):
141	141
142	142	return q['grade']
143	143
	144	+ # ------------------------------------------------------------------------
	145	+ # Start new topic
	146	+ # ------------------------------------------------------------------------
	147	+ def start_topic(self, uid, topic):
	148	+ self.online[uid]['state'].start_topic(topic)
144	149
145	150	# ------------------------------------------------------------------------
146	151	# Fill db table 'Topic' with topics from the graph if not already there.
...	...
...	...	@@ -39,13 +39,15 @@ class Knowledge(object):
39	39	# Start a new topic. If not provided, selects the first with level < 0.8
40	40	# If all levels > 0.8, will stay in the last one forever...
41	41	# ------------------------------------------------------------------------
42		- def start_topic(self, topic=None):
43		- if topic is None:
	42	+ def start_topic(self, topic=''):
	43	+ print(f'knowledge.start_topic "{topic}"')
	44	+ if not topic:
44	45	for topic in self.topic_sequence:
45	46	unlocked = topic in self.state
46	47	needs_work = unlocked and self.state[topic]['level'] < 0.8
47	48	factory = self.depgraph.node[topic]['factory']
48		- if needs_work and factory:
	49	+ print(f'{topic}, unlocked={unlocked}, needs_work={needs_work}')
	50	+ if factory and (not unlocked or needs_work):
49	51	break
50	52	# logger.info(f'{self.student} skipped topic "{topic}"')
51	53	else:
...	...	@@ -53,7 +55,7 @@ class Knowledge(object):
53	55	# FIXME if factory is empty???
54	56
55	57	self.current_topic = topic
56		- logger.info(f'User "{self.student}" topic set to "{topic}"')
	58	+ logger.info(f'User "{self.student}" topic = "{topic}"')
57	59
58	60	# generate question instances for current topic
59	61	questionlist = self.depgraph.node[topic]['questions']
...	...
...	...	@@ -120,6 +120,8 @@ class LearnHandler(BaseHandler):
120	120	@tornado.web.authenticated
121	121	def get(self):
122	122	uid = self.current_user
	123	+ topic = self.get_query_argument('topic', default='')
	124	+ self.learn.start_topic(uid, topic)
123	125	self.render('learn.html',
124	126	uid=uid,
125	127	name=self.learn.get_student_name(uid),
...	...	@@ -204,7 +206,7 @@ class QuestionHandler(BaseHandler):
204	206	}
205	207
206	208	@tornado.web.authenticated
207		- def get(self):
	209	+ def get(self, topic=''):
208	210	self.write(self.new_question(self.current_user))
209	211
210	212	# handles answer posted
...	...
...	...	@@ -8,14 +8,14 @@
8	8	{% if t[0] == current_topic %}
9	9	<li class="active"> <!-- class="active" class="disabled" -->
10	10
11		- <a> {{ gettopicname(t[0]) }}<br>
	11	+ <a href="#"> {{ gettopicname(t[0]) }}<br>
12	12	{{ round(t[1]5)'<i class="fa fa-star text-success" aria-hidden="true"></i>' + round(5-t[1]5)'<i class="fa fa-star-o" aria-hidden="true"></i>' }}
13	13	</a>
14	14
15	15	{% else %}
16	16	<li> <!-- class="active" class="disabled" -->
17	17
18		- <a href="#"> {{ gettopicname(t[0]) }}<br>
	18	+ <a href="/?topic={{ t[0] }}"> {{ gettopicname(t[0]) }}<br>
19	19	{{ round(t[1]5)'<i class="fa fa-star text-success" aria-hidden="true"></i>' + round(5-t[1]5)'<i class="fa fa-star-o" aria-hidden="true"></i>' }}
20	20	</a>
21	21
...	...