LDEV-4332: Refresh page when a tool websocket gets closed. Re-init Co…

…mmand websocket when it gets closed. Rename websockets in JS code to ensure name uniqueness within the page.
ivanDad · May 4, 2017 · 0ec58b4 · 0ec58b4
1 parent 187836d
commit 0ec58b4
Show file tree

Hide file tree

Showing 37 changed files with 676 additions and 469 deletions.
diff --git a/lams_admin/web/WEB-INF/tags/Page.tag b/lams_admin/web/WEB-INF/tags/Page.tag
@@ -146,6 +146,28 @@
 				}
 				$('#sidebar').show();
 			}
+
+			function initCommandWebsocket(){
+				// it is not an obvious place to init the websocket, but we need lesson ID
+				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+
+				commandWebsocket.onclose = function(){
+					// maybe iPad went into sleep mode?
+					// we need this websocket working, so init it again
+					initCommandWebsocket();
+				};
+				// when the server pushes new commands
+				commandWebsocket.onmessage = function(e){
+					// read JSON object
+					var command = JSON.parse(e.data);
+					if (command.message) {
+						alert(command.message);
+					}
+					if (command.redirectURL) {
+						window.location.href = command.redirectURL;
+					}
+				};
+			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -203,19 +225,7 @@
 								});
 							}
 
-							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
-							// when the server pushes new commands
-							commandWebsocket.onmessage = function(e){
-								// read JSON object
-								var command = JSON.parse(e.data);
-								if (command.message) {
-									alert(command.message);
-								}
-								if (command.redirectURL) {
-									window.location.href = command.redirectURL;
-								}
-							};
+							initCommandWebsocket();
 						}
 					});
 				}
@@ -339,7 +349,3 @@
 		</div>
 	</c:otherwise>
 </c:choose>
-
-
-
-
diff --git a/lams_central/web/WEB-INF/tags/Page.tag b/lams_central/web/WEB-INF/tags/Page.tag
@@ -146,6 +146,28 @@
 				}
 				$('#sidebar').show();
 			}
+
+			function initCommandWebsocket(){
+				// it is not an obvious place to init the websocket, but we need lesson ID
+				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+
+				commandWebsocket.onclose = function(){
+					// maybe iPad went into sleep mode?
+					// we need this websocket working, so init it again
+					initCommandWebsocket();
+				};
+				// when the server pushes new commands
+				commandWebsocket.onmessage = function(e){
+					// read JSON object
+					var command = JSON.parse(e.data);
+					if (command.message) {
+						alert(command.message);
+					}
+					if (command.redirectURL) {
+						window.location.href = command.redirectURL;
+					}
+				};
+			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -203,19 +225,7 @@
 								});
 							}
 
-							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
-							// when the server pushes new commands
-							commandWebsocket.onmessage = function(e){
-								// read JSON object
-								var command = JSON.parse(e.data);
-								if (command.message) {
-									alert(command.message);
-								}
-								if (command.redirectURL) {
-									window.location.href = command.redirectURL;
-								}
-							};
+							initCommandWebsocket();
 						}
 					});
 				}
@@ -339,7 +349,3 @@
 		</div>
 	</c:otherwise>
 </c:choose>
-
-
-
-
diff --git a/lams_gradebook/web/WEB-INF/tags/Page.tag b/lams_gradebook/web/WEB-INF/tags/Page.tag
@@ -205,6 +205,12 @@
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
 							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+
+							commandWebsocket.onclose = function(){
+								// maybe iPad went into sleep mode?
+								// we need this websocket working, so reload
+								location.reload();
+							};
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object

diff --git a/lams_learning/web/WEB-INF/tags/Page.tag b/lams_learning/web/WEB-INF/tags/Page.tag
@@ -205,6 +205,12 @@
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
 							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+
+							commandWebsocket.onclose = function(){
+								// maybe iPad went into sleep mode?
+								// we need this websocket working, so reload
+								location.reload();
+							};
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object

diff --git a/lams_monitoring/.classpath b/lams_monitoring/.classpath
@@ -19,5 +19,6 @@
 			<attribute name="javadoc_location" value="http://commons.apache.org/proper/commons-lang/javadocs/api-2.6/"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry combineaccessrules="false" kind="src" path="/lams_gradebook"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/lams_monitoring/web/WEB-INF/tags/Page.tag b/lams_monitoring/web/WEB-INF/tags/Page.tag
@@ -205,6 +205,12 @@
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
 							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+
+							commandWebsocket.onclose = function(){
+								// maybe iPad went into sleep mode?
+								// we need this websocket working, so reload
+								location.reload();
+							};
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object

diff --git a/lams_tool_assessment/web/WEB-INF/tags/Page.tag b/lams_tool_assessment/web/WEB-INF/tags/Page.tag
@@ -146,6 +146,28 @@
 				}
 				$('#sidebar').show();
 			}
