fixed timer reset on reload and login problem

Author: piyushroshan

README.md

@@ -8,6 +8,8 @@ Jaseem Abid <[email protected]>
 
 Vipin Nair <[email protected]>
 
+Roshan Piyush <[email protected]>
+
 UI adapted from UNIXKCD by chromakode.
 
 License

app.yaml

@@ -1,4 +1,4 @@
-application: tuxofwar2011
+application: piyushtux
 version: 10
 runtime: python
 api_version: 1

index.py

@@ -25,8 +25,11 @@ def get(self,var):
 				userdb.userPlayStart(var)
 				self.redirect('/?auth=1')
 			else:
-				self.response.headers['Content-Type'] = 'text/html'
-				self.response.out.write("You have already started the contest. You were not supposed to do this. You can continue the contest <a href='/'>here</a>. You will not have a timer and you may be penalized for this. Contact admins for further details." )
+				if userdb.boolRemainingTime()==True:
+					self.redirect('/?auth=1')
+				else:
+					self.response.headers['Content-Type'] = 'text/html'
+					self.response.out.write('You have finished the contest. You cannot participate again <a href="/"">Back to Tux of War</a>')
 
 
 class contestStop(webapp.RequestHandler):
@@ -56,6 +59,17 @@ def get(self):
 		else:
 			self.response.out.write("{ \"name\" : \"NULL\" }")
 
+class remainingTime(webapp.RequestHandler):
+	def get(self):
+		user = users.get_current_user()
+		if user:
+			time = userdb.userRemainingTime()
+			self.response.out.write("{ \"time\" :\""+ str(time)+"\" }")
+		else:
+			self.response.out.write("{ \"time\" :\""+str(0)+"\" }")
+
+
+
 
 class adminQuestionsAdd(webapp.RequestHandler):
 	def get(self):
@@ -74,7 +88,7 @@ class adminQuestionsSubmit(webapp.RequestHandler):
 	def post(self):
 		if users.get_current_user():
 			if users.is_current_user_admin():
