From ce36eb04c0b6089e3a4ec85252046951019086cc Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Tue, 9 Feb 2016 18:19:37 +0530
Subject: Frontend interface changes: - Current question in nav bar highlighted
 with green - Submitted question in nav bar disabled, greyed out - Timer
 display size increased - Timer warning display, blinking

---
 yaksh/templates/yaksh/question.html | 78 +++++++++++++++++++++++++------------
 1 file changed, 54 insertions(+), 24 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index e532513..b4123d2 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -15,31 +15,61 @@
 <script src="{{ URL_ROOT }}/static/yaksh/js/bootstrap-modal.js"></script>
 
 <script>
-var time_left = {{ time_left }} 
-function secs_to_time(secs)
-{
-    var h = Math.floor(secs/3600);
-    var h_s = (h > 0) ? h+'h:' : '';
-    var m = Math.floor((secs%3600)/60);
-    var m_s = (m > 0) ? m+'m:' : '';
-    var s_s = Math.floor(secs%60) + 's';
-    return h_s + m_s + s_s;
+var time_left = {{ time_left }}
+
+function blinker() {
+    var elem = document.getElementById('time_left');
+    setInterval(function (){
+                elem.style.visibility = (elem.style.visibility == 'hidden' ? '' : 'hidden');
+                }, 400);
 }
 
-function update_time()
+function getTimeRemaining(endtime){
+  var t = Date.parse(endtime) - Date.parse(new Date());
+  var seconds = Math.floor( (t/1000) % 60 );
+  var minutes = Math.floor( (t/1000/60) % 60 );
+  var hours = Math.floor( (t/(1000*60*60)) % 24 );
+  var days = Math.floor( t/(1000*60*60*24) );
+  return {
+    'total': t,
+    'days': days,
+    'hours': hours,
+    'minutes': minutes,
+    'seconds': seconds
+  };
+}
+
+function updateTime()
 {
-    time_left -= 1;
-    if (time_left) 
-    {
-	var elem = document.getElementById("time_left");
-	var t_str = secs_to_time(time_left);
-	elem.innerHTML = "<strong>" + t_str + "</strong>";
-	setTimeout("update_time()", 1000);
+var timeInSeconds = time_left;
+var currentTime = Date.parse(new Date());
+var deadline = new Date(currentTime + timeInSeconds*1000);
+
+function updateClock(){
+    var t = getTimeRemaining(deadline);
+    var hh = ('0' + t.hours).slice(-2);
+    var mm = ('0' + t.minutes).slice(-2);
+    var ss = ('0' + t.seconds).slice(-2);
+
+    if(t.total<=0){
+      clearInterval(timeinterval);
+      document.forms["code"].submit();
     }
-    else 
-    {
-	document.forms["code"].submit();
-    }	
+    else if (0<t.total<=300000){
+      clock.innerHTML = "<span style='color:red'><strong>" + hh + ":" + mm + ":" + ss + "</strong></span>";
+    }
+    else {
+      clock.innerHTML = "<strong>" + hh + ":" + mm + ":" + ss + "</strong>";
+    }
+  }
+
+var clock = document.getElementById("time_left");
+var tm = getTimeRemaining(deadline)
+updateClock();
+if (0<tm.total<=300000){
+  blinker();
+}
+var timeinterval = setInterval(updateClock,1000);
 }
 
 function setSnippetHeight()
@@ -75,12 +105,12 @@ function call_skip(url)
 
 
 
-{% block onload %} onload="update_time();setSnippetHeight()" {% endblock %}
+{% block onload %} onload="updateTime();setSnippetHeight()" {% endblock %}
 
 {% block pagetitle %}
 
 <table><h6><div>
-	<tr><td class=td1-class><h5>You have {{ paper.questions_left }} question(s) left in {{ quiz_name }} </h5>
+	<tr><td class=td1-class><h5>You have {{ paper.questions_left }} question(s) left in {{ quiz_name }} {{ time_left }}</h5>
 	<td class=td2-class><div class=time-div id="time_left">
 	</div>
 </div></h6></table>
@@ -117,7 +147,7 @@ function call_skip(url)
                     {% endif %}
                 {% endif %}
                 {% if qid in submitted %}
-                    <li class="done"><a href="#">{{ num }}</a></li>
+                    <li class="disabled"><a href="#">{{ num }}</a></li>
                 {% endif %}
             {% endfor %}
         </ul>
-- 
cgit 


From 863f451779affbfbc89d165cb86d484e851a7c73 Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Wed, 10 Feb 2016 13:15:34 +0530
Subject: - Fix blinker in Timer - modify question display

---
 yaksh/templates/yaksh/question.html | 57 ++++++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 26 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index b4123d2..6e1da68 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -17,13 +17,6 @@
 <script>
 var time_left = {{ time_left }}
 
-function blinker() {
-    var elem = document.getElementById('time_left');
-    setInterval(function (){
-                elem.style.visibility = (elem.style.visibility == 'hidden' ? '' : 'hidden');
-                }, 400);
-}
-
 function getTimeRemaining(endtime){
   var t = Date.parse(endtime) - Date.parse(new Date());
   var seconds = Math.floor( (t/1000) % 60 );
@@ -51,24 +44,21 @@ function updateClock(){
     var mm = ('0' + t.minutes).slice(-2);
     var ss = ('0' + t.seconds).slice(-2);
 
-    if(t.total<=0){
-      clearInterval(timeinterval);
+    if(t.total<0){
       document.forms["code"].submit();
+      clearInterval(timeinterval);
+      return null;
     }
-    else if (0<t.total<=300000){
-      clock.innerHTML = "<span style='color:red'><strong>" + hh + ":" + mm + ":" + ss + "</strong></span>";
+    if (t.total<=300000){
+      clock.innerHTML = "<blink><span style='color:red'><strong>" + hh + ":" + mm + ":" + ss + "</strong></span></blink>";
     }
-    else {
+    if (t.total>=300000) {
       clock.innerHTML = "<strong>" + hh + ":" + mm + ":" + ss + "</strong>";
     }
   }
 
 var clock = document.getElementById("time_left");
-var tm = getTimeRemaining(deadline)
 updateClock();
-if (0<tm.total<=300000){
-  blinker();
-}
 var timeinterval = setInterval(updateClock,1000);
 }
 
@@ -110,7 +100,7 @@ function call_skip(url)
 {% block pagetitle %}
 
 <table><h6><div>
-	<tr><td class=td1-class><h5>You have {{ paper.questions_left }} question(s) left in {{ quiz_name }} {{ time_left }}</h5>
+	<tr><td class=td1-class><h5>You have {{ paper.questions_left }} question(s) left in {{ quiz_name }}</h5>
 	<td class=td2-class><div class=time-div id="time_left">
 	</div>
 </div></h6></table>
@@ -155,15 +145,30 @@ function call_skip(url)
   </div>
 </div>
 
-     <h4><u> {{ question.summary }} </u><font class=pull-right>(Marks : {{ question.points }}) </font></h4><br>
-	 <font size=3 face=arial>	{{ question.description|safe }} </font>
-         {% if error_message %}
-	 <div class="alert alert-error">
-	 {% for e in error_message.splitlines %}
-	 {{ e|join:"" }} 
-	 <br/>
-	 {% endfor%}
-	 </div>{% endif %}
+<div class="span13">
+<table>
+  <tr>
+    <td width="20%">
+      <h5><u>Marks</u> : {{ question.points }}</h5>
+      <span class="label success">{{ question.language }}</span>
+    </td>
+    <td width="90%">
+      <span align="left"><h4><u> {{ question.summary }} </u></h4>
+      <p>{{ question.description|safe }}</p>
+      </span>
+    </td>
+  </tr>
+</table>
+</div>
+{% if error_message %}
+  <div class="alert alert-error">
+  {% for e in error_message.splitlines %}
+    {{ e|join:"" }} 
+    <br/>
+  {% endfor%}
+  </div>
+{% endif %}
+
 
          <p id="status"></p>
 
-- 
cgit 


From ab1e0998b276dabd69213797c24cffd92faeb153 Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Fri, 12 Feb 2016 13:01:55 +0530
Subject: Revert question display design, add language used

---
 yaksh/templates/yaksh/question.html | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index 6e1da68..650cef0 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -146,19 +146,17 @@ function call_skip(url)
 </div>
 
 <div class="span13">
-<table>
-  <tr>
-    <td width="20%">
-      <h5><u>Marks</u> : {{ question.points }}</h5>
-      <span class="label success">{{ question.language }}</span>
-    </td>
-    <td width="90%">
-      <span align="left"><h4><u> {{ question.summary }} </u></h4>
-      <p>{{ question.description|safe }}</p>
-      </span>
-    </td>
-  </tr>
-</table>
+  <h4><u> {{ question.summary }} </u><font class=pull-right>(Marks : {{ question.points }}) </font></h4><br>
+  <font size=3 face=arial> {{ question.description|safe }} </font>
+  <br><font size=3 face=arial> Language: {{ question.language }} </font><br>
+       {% if error_message %}
+    <div class="alert alert-error">
+      {% for e in error_message.splitlines %}
+      {{ e|join:"" }} 
+      <br/>
+      {% endfor%}
+    </div>
+  {% endif %}
 </div>
 {% if error_message %}
   <div class="alert alert-error">
-- 
cgit