Index: lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/Attic/Scratchie.hbm.xml,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.hbm.xml	27 Apr 2016 13:22:18 -0000	1.1.2.1
+++ lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.hbm.xml	20 Jul 2016 14:33:47 -0000	1.1.2.2
@@ -134,6 +134,14 @@
             insert="true"
             column="burning_questions_enabled"
         />
+        
+        <property
+            name="timeLimit"
+            type="int"
+            update="true"
+            insert="true"
+            column="time_limit"
+        />
 
         <!--
             To add non XDoclet property mappings, create a file named
Index: lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.27.2.3 -r1.27.2.4
--- lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties	1 Jun 2016 04:21:35 -0000	1.27.2.3
+++ lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties	20 Jul 2016 14:33:47 -0000	1.27.2.4
@@ -1,9 +1,6 @@
 appName = scratchie 
 #language code: en 
 #locale code: AU 
-
-
- 
 #=================== labels for Scratchie =================# 
 
 activity.title  =Scratchie
@@ -198,5 +195,10 @@
 label.count  =Count
 label.like  =Like
 label.unlike  =Unlike
+label.time.limit  =Time limit(minutes)
+label.countdown.time.left  =Time left
+label.time.is.over  =Time is over. Processing your answers...
+label.are.you.ready  =You are going to participate in activity that has time limitation. Are you ready to start?
+label.ok  =OK
 
 #======= End labels: Exported 182 labels for en AU =====
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20160720.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java,v
diff -u -r1.9.2.4 -r1.9.2.5
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java	11 May 2016 07:38:00 -0000	1.9.2.4
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java	20 Jul 2016 14:33:47 -0000	1.9.2.5
@@ -36,9 +36,6 @@
  * Scratchie
  *
  * @author Andrey Balan
- *
- *
- *
  */
 public class Scratchie implements Cloneable {
 
@@ -71,6 +68,8 @@
     private boolean extraPoint;
 
     private boolean burningQuestionsEnabled;
+    
+    private int timeLimit;
 
     private boolean reflectOnActivity;
 
@@ -344,4 +343,19 @@
     public void setBurningQuestionsEnabled(boolean burningQuestionsEnabled) {
 	this.burningQuestionsEnabled = burningQuestionsEnabled;
     }
+    
+    /**
+     * @return Returns the time limitation, that students have to complete an attempt.
+     */
+    public int getTimeLimit() {
+	return timeLimit;
+    }
+
+    /**
+     * @param timeLimit
+     *            the time limitation, that students have to complete an attempt.
+     */
+    public void setTimeLimit(int timeLimit) {
+	this.timeLimit = timeLimit;
+    }
 }
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java,v
diff -u -r1.51.2.22 -r1.51.2.23
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	15 Jun 2016 08:06:46 -0000	1.51.2.22
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	20 Jul 2016 14:33:47 -0000	1.51.2.23
@@ -2067,6 +2067,7 @@
 	scratchie.setInstructions(toolContentJSON.getString(RestTags.INSTRUCTIONS));
 
 	scratchie.setBurningQuestionsEnabled(JsonUtil.opt(toolContentJSON, "burningQuestionsEnabled", false));
+	scratchie.setTimeLimit(JsonUtil.opt(toolContentJSON, "timeLimit", 0));
 	scratchie.setExtraPoint(JsonUtil.opt(toolContentJSON, "extraPoint", false));
 	scratchie.setReflectOnActivity(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
 	scratchie.setReflectInstructions(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS, (String) null));
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_scratchie/web/includes/css/scratchie-learning.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scratchie/web/pages/authoring/advance.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/authoring/advance.jsp,v
diff -u -r1.6.2.3 -r1.6.2.4
--- lams_tool_scratchie/web/pages/authoring/advance.jsp	1 Jul 2016 04:25:48 -0000	1.6.2.3
+++ lams_tool_scratchie/web/pages/authoring/advance.jsp	20 Jul 2016 14:33:47 -0000	1.6.2.4
@@ -9,25 +9,32 @@
 	<c:if test="${sessionMap.isEnabledExtraPointOption}">
 		<div class="checkbox">
 			<label for="extraPoint">
-			<html:checkbox property="scratchie.extraPoint" styleId="extraPoint"/>
-			<fmt:message key="label.authoring.advanced.give.extra.point" />
+				<html:checkbox property="scratchie.extraPoint" styleId="extraPoint"/>
+				<fmt:message key="label.authoring.advanced.give.extra.point" />
 			</label>
 		</div>
 	</c:if>
 	
 	<div class="checkbox">
 		<label for="burningQuestionsEnabled">
-		<html:checkbox property="scratchie.burningQuestionsEnabled" styleId="burningQuestionsEnabled"/>
-		<fmt:message key="label.authoring.advanced.burning.questions" />
+			<html:checkbox property="scratchie.burningQuestionsEnabled" styleId="burningQuestionsEnabled"/>
+			<fmt:message key="label.authoring.advanced.burning.questions" />
 		</label>
 	</div>
