- fixed debug loglevel when command line option --debug is active.

- fixed giveup() not logging out stude - insert new student on /admin

- fixed debug loglevel when command line option --debug is active.
- fixed giveup() not logging out stude - insert new student on /admin
Miguel Barão
1 parent 870abe3c
Showing 8 changed files with 66 additions and 29 deletions Show diff stats
BUGS.md
app.py
config/logger-debug.yaml
serve.py
static/js/admin.js
templates/admin.html
templates/test.html
test.py
@@ -3,7 +3,7 @@
 - usar thread.Lock para aceder a variaveis de estado?
 - permitir adicionar imagens nas perguntas.
-- debug mode: log levels not working
+- detect_unfocus.js so funciona se estiver inline no html. porquê???
 # TODO
@@ -24,6 +24,10 @@
 # FIXED
+- inserir novo aluno /admin não fecha.
+- se aluno desistir, ainda fica marcado como online
+- give dá None em vez de 0.0
+- debug mode: log levels not working
 - Se aluno fizer logout, o teste não é gravado e ficamos sem registo do teste que o aluno viu.
 - criar sqlalchemy sessions dentro de app de modo a estarem associadas a requests. ver se é facil usar with db:(...) para criar e fechar sessão.
 - sqlalchemy queixa-se de threads.
@@ -158,11 +158,12 @@ class App(object):
     def giveup_test(self, uid):
         logger.info('Student {0}:  gave up.'.format(uid))
         t = self.online[uid]['test']
-        t.giveup()
+        grade = t.giveup()
         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)
+        return grade
     # -----------------------------------------------------------------------
@@ -245,3 +246,13 @@ class App(object):
     def set_user_ip(self, uid, ipaddress=''):
         self.online[uid]['student']['ip_address'] = ipaddress
+
+    def insert_new_student(self, uid, name):
+        try:
+            with self.db_session() as s:
+                s.add(Student(id=uid, name=name, password=''))
+                s.commit()
+        except Exception:
+            logger.error('Insert failed: student {} already exists.'.format(uid))
+        else:
+            logger.info('New student inserted into database: {}, {}'.format(uid, name))
@@ -9,19 +9,19 @@ formatters:
 handlers:
     default:
-        level: 'INFO'
+        level: 'DEBUG'
         class: 'logging.StreamHandler'
         formatter: 'standard'
         stream: 'ext://sys.stdout'
     cherrypy_console:
-        level: 'INFO'
+        level: 'DEBUG'
         class: 'logging.StreamHandler'
         formatter: 'standard'
         stream: 'ext://sys.stdout'
     cherrypy_access:
-        level: 'INFO'
+        level: 'DEBUG'
         class: 'logging.handlers.RotatingFileHandler'
         formatter: 'void'
         filename: 'logs/access.log'
@@ -30,7 +30,7 @@ handlers:
         encoding: 'utf8'
     cherrypy_error:
-        level: 'INFO'
+        level: 'DEBUG'
         class: 'logging.handlers.RotatingFileHandler'
         formatter: 'void'
         filename: 'logs/errors.log'
@@ -99,12 +99,11 @@ class AdminWebService(object):
         elif args['cmd'] == 'reset':
             return self.app.reset_password(args['name'])
+        elif args['cmd'] == 'insert':
+            return self.app.insert_new_student(uid=args['number'], name=args['name'])
+
         else:
             print(args)
-        #     if args['cmd'] == 'focus':
-        #     print('FOCUS', args['name'])
-        # elif args['cmd'] == 'blur':
-        #     print('FOCUS', args['name'])
 # ============================================================================
 #   Webserver root
@@ -177,7 +176,7 @@ class Root(object):
         #   radio    - all off -> no key, 1 on -> string '0'
         #   text     - always returns string. no answer '', otherwise 'dskdjs'
         uid = cherrypy.session.get(SESSION_KEY)
-        student_name = self.app.get_student_name(uid)
+        name = self.app.get_student_name(uid)
         title = self.app.get_test(uid)['title']
         qq = self.app.get_test_qtypes(uid)  # {'q1_ref': 'checkbox', ...}
@@ -204,7 +203,7 @@ class Root(object):
         # --- Show result to student
         return self.template['grade'].render(
             title=title,
-            student_id=uid + ' - ' + student_name,
+            student_id=uid + ' - ' + name,
             grade=grade,
             allgrades=self.app.get_student_grades_from_all_tests(uid)
             )
@@ -214,7 +213,11 @@ class Root(object):
     @require()
     def giveup(self):
         uid = cherrypy.session.get(SESSION_KEY)
+        name = self.app.get_student_name(uid)
+        title = self.app.get_test(uid)['title']
+
         grade = self.app.giveup_test(uid)
+        self.app.logout(uid)
         # --- Expire session
         cherrypy.lib.sessions.expire()  # session coockie expires client side
@@ -222,8 +225,8 @@ class Root(object):
         # --- Show result to student
         return self.template['grade'].render(
-            title='title',
-            student_id=uid,
+            title=title,
+            student_id=uid + ' - ' + name,
             grade=grade,
             allgrades=self.app.get_student_grades_from_all_tests(uid)
             )
@@ -21,9 +21,17 @@ $(document).ready(function() {
                 });
             }
         );
