Index: lams_tool_assessment/web/pages/learning/learning.jsp
===================================================================
diff -u -rf5bcf9323324eb4d5add901d9e7a23c33050533a -r5a579db63172ae32b83984fb7cde499217bbcdd4
--- lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision f5bcf9323324eb4d5add901d9e7a23c33050533a)
+++ lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 5a579db63172ae32b83984fb7cde499217bbcdd4)
@@ -137,10 +137,10 @@
 						}			            
 			        });
 			    });
-				
-				initAssessmentTimeLimitWebsocket();
 			}
 
+			initAssessmentTimeLimitWebsocket();
+
 			//autocomplete for VSA
 			$('.ui-autocomplete-input').each(function(){
 				$(this).autocomplete({
@@ -292,13 +292,15 @@
 						$(this).removeClass('countdown-timeout');
 					}
 				},
-				onExpiry: function(periods) {
-			        $.blockUI({ message: '<h1 id="timelimit-expired"><i class="fa fa-refresh fa-spin fa-1x fa-fw"></i> <fmt:message key="label.learning.blockui.time.is.over" /></h1>' }); 
-			        
-			        setTimeout(function() { 
-			        	submitAll(true);
-			        }, 4000); 
-				},
+				<c:if test="${hasEditRight && (mode != 'teacher')}">
+					onExpiry: function(periods) {
+				        $.blockUI({ message: '<h1 id="timelimit-expired"><i class="fa fa-refresh fa-spin fa-1x fa-fw"></i> <fmt:message key="label.learning.blockui.time.is.over" /></h1>' }); 
+				        
+				        setTimeout(function() { 
+				        	submitAll(true);
+				        }, 4000); 
+					},
+				</c:if>
 				description: "<div id='countdown-label'><fmt:message key='label.learning.countdown.time.left' /></div>"
 			});
 		}