don't show topic dependencies that are not goals if already done

Miguel Barão
1 parent f37c5e30
Showing 4 changed files with 42 additions and 17 deletions Show diff stats
aprendizations/learnapp.py
aprendizations/serve.py
aprendizations/student.py
aprendizations/templates/maintopics-table.html
@@ -36,6 +36,16 @@ class DatabaseUnusableError(LearnException):
 # ============================================================================
 # LearnApp - application logic
+#
+#   self.deps - networkx topic dependencies
+#   self.courses - dict {course_id: {'title': ...,
+#                                    'description': ...,
+#                                    'goals': ...,}, ...}
+#   self.factory = dict {qref: QFactory()}
+#   self.online - dict {student_id: {'number': ...,
+#                                    'name': ...,
+#                                    'state': StudentState(),
+#                                    'counter': ...}, ...}
 # ============================================================================
 class LearnApp(object):
     # ------------------------------------------------------------------------
@@ -95,8 +105,9 @@ class LearnApp(object):
             d.setdefault('title', '')  # course title undefined
             for goal in d['goals']:
                 if goal not in self.deps.nodes():
-                    raise LearnException(f'Goal "{goal}" from course "{c}" '
-                                         ' does not exist')
+                    msg = f'Goal "{goal}" from course "{c}" does not exist'
+                    logger.error(msg)
+                    raise LearnException(msg)
         # --- factory is a dict with question generators for all topics
         self.factory: Dict[str, QFactory] = self.make_factory()
@@ -291,15 +302,15 @@ class LearnApp(object):
     # ------------------------------------------------------------------------
     # Start course
     # ------------------------------------------------------------------------
-    def start_course(self, uid: str, course: str) -> None:
+    def start_course(self, uid: str, course_id: str) -> None:
         student = self.online[uid]['state']
         try:
-            student.start_course(course)
-        except Exception as e:
-            logger.warning(f'"{uid}" could not start course "{course}": {e}')
+            student.start_course(course_id)
+        except Exception:
+            logger.warning(f'"{uid}" could not start course "{course_id}"')
             raise
         else:
-            logger.info(f'User "{uid}" started course "{course}"')
+            logger.info(f'User "{uid}" started course "{course_id}"')
     # ------------------------------------------------------------------------
     # Start new topic
@@ -516,6 +527,11 @@ class LearnApp(object):
         return self.online[uid]['state'].get_current_course_id()
     # ------------------------------------------------------------------------
+    # def get_student_course(self, uid: str) -> Optional[str]:
+    #     course_id = self.online[uid]['state'].get_current_course_id()
+    #     return course_id, self.courses[course_id]
+
+    # ------------------------------------------------------------------------
     def get_topic_name(self, ref: str) -> str:
         return self.deps.nodes[ref]['name']
@@ -529,6 +545,9 @@ class LearnApp(object):
     def get_courses(self, uid: str) -> Dict:
         return self.courses
+    def get_course(self, course_id: str) -> Dict:
+        return self.courses[course_id]
+
     # ------------------------------------------------------------------------
     def get_rankings(self, uid: str, course_id: str) -> Iterable[Tuple[str, str, float, float]]:
@@ -205,13 +205,11 @@ class CoursesHandler(BaseHandler):
 # ----------------------------------------------------------------------------
 class CourseHandler(BaseHandler):
     @tornado.web.authenticated
-    def get(self, course):
+    def get(self, course_id):
         uid = self.current_user
-        if course == '':
-            course = self.learn.get_student_course_id(uid)
         try:
-            self.learn.start_course(uid, course)
+            self.learn.start_course(uid, course_id)
         except KeyError:
             self.redirect('/courses')
@@ -220,8 +218,8 @@ class CourseHandler(BaseHandler):
                     uid=uid,
                     name=self.learn.get_student_name(uid),
                     state=self.learn.get_student_state(uid),
-                    course_title=self.learn.get_student_course_title(uid),
-                    course_id=self.learn.get_student_course_id(uid),
+                    course_id=course_id,
+                    course=self.learn.get_course(course_id)
                     )
@@ -236,9 +236,17 @@ class StudentState(object):
         G = self.deps
         ts = set(goals)
         for t in goals:
-            ts.update(nx.ancestors(G, t))
-            # FIXME filter by level done, only level < 50% are included
-        tl = list(nx.topological_sort(G.subgraph(ts)))
+            ts.update(nx.ancestors(G, t))  # include dependencies not in goals
+
+        todo = []
+        for t in ts:
+            level = self.state[t]['level'] if t in self.state else 0.0
+            min_level = G.nodes[t]['min_level']
+            if t in goals or level < min_level:
+                todo.append(t)
+
+        # FIXME topological sort is a poor way to sort topics
+        tl = list(nx.topological_sort(G.subgraph(todo)))
         # sort with unlocked first
         unlocked = [t for t in tl if t in self.state]
@@ -60,7 +60,7 @@
   <div id="notifications"></div>
-  <h4>{{ course_title }}</h4>
+  <h4>{{ course['title'] }}</h4>
   <table class="table table-hover">
     <thead class="">
	@@ -236,9 +236,17 @@ class StudentState(object):		@@ -236,9 +236,17 @@ class StudentState(object):
236	G = self.deps	236	G = self.deps
237	ts = set(goals)	237	ts = set(goals)
238	for t in goals:	238	for t in goals:
239	- ts.update(nx.ancestors(G, t))
240	- # FIXME filter by level done, only level < 50% are included
241	- tl = list(nx.topological_sort(G.subgraph(ts)))	239	+ ts.update(nx.ancestors(G, t)) # include dependencies not in goals
		240	+
		241	+ todo = []
		242	+ for t in ts:
		243	+ level = self.state[t]['level'] if t in self.state else 0.0
		244	+ min_level = G.nodes[t]['min_level']
		245	+ if t in goals or level < min_level:
		246	+ todo.append(t)
		247	+
		248	+ # FIXME topological sort is a poor way to sort topics
		249	+ tl = list(nx.topological_sort(G.subgraph(todo)))
242		250
243	# sort with unlocked first	251	# sort with unlocked first
244	unlocked = [t for t in tl if t in self.state]	252	unlocked = [t for t in tl if t in self.state]
	@@ -60,7 +60,7 @@		@@ -60,7 +60,7 @@
60		60
61	<div id="notifications"></div>	61	<div id="notifications"></div>
62		62
63	- <h4>{{ course_title }}</h4>	63	+ <h4>{{ course['title'] }}</h4>
64		64
65	<table class="table table-hover">	65	<table class="table table-hover">
66	<thead class="">	66	<thead class="">