Index: lams_gradebook/web/gradebookMonitor.jsp
===================================================================
diff -u -ra83b0eec89979dce7415b02afdda324b14018dbb -ra6b6c417f3176619bd4c5605e1f3d485bd5634d5
--- lams_gradebook/web/gradebookMonitor.jsp	(.../gradebookMonitor.jsp)	(revision a83b0eec89979dce7415b02afdda324b14018dbb)
+++ lams_gradebook/web/gradebookMonitor.jsp	(.../gradebookMonitor.jsp)	(revision a6b6c417f3176619bd4c5605e1f3d485bd5634d5)
@@ -26,6 +26,7 @@
 	
 		var marksReleased = ${marksReleased};
 		var graphLoaded = false;
+		var lessonDatesHidden = true;
 
 		function toggleMarkChart() {
 			// the two methods showMarkChart and hideMarkChart are used in the Monitoring tour
@@ -99,37 +100,28 @@
 		}
 		
 		// Show/hide the dates for the start and end of the lesson. 
-		function toggleLessonDates(){
-		    var colModel = jQuery("#userView").jqGrid('getGridParam', 'colModel'), 
-		    	i, 
-		    	l = colModel.length,
-		    	hidden = false;
-		    
-	        for (i = 0; ! hidden && i < l; i++) {
-	            var colItem = colModel[i];
-	            var cmName = colItem.name;
-	            if (cmName == 'startDate' || cmName == 'finishDate') {
-	            	hidden = colItem.hidden;
-	            }
-	        }
-	            
-            if ( hidden ) {
-				jQuery("#userView").jqGrid('showCol','startDate');
-				jQuery("#userView").jqGrid('showCol','finishDate');
-				document.getElementById("datesShown").style.display="inline";
-				document.getElementById("datesNotShown").style.display="none";
+		function toggleLessonDates() {
+			lessonDatesHidden = !lessonDatesHidden;
+			processLessonDateFields( lessonDatesHidden ) 
+		}
+		
+		function processLessonDateFields( hide ) {
 
-            } else { 
+            if ( hide ) {
 				jQuery("#userView").jqGrid('hideCol','startDate');
 				jQuery("#userView").jqGrid('hideCol','finishDate');
 				document.getElementById("datesShown").style.display="none";
 				document.getElementById("datesNotShown").style.display="inline";
+            } else { 
+				jQuery("#userView").jqGrid('showCol','startDate');
+				jQuery("#userView").jqGrid('showCol','finishDate');
+				document.getElementById("datesShown").style.display="inline";
+				document.getElementById("datesNotShown").style.display="none";
             }
 
             resizeJqgrid(jQuery("#userView"));
+ 		}
 
-		}
-
         function resizeJqgrid(jqgrids) {
             jqgrids.each(function(index) {
                 var gridId = $(this).attr('id');
@@ -301,7 +293,7 @@
 					gridComplete: function(){
 						toolTip($(".jqgrow"));  // Allow tooltips for this grid	
 						// Load dates shown but hide straight away as all columns needed initially so that subgrid is displayed properly LDEV-4289
-						toggleLessonDates();  
+						processLessonDateFields( lessonDatesHidden );
 					}
 				}).navGrid("#userViewPager", {edit:false,add:false,del:false,search:false}); // applying refresh button