Index: lams_tool_laqa/web/monitoring/SummaryContent.jsp
===================================================================
diff -u -r57157cef4ee9b4d70e92be83584eb8d10bcea83c -r0e25eab07d7153c61f50deb6332abc0d4ed3ec69
--- lams_tool_laqa/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision 57157cef4ee9b4d70e92be83584eb8d10bcea83c)
+++ lams_tool_laqa/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision 0e25eab07d7153c61f50deb6332abc0d4ed3ec69)
@@ -23,7 +23,7 @@
 
 	<html:hidden property="responseId"/>	 
 	
-		<c:if test="${(userExceptionNoToolSessions == 'true')}"> 	
+		<c:if test="${(qaGeneralMonitoringDTO.userExceptionNoToolSessions == 'true')}"> 	
 				<table class="forms">
 					<tr> 
 						<td NOWRAP valign=top align=center> 
@@ -33,7 +33,7 @@
 				</table>
 		</c:if>			
 					
-		<c:if test="${(userExceptionNoToolSessions != 'true') }"> 	
+		<c:if test="${(qaGeneralMonitoringDTO.userExceptionNoToolSessions != 'true') }"> 	
 			<html:hidden property="selectedToolSessionId"/>							
 			<input type="hidden" name="isToolSessionChanged"/>
 				<table class="forms">
@@ -42,14 +42,14 @@
 						<tr> 
 							<td NOWRAP  valign=top align=center> <b> <bean:message key="label.selectGroup"/> </b>
 									<select name="monitoredToolSessionId" onchange="javascript:submitSession(this.value,'submitSession');">
-									<c:forEach var="toolSessionName" items="${sessionScope.summaryToolSessions}">
-										<c:forEach var="toolSessionId" items="${sessionScope.summaryToolSessionsId}">
+									<c:forEach var="toolSessionName" items="${requestScope.summaryToolSessions}">
+										<c:forEach var="toolSessionId" items="${requestScope.summaryToolSessionsId}">
 											<c:out value="${toolSessionName.key}"/> -<c:out value="${toolSessionId.value}"/>
 										
 												<c:if test="${toolSessionName.key == toolSessionId.key}"> 			
 											
 													<c:set var="SELECTED_SESSION" scope="request" value=""/>
-													<c:if test="${sessionScope.selectionCase == 2}"> 			
+													<c:if test="${requestScope.selectionCase == 2}"> 			
 														<c:set var="currentMonitoredToolSession" scope="request" value="All"/>
 													</c:if>						
 													
@@ -97,15 +97,105 @@
 								  	 		<c:set var="responseUid" scope="request" value="${userData.uid}"/>
 
 	  	 									<c:if test="${currentQuestionId == userData.questionUid}"> 			
-		  	 									<c:if test="${currentMonitoredToolSession == 'All'}"> 			
-															<jsp:include page="/monitoring/UserResponses.jsp" />
-												</c:if>														  					 									  			
+												<tr> 
+													<c:if test="${qaGeneralMonitoringDTO.editResponse != 'true'}">	  	 									 			
+														 <td NOWRAP valign=top>   <c:out value="${userData.userName}"/>   </td>  
+														 <td NOWRAP valign=top>   <c:out value="${userData.attemptTime}"/> </td>
+														 <td NOWRAP valign=top>   <c:out value="${userData.response}"/> 
+											
+														<c:if test="${userData.visible != 'true' }"> 			
+											                         <i><bean:message key="label.response.hidden"/> </i> 
+														</c:if> 								
+														 </td>
 												
