- added logout option in the menu.

- added final grade in a jumbotron when in train_mode.

- added logout option in the menu.
- added final grade in a jumbotron when in train_mode.
Miguel Barão
1 parent 623ce110
Showing 4 changed files with 38 additions and 8 deletions Show diff stats
BUGS.md
serve.py
static/.DS_Store
templates/test.html
@@ -8,7 +8,7 @@
 # TODO
-- implementar train_mode:False em que a submissão do teste só faz a correcção e mantem-se na mesma página para o aluno corrigir as respostas.
+- 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
@@ -19,6 +19,7 @@
 # FIXED
+- 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
 - modal a pedir confirmação de submissão.
@@ -32,10 +32,20 @@ class Root(object):
     def default(self, *args):
         raise cherrypy.HTTPRedirect('/test')
+    # --- LOGOUT ------------------------------------------------------------
+    @cherrypy.expose
+    @require()
+    def logout(self):
+        uid = cherrypy.session.get('userid')
+        self.loggedin.discard(uid)
+        cherrypy.lib.sessions.expire()  # session coockie expires client side
+        cherrypy.session['userid'] = cherrypy.request.login = None
+        cherrypy.log.error('Student {0} logged out.'.format(uid), 'APPLICATION')
+        raise cherrypy.HTTPRedirect('/')
+
     # --- STUDENTS -----------------------------------------------------------
     @cherrypy.expose
     @require()
-    # def students(self, reset_pw=None):
     def students(self, **reset_pw):
         uid = cherrypy.session.get('userid')
         if uid != '0':
@@ -63,8 +63,14 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="navbar-brand" href="#">UÉvora</a>
+      <a class="navbar-brand" href="#">
+          <!-- <img class="brand" alt="UEvora" src="/pomba-ue.svg"/> -->
+          UEvora
+      </a>
     </div>
+
+    <p class="navbar-text"> ${t['title']} </p>
+
     <div class="collapse navbar-collapse" id="myNavbar">
 <!--       <ul class="nav navbar-nav">
         <li><a href="#">Teoria</a></li>
@@ -74,12 +80,15 @@
  -->
       <ul class="nav navbar-nav navbar-right">
         <li class="dropdown">
-          <a class="dropdown-toggle" data-toggle="dropdown" href="#">${t['number']} - ${t['name']} <span class="caret"></span></a>
-<!--           <ul class="dropdown-menu">
-            <li><a href="#">Toggle colors (day/night)</a></li>
-            <li><a href="#">Change password</a></li>
+          <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+              <span class="glyphicon glyphicon-user" aria-hidden="true"></span>
+              ${t['name']} (${t['number']}) <span class="caret"></span>
+          </a>
+          <ul class="dropdown-menu">
+            <li><a href="/logout"><span class="glyphicon glyphicon-log-out" aria-hidden="true"></span> Logout</a></li>
+            <!-- <li><a href="#">Change password</a></li> -->
           </ul>
- -->        </li>
+        </li>
       </ul>
     </div>
   </div>
@@ -103,6 +112,16 @@
             <%
                 total_points = sum(q['points'] for q in questions)
             %>
+
+            % if t['train_mode'] and 'grade' in t:
+                <div class="jumbotron drop-shadow">
+                    <h1>Resultado</h1>
+                    <p>Teve <strong>${'{:.1f}'.format(t['grade'])}</strong> valores no teste.</p>
+                    <p>Se quiser, pode submeter o teste novamente. Para terminar faça logout no menu.</p>
+
+                </div>
+            % endif
+
             % for i,q in enumerate(questions):
                 <div class="ui-corner-all custom-corners">
                     % if q['type'] == 'information':
	@@ -32,10 +32,20 @@ class Root(object):		@@ -32,10 +32,20 @@ class Root(object):
32	def default(self, *args):	32	def default(self, *args):
33	raise cherrypy.HTTPRedirect('/test')	33	raise cherrypy.HTTPRedirect('/test')
34		34
		35	+ # --- LOGOUT ------------------------------------------------------------
		36	+ @cherrypy.expose
		37	+ @require()
		38	+ def logout(self):
		39	+ uid = cherrypy.session.get('userid')
		40	+ self.loggedin.discard(uid)
		41	+ cherrypy.lib.sessions.expire() # session coockie expires client side
		42	+ cherrypy.session['userid'] = cherrypy.request.login = None
		43	+ cherrypy.log.error('Student {0} logged out.'.format(uid), 'APPLICATION')
		44	+ raise cherrypy.HTTPRedirect('/')
		45	+
35	# --- STUDENTS -----------------------------------------------------------	46	# --- STUDENTS -----------------------------------------------------------
36	@cherrypy.expose	47	@cherrypy.expose
37	@require()	48	@require()
38	- # def students(self, reset_pw=None):
39	def students(self, **reset_pw):	49	def students(self, **reset_pw):
40	uid = cherrypy.session.get('userid')	50	uid = cherrypy.session.get('userid')
41	if uid != '0':	51	if uid != '0':