- changed database table "test" to include title and JSON filename where the test was saved.

- fixed bug where incorrect test results were shown to student after /correct.

- changed database table "test" to include title and JSON filename where the test was saved.
- fixed bug where incorrect test results were shown to student after /correct.
Miguel Barão
1 parent 1699423a
Showing 5 changed files with 79 additions and 69 deletions Show diff stats
BUGS.md
app.py
models.py
serve.py
templates/grade.html
 # BUGS
-- implementar practice mode.
 - usar thread.Lock para aceder a variaveis de estado?
+- visualizar um teste ja realizado na página de administração
 # TODO
+- usar http://wtfforms.com para radio e checkboxes
+- usar http://fontawesome.io/examples/ em vez dos do bootstrap3
+- implementar practice mode.
 - abrir o teste numa janela maximizada e que nao permite que o aluno a redimensione/mova.
 - detectar scroll e enviar posição para servidor (analise de scroll para detectar copianço? ou simplesmente para analisar como os alunos percorrem o teste)
-- detectar se janela perde focus e alertar o prof (http://stackoverflow.com/questions/1060008/is-there-a-way-to-detect-if-a-browser-window-is-not-currently-active)
 - single page web no teste/correcçao. Página construída em javascript, obter perguntas com ajax (para practice?).
 - aviso na pagina principal para quem usa browser da treta
 - permitir varios testes, aluno escolhe qual o teste que quer fazer.
 - criar perguntas de outros tipos, e.g. associação, ordenação, varios textinput
 - perguntas para professor corrigir mais tarde.
-- visualizar um teste ja realizado na página de administração
 - fazer uma calculadora javascript e por no menu. surge como modal
 - GeoIP?
 - alunos online têm acesso a /correct e servidor rebenta. (não é fácil impedir...)
@@ -22,6 +23,8 @@
 # FIXED
+- Depois da correcção, mostra testes realizados que não foram realizados pelo próprio
+- detectar se janela perde focus e alertar o prof (http://stackoverflow.com/questions/1060008/is-there-a-way-to-detect-if-a-browser-window-is-not-currently-active)
 - server nao esta a receber eventos focus/blur dos utilizadores diferentes de '0', estranho...
 - permitir adicionar imagens nas perguntas.
 - detect_unfocus.js so funciona se estiver inline no html. porquê???
@@ -131,22 +131,25 @@ class App(object):
         grade = t.correct()
         logger.info('Student {0}:  finished with {1} points.'.format(uid, grade))
-        if t['save_answers']:
-            fname = ' -- '.join((t['student']['number'], t['ref'], str(t['finish_time']))) + '.json'
-            fpath = path.abspath(path.join(t['answers_dir'], fname))
-            t.save_json(fpath)
+        # save JSON with the test
+        fname = ' -- '.join((t['student']['number'], t['ref'], str(t['finish_time']))) + '.json'
+        fpath = path.abspath(path.join(t['answers_dir'], fname))
+        t.save_json(fpath)
+        # insert test and questions into database
         with self.db_session() as s:
             s.add(Test(
                 ref=t['ref'],
+                title=t['title'],
                 grade=t['grade'],
                 starttime=str(t['start_time']),
                 finishtime=str(t['finish_time']),
+                filename=fpath,
                 student_id=t['student']['number']))
             s.add_all([Question(
                 ref=q['ref'],
                 grade=q['grade'],
-                starttime='',
+                starttime=str(t['start_time']),
                 finishtime=str(t['finish_time']),
                 student_id=t['student']['number'],
                 test_id=t['ref']) for q in t['questions'] if 'grade' in q])
@@ -176,9 +179,12 @@ class App(object):
         return {q['ref']:q['type'] for q in self.online[uid]['test']['questions']}
     def get_student_grades_from_all_tests(self, uid):
         with self.db_session() as s:
-            r = s.query(Test).filter(Student.id == uid).all()
-        return [(t.id, t.grade, t.finishtime) for t in r]
-
+            r = s.query(Test).filter(Test.student_id == uid).all()
+        return [(t.title, t.grade, t.finishtime) for t in r]
+    # def get_saved_tests_filenames(self):
+    #     with self.db_session() as s:
+    #         rr = s.query(Test).filter(Test.ref == self.testfactory['ref']).all()
+    #     return [(r.student_id, r.finishtime, r.grade) for r in rr]
     def get_online_students(self):
         # [('uid', 'name', 'starttime')]
         return [(k, v['student']['name'], str(v.get('test', {}).get('start_time', '---'))) for k,v in self.online.items() if k != '0']
@@ -29,9 +29,11 @@ class Test(Base):
     __tablename__ = 'tests'
     id = Column(Integer, primary_key=True) # auto_increment
     ref = Column(String)
+    title = Column(String)
     grade = Column(Float)
     starttime = Column(String)
     finishtime = Column(String)
+    filename = Column(String)
     student_id = Column(String, ForeignKey('students.id'))
     # ---
@@ -198,7 +198,6 @@ class Root(object):
         #   text     - always returns string. no answer '', otherwise 'dskdjs'
         uid = cherrypy.session.get(SESSION_KEY)
         name = self.app.get_student_name(uid)
-        title = self.app.get_test(uid)['title']
         qq = self.app.get_test_qtypes(uid)  # {'q1_ref': 'checkbox', ...}
         # each question that is marked to be classified must have an answer.
@@ -215,6 +214,7 @@ class Root(object):
                 ans[qref] = a
         grade = self.app.correct_test(uid, ans)
+        t = self.app.get_test(uid)
         self.app.logout(uid)
         # --- Expire session
@@ -223,9 +223,7 @@ class Root(object):
         # --- Show result to student
         return self.template['grade'].render(
-            title=title,
-            student_id=uid + ' - ' + name,
-            grade=grade,
+            t=t,
             allgrades=self.app.get_student_grades_from_all_tests(uid)
             )
@@ -267,6 +265,14 @@ class Root(object):
     def admin(self, **reset_pw):
         return self.template['admin'].render()
+    # --- REVIEW -------------------------------------------------------------
+    @cherrypy.expose
+    @require(name_is('0'))
+    def review(self, uid=None):
+        if uid is None:
+            # get show list of files
+            pass
+
 # ============================================================================
 def parse_arguments():
     argparser = argparse.ArgumentParser(description='Server for online tests. Enrolled students and tests have to be previously configured. Please read the documentation included with this software before running the server.')
@@ -4,34 +4,17 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title> ${title} </title>
+    <title> Teste </title>
     <link rel="icon" href="/static/favicon.ico">
     <!-- Bootstrap -->
     <link rel="stylesheet" href="/static/css/bootstrap.min.css">
     <link rel="stylesheet" href="/static/css/bootstrap-theme.min.css"> <!-- optional -->
-
-<!--     <link rel="stylesheet" href="/js/jquery/jquery.mobile-1.4.5.min.css" />
-    <script src="/js/jquery/jquery-2.1.1.min.js"></script>
-    <script src="/js/jquery/jquery.mobile-1.4.5.min.js"></script>
- -->
+    <link rel="stylesheet" href="/static/css/test.css">
     <script src="/static/js/jquery.min.js"></script>
     <script src="/static/js/bootstrap.min.js"></script>
-
-    <style>
-        /* Fixes navigation panel overlaying content */
-        body {
-            padding-top: 80px;
-            background: #aaa;
-        }
-        .drop-shadow {
-            -webkit-box-shadow: 0 0 5px 2px rgba(0, 0, 0, .5);
-            box-shadow: 0px 2px 10px 3px rgba(0, 0, 0, .2);
-            border-radius:5px;
-        }
-    </style>
- </head>
+</head>
  <!-- ===================================================================== -->
 <body>
@@ -43,13 +26,20 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="navbar-brand" href="#">UÉvora</a>
+      <a class="navbar-brand" href="#">
+          ${t['title']}
+      </a>
     </div>
+
     <div class="collapse navbar-collapse" id="myNavbar">
+
       <ul class="nav navbar-nav navbar-right">
         <li class="dropdown">
             <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                ${student_id} <span class="caret"></span>
+                <span class="glyphicon glyphicon-user" aria-hidden="true"></span>
+                <span id="name">${t['student']['name']}</span>
+                (<span id="number">${t['student']['number']}</span>)
+                <!-- <span class="caret"></span> -->
             </a>
         </li>
       </ul>
@@ -60,46 +50,49 @@
 <div class="container">
     <div class="jumbotron drop-shadow">
       <h1>Resultado</h1>
-      <p>Teve <strong>${'{}'.format(grade)}</strong> valores na escala de 0 a 20.</p>
+      <p>Teve <strong>${t['grade']}</strong> valores na escala de 0 a 20.</p>
       <p>A prova está terminada, pode fechar o browser e desligar o computador.</p>
     </div>
     <div class="panel panel-default drop-shadow">
         <div class="panel-heading">
-            Testes realizados
+            Provas realizadas até ao momento
         </div>
-        <table class="table table-condensed">
-            <thead>
-                <tr>
-                    <th>Data</th>
-                    <th>Hora</th>
-                    <th>Teste</th>
-                    <th>Nota (0-20)</th>
-                </tr>
-            </thead>
-            <tbody>
-                % for g in allgrades:
+        <div class="panel-body">
+
+            <table class="table table-condensed">
+                <thead>
                     <tr>
-                        <td>${g[2][:10]}</td>  <!-- data -->
-                        <td>${g[2][11:19]}</td>  <!-- hora -->
-                        <td>${g[0]}</td>  <!-- teste -->
-                        <td>
-                            <div class="progress">
-                                % if g[1] < 10:
-                                    <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="${'{0}'.format(round(g[1]))}" aria-valuemin="0" aria-valuemax="20" style="min-width: 2em; width: ${'{0}'.format(round(5 * g[1]))}%;">
-                                % elif g[1] < 15:
-                                    <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="${'{0}'.format(round(g[1]))}" aria-valuemin="0" aria-valuemax="20" style="min-width: 2em; width: ${'{0}'.format(round(5 * g[1]))}%;">
-                                % else:
-                                    <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="${'{0}'.format(round(g[1]))}" aria-valuemin="0" aria-valuemax="20" style="min-width: 2em; width: ${'{0}'.format(round(5 * g[1]))}%;">
-                                % endif
-                                ${'{:.1f}'.format(g[1])}
-                                </div>
-                            </div>
-                        </td>
+                        <th>Prova</th>
+                        <th>Data</th>
+                        <th>Hora</th>
+                        <th>Nota (0-20)</th>
                     </tr>
-                % endfor
-            </tbody>
-        </table>
+                </thead>
+                <tbody>
+                    % for g in allgrades:
+                        <tr>
+                            <td>${g[0]}</td>  <!-- teste -->
+                            <td>${g[2][:10]}</td>  <!-- data -->
+                            <td>${g[2][11:19]}</td>  <!-- hora -->
+                            <td>
+                                <div class="progress">
+                                    % if g[1] < 10:
+                                        <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="${'{0}'.format(round(g[1]))}" aria-valuemin="0" aria-valuemax="20" style="min-width: 2em; width: ${'{0}'.format(round(5 * g[1]))}%;">
+                                    % elif g[1] < 15:
+                                        <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="${'{0}'.format(round(g[1]))}" aria-valuemin="0" aria-valuemax="20" style="min-width: 2em; width: ${'{0}'.format(round(5 * g[1]))}%;">
+                                    % else:
+                                        <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="${'{0}'.format(round(g[1]))}" aria-valuemin="0" aria-valuemax="20" style="min-width: 2em; width: ${'{0}'.format(round(5 * g[1]))}%;">
+                                    % endif
+                                    ${'{:.1f}'.format(g[1])}
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+                    % endfor
+                </tbody>
+            </table>
+        </div>
     </div> <!-- panel -->
 </div> <!-- container -->
 </body>