Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java =================================================================== diff -u -r9393c098e5dfd603e2d37347cd1e531a25aa424a -r4b57e04114818b323e27712d02c38e3f04cfd357 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java (.../McUtils.java) (revision 9393c098e5dfd603e2d37347cd1e531a25aa424a) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java (.../McUtils.java) (revision 4b57e04114818b323e27712d02c38e3f04cfd357) @@ -125,7 +125,7 @@ return (DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG).format(date)); } - public static void persistTimeZone(HttpServletRequest request) + public static void saveTimeZone(HttpServletRequest request) { TimeZone timeZone=TimeZone.getDefault(); logger.debug("current timezone: " + timeZone.getDisplayName()); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java =================================================================== diff -u -rf5f65dc49c173cb6bef72ba8281762814c12b315 -r4b57e04114818b323e27712d02c38e3f04cfd357 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java (.../IMcUserDAO.java) (revision f5f65dc49c173cb6bef72ba8281762814c12b315) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java (.../IMcUserDAO.java) (revision 4b57e04114818b323e27712d02c38e3f04cfd357) @@ -93,5 +93,7 @@ public int getTotalNumberOfUsers(McContent mcContent); public int getTotalNumberOfUsers(); + + public int countUserComplete(McContent mcContent); } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java =================================================================== diff -u -r1d705f95c7d374192c678e101772e93f0442dae9 -r4b57e04114818b323e27712d02c38e3f04cfd357 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java (.../McSessionDAO.java) (revision 1d705f95c7d374192c678e101772e93f0442dae9) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java (.../McSessionDAO.java) (revision 4b57e04114818b323e27712d02c38e3f04cfd357) @@ -49,7 +49,7 @@ private static final String GET_SESSIONS_FROM_CONTENT = "select ms.mcSessionId from McSession ms where ms.mcContent=:mcContent"; - private static final String COUNT_SESSION_COMPLETE = "from mcSession in class McSession where mcSession.sessionStatus='COMPLETE'"; + private static final String COUNT_SESSION_COMPLETE = "from mcSession in class McSession where mcSession.sessionStatus='COMPLETED'"; private static final String COUNT_SESSION_INCOMPLETE = "from mcSession in class McSession where mcSession.sessionStatus='INCOMPLETE'"; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java =================================================================== diff -u -r1d705f95c7d374192c678e101772e93f0442dae9 -r4b57e04114818b323e27712d02c38e3f04cfd357 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java (.../McUserDAO.java) (revision 1d705f95c7d374192c678e101772e93f0442dae9) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java (.../McUserDAO.java) (revision 4b57e04114818b323e27712d02c38e3f04cfd357) @@ -22,6 +22,7 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.mc.dao.hibernate; +import java.util.Iterator; import java.util.List; import org.hibernate.FlushMode; @@ -158,22 +159,67 @@ List list = getSession().createQuery(strGetUser) .list(); logger.debug("strGetUser: " + strGetUser); + logger.debug("list: " + list); + int totalUserCount=0; if(list != null && list.size() > 0){ - McQueUsr usr = (McQueUsr) list.get(0); - logger.debug("usr: " + usr); - logger.debug("local usr content uid versus incoming content uid: " + - usr.getMcSession().getMcContent().getUid().intValue() + " versus " + mcContent.getUid().intValue()); - - if (usr.getMcSession().getMcContent().getUid().intValue() == mcContent.getUid().intValue()) - { - logger.debug("increasing user count"); - ++totalUserCount; - } + Iterator listIterator=list.iterator(); + while (listIterator.hasNext()) + { + McQueUsr usr=(McQueUsr)listIterator.next(); + logger.debug("usr: " + usr); + logger.debug("local usr content uid versus incoming content uid: " + + usr.getMcSession().getMcContent().getUid().intValue() + " versus " + mcContent.getUid().intValue()); + + if (usr.getMcSession().getMcContent().getUid().intValue() == mcContent.getUid().intValue()) + { + logger.debug("increasing user count"); + ++totalUserCount; + } + } } + logger.debug("final totalUserCount: " + totalUserCount); return totalUserCount; } + + public int countUserComplete(McContent mcContent) + { + logger.debug("starting countUserComplete: " + mcContent); + String strGetUser = "from mcQueUsr in class McQueUsr"; + HibernateTemplate templ = this.getHibernateTemplate(); + List list = getSession().createQuery(strGetUser) + .list(); + logger.debug("strGetUser: " + strGetUser); + logger.debug("list: " + list); + + + int totalUserCount=0; + if(list != null && list.size() > 0){ + Iterator listIterator=list.iterator(); + while (listIterator.hasNext()) + { + McQueUsr usr=(McQueUsr)listIterator.next(); + logger.debug("usr: " + usr); + logger.debug("local usr content uid versus incoming content uid: " + + usr.getMcSession().getMcContent().getUid().intValue() + " versus " + mcContent.getUid().intValue()); + + if (usr.getMcSession().getMcContent().getUid().intValue() == mcContent.getUid().intValue()) + { + if (usr.getMcSession().getSessionStatus().equals("COMPLETED")) + { + logger.debug("this user's session is COMPLETED, increasing user count"); + ++totalUserCount; + } + + } + } + } + + logger.debug("final totalUserCount: " + totalUserCount); + return totalUserCount; + } + } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java =================================================================== diff -u -r54049b70be0d86d212cf2cee1e27bca3b97ea59f -r4b57e04114818b323e27712d02c38e3f04cfd357 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java (.../IMcService.java) (revision 54049b70be0d86d212cf2cee1e27bca3b97ea59f) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java (.../IMcService.java) (revision 4b57e04114818b323e27712d02c38e3f04cfd357) @@ -143,6 +143,8 @@ public void deleteMcQueUsr(McQueUsr mcQueUsr) throws McApplicationException; + public int countUserComplete(McContent mcContent) throws McApplicationException; + public List findMcOptionsContentByQueId(Long mcQueContentId) throws McApplicationException; public void saveMcOptionsContent(McOptsContent mcOptsContent) throws McApplicationException; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java =================================================================== diff -u -r54049b70be0d86d212cf2cee1e27bca3b97ea59f -r4b57e04114818b323e27712d02c38e3f04cfd357 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision 54049b70be0d86d212cf2cee1e27bca3b97ea59f) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision 4b57e04114818b323e27712d02c38e3f04cfd357) @@ -1202,7 +1202,23 @@ } } + + public int countUserComplete(McContent mcContent) throws McApplicationException + { + try + { + return mcUserDAO.countUserComplete(mcContent); + } + catch (DataAccessException e) + { + throw new McApplicationException("Exception occured when lams is retrieving completed user count: " + + e.getMessage(), + e); + } + } + + public int getTotalNumberOfUsers(McContent mcContent) throws McApplicationException { try Index: lams_tool_lamc/web/monitoring/Summary.jsp =================================================================== diff -u -re3cad6678d4dae4c9d8636b31c53c0bb61f43fcc -r4b57e04114818b323e27712d02c38e3f04cfd357 --- lams_tool_lamc/web/monitoring/Summary.jsp (.../Summary.jsp) (revision e3cad6678d4dae4c9d8636b31c53c0bb61f43fcc) +++ lams_tool_lamc/web/monitoring/Summary.jsp (.../Summary.jsp) (revision 4b57e04114818b323e27712d02c38e3f04cfd357) @@ -78,15 +78,6 @@ - - - - - - - - - Index: lams_tool_lamc/web/monitoring/SummaryIndividualSession.jsp =================================================================== diff -u -re3cad6678d4dae4c9d8636b31c53c0bb61f43fcc -r4b57e04114818b323e27712d02c38e3f04cfd357 --- lams_tool_lamc/web/monitoring/SummaryIndividualSession.jsp (.../SummaryIndividualSession.jsp) (revision e3cad6678d4dae4c9d8636b31c53c0bb61f43fcc) +++ lams_tool_lamc/web/monitoring/SummaryIndividualSession.jsp (.../SummaryIndividualSession.jsp) (revision 4b57e04114818b323e27712d02c38e3f04cfd357) @@ -32,7 +32,7 @@ -
+ :