-		  	 									<c:if test="${currentMonitoredToolSession != 'All'}"> 			
-		  	 										<c:if test="${currentMonitoredToolSession == userData.sessionId}"> 			
-															<jsp:include page="/monitoring/UserResponses.jsp" />										
+														
+															 <td NOWRAP valign=top> <img src="<c:out value="${tool}"/>images/edit.gif" align=left onclick="javascript:submitEditResponse('<c:out value="${userData.uid}"/>','editResponse');">	</td>	  	 
+															 <td NOWRAP valign=top> 				 
+															<c:if test="${userData.visible == 'true' }"> 			
+											                            <html:submit property="hideResponse" 
+											                                         styleClass="linkbutton" 
+											                                         onclick="submitResponse(${responseUid}, 'hideResponse');">						                                             
+											                                <bean:message key="label.hide"/>
+											                            </html:submit>
+															</c:if> 													
+											
+															<c:if test="${userData.visible != 'true' }"> 			
+											                            <html:submit property="showResponse" 
+											                                         styleClass="linkbutton" 
+											                                         onclick="submitResponse(${responseUid}, 'showResponse');">						                                             
+											                                <bean:message key="label.show"/>
+											                            </html:submit>
+															</c:if> 						
+														 	</td>	  	 
+													</c:if>
+													
+													<c:if test="${qaGeneralMonitoringDTO.editResponse == 'true'}">	  	
+														<c:if test="${editableResponseId == responseUid}">	  	 									 			
+															 <td NOWRAP valign=top>  <c:out value="${userData.userName}"/>   </td>  
+															 <td NOWRAP valign=top>  <c:out value="${userData.attemptTime}"/>  </td>
+															 <td NOWRAP valign=top>  <input type="text" name="updatedResponse" value='<c:out value="${userData.response}"/>'> 
+											
+															<c:if test="${userData.visible != 'true' }"> 			
+												                         <i><bean:message key="label.response.hidden"/> </i> 
+															</c:if> 								
+															 </td>
+													
+												
+																 <td NOWRAP valign=top> <img src="<c:out value="${tool}"/>images/tick.gif" align=left onclick="javascript:submitEditResponse('<c:out value="${userData.uid}"/>','updateResponse');">	</td>	  	 
+																 <td NOWRAP valign=top> 
+																	<c:if test="${userData.visible == 'true' }"> 			
+													                            <html:submit property="hideResponse" 
+													                                         styleClass="linkbutton" 
+													                                         onclick="submitResponse(${responseUid}, 'hideResponse');">						                                             
+													                                <bean:message key="label.hide"/>
+													                            </html:submit>
+																	</c:if> 													
+													
+																	<c:if test="${userData.visible != 'true' }"> 			
+													                            <html:submit property="showResponse" 
+													                                         styleClass="linkbutton" 
+													                                         onclick="submitResponse(${responseUid}, 'showResponse');">						                                             
+													                                <bean:message key="label.show"/>
+													                            </html:submit>
+																	</c:if> 						
+															 	</td>	  	 
+															</c:if>
+													
+													<c:if test="${editableResponseId != responseUid}">	  	 									 			
+															 <td NOWRAP valign=top>   <c:out value="${userData.userName}"/>   </td>  
+															 <td NOWRAP valign=top>   <c:out value="${userData.attemptTime}"/>  </td>
+															 <td NOWRAP valign=top>   <c:out value="${userData.response}"/> 
+																<c:if test="${userData.visible != 'true' }"> 			
+													                         <i><bean:message key="label.response.hidden"/> </i> 
+																</c:if> 								
+															 </td>
+													
+													
+																 <td NOWRAP valign=top> <img src="<c:out value="${tool}"/>images/edit.gif" align=left onclick="javascript:submitEditResponse('<c:out value="${userData.uid}"/>','editResponse');">	</td>	  	 
+																 <td NOWRAP valign=top> 
+																	<c:if test="${userData.visible == 'true' }"> 			
+													                            <html:submit property="hideResponse" 
+													                                         styleClass="linkbutton" 
+													                                         onclick="submitResponse(${responseUid}, 'hideResponse');">						                                             
+													                                <bean:message key="label.hide"/>
+													                            </html:submit>
+																	</c:if> 													
+													
+																	<c:if test="${userData.visible != 'true' }"> 			
+													                            <html:submit property="showResponse" 
+													                                         styleClass="linkbutton" 
+													                                         onclick="submitResponse(${responseUid}, 'showResponse');">						                                             
+													                                <bean:message key="label.show"/>
+													                            </html:submit>
+																	</c:if> 						
+																 	</td>	  	 
+														</c:if>														  					 									  													  			
 													</c:if>														  					 									  													  			
-												</c:if>														  					 									  													  			
+												</tr>		
+
+
+
+
 											</c:if>														  					 
 	 									</c:forEach>		  	
 									</c:forEach>