+	
+	<div class="form-inline">
+		<label for="time-limit">
+			<fmt:message key="label.time.limit" />&nbsp;
+			<html:text property="scratchie.timeLimit" size="3" styleId="time-limit" styleClass="form-control input-sm"/>
+		</label>
+	</div>
 </lams:SimplePanel>
 
 <lams:SimplePanel titleKey="label.activity.completion">
 	<div class="checkbox">
-		<label for="reflectOn">
-		<html:checkbox property="scratchie.reflectOnActivity" styleId="reflectOn"/>
-		<fmt:message key="label.authoring.advanced.reflectOnActivity" />
+		<label for="reflect-on">
+			<html:checkbox property="scratchie.reflectOnActivity" styleId="reflect-on"/>
+			<fmt:message key="label.authoring.advanced.reflectOnActivity" />
 		</label>
 	</div>
 	
Index: lams_tool_scratchie/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/learning/learning.jsp,v
diff -u -r1.18.2.6 -r1.18.2.7
--- lams_tool_scratchie/web/pages/learning/learning.jsp	14 Apr 2016 12:19:51 -0000	1.18.2.6
+++ lams_tool_scratchie/web/pages/learning/learning.jsp	20 Jul 2016 14:33:47 -0000	1.18.2.7
@@ -1,6 +1,9 @@
 <!DOCTYPE html>
 
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
 <%-- param has higher level for request attribute --%>
 <c:if test="${not empty param.sessionMapID}">
 	<c:set var="sessionMapID" value="${param.sessionMapID}" />
@@ -10,32 +13,21 @@
 <c:set var="mode" value="${sessionMap.mode}" />
 <c:set var="toolSessionID" value="${sessionMap.toolSessionID}" />
 <c:set var="scratchie" value="${sessionMap.scratchie}" />
-<c:set var="isUserLeader" value="${sessionMap.isUserLeader}" />
+<c:set var="isUserLeader" value="${sessionMap.isUserLeader}" />	
 
 <lams:html>
 <lams:head>
 	<title><fmt:message key="label.learning.title" /></title>
 	<%@ include file="/common/header.jsp"%>
-	<style type="text/css">
-#scratches {
-	margin: 40px 0px;
-	border-spacing: 0;
-}
+	<link rel="stylesheet" type="text/css" href="${lams}css/jquery.countdown.css" />
+	<link rel="stylesheet" type="text/css" href="${lams}css/jquery.jgrowl.css" />
+	<link rel="stylesheet" type="text/css" href="includes/css/scratchie-learning.css" />
 
-#scratches tr td {
-	padding: 12px 15px;
-}
-
-#scratches a, #scratches a:hover {
-	border-bottom: none;
-}
-
-.scartchie-image {
-	border: 0;
-}
-</style>
-
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.plugin.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.countdown.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.jgrowl.js"></script>	
 	<script type="text/javascript">
 		function scratchImage(itemUid, answerUid, isCorrect) {
 			// first show animation, then put static image
@@ -76,19 +68,79 @@
 	       	});
 		}
 
