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.33 -r1.34
--- lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties	11 May 2016 08:10:17 -0000	1.33
+++ lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties	20 Jul 2016 15:44:38 -0000	1.34
@@ -198,5 +198,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.13 -r1.14
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java	11 May 2016 08:10:17 -0000	1.13
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java	20 Jul 2016 15:44:38 -0000	1.14
@@ -72,6 +72,8 @@
 
     private boolean burningQuestionsEnabled;
 
+    private int timeLimit;
+
     private boolean reflectOnActivity;
 
     private String reflectInstructions;
@@ -344,4 +346,21 @@
     public void setBurningQuestionsEnabled(boolean burningQuestionsEnabled) {
 	this.burningQuestionsEnabled = burningQuestionsEnabled;
     }
+    
+    /**
+     * @hibernate.property column="time_limit"
+     * @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.73 -r1.74
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	13 Jun 2016 14:52:15 -0000	1.73
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	20 Jul 2016 15:44:38 -0000	1.74
@@ -2081,6 +2081,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.7 -r1.8
--- lams_tool_scratchie/web/pages/authoring/advance.jsp	11 Feb 2015 23:00:52 -0000	1.7
+++ lams_tool_scratchie/web/pages/authoring/advance.jsp	20 Jul 2016 15:44:38 -0000	1.8
@@ -22,6 +22,13 @@
 </p>
 
 <p>
+	<label for="time-limit">
+		<fmt:message key="label.time.limit" />&nbsp;
+		<html:text property="scratchie.timeLimit" size="3" styleId="time-limit"/>
+	</label>
+</p>
+
+<p>
 	<html:checkbox property="scratchie.reflectOnActivity" styleClass="noBorder" styleId="reflectOn"/>
 	<label for="reflectOn">
 		<fmt:message key="label.authoring.advanced.reflectOnActivity" />
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.23 -r1.24
--- lams_tool_scratchie/web/pages/learning/learning.jsp	20 Aug 2015 21:35:51 -0000	1.23
+++ lams_tool_scratchie/web/pages/learning/learning.jsp	20 Jul 2016 15:44:38 -0000	1.24
@@ -1,29 +1,33 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
-	<%-- param has higher level for request attribute --%>
-	<c:if test="${not empty param.sessionMapID}">
-		<c:set var="sessionMapID" value="${param.sessionMapID}" />
-	</c:if>
-	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<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}" />
+</c:if>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-	<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="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}" />	
 
 <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;}
-    	#scratches tr td { padding: 12px 15px; }
-    	#scratches a, #scratches a:hover {border-bottom: none;}
-    	.scartchie-image {border: 0;}
-    </style>
+	<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" />
 
-	<script language="JavaScript" 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 scratchItem(itemUid, answerUid){
@@ -61,16 +65,78 @@
         	return false;
 		}
 
-		function finish(method){
-			var numberOfAvailableScratches = $("[id^=imageLink-][onclick]").length;
-			var	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;
 		}
 		
 		var refreshIntervalId = null;
@@ -120,6 +186,17 @@
 			</div>
 		</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">
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.15 -r1.16
--- lams_tool_scratchie/web/pages/learning/questionlist.jsp	11 Aug 2015 22:10:32 -0000	1.15
+++ lams_tool_scratchie/web/pages/learning/questionlist.jsp	20 Jul 2016 15:44:38 -0000	1.16
@@ -126,17 +126,20 @@
 	<div class="space-bottom-top align-right">
 		<c:choose>
 			<c:when test="${isUserLeader && sessionMap.isBurningQuestionsEnabled}">
-				<html:button property="finishButton" styleId="finishButton" onclick="return finish('showBurningQuestions')" styleClass="button">
+				<input type="hidden" name="method" id="method" value="showBurningQuestions">
+				<html:button property="finishButton" styleId="finishButton" onclick="return finish(false);" styleClass="button">
 					<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')" styleClass="button">
+				<input type="hidden" name="method" id="method" value="newReflection">
+				<html:button property="finishButton" styleId="finishButton" onclick="return finish(false);" styleClass="button">
 					<fmt:message key="label.continue" />
 				</html:button>
 			</c:when>
 			<c:when test="${isUserLeader && (!sessionMap.isBurningQuestionsEnabled || !sessionMap.reflectOn) || !isUserLeader && isScratchingFinished}">
-				<html:button property="finishButton" styleId="finishButton" onclick="return finish('showResults')" styleClass="button">
+				<input type="hidden" name="method" id="method" value="showResults">
+				<html:button property="finishButton" styleId="finishButton" onclick="return finish(false);" styleClass="button">
 					<fmt:message key="label.submit" />
 				</html:button>
 			</c:when>
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.6 -r1.7
--- lams_tool_scratchie/web/pages/monitoring/parts/advanceOptions.jsp	11 Feb 2015 23:00:52 -0000	1.6
+++ lams_tool_scratchie/web/pages/monitoring/parts/advanceOptions.jsp	20 Jul 2016 15:44:38 -0000	1.7
@@ -45,6 +45,16 @@
 			</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>