- everything working.

Miguel Barão
1 parent 4a961828
Showing 7 changed files with 34 additions and 51 deletions Show diff stats
BUGS.md
app.py
serve.py
static/css/test.css
static/js/admin.js
templates/admin.html
templates/test.html
 # BUGS
-- reset password nao funciona no admin
 - qual a diferenca entre md_to_html e md_to_html_review, parece desnecessario haver dois.
 - servir imagens das perguntas
 - como alterar configuracao para mostrar logs de debug?
@@ -12,6 +11,7 @@
 # TODO
+- cancelar teste no menu admin. Dado o numero de aluno remove teste e faz logout do aluno.
 - decorador para user 0, evita o "if uid==0" em muitas funcoes.
 - mathjax-node:
     sudo pkg install node npm
@@ -35,6 +35,7 @@
 # FIXED
+- reset password nao funciona no admin
 - reload a intervalos não funciona.
 - allow/deny nao funciona no /admin.
 - Review de um teste que foi apagado rebenta.
@@ -252,9 +252,7 @@ class App(object):
                 'start_time': self.online.get(uid, {}).get('test', {}).get('start_time',''),
                 'password_defined': pw != '',
                 'grades': self.get_student_grades_from_test(uid, self.testfactory['ref']),
-                'ip_address': self.online.get(uid, {}).get('student', {}).get('ip_address',''),
-                'user_agent': self.online.get(uid, {}).get('student', {}).get('user_agent',''),
-                'focus': self.online.get(uid, {}).get('student', {}).get('focus', True),
+                'focus': self.online.get(uid, {}).get('student', {}).get('focus', True), # FIXME
                 })
         return l
@@ -284,11 +282,11 @@ class App(object):
             s.commit()
         logger.info(f'Student {uid}: password reset to ""')
-    def set_user_agent(self, uid, user_agent=''):
-        self.online[uid]['student']['user_agent'] = user_agent
+    # def set_user_agent(self, uid, user_agent=''):
+    #     self.online[uid]['student']['user_agent'] = user_agent
-    def set_user_ip(self, uid, ipaddress=''):
-        self.online[uid]['student']['ip_address'] = ipaddress
+    # def set_user_ip(self, uid, ipaddress=''):
+    #     self.online[uid]['student']['ip_address'] = ipaddress
     def insert_new_student(self, uid, name):
         try:
@@ -280,7 +280,6 @@ class AdminHandler(BaseHandler):
             self.testapp.deny_student(value)
         elif cmd == 'reset_password':
