fixed some errors not being reported

show legend in topics table show puzzle icon for nongoal dependencies modified looks of chapters

fixed some errors not being reported
show legend in topics table show puzzle icon for nongoal dependencies modified looks of chapters
Miguel Barão
1 parent 3539d1d0
Showing 3 changed files with 42 additions and 27 deletions Show diff stats
aprendizations/__init__.py
aprendizations/learnapp.py
aprendizations/templates/maintopics-table.html
@@ -30,7 +30,7 @@ are progressively uncovered as the students progress.
 '''
 APP_NAME = 'aprendizations'
-APP_VERSION = '2020.01.dev3'
+APP_VERSION = '2020.01.dev4'
 APP_DESCRIPTION = __doc__
 __author__ = 'Miguel Barão'
@@ -434,19 +434,19 @@ class LearnApp(object):
     # makes factory for a single topic
     # ------------------------------------------------------------------------
     def factory_for(self, tref: str) -> Dict[str, QFactory]:
-        factory: Dict[str, QFactory] = {}
+        factory: Dict[str, QFactory] = dict()
         g = self.deps
         t = g.nodes[tref]  # get node
-
         # load questions as list of dicts
         topicpath: str = path.join(g.graph['prefix'], tref)
         try:
             fullpath: str = path.join(topicpath, t['file'])
         except Exception:
             msg1 = f'Invalid topic "{tref}"'
-            msg2 = f'Check dependencies of {", ".join(g.successors(tref))}'
-            raise LearnException(f'{msg1}. {msg2}')
-
+            msg2 = f'Check dependencies of: {", ".join(g.successors(tref))}'
+            msg = f'{msg1}. {msg2}'
+            logger.error(msg)
+            raise LearnException(msg)
         logger.debug(f'  Loading {fullpath}')
         try:
             questions: List[QDict] = load_yaml(fullpath)
@@ -457,9 +457,9 @@ class LearnApp(object):
                 msg = f'Failed to load "{fullpath}"'
                 logger.error(msg)
                 raise LearnException(msg)
-
         if not isinstance(questions, list):
             msg = f'File "{fullpath}" must be a list of questions'
+            logger.error(msg)
             raise LearnException(msg)
         # update refs to include topic as prefix.
@@ -60,7 +60,21 @@
   <div id="notifications"></div>
-  <h4>{{ course['title'] }}</h4>
+  <div class="alert alert-warning alert-dismissible fade show" role="alert">
+    <p><strong>Legenda:</strong></p>
+    <p class="ml-3">
+    <i class="fas fa-book"></i> - Material de estudo<br>
+    <i class="fas fa-pencil-alt"></i> - Exercícios<br>
+    <i class="fas fa-puzzle-piece"></i> - Tópico que não faz parte dos objectivos deste curso mas que é necessário saber<br>
+    <i class="fas fa-flag"></i> - Milestone, terminou um certo conjunto de tópicos
+    </p>
+
+    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+
+  <h4 class="p-4">{{ course['title'] }}</h4>
   <table class="table table-hover">
     <thead class="">
@@ -75,21 +89,21 @@
         {% if t['level'] is None %}
           <tr class="table-secondary">
             <td>
-              {% if t['type']=='chapter' %}
-                <div class="text-muted lead">
-                  {{ t['name'] }}
-                </div>
-              {% elif t['type']=='learn' %}
-                <div class="text-muted">
+              <div class="text-muted">
+                {% if t['ref'] not in course['goals'] %}
+                  <i class="fas fa-puzzle-piece"></i>
+                {% end %}
+
+                {% if t['type']=='chapter' %}
+                  <i class="fas fa-flag"></i>
+                {% elif t['type']=='learn' %}
                   <i class="fas fa-book"></i>&nbsp;
-                  {{ t['name'] }}
-                </div>
-              {% else %}
-                <div class="text-muted">
+                {% else %}
                   <i class="fas fa-pencil-alt"></i>&nbsp;
-                  {{ t['name'] }}
-                </div>
-              {% end %}
+                {% end %}
+
+                {{ t['name'] }}
+              </div>
             </td>
             <td class="text-center">
               <i class="fas fa-lock text-muted"></i>
@@ -100,18 +114,19 @@
           <tr class="clickable-row " data-href="/topic/{{t['ref']}}">
             <td class="text-primary">
+              {% if t['ref'] not in course['goals'] %}
+                <i class="fas fa-puzzle-piece"></i>
+              {% end %}
+
               {% if t['type']=='chapter' %}
-                <h5>
-                  <i class="fas fa-flag-checkered"></i>&nbsp;
-                  {{ t['name'] }}
-                </h5>
+                <i class="fas fa-flag-checkered"></i>&nbsp;
               {% elif t['type']=='learn' %}
                 <i class="fas fa-book"></i>&nbsp;
-                {{ t['name'] }}
               {% else %}
                 <i class="fas fa-pencil-alt"></i>&nbsp;
-                {{ t['name'] }}
               {% end %}
+
+              {{ t['name'] }}
             </td>
             <td class="text-center">
	@@ -30,7 +30,7 @@ are progressively uncovered as the students progress.		@@ -30,7 +30,7 @@ are progressively uncovered as the students progress.
30	'''	30	'''
31		31
32	APP_NAME = 'aprendizations'	32	APP_NAME = 'aprendizations'
33	-APP_VERSION = '2020.01.dev3'	33	+APP_VERSION = '2020.01.dev4'
34	APP_DESCRIPTION = __doc__	34	APP_DESCRIPTION = __doc__
35		35
36	__author__ = 'Miguel Barão'	36	__author__ = 'Miguel Barão'