+
+			function initCommandWebsocket(){
+				// it is not an obvious place to init the websocket, but we need lesson ID
+				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+
+				commandWebsocket.onclose = function(){
+					// maybe iPad went into sleep mode?
+					// we need this websocket working, so init it again
+					initCommandWebsocket();
+				};
+				// when the server pushes new commands
+				commandWebsocket.onmessage = function(e){
+					// read JSON object
+					var command = JSON.parse(e.data);
+					if (command.message) {
+						alert(command.message);
+					}
+					if (command.redirectURL) {
+						window.location.href = command.redirectURL;
+					}
+				};
+			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -203,19 +225,7 @@
 								});
 							}
 
-							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
-							// when the server pushes new commands
-							commandWebsocket.onmessage = function(e){
-								// read JSON object
-								var command = JSON.parse(e.data);
-								if (command.message) {
-									alert(command.message);
-								}
-								if (command.redirectURL) {
-									window.location.href = command.redirectURL;
-								}
-							};
+							initCommandWebsocket();
 						}
 					});
 				}
@@ -339,7 +349,3 @@
 		</div>
 	</c:otherwise>
 </c:choose>
-
-
-
-
diff --git a/lams_tool_bbb/web/WEB-INF/tags/Page.tag b/lams_tool_bbb/web/WEB-INF/tags/Page.tag
@@ -146,6 +146,28 @@
 				}
 				$('#sidebar').show();
 			}
+
+			function initCommandWebsocket(){
+				// it is not an obvious place to init the websocket, but we need lesson ID
+				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+
+				commandWebsocket.onclose = function(){
+					// maybe iPad went into sleep mode?
+					// we need this websocket working, so init it again
+					initCommandWebsocket();
+				};
+				// when the server pushes new commands
+				commandWebsocket.onmessage = function(e){
+					// read JSON object
+					var command = JSON.parse(e.data);
+					if (command.message) {
+						alert(command.message);
+					}
+					if (command.redirectURL) {
+						window.location.href = command.redirectURL;
+					}
+				};
+			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -203,19 +225,7 @@
 								});
 							}
 
-							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
-							// when the server pushes new commands
-							commandWebsocket.onmessage = function(e){
-								// read JSON object
-								var command = JSON.parse(e.data);
-								if (command.message) {
-									alert(command.message);
-								}
-								if (command.redirectURL) {
-									window.location.href = command.redirectURL;
-								}
-							};
+							initCommandWebsocket();
 						}
 					});
 				}
@@ -339,7 +349,3 @@
 		</div>
 	</c:otherwise>
 </c:choose>
-
-
-
-
diff --git a/lams_tool_chat/web/WEB-INF/tags/Page.tag b/lams_tool_chat/web/WEB-INF/tags/Page.tag
@@ -205,6 +205,12 @@
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
 							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+
+							commandWebsocket.onclose = function(){
+								// maybe iPad went into sleep mode?
+								// we need this websocket working, so reload
+								location.reload();
+							};
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object

diff --git a/lams_tool_chat/web/includes/javascript/learning.js b/lams_tool_chat/web/includes/javascript/learning.js
@@ -23,9 +23,12 @@ $(document).ready(function() {
 	var selectedUser = null,
 		// init the connection with server using server URL but with different protocol
 		chatToolWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'learningWebsocket?toolSessionID=' + TOOL_SESSION_ID);
+
+	chatToolWebsocket.onclose = function(){
+		location.reload();
+	};
 
 	chatToolWebsocket.onmessage = function(e){
-
 		// create JSON object
 		var input = JSON.parse(e.data);
 		// clear old messages

diff --git a/lams_tool_daco/web/WEB-INF/tags/Page.tag b/lams_tool_daco/web/WEB-INF/tags/Page.tag
@@ -205,6 +205,12 @@
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
 							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+
+							commandWebsocket.onclose = function(){
+								// maybe iPad went into sleep mode?
+								// we need this websocket working, so reload
+								location.reload();
+							};
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object

diff --git a/lams_tool_forum/web/WEB-INF/tags/Page.tag b/lams_tool_forum/web/WEB-INF/tags/Page.tag
@@ -146,6 +146,28 @@
 				}
 				$('#sidebar').show();
 			}
+
+			function initCommandWebsocket(){
+				// it is not an obvious place to init the websocket, but we need lesson ID
+				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+
+				commandWebsocket.onclose = function(){
+					// maybe iPad went into sleep mode?
+					// we need this websocket working, so init it again
+					initCommandWebsocket();
+				};
+				// when the server pushes new commands
+				commandWebsocket.onmessage = function(e){
+					// read JSON object
+					var command = JSON.parse(e.data);
+					if (command.message) {
+						alert(command.message);
+					}
+					if (command.redirectURL) {
+						window.location.href = command.redirectURL;
+					}
+				};
+			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -203,19 +225,7 @@
 								});
 							}
 
-							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
-							// when the server pushes new commands
-							commandWebsocket.onmessage = function(e){
-								// read JSON object
-								var command = JSON.parse(e.data);
-								if (command.message) {
-									alert(command.message);
-								}
-								if (command.redirectURL) {
-									window.location.href = command.redirectURL;
-								}
-							};
+							initCommandWebsocket();
 						}
 					});
 				}
@@ -339,7 +349,3 @@
 		</div>
 	</c:otherwise>
 </c:choose>
-
-
-
-