Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml =================================================================== diff -u -r92a8f83706fa45c3ee72fb07aae85ad3107bb28e -re9eb408b02e578697e41a0ef7c9b2ea402a50c2a --- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml (.../QaUsrResp.hbm.xml) (revision 92a8f83706fa45c3ee72fb07aae85ad3107bb28e) +++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml (.../QaUsrResp.hbm.xml) (revision e9eb408b02e578697e41a0ef7c9b2ea402a50c2a) @@ -40,6 +40,14 @@ length="10" > + + - + @@ -436,7 +436,7 @@ - + @@ -510,6 +510,19 @@ + + + + + + + + + + + + + Index: lams_tool_laqa/db/sql/create_lams_tool_qa.sql =================================================================== diff -u -rcf6570739202d43754f67c8db2dd159176a33637 -re9eb408b02e578697e41a0ef7c9b2ea402a50c2a --- lams_tool_laqa/db/sql/create_lams_tool_qa.sql (.../create_lams_tool_qa.sql) (revision cf6570739202d43754f67c8db2dd159176a33637) +++ lams_tool_laqa/db/sql/create_lams_tool_qa.sql (.../create_lams_tool_qa.sql) (revision e9eb408b02e578697e41a0ef7c9b2ea402a50c2a) @@ -66,6 +66,7 @@ , attempt_time DATETIME , que_usr_id BIGINT(20) NOT NULL , qa_que_content_id BIGINT(20) NOT NULL + , visible TINYINT(1) NOT NULL DEFAULT 1 , PRIMARY KEY (response_id) , INDEX (que_usr_id) , CONSTRAINT FK_tl_laqa11_usr_resp_3 FOREIGN KEY (que_usr_id) @@ -87,7 +88,6 @@ REFERENCES tl_laqa11_content (uid) )TYPE=InnoDB; - -- data for content table INSERT INTO tl_laqa11_content (qa_content_id, creation_date) VALUES (${default_content_id}, NOW()); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaMonitoredUserDTO.java =================================================================== diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -re9eb408b02e578697e41a0ef7c9b2ea402a50c2a --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaMonitoredUserDTO.java (.../QaMonitoredUserDTO.java) (revision 65166da92a6f0f4ff73acb92b95672e237b25742) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaMonitoredUserDTO.java (.../QaMonitoredUserDTO.java) (revision e9eb408b02e578697e41a0ef7c9b2ea402a50c2a) @@ -52,6 +52,8 @@ private String sessionId; private String questionUid; + + private String visible; private Map usersAttempts; @@ -191,4 +193,16 @@ public void setQuestionUid(String questionUid) { this.questionUid = questionUid; } + /** + * @return Returns the visible. + */ + public String getVisible() { + return visible; + } + /** + * @param visible The visible to set. + */ + public void setVisible(String visible) { + this.visible = visible; + } } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.java =================================================================== diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -re9eb408b02e578697e41a0ef7c9b2ea402a50c2a --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.java (.../QaUsrResp.java) (revision 65166da92a6f0f4ff73acb92b95672e237b25742) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.java (.../QaUsrResp.java) (revision e9eb408b02e578697e41a0ef7c9b2ea402a50c2a) @@ -60,6 +60,8 @@ /** nullable persistent field */ private QaQueContent qaQueContent; + private boolean visible; + /** nullable persistent field */ private Long qaQueContentId; //added to enable deletion by the resp dao @@ -105,7 +107,25 @@ this.qaQueUser = qaQueUser; } + public QaUsrResp(String answer, + boolean hidden, + Date attemptTime, + String timezone, + QaQueContent qaQueContent, + QaQueUsr qaQueUser, + boolean visible) { + this.answer = answer; + this.hidden = hidden; + this.attemptTime = attemptTime; + this.timezone = timezone; + this.qaQueContent = qaQueContent; + this.qaQueUser = qaQueUser; + this.visible=visible; +} + + + public QaUsrResp(String answer, boolean hidden, Date attemptTime, String timezone, @@ -374,4 +394,18 @@ public void setTimezone(String timezone) { this.timezone = timezone; } + + /** + * @return Returns the visible. + */ + public boolean isVisible() { + return visible; + } + /** + * @param visible The visible to set. + */ + public void setVisible(boolean visible) { + this.visible = visible; + } + } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaUsrRespDAO.java =================================================================== diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -re9eb408b02e578697e41a0ef7c9b2ea402a50c2a --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaUsrRespDAO.java (.../IQaUsrRespDAO.java) (revision 65166da92a6f0f4ff73acb92b95672e237b25742) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaUsrRespDAO.java (.../IQaUsrRespDAO.java) (revision e9eb408b02e578697e41a0ef7c9b2ea402a50c2a) @@ -35,6 +35,8 @@ public interface IQaUsrRespDAO { public void saveUserResponse(QaUsrResp resp); + + public QaUsrResp getAttemptByUID(Long uid); public void updateUserResponse(QaUsrResp resp); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java =================================================================== diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -re9eb408b02e578697e41a0ef7c9b2ea402a50c2a --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java (.../QaUsrRespDAO.java) (revision 65166da92a6f0f4ff73acb92b95672e237b25742) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java (.../QaUsrRespDAO.java) (revision e9eb408b02e578697e41a0ef7c9b2ea402a50c2a) @@ -58,7 +58,24 @@ return (QaUsrResp) this.getHibernateTemplate().get(QaUsrResp.class, new Long(responseId)); } + public QaUsrResp getAttemptByUID(Long uid) + { + String query = "from QaUsrResp attempt where attempt.responseId=?"; + + HibernateTemplate templ = this.getHibernateTemplate(); + List list = getSession().createQuery(query) + .setLong(0,uid.longValue()) + .list(); + + if(list != null && list.size() > 0){ + QaUsrResp attempt = (QaUsrResp) list.get(0); + return attempt; + } + return null; + } + + /** * @see org.lamsfoundation.lams.tool.qa.dao.interfaces.IQaUsrRespDAO#saveUserResponse(com.lamsinternational.tool.qa.domain.QaUsrResp) */ Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java =================================================================== diff -u -r4de20585ea721b818c59bdfd2e7aa5550d9cf8d5 -re9eb408b02e578697e41a0ef7c9b2ea402a50c2a --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java (.../IQaService.java) (revision 4de20585ea721b818c59bdfd2e7aa5550d9cf8d5) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java (.../IQaService.java) (revision e9eb408b02e578697e41a0ef7c9b2ea402a50c2a) @@ -94,6 +94,8 @@ public void createQaUsrResp(QaUsrResp qaUsrResp) throws QaApplicationException; + public void updateUserResponse(QaUsrResp resp) throws QaApplicationException; + public QaUsrResp retrieveQaUsrResp(long responseId) throws QaApplicationException; public void updateQaUsrResp(QaUsrResp qaUsrResp) throws QaApplicationException; @@ -143,6 +145,12 @@ public void createQa(QaContent qa) throws QaApplicationException; + public QaUsrResp getAttemptByUID(Long uid) throws QaApplicationException; + + public void hideResponse(QaUsrResp qaUsrResp) throws QaApplicationException; + + public void showResponse(QaUsrResp qaUsrResp) throws QaApplicationException; + public void deleteQa(QaContent qa) throws QaApplicationException; public void deleteQaSession(QaSession QaSession) throws QaApplicationException; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java =================================================================== diff -u -r4de20585ea721b818c59bdfd2e7aa5550d9cf8d5 -re9eb408b02e578697e41a0ef7c9b2ea402a50c2a --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision 4de20585ea721b818c59bdfd2e7aa5550d9cf8d5) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision e9eb408b02e578697e41a0ef7c9b2ea402a50c2a) @@ -422,6 +422,34 @@ e); } } + + public QaUsrResp getAttemptByUID(Long uid) throws QaApplicationException + { + try + { + return qaUsrRespDAO.getAttemptByUID(uid); + } + catch (DataAccessException e) + { + throw new QaApplicationException("Exception occured when lams is getting response by uid: " + + e.getMessage(), + e); + } + } + + public void updateUserResponse(QaUsrResp resp) throws QaApplicationException + { + try + { + qaUsrRespDAO.updateUserResponse(resp); + } + catch (DataAccessException e) + { + throw new QaApplicationException("Exception occured when lams is updating response" + + e.getMessage(), + e); + } + } public List getUserBySessionOnly(final QaSession qaSession) throws QaApplicationException @@ -678,7 +706,29 @@ } } + + /** + * logs hiding of a user entered vote + */ + public void hideResponse(QaUsrResp qaUsrResp) throws QaApplicationException + { + logger.debug("hiding user entry: " + qaUsrResp.getAnswer()); + auditService.logHideEntry(MY_SIGNATURE, qaUsrResp.getQueUsrId(), + qaUsrResp.getQaQueUser().getUsername(), qaUsrResp.getAnswer()); + } + + /** + * logs showing of a user entered vote + */ + public void showResponse(QaUsrResp qaUsrResp) throws QaApplicationException + { + logger.debug("showing user entry: " + qaUsrResp.getAnswer()); + auditService.logShowEntry(MY_SIGNATURE, qaUsrResp.getQueUsrId(), + qaUsrResp.getQaQueUser().getUsername(), qaUsrResp.getAnswer()); + } + + public void deleteUsrRespByQueId(Long qaQueId) throws QaApplicationException { try Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java =================================================================== diff -u -r51ea581c3f05c4fac45ad4e415001da68a9ef216 -re9eb408b02e578697e41a0ef7c9b2ea402a50c2a --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java (.../LearningUtil.java) (revision 51ea581c3f05c4fac45ad4e415001da68a9ef216) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java (.../LearningUtil.java) (revision e9eb408b02e578697e41a0ef7c9b2ea402a50c2a) @@ -164,7 +164,8 @@ new Date(System.currentTimeMillis()), timezoneId, qaQueContent, - qaQueUsr); + qaQueUsr, + true); logger.debug("iterationg qaUsrResp: " + qaUsrResp); if (qaUsrResp != null) Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java =================================================================== diff -u -r737c08da4756eb0d49aa07e331468eb94f7113c1 -re9eb408b02e578697e41a0ef7c9b2ea402a50c2a --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision 737c08da4756eb0d49aa07e331468eb94f7113c1) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision e9eb408b02e578697e41a0ef7c9b2ea402a50c2a) @@ -385,6 +385,7 @@ qaMonitoredUserDTO.setSessionId(sessionId.toString()); qaMonitoredUserDTO.setResponse(qaUsrResp.getAnswer()); qaMonitoredUserDTO.setQuestionUid(questionUid); + qaMonitoredUserDTO.setVisible(new Boolean(qaUsrResp.isVisible()).toString()); listMonitoredUserContainerDTO.add(qaMonitoredUserDTO); } } @@ -428,6 +429,7 @@ qaMonitoredUserDTO.setSessionId(sessionId.toString()); qaMonitoredUserDTO.setResponse(qaUsrResp.getAnswer()); qaMonitoredUserDTO.setQuestionUid(questionUid); + qaMonitoredUserDTO.setVisible(new Boolean(qaUsrResp.isVisible()).toString()); listMonitoredUserContainerDTO.add(qaMonitoredUserDTO); } } @@ -482,6 +484,7 @@ qaMonitoredUserDTO.setSessionId(sessionId.toString()); qaMonitoredUserDTO.setResponse(qaUsrResp.getAnswer()); qaMonitoredUserDTO.setQuestionUid(questionUid); + qaMonitoredUserDTO.setVisible(new Boolean(qaUsrResp.isVisible()).toString()); listMonitoredUserContainerDTO.add(qaMonitoredUserDTO); } } @@ -524,6 +527,7 @@ qaMonitoredUserDTO.setSessionId(sessionId.toString()); qaMonitoredUserDTO.setResponse(qaUsrResp.getAnswer()); qaMonitoredUserDTO.setQuestionUid(questionUid); + qaMonitoredUserDTO.setVisible(new Boolean(qaUsrResp.isVisible()).toString()); listMonitoredUserContainerDTO.add(qaMonitoredUserDTO); } } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java =================================================================== diff -u -r51ea581c3f05c4fac45ad4e415001da68a9ef216 -re9eb408b02e578697e41a0ef7c9b2ea402a50c2a --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java (.../QaLearningAction.java) (revision 51ea581c3f05c4fac45ad4e415001da68a9ef216) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java (.../QaLearningAction.java) (revision e9eb408b02e578697e41a0ef7c9b2ea402a50c2a) @@ -181,12 +181,6 @@ logger.debug("populating mapAnswers..."); mapAnswers=populateAnswersMap(mapping, form, request, response); logger.debug("mapAnswers: " + mapAnswers); - /* - logger.debug("totalQuestionCount is > 1: " + qaLearningForm.getAnswer()); - int mapSize=mapAnswers.size(); - logger.debug("mapSize: " + mapSize); - mapAnswers.put(new Long(mapSize).toString() , qaLearningForm.getAnswer()); - */ } } @@ -264,12 +258,6 @@ Long toolContentID=(Long) request.getSession().getAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID); logger.debug("toolContentID: " + toolContentID); - /*the report should have all the users' entries OR - * the report should have only the current session's entries*/ - //logger.debug("generating summary data: "); - //qaMonitoringAction.refreshSummaryData(request, qaContent, qaService, isUserNamesVisible, true, toolSessionId.toString(), userID); - - QaMonitoringAction qaMonitoringAction= new QaMonitoringAction(); qaMonitoringAction.refreshSummaryData(request, qaContent, qaService, isUserNamesVisible, true, toolSessionId.toString(), null); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java =================================================================== diff -u -r420cd2eee22087752d6f49705ee504176380dd41 -re9eb408b02e578697e41a0ef7c9b2ea402a50c2a --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java (.../QaMonitoringAction.java) (revision 420cd2eee22087752d6f49705ee504176380dd41) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java (.../QaMonitoringAction.java) (revision e9eb408b02e578697e41a0ef7c9b2ea402a50c2a) @@ -895,6 +895,133 @@ } + public ActionForward showResponse(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) throws IOException, + ServletException, ToolException + { + logger.debug("dispatching showResponse..."); + IQaService qaService=null; + qaService = (IQaService)request.getSession().getAttribute(TOOL_SERVICE); + + if (qaService == null) + { + logger.debug("will retrieve qaService"); + qaService = QaServiceProxy.getQaService(getServlet().getServletContext()); + } + logger.debug("qaService: " + qaService); + + QaMonitoringForm voteMonitoringForm = (QaMonitoringForm) form; + + String currentUid=voteMonitoringForm.getCurrentUid(); + logger.debug("currentUid: " + currentUid); + QaUsrResp qaUsrResp =qaService.getAttemptByUID(new Long(currentUid)); + logger.debug("qaUsrResp: " + qaUsrResp); + qaUsrResp.setVisible(true); + qaService.updateUserResponse(qaUsrResp); + qaService.showResponse(qaUsrResp); + logger.debug("qaUsrResp: " + qaUsrResp); + + Long toolContentId =(Long) request.getSession().getAttribute(TOOL_CONTENT_ID); + logger.debug("toolContentId: " + toolContentId); + + QaContent qaContent=qaService.loadQa(toolContentId.longValue()); + logger.debug("existing qaContent:" + qaContent); + + + String currentMonitoredToolSession=voteMonitoringForm.getSelectedToolSessionId(); + logger.debug("currentMonitoredToolSession: " + currentMonitoredToolSession); + + if (currentMonitoredToolSession.equals("")) + { + currentMonitoredToolSession="All"; + } + + refreshSummaryData(request, qaContent, qaService, true, false, null, null); + + + if (currentMonitoredToolSession.equals("All")) + { + request.getSession().setAttribute(SELECTION_CASE, new Long(2)); + } + else + { + request.getSession().setAttribute(SELECTION_CASE, new Long(1)); + } + logger.debug("SELECTION_CASE: " + request.getSession().getAttribute(SELECTION_CASE)); + + request.getSession().setAttribute(CURRENT_MONITORED_TOOL_SESSION, currentMonitoredToolSession); + logger.debug("CURRENT_MONITORED_TOOL_SESSION: " + request.getSession().getAttribute(CURRENT_MONITORED_TOOL_SESSION)); + + logger.debug("submitting session to refresh the data from the database: "); + return (mapping.findForward(LOAD_MONITORING)); + } + + + public ActionForward hideResponse(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) throws IOException, + ServletException, ToolException + { + logger.debug("dispatching hideResponse..."); + IQaService qaService=null; + qaService = (IQaService)request.getSession().getAttribute(TOOL_SERVICE); + + if (qaService == null) + { + logger.debug("will retrieve qaService"); + qaService = QaServiceProxy.getQaService(getServlet().getServletContext()); + } + logger.debug("qaService: " + qaService); + + QaMonitoringForm voteMonitoringForm = (QaMonitoringForm) form; + + String currentUid=voteMonitoringForm.getCurrentUid(); + logger.debug("currentUid: " + currentUid); + QaUsrResp qaUsrResp =qaService.getAttemptByUID(new Long(currentUid)); + logger.debug("qaUsrResp: " + qaUsrResp); + qaUsrResp.setVisible(false); + qaService.updateUserResponse(qaUsrResp); + qaService.hideResponse(qaUsrResp); + logger.debug("qaUsrResp: " + qaUsrResp); + + Long toolContentId =(Long) request.getSession().getAttribute(TOOL_CONTENT_ID); + logger.debug("toolContentId: " + toolContentId); + + QaContent qaContent=qaService.loadQa(toolContentId.longValue()); + logger.debug("existing qaContent:" + qaContent); + + + String currentMonitoredToolSession=voteMonitoringForm.getSelectedToolSessionId(); + logger.debug("currentMonitoredToolSession: " + currentMonitoredToolSession); + if (currentMonitoredToolSession.equals("")) + { + currentMonitoredToolSession="All"; + } + + refreshSummaryData(request, qaContent, qaService, true, false, null, null); + + + if (currentMonitoredToolSession.equals("All")) + { + request.getSession().setAttribute(SELECTION_CASE, new Long(2)); + } + else + { + request.getSession().setAttribute(SELECTION_CASE, new Long(1)); + } + logger.debug("SELECTION_CASE: " + request.getSession().getAttribute(SELECTION_CASE)); + + request.getSession().setAttribute(CURRENT_MONITORED_TOOL_SESSION, currentMonitoredToolSession); + logger.debug("CURRENT_MONITORED_TOOL_SESSION: " + request.getSession().getAttribute(CURRENT_MONITORED_TOOL_SESSION)); + + logger.debug("submitting session to refresh the data from the database: "); + return (mapping.findForward(LOAD_MONITORING)); + } + + /** * populates data for instructions screen * @param request Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringForm.java =================================================================== diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -re9eb408b02e578697e41a0ef7c9b2ea402a50c2a --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringForm.java (.../QaMonitoringForm.java) (revision 65166da92a6f0f4ff73acb92b95672e237b25742) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringForm.java (.../QaMonitoringForm.java) (revision e9eb408b02e578697e41a0ef7c9b2ea402a50c2a) @@ -36,6 +36,46 @@ protected String selectedToolSessionId; protected String isToolSessionChanged; + protected String hideResponse; + protected String showResponse; + protected String currentUid; + + /** + * @return Returns the currentUid. + */ + public String getCurrentUid() { + return currentUid; + } + /** + * @param currentUid The currentUid to set. + */ + public void setCurrentUid(String currentUid) { + this.currentUid = currentUid; + } + /** + * @return Returns the hideResponse. + */ + public String getHideResponse() { + return hideResponse; + } + /** + * @param hideResponse The hideResponse to set. + */ + public void setHideResponse(String hideResponse) { + this.hideResponse = hideResponse; + } + /** + * @return Returns the showResponse. + */ + public String getShowResponse() { + return showResponse; + } + /** + * @param showResponse The showResponse to set. + */ + public void setShowResponse(String showResponse) { + this.showResponse = showResponse; + } /** * @return Returns the isToolSessionChanged. */ Index: lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp =================================================================== diff -u -raf3906ba75d798954fca027bea336bb842d8b976 -re9eb408b02e578697e41a0ef7c9b2ea402a50c2a --- lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp (.../MonitoringMaincontent.jsp) (revision af3906ba75d798954fca027bea336bb842d8b976) +++ lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp (.../MonitoringMaincontent.jsp) (revision e9eb408b02e578697e41a0ef7c9b2ea402a50c2a) @@ -94,7 +94,14 @@ submitMonitoringMethod(actionMethod); } + function submitResponse(currentUid, actionMethod) + { + document.QaMonitoringForm.currentUid.value=currentUid; + submitMethod(actionMethod); + } + + var imgRoot="${lams}images/"; var themeName="aqua"; @@ -142,6 +149,7 @@ + Index: lams_tool_laqa/web/monitoring/UserResponses.jsp =================================================================== diff -u -rcc57114dde638ab1b37c0ac5556c1a2822e79bf3 -re9eb408b02e578697e41a0ef7c9b2ea402a50c2a --- lams_tool_laqa/web/monitoring/UserResponses.jsp (.../UserResponses.jsp) (revision cc57114dde638ab1b37c0ac5556c1a2822e79bf3) +++ lams_tool_laqa/web/monitoring/UserResponses.jsp (.../UserResponses.jsp) (revision e9eb408b02e578697e41a0ef7c9b2ea402a50c2a) @@ -35,34 +35,96 @@ - + - + - + - + - + - +
+ + + + + images/edit.gif" align=left onclick="javascript:submitEditResponse('','editResponse');"> images/delete.gif" align=left onclick="javascript:submitEditResponse('','deleteResponse');"> + + + + + + + + + + + + + + + + + images/tick.gif" align=left onclick="javascript:submitEditResponse('','updateResponse');"> images/delete.gif" align=left onclick="javascript:submitEditResponse('','deleteResponse');"> + + + + + + + + + + + + + + + + images/edit.gif" align=left onclick="javascript:submitEditResponse('','editResponse');"> images/delete.gif" align=left onclick="javascript:submitEditResponse('','deleteResponse');"> + + + + + + + + + + + +