-        $("#novo_aluno").click(
+        $("#inserir_novo_aluno").click(
             function () {
-                alert('Não implementado!');
+                $.ajax({
+                    type: "POST",
+                    url: "/adminwebservice",
+                    data: {
+                        "cmd": "insert",
+                        "number": $("#novo_numero").val(),
+                        "name": $("#novo_nome").val()
+                    }
+                });
             }
         );
     }
@@ -158,5 +166,5 @@ $(document).ready(function() {
     populate();                    // run once when the page is loaded
     define_buttons_handlers();
-    setInterval(populate, 5000);  // poll server on 5s interval
+    setInterval(populate, 5000);   // poll server on 5s interval
 });
@@ -130,20 +130,39 @@
                     <button id="deny_all" class="btn btn-xs btn-danger">Nenhum</button>
                 </div>
                 <div class="col-sm-4">
-                    <button id="novo_aluno" class="btn btn-xs btn-danger">Inserir novo aluno</button>
+                    <button id="novo_aluno" class="btn btn-xs btn-danger" data-toggle="modal" data-target="#novo_aluno_modal">Inserir novo aluno</button>
                 </div>
                 <div class="col-sm-4">
                     <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-danger" type="button">Reset password!</button>
+                            <button id="reset_password" class="btn btn-danger" type="button">Reset password!</button>
                         </span>
-                    </div><!-- /input-group -->
+                    </div>
                 </div>
             </div>
         </div>
     </div>
+    <div class="modal fade" id="novo_aluno_modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+      <div class="modal-dialog">
+        <div class="modal-content">
+          <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+            <h4 class="modal-title">Inserir novo aluno</h4>
+          </div>
+          <div class="modal-body">
+            Número: <input id="novo_numero" type="text">
+            Nome: <input id="novo_nome" type="text">
+          </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-danger" role="button" data-dismiss="modal">Inserir</button>
+          </div>
+        </div>
+      </div>
+    </div>
+
 </div> <!-- container -->
 </body>
 </html>
@@ -29,8 +29,8 @@
 <!-- My javascripts -->
     <script src="/static/js/question_disabler.js"></script>
     <script src="/static/js/prevent_enter_submit.js"></script>
-    <script src="/static/js/detect_unfocus.js"></script>
     <script src="/static/js/tabkey_in_textarea.js"></script>
+    <script src="/static/js/detect_unfocus.js"></script>
     <style>
         /* Fixes navigation panel overlaying content */
@@ -333,7 +333,5 @@
       </div>
     </div>
 </div>
-
-
 </body>
 </html>
@@ -249,9 +249,3 @@ class Test(dict):
             json.dump(self, f, indent=2, default=str)
             # HACK default=str is required for datetime objects
         logger.info('Student {}:  saved JSON file.'.format(self['student']['number']))
-
-    # -----------------------------------------------------------------------
-    # def generate_html(self):
-    #     for q in self['questions']:
-    #         q['text_html'] = markdown.markdown(q['text'])
-
	@@ -9,19 +9,19 @@ formatters:		@@ -9,19 +9,19 @@ formatters:
9		9
10	handlers:	10	handlers:
11	default:	11	default:
12	- level: 'INFO'	12	+ level: 'DEBUG'
13	class: 'logging.StreamHandler'	13	class: 'logging.StreamHandler'
14	formatter: 'standard'	14	formatter: 'standard'
15	stream: 'ext://sys.stdout'	15	stream: 'ext://sys.stdout'
16		16
17	cherrypy_console:	17	cherrypy_console:
18	- level: 'INFO'	18	+ level: 'DEBUG'
19	class: 'logging.StreamHandler'	19	class: 'logging.StreamHandler'
20	formatter: 'standard'	20	formatter: 'standard'
21	stream: 'ext://sys.stdout'	21	stream: 'ext://sys.stdout'
22		22
23	cherrypy_access:	23	cherrypy_access:
24	- level: 'INFO'	24	+ level: 'DEBUG'
25	class: 'logging.handlers.RotatingFileHandler'	25	class: 'logging.handlers.RotatingFileHandler'
26	formatter: 'void'	26	formatter: 'void'
27	filename: 'logs/access.log'	27	filename: 'logs/access.log'
	@@ -30,7 +30,7 @@ handlers:		@@ -30,7 +30,7 @@ handlers:
30	encoding: 'utf8'	30	encoding: 'utf8'
31		31
32	cherrypy_error:	32	cherrypy_error:
33	- level: 'INFO'	33	+ level: 'DEBUG'
34	class: 'logging.handlers.RotatingFileHandler'	34	class: 'logging.handlers.RotatingFileHandler'
35	formatter: 'void'	35	formatter: 'void'
36	filename: 'logs/errors.log'	36	filename: 'logs/errors.log'
	@@ -249,9 +249,3 @@ class Test(dict):		@@ -249,9 +249,3 @@ class Test(dict):
249	json.dump(self, f, indent=2, default=str)	249	json.dump(self, f, indent=2, default=str)
250	# HACK default=str is required for datetime objects	250	# HACK default=str is required for datetime objects
251	logger.info('Student {}: saved JSON file.'.format(self['student']['number']))	251	logger.info('Student {}: saved JSON file.'.format(self['student']['number']))
252	-
253	- # -----------------------------------------------------------------------
254	- # def generate_html(self):
255	- # for q in self['questions']:
256	- # q['text_html'] = markdown.markdown(q['text'])
257	-