Some bugs fixed (pressing puzzles buttons without starting a session), added the time of the sessionHEADmaster

3 files changed, 26 insertions, 18 deletions

diff --git a/controller.py b/controller.py
index a2b8e41..36447a5 100644
--- a/controller.py
+++ b/controller.py
@@ -11,31 +11,37 @@ class Controller():
         self.nextPuzzle(widget)
 
     def evaluateAnswer(self,widget):
-        if not self.session.isAnswered():
-            if self.session.evaluateAnswer(self.view.respT.get_text()):
-                status='Correcto.'
-            else:
-                status='Incorrecto.'
-            self.view.showAnswer(status,self.session.currentPuzzle().answer)
+        if 'session' in self.__dict__:
+            if not self.session.isAnswered():
+                if self.session.evaluateAnswer(self.view.respT.get_text()):
+                    status='Correcto.'
+                else:
+                    status='Incorrecto.'
+                self.view.showAnswer(status,self.session.currentPuzzle().answer)
 
     def hasClue(self,widget):
-        return self.session.currentPuzzle().hasClue()
+        if 'session' in self.__dict__:
+            return self.session.currentPuzzle().hasClue()
 
     def getClue(self,widget):
-        return self.session.currentPuzzle().getClue()
+        if 'session' in self.__dict__:
+            return self.session.currentPuzzle().getClue()
 
     def nextPuzzle(self,widget):
-        self.session.nextPuzzle()
-        self.view.refreshQuestion(self.session.currentPuzzle().question)
-        self.view.hideAnswer()
-        self.view.cleanUserAnswer()
+        if 'session' in self.__dict__:
+            if self.session.continues:
+                self.session.nextPuzzle()
+                self.view.refreshQuestion(self.session.currentPuzzle().question)
+                self.view.hideAnswer()
+                self.view.cleanUserAnswer()
 
     def pause(self,widget):
         return self.session.pause()
 
     def end(self,widget):
-        self.session.end()
-        self.nextPuzzle(widget)
+        if 'session' in self.__dict__:
+            self.session.end()
+            self.nextPuzzle(widget)
 
     def get_active_text(self,combobox):
       model = combobox.get_model()
diff --git a/puzzles/1/Matematica/prueba2.txt b/puzzles/1/Castellano/prueba2.txt
index 9c14442..9c14442 100755
--- a/puzzles/1/Matematica/prueba2.txt
+++ b/puzzles/1/Castellano/prueba2.txt
diff --git a/session.py b/session.py
index 7afe105..1214ee8 100644
--- a/session.py
+++ b/session.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import random
 import os
-import datetime
+import time
 from puzzle import *
 
 
@@ -21,9 +21,10 @@ class Session:
             list_files = os.listdir('./puzzles/' + str(self.difficulty) + '/' + self.topic)
             for item in list_files:
                 self.list_puzzles.append(Puzzle('./puzzles/' + str(self.difficulty) + '/' + self.topic + '/' + item))
-        self.time = datetime.datetime.now()
+        self.time = time.time()
         self.old_puzzles = []
         self.score=0
+        self.continues=True
 
     def nextPuzzle(self):
         l=len(self.list_puzzles)
@@ -33,8 +34,9 @@ class Session:
             self.current=self.list_puzzles.pop(i)
             self.answered=False
         else:
-            self.current.question='Juego Terminado\nPuntaje='+str(self.score)
+            self.current.question='Juego Terminado\nPuntaje='+str(self.score)+'\nTiempo='+str(time.time()-self.time)+' segundos'
             self.answered=True
+            self.continues=False
 
     def currentPuzzle(self):
         return self.current
@@ -52,6 +54,6 @@ class Session:
 
     def isAnswered(self):
         return self.answered
-    
+
     def __str__(self):
         return 'Sesión de topico = ' + str(self.topic) + ' y dificultad = ' + str(self.difficulty)