Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties
===================================================================
diff -u -rb7c4250adc416462793208c4393c5befc2dc69c7 -r861c3ee9fb6adda0f075e93533a2640c3041e9f9
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties	(.../QaResources.properties)	(revision b7c4250adc416462793208c4393c5befc2dc69c7)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties	(.../QaResources.properties)	(revision 861c3ee9fb6adda0f075e93533a2640c3041e9f9)
@@ -69,7 +69,8 @@
 button.deleteLesson						=Delete Lesson
 button.contributeLesson					=Contribute -> Report
 button.forceComplete					=Force Complete
-error.synchInMonitor					=The report is available only after all the students finish their activities <br> Some of the students has not completed the activity yet. <b> Those students may be forced to complete.
+error.synchInMonitor					=The report is available only after all the students finish their activities. <br> 
+										 Some of the students has not completed the activity yet.  However, those students may be forced to complete.
 error.monitorReportTitle				=The field "Monitor Report Title (Advanced)" is mandatory. <br>
 error.noStudentActivity					=Sorry, the report can not be generated. <br> No student has attempted the activity yet.
 error.contentAndToolSession.notCompatible	=Tool Activity Error! Can't continue. The content id and tool session(s) passed to the tool activity are not compatible with each other. <br> The Tool Activity expects that each of the passed tool sessions refer to the same passed content id.
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java
===================================================================
diff -u -rdbc459a54a0eb6961b4c331f3174cc1fa4661f02 -r861c3ee9fb6adda0f075e93533a2640c3041e9f9
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java	(.../QaMonitoringAction.java)	(revision dbc459a54a0eb6961b4c331f3174cc1fa4661f02)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java	(.../QaMonitoringAction.java)	(revision 861c3ee9fb6adda0f075e93533a2640c3041e9f9)
@@ -269,6 +269,14 @@
 		}
 		logger.debug(logger + " " + this.getClass().getName() +  "SELECTION_CASE: " + SELECTION_CASE);
 		
+		boolean useSelectedToolSessionId=false;
+		String selectedToolSessionId = (String) request.getSession().getAttribute(CURRENT_MONITORED_TOOL_SESSION);
+		if ((selectedToolSessionId != null) && (SELECTION_CASE == 3) && (READABLE_TOOL_SESSION_COUNT.intValue()  == 2))
+		{
+			useSelectedToolSessionId=true;
+		}
+		
+		
 		if ((qaMonitoringForm.getEditReport() == null) && (qaMonitoringForm.getUpdateReport() == null))
 		{
 			logger.debug(logger + " " + this.getClass().getName() +  "no editReport or updateReport selected");
@@ -323,7 +331,17 @@
 		for (int toolSessionIdCounter=1; toolSessionIdCounter < READABLE_TOOL_SESSION_COUNT.intValue(); toolSessionIdCounter++)
 		{
 			logger.debug(logger + " " + this.getClass().getName() +  "toolSessionIdCounter: " + toolSessionIdCounter);
-			String strToolSessionId=(String) originalSessionList.get(""+toolSessionIdCounter);
+			String strToolSessionId="";
+			if (useSelectedToolSessionId)
+			{
+				strToolSessionId=(String) request.getSession().getAttribute(CURRENT_MONITORED_TOOL_SESSION);
+				logger.debug(logger + " " + this.getClass().getName() +  "using strToolSessionId: " +strToolSessionId);
+			}
+			else
+			{
+				strToolSessionId=(String) originalSessionList.get(""+toolSessionIdCounter);
+				logger.debug(logger + " " + this.getClass().getName() +  "using strToolSessionId from the session: ");
+			}
 			logger.debug(logger + " " + this.getClass().getName() +  "original strToolSessionId: " + strToolSessionId);
 					    
 		    String strRetrievableToolSessionId="";