-				q = questiondb.question(questionNumber=string.atoi(self.request.get('qno')),
+				q = questiondb.questionm(questionNumber=string.atoi(self.request.get('qno')),
 										question=self.request.get('ques'),
 										qimage=self.request.get('qimg'),
 										opt1=self.request.get('opt1'),
@@ -94,7 +108,7 @@ def get(self):
 		if users.get_current_user():
 			if users.is_current_user_admin():
 				self.response.headers['Content-Type'] = 'text/html'
-				query = questiondb.question.all()
+				query = questiondb.questionm.all()
 				result = query.fetch(100)
 				template_values = { 'questions' : result }
 				path = os.path.join(os.path.dirname(__file__), 'templates/questionlist.html')
@@ -142,8 +156,9 @@ def get(self):
 									('/contest/stop/',contestStop),
 									('/contest/question/(\d*)|/', contestQuestion),
 									('/contest/answer/', contestAnswer),
+									('/contest/time/', remainingTime),
 									('/contest/activeuser/', contestActiveuser),
-									('/admin/questions/add/', adminQuestionsAdd),
+									('/admin/questions/add/contest', adminQuestionsAdd),
 									('/admin/questions/submit/', adminQuestionsSubmit),
 									('/admin/questions/list/',adminQuestionsList),
 									('/admin/questions/answered/',adminQuestionsAnswered),

js/xkcd_cli.js

@@ -25,13 +25,14 @@ function getUrlVars() {
 }
 
 var xkcd = {
-	latest: {"num" : 45},
+	latest: {"num" : 4},
 	last: {"num" : 1},
 	cache: {},
 	baseQ: '/contest/question/',
 	baseA: '/contest/answer/',
 	baseR: '/contest/start/',
 	baseE: '/contest/stop/',
+	baseT: '/contest/time/',
 
 	get: function(num, success, error) {
 		if (num === null) {
@@ -237,7 +238,7 @@ var Filesystem = {
 	'welcome.txt': {type: 'file', read: function (terminal) {
 		'use strict';
 		$.each([
-			$('<h3>').text('Welcome to Tux of War contest console'),
+			$('<h3>').text('Welcome to Roshan Piyush\'s Tux of War contest console'),
 			'Use "ls", "cat", and "cd" to navigate the filesystem.Press "Ctrl" then "L" to clear.',
 			'cat reginfo.txt for registration information.',
 			'The contest opens at 10pm tonight. You may login upto 10:30 pm to finish the contest in time.',
@@ -771,13 +772,17 @@ $(document).ready(function() {
 		/* Example implementation : var cid = getUrlVars()['id']; */
 		if(getUrlVars()['auth']) {
 			Terminal.runCommand('welcome');
-			var dur = 1800, kill = setInterval(function(){
-				$("#timer").text(Math.floor((dur/60)) + " minutes " + Math.floor((dur%60)) +" seconds left");
-				dur -= 1;
+			var dur = 0;
+			$.getJSON("/contest/time/", function(data) {
+   					dur = Number(data.time);
+   			});
+			kill = setInterval(function(){
 				if (dur === 0) {
 					clearTimeout(kill);
 					window.location = xkcd.baseE;
 				}
+				$("#timer").text(Math.floor((dur/60)) + " minutes " + Math.floor((dur%60)) +" seconds left");
+				dur -= 1;
 			},1000);
 		} else if(getUrlVars()['end']) {
 			Terminal.runCommand('end');

questiondb.py

@@ -1,7 +1,7 @@
 # Model Defining Questions Database
 import string
 from google.appengine.ext import db
-class question(db.Model):
+class questionm(db.Model):
 	questionNumber = db.IntegerProperty(required=True)
 	question = db.StringProperty(required=True, multiline=True)
 	qimage = db.StringProperty()
@@ -11,8 +11,10 @@ class question(db.Model):
 	opt4 = db.StringProperty(required=True, multiline=True)
 	ans = db.StringProperty(required=True)
 
+
 def getQuestion(num,var):
-	query = question.all()
+	query = questionm.all()
+
 	q = query.filter('questionNumber =',num).get()
 	if q:
 		return ("{"+
@@ -26,3 +28,15 @@ def getQuestion(num,var):
 									"\""+q.opt4.replace('\r\n','<br />')+"\""+
 									"]"+
 				"}")
+	else:
+		return ("{"+
+			"\"num\" : " + "\""+"1"+"\""+","+
+			"\"question\" : "+"\""+"Sorry question not found. We'll fix it Soon"+"\""+","+
+			"\"image\" : "+"\""+"\""+","+ 
+			"\"options\" : " + "["+
+								"\""+""+"\""+","+
+								"\""+""+"\""+","+
+								"\""+""+"\""+","+
+								"\""+""+"\""+
+								"]"+
+			"}")

userdb.py

@@ -6,10 +6,10 @@
 from google.appengine.api import users
 from google.appengine.ext import db
 from google.appengine.api import users
-
+from questiondb import questionm
 def generateSet():
 	a = []
-	for i in range(45):
+	for i in range(4):
 		a.append(i+1)
 	random.shuffle(a)
 	return a
@@ -20,6 +20,7 @@ class userPlay(db.Model):
 	tathvaID = db.StringProperty(required=True)
 	startTime = db.DateTimeProperty(required=True)
 	endTime = db.DateTimeProperty
+	closeTime=db.DateTimeProperty(required=True)
 
 def userPlayExist():
 	query = userPlay.all()
@@ -34,7 +35,9 @@ def userPlayStart(tid):
 		u = userPlay(user = users.get_current_user(),
 					questionSet = generateSet(),
 					tathvaID = tid,
-					startTime = datetime.datetime.now())
+					startTime = datetime.datetime.now(),
+					closeTime = datetime.datetime.now()+datetime.timedelta(minutes=30)
+					)
 		u.put()
 		return u.user.nickname() + u.tathvaID
 
@@ -46,10 +49,27 @@ def userPlayStop():
 		u.put()
 	return u.user.nickname() + u.tathvaID + str(u.endTime)
 
+def userRemainingTime():
+	query = userPlay.all()
+	u = query.filter('user = ', users.get_current_user()).get()
+	urtime = (u.closeTime-datetime.datetime.now()).seconds
+	if u.closeTime > datetime.datetime.now():
+		return urtime
+	else:
+		return 0
+
+def boolRemainingTime():
+	query = userPlay.all()
+	u = query.filter('user = ', users.get_current_user()).get()
+	if u.closeTime > datetime.datetime.now():
+		return True
+	else:
+		return False
+
 def userElapsedTime():
 	query = userPlay.all()
 	u = query.filter('user = ', users.get_current_user()).get()
-	return ((datetime.datetime.now() - u.startTime).microseconds/1000)
+	return ((datetime.datetime.now() - u.startTime).microseconds/1000)	
 
 def userPermutation(num):
 	query = userPlay.all()