- questions generated by an external script

- test information in the when in debug mode

- questions generated by an external script
- test information in the when in debug mode
Miguel Barao
1 parent 1b40ee75
Showing 4 changed files with 46 additions and 7 deletions Show diff stats
BUGS.md
questions.py
static/.DS_Store
templates/test.html
@@ -8,17 +8,19 @@
 # TODO
+- testar envio de parametros para stdin para perguntas tipo generator
 - permitir enviar varios testes, aluno escolhe qual o teste que quer fazer.
 - alterar o script json2md.py em conformidade
 - Menu para professor com link para /results e /students
 - implementar singlepage/multipage. Fazer uma class para single page que trate de andar gerir o avanco e correcao das perguntas
-- criar pergunta gerada por script externo. Na instanciacao QuestionScript() é corrido um script que devolve uma instancia de pergunta de qualquer tipo.
 - permitir adicionar imagens nas perguntas
 - criar perguntas de outros tipos, e.g. associação, ordenação, varios textinput
 # FIXED
+- criar pergunta gerada por script externo. 
+- debug mode
 - in the train_mode, there is no way to logout. Add logout option in the menu.
 - simplificar a gravacao do teste em json.
 - mostrar numero ordem em /results
@@ -55,7 +55,7 @@ class QuestionsPool(dict):
 #============================================================================
 # Question Factory
-# given a dictionary returns a question instance.
+# Given a dictionary returns a question instance.
 def create_question(q):
     '''To create a question, q must be a dictionary with at least the
     following keys defined:
@@ -65,15 +65,20 @@ def create_question(q):
     The remaing keys depend on the type of question.
     '''
+    if q['type'] == 'generator':
+        q.update(question_generator(q))
+    # at this point the generator question was replaced by an actual question
+
     types = {
-        'information': QuestionInformation,
         'radio'     : QuestionRadio,
         'checkbox'  : QuestionCheckbox,
         'text'      : QuestionText,
         'text_regex': QuestionTextRegex,
         'textarea'  : QuestionTextArea,
+        'information': QuestionInformation,
         ''          : QuestionInformation,  # default
     }
+
     # create instance of given type
     try:
         questiontype = types[q['type']]
@@ -84,6 +89,22 @@ def create_question(q):
     # create question instance and return
     return questiontype(q)
+
+# ---------------------------------------------------------------------------
+def question_generator(q):
+    '''Run an external script that will generate a question in yaml format.
+    This function will return the yaml converted back to a dict.'''
+    # raise exception('question generation not yet implemented.')
+    q['stdin'] = q.get('stdin', '')
+    p = subprocess.Popen([q['script']], stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.STDOUT)
+    try:
+        qyaml = p.communicate(input=q['stdin'].encode('utf-8'), timeout=5)[0].decode('utf-8')
+    except subprocess.TimeoutExpired:
+        p.kill()
+
+    return yaml.load(qyaml)
+
+
 # ===========================================================================
 class Question(dict):
     '''
@@ -93,6 +114,7 @@ class Question(dict):
     '''
     pass
+
 # ===========================================================================
 class QuestionRadio(Question):
     '''An instance of QuestionRadio will always have the keys:
@@ -165,6 +187,7 @@ class QuestionRadio(Question):
         self['grade'] = x
         return x
+
 # ===========================================================================
 class QuestionCheckbox(Question):
     '''An instance of QuestionCheckbox will always have the keys:
@@ -236,6 +259,7 @@ class QuestionCheckbox(Question):
         return self['grade']
+
 # ===========================================================================
 class QuestionText(Question):
     '''An instance of QuestionCheckbox will always have the keys:
@@ -253,9 +277,13 @@ class QuestionText(Question):
         self['text'] = self.get('text', '')
         # make sure its always a list of possible correct answers
-        if isinstance(self['correct'], str):
+        if not isinstance(self['correct'], list):
             self['correct'] = [self['correct']]
+        # make sure the elements of the list are strings
+        for i, a in enumerate(self['correct']):
+            self['correct'][i] = str(a)
+
         self['answer'] = None
     #------------------------------------------------------------------------
@@ -270,6 +298,7 @@ class QuestionText(Question):
         return self['grade']
+
 # ===========================================================================
 class QuestionTextRegex(Question):
     '''An instance of QuestionCheckbox will always have the keys:
@@ -298,6 +327,7 @@ class QuestionTextRegex(Question):
         return self['grade']
+
 # ===========================================================================
 class QuestionTextArea(Question):
     '''An instance of QuestionCheckbox will always have the keys:
@@ -353,6 +383,7 @@ class QuestionTextArea(Question):
         return self['grade']
+
 # ===========================================================================
 class QuestionInformation(Question):
     '''An instance of QuestionCheckbox will always have the keys:
@@ -374,3 +405,4 @@ class QuestionInformation(Question):
     def correct(self):
         self['grade'] = 1.0  # always "correct" but points should be zero!
         return self['grade']
+
@@ -69,7 +69,7 @@
       </a>
     </div>
-    <p class="navbar-text"> ${t['title']} </p>
+    <!-- <p class="navbar-text"> ${t['title']} </p> -->
     <div class="collapse navbar-collapse" id="myNavbar">
 <!--       <ul class="nav navbar-nav">
@@ -113,6 +113,11 @@
             <%
                 total_points = sum(q['points'] for q in questions)
             %>
+            % if t['debug']:
+                <pre>
+                    ${yaml.dump({k:v for k,v in t.items() if k!='questions'})}
+                </pre>
+            % endif
             % if t['train_mode'] and 'grade' in t:
                 <div class="jumbotron drop-shadow">
@@ -215,7 +220,7 @@
                                         <span class="glyphicon glyphicon-ok" aria-hidden="true"></span>
                                         ${round(q['grade'] * q['points'] / total_points * 20.0, 1)} pontos
                                     </div>
-                                % elif q['grade'] > 0.5:
+                                % elif q['grade'] > 0.49:
                                     <div class="alert alert-warning" role="alert">
                                         <span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>
                                         ${round(q['grade'] * q['points'] / total_points * 20.0, 1)} pontos
@@ -268,7 +273,7 @@
           </div>
           <div class="modal-footer">
             <button type="button" class="btn btn-success btn-lg" data-dismiss="modal">Não!</button>
-            <button form="test" type="submit" class="btn btn-danger">Sim, submeter</button>
+            <button form="test" type="submit" class="btn btn-danger btn-lg">Sim, submeter</button>
           </div>
         </div>
       </div>