-		function finish(method){
-			var numberOfAvailableScratches = $("[id^=imageLink-][onclick]").length,
-				finishConfirmed = (numberOfAvailableScratches > 0) ? confirm("<fmt:message key="label.one.or.more.questions.not.completed"></fmt:message>") : true;
+		//time limit feature
+		<c:if test="${not sessionMap.userFinished && scratchie.timeLimit > 0 && (mode != 'teacher')}">
+			$(document).ready(function(){
+				//show confirmation dialog
+				$.blockUI({ 
+					message: $('#timelimit-start-dialog'), 
+					css: { width: '325px', height: '120px'}, 
+					overlayCSS: { opacity: '.98'} 
+				});
+					
+				//once OK button pressed start countdown
+			    $('#timelimit-start-ok').click(function() {
+			       	$.unblockUI();
+			       	displayCountdown();
+			    });
+			});
 			
-			if (finishConfirmed) {
-				document.getElementById("finishButton").disabled = true;
-				document.location.href ='<c:url value="/learning/' + method + '.do?sessionMapID=${sessionMapID}"/>';
+			function displayCountdown(){
+				var countdown = '<div id="countdown"></div>' 
+				$.blockUI({
+					message: countdown, 
+					showOverlay: false,
+					focusInput: false,
+					css: { 
+						top: '40px',
+						left: '',
+						right: '0%',
+				        opacity: '.8', 
+				        width: '230px',
+				        cursor: 'default',
+				        border: 'none'
+			        }   
+				});
 				
-				return false;
+				$('#countdown').countdown({
+					until: '+${scratchie.timeLimit * 60}S',  
+					format: 'hMS',
+					compact: true,
+					onTick: function(periods) {
+						//check for 30 seconds
+						if ((periods[4] == 0) && (periods[5] == 0) && (periods[6] <= 30)) {
+							$('#countdown').css('color', '#FF3333');
+						}					
+					},
+					onExpiry: function(periods) {
+				        $.blockUI({ message: '<h1 id="timelimit-expired"><img src="<html:rewrite page='/includes/images/indicator.gif'/>" border="0" > <fmt:message key="label.time.is.over" /></h1>' }); 
+				        
+				        setTimeout(function() { 
+				        	finish(true);
+				        }, 4000); 
+					},
+					description: "<div id='countdown-label'><fmt:message key='label.countdown.time.left' /></div>"
+				});
 			}
+		</c:if>
+
+		function finish(isTimelimitExpired) {
+			var method = $("#method").val();
+			
+			var proceed = true;
+			//ask for leave confirmation only if time limit is not expired
+			if (!isTimelimitExpired) {
+				var numberOfAvailableScratches = $("[id^=imageLink-][onclick]").length;
+				proceed = (numberOfAvailableScratches > 0) ? confirm("<fmt:message key="label.one.or.more.questions.not.completed"></fmt:message>") : true;	
+			}
+			
+			if (proceed) {
+				document.getElementById("finishButton").disabled = true;
+				document.location.href ='<c:url value="/learning/' + method + '.do?sessionMapID=${sessionMapID}"/>';	
+			}
+			
+			return false;
 		}
-		
-		
     </script>
 </lams:head>
 <body class="stripes">
@@ -116,14 +168,24 @@
 				</fmt:message>
 			</lams:Alert>
 		</c:if>
+		
+		<c:if test="${mode != 'teacher'}">
+			<div id="timelimit-start-dialog"> 
+		        <h4>
+		        	<fmt:message key='label.are.you.ready' />
+		        </h4>
+		        <html:button property="ok" styleId="timelimit-start-ok" styleClass="button">
+					<fmt:message key='label.ok' />
+				</html:button>
+			</div>
+		</c:if>
 
 		<%@ include file="/common/messages.jsp"%>
 
 		<div id="questionListArea">
 			<%@ include file="questionlist.jsp"%>
 		</div>
 
-
 		<div id="footer"></div>
 		<!--closes footer-->
 	</lams:Page>
Index: lams_tool_scratchie/web/pages/learning/questionlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/learning/questionlist.jsp,v
diff -u -r1.12.2.3 -r1.12.2.4
--- lams_tool_scratchie/web/pages/learning/questionlist.jsp	14 Apr 2016 12:19:51 -0000	1.12.2.3
+++ lams_tool_scratchie/web/pages/learning/questionlist.jsp	20 Jul 2016 14:33:47 -0000	1.12.2.4
@@ -24,7 +24,6 @@
 		}
 	});
 	
-	
 	//init the connection with server using server URL but with different protocol
 	var websocket = new WebSocket('<lams:WebAppURL />'.replace('http', 'ws') 
 					+ 'learningWebsocket?toolSessionID=' + ${toolSessionID});
@@ -126,19 +125,22 @@
 	<div class="voffset10 pull-right">
 		<c:choose>
 			<c:when test="${isUserLeader && sessionMap.isBurningQuestionsEnabled}">
-				<html:button property="finishButton" styleId="finishButton" onclick="return finish('showBurningQuestions')"
+				<input type="hidden" name="method" id="method" value="showBurningQuestions">
+				<html:button property="finishButton" styleId="finishButton" onclick="return finish(false);"
 					styleClass="btn btn-sm btn-default">
 					<fmt:message key="label.continue.burning.questions" />
 				</html:button>
 			</c:when>
 			<c:when test="${isUserLeader && sessionMap.reflectOn}">
-				<html:button property="finishButton" styleId="finishButton" onclick="return finish('newReflection')"
+				<input type="hidden" name="method" id="method" value="newReflection">
+				<html:button property="finishButton" styleId="finishButton" onclick="return finish(false);"
 					styleClass="btn btn-default">
 					<fmt:message key="label.continue" />
 				</html:button>
 			</c:when>
 			<c:otherwise>
-				<html:button property="finishButton" styleId="finishButton" onclick="return finish('showResults')"
+				<input type="hidden" name="method" id="method" value="showResults">
+				<html:button property="finishButton" styleId="finishButton" onclick="return finish(false);"
 					styleClass="btn btn-default">
 					<fmt:message key="label.submit" />
 				</html:button>
Index: lams_tool_scratchie/web/pages/monitoring/parts/advanceOptions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/monitoring/parts/advanceOptions.jsp,v
diff -u -r1.5.2.2 -r1.5.2.3
--- lams_tool_scratchie/web/pages/monitoring/parts/advanceOptions.jsp	1 Jun 2016 04:21:36 -0000	1.5.2.2
+++ lams_tool_scratchie/web/pages/monitoring/parts/advanceOptions.jsp	20 Jul 2016 14:33:47 -0000	1.5.2.3
@@ -34,12 +34,22 @@
 				<c:otherwise>
 					<fmt:message key="label.off" />
 				</c:otherwise>
-			</c:choose>	
+			</c:choose>
 		</td>
 	</tr>
 	
 	<tr>
 		<td>
+			<fmt:message key="label.time.limit" />
+		</td>
+			
+		<td>
+			<c:out value="${sessionMap.scratchie.timeLimit}" escapeXml="true"/>
+		</td>
+	</tr>
+	
+	<tr>
+		<td>
 			<fmt:message key="monitor.summary.td.addNotebook" />
 		</td>