-            print('reset ',value)
             self.testapp.reset_password(value)
         elif cmd == 'insert_student':
 /* Fixes navigation panel overlaying content */
 html {
-    font-size: 14px;
+    font-size: 13px;
 }
 body {
@@ -14,20 +14,15 @@ body {
     color: inherit;
 }
-/*.card {
+.card {
     margin-top: 70px;
 }
-*/
-/*.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;
-}
-*/
+
 textarea {
     font-family: monospace !important;
 }
+
 /* make markdown tables beautiful */
 table {
     border-collapse: collapse;
 $(document).ready(function() {
-    // button handlers (runs once)
     function button_handlers() {
-
+        // button handlers (runs once)
         $("#allow_all").click(
             function() {
                 $(":checkbox").prop("checked", true).trigger('change');
@@ -39,7 +38,6 @@ $(document).ready(function() {
                 });
             }
         );
-
         // authorization checkboxes in the students_table:
         $("tbody", "#students_table").on("change", "input", autorizeStudent);
     }
@@ -86,7 +84,7 @@ $(document).ready(function() {
         $.ajax({
             url: "/admin",
             data: {"cmd": "test", "value": ""},
-            // dataType: "json",
+            dataType: "json",
             success: function(data) {
                 // fill jumbotron data
                 $("#title").html(data['data']['title']);
@@ -114,8 +112,9 @@ $(document).ready(function() {
                 emptyTable:     "Não há alunos inscritos",
             },
             ajax: {
-                data: {"cmd": "students_table", "value": ""},
                 url: "admin", // students_table
+                data: {"cmd": "students_table", "value": ""},
+                dataType: "json",
                 dataSrc: function ( json ) {
                     var t = [];
                     for ( var i=0; i<json.data.length ; i++ ) {
@@ -145,7 +144,7 @@ $(document).ready(function() {
         }, 3000 );
     }
-    // populateHeader();              // run once when the page is loaded
+    populateHeader();              // run once when the page is loaded
     populateStudentsTable();
     button_handlers();             // assign handlers to buttons
 });
@@ -43,7 +43,7 @@
         </a>
         <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownAluno">
           <a class="dropdown-item" href="#" id="novo_aluno" data-toggle="modal" data-target="#novo_aluno_modal">Inserir novo...</a>
-          <a class="dropdown-item" href="#" id="reset_password" data-toggle="modal" data-target="#reset_password_modal">Reset password...</a>
+          <a class="dropdown-item" href="#" id="reset_password_menu" data-toggle="modal" data-target="#reset_password_modal">Reset password...</a>
           <a class="dropdown-item" href="#" id="allow_all">Autorizar todos</a>
           <a class="dropdown-item" href="#" id="deny_all">Desautorizar todos</a>
         </div>
@@ -105,7 +105,6 @@
       </div>
       <div class="modal-footer">
-        <!-- <button type="button" class="btn btn-danger" data-dismiss="modal">Cancelar</button> -->
         <button id="inserir_novo_aluno" class="btn btn-primary" role="button" data-dismiss="modal">Inserir</button>
       </div>
@@ -124,15 +123,20 @@
       </div>
       <div class="modal-body">
-        <div class="input-group input-group-sm">
-          <input id="reset_number" type="text" class="form-control" placeholder="Número">
-          <span class="input-group-btn">
-              <button id="reset_password" class="btn btn-primary" type="button">Reset password!</button>
-          </span>
+        <div class="form-group row">
+          <label for="reset_number" class="col-sm-2 col-form-label">Número</label>
+          <div class="col-sm-10">
+            <input id="reset_number" type="text" class="form-control">
+            <!-- <input type="text" class="form-control" id="novo_numero" value=""> -->
+          </div>
         </div>
       </div>
+
+      <div class="modal-footer">
+        <button id="reset_password" class="btn btn-primary" role="button" data-dismiss="modal">Reset password</button>
+      </div>
     </div>
-  </div>
+  </div> <!-- modal -->
 </div>
@@ -42,22 +42,10 @@
     </ul>
     <span class="navbar-text">
-
-
-<!--     <span class="navbar-text dropdown">
-      <a class="nav-link dropdown-toggle" href="http://example.com" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
- -->
-
       <i class="fa fa-user" aria-hidden="true"></i>
       <span id="name">{{ escape(t['student']['name']) }}</span>
       (<span id="number">{{ escape(t['student']['number']) }}</span>)
       <span class="caret"></span>
-
-<!--       </a>
-      <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
-        <a class="dropdown-item" href="#">Password</a>
-      </div>
- -->
     </span>
   </div>
 </nav>
@@ -65,17 +53,16 @@
   <div class="jumbotron">
     <h1 class="display-5">{{ t['title'] }}</h1>
-    {{ t.get('duration', '') }}
     <hr>
     <h5>
       <div class="row">
-        <label for="inicio" class="col-sm-2">Início:</label>
-        <div class="col-sm-10" id="inicio">{{ str(t['start_time'].time())[:8]}}</div>
+        <label for="inicio" class="col-sm-3">Início:</label>
+        <div class="col-sm-9" id="inicio">{{ str(t['start_time'].time())[:8]}}</div>
       </div>
       <div class="row">
-        <label for="duracao" class="col-sm-2">Duração:</label>
-        <div class="col-sm-10" id="duracao">{{ t.get('duration', chr(8734)) }}</div>
+        <label for="duracao" class="col-sm-3">Duração:</label>
+        <div class="col-sm-9" id="duracao">{{ t.get('duration', chr(8734)) }}</div>
       </div>
     </h5>
   </div>
@@ -86,10 +73,10 @@
     {% end %}
     <div class="form-row">
-    <div class="col-9">
+    <div class="col-12">
       <button type="button" class="btn btn-success btn-lg btn-block" data-toggle="modal" data-target="#confirmar" id="form-button-submit">Submeter teste</button>
     </div>
-<!--     <div class="col-3">
+<!--     <div class="col-2">
       <button type="button" class="btn btn-danger btn-lg btn-block" data-toggle="modal" data-target="#sair" id="form-button-sair">Desisto</button>
     </div> -->
   </div>
	@@ -280,7 +280,6 @@ class AdminHandler(BaseHandler):		@@ -280,7 +280,6 @@ class AdminHandler(BaseHandler):
280	self.testapp.deny_student(value)	280	self.testapp.deny_student(value)
281		281
282	elif cmd == 'reset_password':	282	elif cmd == 'reset_password':
283	- print('reset ',value)
284	self.testapp.reset_password(value)	283	self.testapp.reset_password(value)
285		284
286	elif cmd == 'insert_student':	285	elif cmd == 'insert_student':