Index: lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/VoteUsrAttempt.hbm.xml =================================================================== diff -u -r83ebb6f565f6d5ce638160e37fc6793c074c6356 -rbeea90636c10488ed392e5b6e6030b46c727ca66 --- lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/VoteUsrAttempt.hbm.xml (.../VoteUsrAttempt.hbm.xml) (revision 83ebb6f565f6d5ce638160e37fc6793c074c6356) +++ lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/VoteUsrAttempt.hbm.xml (.../VoteUsrAttempt.hbm.xml) (revision beea90636c10488ed392e5b6e6030b46c727ca66) @@ -75,6 +75,13 @@ length="1" /> + - + @@ -174,6 +174,19 @@ + + + + + + + + + + + + + Index: lams_tool_vote/db/sql/create_lams_tool_vote.sql =================================================================== diff -u -r83ebb6f565f6d5ce638160e37fc6793c074c6356 -rbeea90636c10488ed392e5b6e6030b46c727ca66 --- lams_tool_vote/db/sql/create_lams_tool_vote.sql (.../create_lams_tool_vote.sql) (revision 83ebb6f565f6d5ce638160e37fc6793c074c6356) +++ lams_tool_vote/db/sql/create_lams_tool_vote.sql (.../create_lams_tool_vote.sql) (revision beea90636c10488ed392e5b6e6030b46c727ca66) @@ -65,6 +65,7 @@ , time_zone VARCHAR(255) , userEntry VARCHAR(255) , singleUserEntry TINYINT(1) NOT NULL DEFAULT 0 + , visible TINYINT(1) NOT NULL DEFAULT 1 , PRIMARY KEY (uid) , INDEX (que_usr_id) , CONSTRAINT FK_tl_lavote11_usr_attempt_2 FOREIGN KEY (que_usr_id) Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteMonitoredAnswersDTO.java =================================================================== diff -u -re8bdd364f7372b39f60efbd8cdbb114e7955e9a2 -rbeea90636c10488ed392e5b6e6030b46c727ca66 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteMonitoredAnswersDTO.java (.../VoteMonitoredAnswersDTO.java) (revision e8bdd364f7372b39f60efbd8cdbb114e7955e9a2) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteMonitoredAnswersDTO.java (.../VoteMonitoredAnswersDTO.java) (revision beea90636c10488ed392e5b6e6030b46c727ca66) @@ -40,6 +40,8 @@ private String question; + private String attemptUid; + private List candidateAnswers; private Map questionAttempts; @@ -111,4 +113,16 @@ return (int) (new Long(questionUid).longValue() - new Long(voteMonitoredAnswersDTO.questionUid).longValue()); } + /** + * @return Returns the attemptUid. + */ + public String getAttemptUid() { + return attemptUid; + } + /** + * @param attemptUid The attemptUid to set. + */ + public void setAttemptUid(String attemptUid) { + this.attemptUid = attemptUid; + } } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteMonitoredUserDTO.java =================================================================== diff -u -r261d9a36d11a99322125fa55faaddffc16a041b3 -rbeea90636c10488ed392e5b6e6030b46c727ca66 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteMonitoredUserDTO.java (.../VoteMonitoredUserDTO.java) (revision 261d9a36d11a99322125fa55faaddffc16a041b3) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteMonitoredUserDTO.java (.../VoteMonitoredUserDTO.java) (revision beea90636c10488ed392e5b6e6030b46c727ca66) @@ -50,6 +50,8 @@ private String userEntry; + private String visible; + private String sessionId; private String questionUid; @@ -204,4 +206,16 @@ public void setUserEntry(String userEntry) { this.userEntry = userEntry; } + /** + * @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_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUsrAttemptDAO.java =================================================================== diff -u -ra178ed11c7cc66dbfbff48645b8c6cc33eb2dbf8 -rbeea90636c10488ed392e5b6e6030b46c727ca66 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUsrAttemptDAO.java (.../IVoteUsrAttemptDAO.java) (revision a178ed11c7cc66dbfbff48645b8c6cc33eb2dbf8) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUsrAttemptDAO.java (.../IVoteUsrAttemptDAO.java) (revision beea90636c10488ed392e5b6e6030b46c727ca66) @@ -53,6 +53,8 @@ public Set getSessionUserEntries(final Long voteSessionUid); + public VoteUsrAttempt getAttemptByUID(Long uid); + public int getCompletedSessionEntriesCount(final Long voteSessionUid); public int getSessionEntriesCount(final Long voteSessionId); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java =================================================================== diff -u -rc8f1ea88d18b9b6b1ee0002d299ac9bfb1431d84 -rbeea90636c10488ed392e5b6e6030b46c727ca66 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java (.../VoteUsrAttemptDAO.java) (revision c8f1ea88d18b9b6b1ee0002d299ac9bfb1431d84) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java (.../VoteUsrAttemptDAO.java) (revision beea90636c10488ed392e5b6e6030b46c727ca66) @@ -73,6 +73,25 @@ return (VoteUsrAttempt) this.getHibernateTemplate() .get(VoteUsrAttempt.class, uid); } + + + public VoteUsrAttempt getAttemptByUID(Long uid) + { + String query = "from VoteUsrAttempt attempt where attempt.uid=?"; + + HibernateTemplate templ = this.getHibernateTemplate(); + List list = getSession().createQuery(query) + .setLong(0,uid.longValue()) + .list(); + + if(list != null && list.size() > 0){ + VoteUsrAttempt attempt = (VoteUsrAttempt) list.get(0); + return attempt; + } + return null; + } + + public void saveVoteUsrAttempt(VoteUsrAttempt voteUsrAttempt) { @@ -479,6 +498,7 @@ public void updateVoteUsrAttempt(VoteUsrAttempt voteUsrAttempt) { + this.getSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().update(voteUsrAttempt); } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteUsrAttempt.java =================================================================== diff -u -r83ebb6f565f6d5ce638160e37fc6793c074c6356 -rbeea90636c10488ed392e5b6e6030b46c727ca66 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteUsrAttempt.java (.../VoteUsrAttempt.java) (revision 83ebb6f565f6d5ce638160e37fc6793c074c6356) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteUsrAttempt.java (.../VoteUsrAttempt.java) (revision beea90636c10488ed392e5b6e6030b46c727ca66) @@ -54,6 +54,8 @@ private Long queUsrId; + private boolean visible; + private boolean singleUserEntry; private Long voteQueContentId; @@ -103,6 +105,15 @@ this.singleUserEntry=singleUserEntry; } + public VoteUsrAttempt(Date attemptTime, String timeZone, org.lamsfoundation.lams.tool.vote.pojos.VoteQueContent voteQueContent, + org.lamsfoundation.lams.tool.vote.pojos.VoteQueUsr voteQueUsr, String userEntry, boolean singleUserEntry, boolean visible) { + this.attemptTime = attemptTime; + this.timeZone = timeZone; + this.voteQueContent = voteQueContent; + this.voteQueUsr = voteQueUsr; + this.userEntry=userEntry; + this.visible=visible; + } public VoteUsrAttempt(String userEntry, Date attemptTime, String timeZone, org.lamsfoundation.lams.tool.vote.pojos.VoteQueContent voteQueContent, org.lamsfoundation.lams.tool.vote.pojos.VoteQueUsr voteQueUsr) { @@ -242,4 +253,17 @@ this.singleUserEntry = singleUserEntry; } + /** + * @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_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java =================================================================== diff -u -r99dfa3c71ae1855a7146b540358c474c6d88316d -rbeea90636c10488ed392e5b6e6030b46c727ca66 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java (.../IVoteService.java) (revision 99dfa3c71ae1855a7146b540358c474c6d88316d) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java (.../IVoteService.java) (revision beea90636c10488ed392e5b6e6030b46c727ca66) @@ -57,6 +57,8 @@ public VoteContent retrieveVote(Long toolContentId) throws VoteApplicationException; + public VoteUsrAttempt getAttemptByUID(Long uid) throws VoteApplicationException; + public void createVoteQue(VoteQueContent voteQueContent) throws VoteApplicationException; public void createVoteSession(VoteSession voteSession) throws VoteApplicationException; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java =================================================================== diff -u -r9b9b31de09cd2c5a5594ae149ca63b209cd602c3 -rbeea90636c10488ed392e5b6e6030b46c727ca66 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java (.../VoteServicePOJO.java) (revision 9b9b31de09cd2c5a5594ae149ca63b209cd602c3) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java (.../VoteServicePOJO.java) (revision beea90636c10488ed392e5b6e6030b46c727ca66) @@ -545,7 +545,21 @@ } + public VoteUsrAttempt getAttemptByUID(Long uid) throws VoteApplicationException + { + try + { + return voteUsrAttemptDAO.getAttemptByUID(uid); + } + catch (DataAccessException e) + { + throw new VoteApplicationException("Exception occured when lams is getting attemptby uid: " + + e.getMessage(), + e); + } + } + public int getUserRecordsEntryCount(final String userEntry) throws VoteApplicationException { try Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/LearningUtil.java =================================================================== diff -u -r2be43d0e5d701ff9c00b32c85e0d35f3367d52cb -rbeea90636c10488ed392e5b6e6030b46c727ca66 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/LearningUtil.java (.../LearningUtil.java) (revision 2be43d0e5d701ff9c00b32c85e0d35f3367d52cb) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/LearningUtil.java (.../LearningUtil.java) (revision beea90636c10488ed392e5b6e6030b46c727ca66) @@ -192,7 +192,7 @@ else { logger.debug("create new attempt"); - VoteUsrAttempt voteUsrAttempt=new VoteUsrAttempt(attempTime, timeZone, voteQueContent, voteQueUsr, userEntry, singleUserEntry); + VoteUsrAttempt voteUsrAttempt=new VoteUsrAttempt(attempTime, timeZone, voteQueContent, voteQueUsr, userEntry, singleUserEntry, true); logger.debug("voteUsrAttempt: " + voteUsrAttempt); voteService.createVoteUsrAttempt(voteUsrAttempt); logger.debug("created voteUsrAttempt in the db :" + voteUsrAttempt); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java =================================================================== diff -u -r9b9b31de09cd2c5a5594ae149ca63b209cd602c3 -rbeea90636c10488ed392e5b6e6030b46c727ca66 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java (.../VoteMonitoringAction.java) (revision 9b9b31de09cd2c5a5594ae149ca63b209cd602c3) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java (.../VoteMonitoringAction.java) (revision beea90636c10488ed392e5b6e6030b46c727ca66) @@ -304,6 +304,8 @@ voteMonitoredUserDTO.setUserName(voteUsrAttempt.getVoteQueUsr().getUsername()); voteMonitoredUserDTO.setQueUsrId(voteUsrAttempt.getVoteQueUsr().getUid().toString()); voteMonitoredUserDTO.setUserEntry(voteUsrAttempt.getUserEntry()); + voteMonitoredUserDTO.setUid(voteUsrAttempt.getUid().toString()); + voteMonitoredUserDTO.setVisible(new Boolean(voteUsrAttempt.isVisible()).toString()); listMonitoredUserContainerDTO.add(voteMonitoredUserDTO); } } @@ -330,7 +332,9 @@ voteMonitoredUserDTO.setUserName(voteUsrAttempt.getVoteQueUsr().getUsername()); voteMonitoredUserDTO.setQueUsrId(voteUsrAttempt.getVoteQueUsr().getUid().toString()); voteMonitoredUserDTO.setUserEntry(voteUsrAttempt.getUserEntry()); - listMonitoredUserContainerDTO.add(voteMonitoredUserDTO); + listMonitoredUserContainerDTO.add(voteMonitoredUserDTO); + voteMonitoredUserDTO.setUid(voteUsrAttempt.getUid().toString()); + voteMonitoredUserDTO.setVisible(new Boolean(voteUsrAttempt.isVisible()).toString()); } } } @@ -350,6 +354,8 @@ voteMonitoredUserDTO.setQueUsrId(voteUsrAttempt.getVoteQueUsr().getUid().toString()); voteMonitoredUserDTO.setUserEntry(voteUsrAttempt.getUserEntry()); listMonitoredUserContainerDTO.add(voteMonitoredUserDTO); + voteMonitoredUserDTO.setUid(voteUsrAttempt.getUid().toString()); + voteMonitoredUserDTO.setVisible(new Boolean(voteUsrAttempt.isVisible()).toString()); } } } @@ -791,7 +797,30 @@ voteMonitoringForm.setShowOpenVotesSection(new Boolean(true).toString()); logger.debug("showOpen votes set to true: "); + + Long toolContentId =(Long) request.getSession().getAttribute(TOOL_CONTENT_ID); + logger.debug("toolContentId: " + toolContentId); + + VoteContent voteContent=voteService.retrieveVote(toolContentId); + logger.debug("existing voteContent:" + voteContent); + String currentMonitoredToolSession=voteMonitoringForm.getSelectedToolSessionId(); + logger.debug("currentMonitoredToolSession: " + currentMonitoredToolSession); + + refreshSummaryData(request, voteContent, voteService, true, false, currentMonitoredToolSession, null, true); + + 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)); return (mapping.findForward(LOAD_MONITORING)); } @@ -822,8 +851,116 @@ return (mapping.findForward(LOAD_MONITORING)); } + + + public ActionForward hideOpenVote(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) throws IOException, + ServletException, ToolException + { + logger.debug("dispatching hideOpenVote..."); + IVoteService voteService=null; + voteService = (IVoteService)request.getSession().getAttribute(TOOL_SERVICE); + + if (voteService == null) + { + logger.debug("will retrieve voteService"); + voteService = VoteServiceProxy.getVoteService(getServlet().getServletContext()); + } + logger.debug("voteService: " + voteService); + + VoteMonitoringForm voteMonitoringForm = (VoteMonitoringForm) form; + String currentUid=voteMonitoringForm.getCurrentUid(); + logger.debug("currentUid: " + currentUid); + VoteUsrAttempt voteUsrAttempt =voteService.getAttemptByUID(new Long(currentUid)); + logger.debug("voteUsrAttempt: " + voteUsrAttempt); + voteUsrAttempt.setVisible(false); + voteService.updateVoteUsrAttempt(voteUsrAttempt); + + Long toolContentId =(Long) request.getSession().getAttribute(TOOL_CONTENT_ID); + logger.debug("toolContentId: " + toolContentId); + + VoteContent voteContent=voteService.retrieveVote(toolContentId); + logger.debug("existing voteContent:" + voteContent); + + String currentMonitoredToolSession=voteMonitoringForm.getSelectedToolSessionId(); + logger.debug("currentMonitoredToolSession: " + currentMonitoredToolSession); + + refreshSummaryData(request, voteContent, voteService, true, false, currentMonitoredToolSession, null, true); + + 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)); + + return (mapping.findForward(LOAD_MONITORING)); + } + + public ActionForward showOpenVote(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) throws IOException, + ServletException, ToolException + { + logger.debug("dispatching showOpenVote..."); + IVoteService voteService=null; + voteService = (IVoteService)request.getSession().getAttribute(TOOL_SERVICE); + + if (voteService == null) + { + logger.debug("will retrieve voteService"); + voteService = VoteServiceProxy.getVoteService(getServlet().getServletContext()); + } + logger.debug("voteService: " + voteService); + + VoteMonitoringForm voteMonitoringForm = (VoteMonitoringForm) form; + + String currentUid=voteMonitoringForm.getCurrentUid(); + logger.debug("currentUid: " + currentUid); + VoteUsrAttempt voteUsrAttempt =voteService.getAttemptByUID(new Long(currentUid)); + logger.debug("voteUsrAttempt: " + voteUsrAttempt); + voteUsrAttempt.setVisible(true); + voteService.updateVoteUsrAttempt(voteUsrAttempt); + + Long toolContentId =(Long) request.getSession().getAttribute(TOOL_CONTENT_ID); + logger.debug("toolContentId: " + toolContentId); + + VoteContent voteContent=voteService.retrieveVote(toolContentId); + logger.debug("existing voteContent:" + voteContent); + + String currentMonitoredToolSession=voteMonitoringForm.getSelectedToolSessionId(); + logger.debug("currentMonitoredToolSession: " + currentMonitoredToolSession); + + refreshSummaryData(request, voteContent, voteService, true, false, currentMonitoredToolSession, null, true); + + 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)); + + + return (mapping.findForward(LOAD_MONITORING)); + } + + /** * persists error messages to request scope * @param request Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringForm.java =================================================================== diff -u -r9b9b31de09cd2c5a5594ae149ca63b209cd602c3 -rbeea90636c10488ed392e5b6e6030b46c727ca66 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringForm.java (.../VoteMonitoringForm.java) (revision 9b9b31de09cd2c5a5594ae149ca63b209cd602c3) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringForm.java (.../VoteMonitoringForm.java) (revision beea90636c10488ed392e5b6e6030b46c727ca66) @@ -48,9 +48,39 @@ protected String closeOpenVotes; + protected String hideOpenVote; + protected String showOpenVote; + 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 hideOpenVote. + */ + public String getHideOpenVote() { + return hideOpenVote; + } + /** + * @param hideOpenVote The hideOpenVote to set. + */ + public void setHideOpenVote(String hideOpenVote) { + this.hideOpenVote = hideOpenVote; + } + /** * @return Returns the closeOpenVotes. */ public String getCloseOpenVotes() { @@ -148,4 +178,16 @@ public void setShowOpenVotesSection(String showOpenVotesSection) { this.showOpenVotesSection = showOpenVotesSection; } + /** + * @return Returns the showOpenVote. + */ + public String getShowOpenVote() { + return showOpenVote; + } + /** + * @param showOpenVote The showOpenVote to set. + */ + public void setShowOpenVote(String showOpenVote) { + this.showOpenVote = showOpenVote; + } } Index: lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp =================================================================== diff -u -r55e015221d64f87ca024dd967925bd763dceafd0 -rbeea90636c10488ed392e5b6e6030b46c727ca66 --- lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp (.../MonitoringMaincontent.jsp) (revision 55e015221d64f87ca024dd967925bd763dceafd0) +++ lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp (.../MonitoringMaincontent.jsp) (revision beea90636c10488ed392e5b6e6030b46c727ca66) @@ -105,7 +105,12 @@ submitMethod(actionMethod); } - + function submitOpenVote(currentUid, actionMethod) + { + document.VoteMonitoringForm.currentUid.value=currentUid; + submitMethod(actionMethod); + } + var imgRoot="${lams}images/"; var themeName="aqua"; Index: lams_tool_vote/web/monitoring/SummaryContent.jsp =================================================================== diff -u -rae0e9a2e04c5504dc1b5ebe86ea036cf40e74926 -rbeea90636c10488ed392e5b6e6030b46c727ca66 --- lams_tool_vote/web/monitoring/SummaryContent.jsp (.../SummaryContent.jsp) (revision ae0e9a2e04c5504dc1b5ebe86ea036cf40e74926) +++ lams_tool_vote/web/monitoring/SummaryContent.jsp (.../SummaryContent.jsp) (revision beea90636c10488ed392e5b6e6030b46c727ca66) @@ -32,6 +32,7 @@ + @@ -163,53 +164,83 @@ -
+ + + + + + @@ -220,3 +251,4 @@ +
  
  
- +
- + + + -
: -
- - - + + + + + + - - - + + + + + +
                                            
                                       + + + + + + + + + + + + + +
+