Index: lams_tool_lamc/web/monitoring/Edit.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/Edit.jsp,v
diff -u -r1.12.2.3 -r1.12.2.4
--- lams_tool_lamc/web/monitoring/Edit.jsp	7 Apr 2017 14:25:40 -0000	1.12.2.3
+++ lams_tool_lamc/web/monitoring/Edit.jsp	19 May 2017 23:54:36 -0000	1.12.2.4
@@ -1,43 +1,20 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
-<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 
-<html:hidden property="questionIndex"/>
 <table class="table table-condensed">
 	<tr>
 		<td width="10%" ><fmt:message key="label.authoring.title.col"></fmt:message></td>
-		<td><c:out value="${mcGeneralAuthoringDTO.activityTitle}" escapeXml="false"/></td>
+		<td><c:out value="${mcGeneralMonitoringDTO.activityTitle}" escapeXml="false"/></td>
 	</tr>		
 
 	<tr>
 		<td width="10%" ><fmt:message key="label.authoring.instructions.col"></fmt:message></td>
-		<td><c:out value="${mcGeneralAuthoringDTO.activityInstructions}" escapeXml="false"/></td>
+		<td><c:out value="${mcGeneralMonitoringDTO.activityInstructions}" escapeXml="false"/></td>
 	</tr>
-
-	<c:set var="queIndex" scope="request" value="0"/>
-		
-	<c:forEach items="${listQuestionContentDTO}" var="currentDTO" varStatus="status">
-		<c:set var="queIndex" scope="request" value="${queIndex +1}"/>
-		<c:set var="question" scope="request" value="${currentDTO.question}"/>
-		<c:set var="feedback" scope="request" value="${currentDTO.feedback}"/>
-		<c:set var="displayOrder" scope="request" value="${currentDTO.displayOrder}"/>	
-		
-		<tr>
-			<td width="10%">
-				<fmt:message key="label.question" />:
-		</td>
-		
-		<td>
-			<c:out value="${question}" escapeXml="false"/> 
-			</td>		
-		</tr>
-	</c:forEach>
-		
 </table>
 
 <c:url  var="authoringUrl" value="/authoringStarter.do">
-	<c:param name="toolContentID" value="${formBean.toolContentID}" />
-	<c:param name="contentFolderID" value="${formBean.contentFolderID}" />
+	<c:param name="toolContentID" value="${mcGeneralMonitoringDTO.toolContentID}" />
+	<c:param name="contentFolderID" value="${contentFolderID}" />
 	<c:param name="mode" value="teacher" />
 </c:url>
 <html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default pull-right">