Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java,v
diff -u -r1.33 -r1.34
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java 2 Mar 2006 19:12:24 -0000 1.33
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java 2 Mar 2006 21:20:05 -0000 1.34
@@ -204,6 +204,7 @@
public static final String MONITORING_ERROR ="monitoringError";
public static final String MAP_MONITORING_QUESTIONS ="mapMonitoringQuestions";
public static final String SUMMARY_TOOL_SESSIONS ="summaryToolSessions";
+ public static final String SUMMARY_TOOL_SESSIONS_ID ="summaryToolSessionsId";
public static final String CURRENT_MONITORED_TOOL_SESSION ="currentMonitoredToolSession";
public static final String CHOICE_MONITORING ="choiceMonitoring";
public static final String CHOICE_TYPE_MONITORING_SUMMARY ="choiceTypeMonitoringSummary";
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaResources.properties,v
diff -u -r1.19 -r1.20
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties 2 Mar 2006 19:12:24 -0000 1.19
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties 2 Mar 2006 21:20:05 -0000 1.20
@@ -144,6 +144,11 @@
error.contentrepository =An error has occurred when saving/deleting instruction file {0}. The files may not be saved correctly.
monitoring.feedback.instructionUpdate =The content has been updated successfully.
+label.user =User
+label.question.col =Question:
+label.attemptTime =Attempt Date/Time
+label.timezone =Time-Zone
+label.response =Response
label.selectGroup =Select Group:
group.label =Group
button.summary =Summary
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaSessionDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaSessionDAO.java,v
diff -u -r1.7 -r1.8
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaSessionDAO.java 2 Mar 2006 15:04:15 -0000 1.7
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaSessionDAO.java 2 Mar 2006 21:20:05 -0000 1.8
@@ -53,6 +53,10 @@
public void deleteQaSession(QaSession session);
public List getSessionsFromContent(QaContent qaContent);
+
+ public String getSessionNameById(long qaSessionId);
+
+ public List getSessionNamesFromContent(QaContent qaContent);
}
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaSessionDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaSessionDAO.java,v
diff -u -r1.10 -r1.11
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaSessionDAO.java 2 Mar 2006 15:04:13 -0000 1.10
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaSessionDAO.java 2 Mar 2006 21:20:05 -0000 1.11
@@ -44,9 +44,10 @@
private static final String GET_SESSION_IDS_FOR_CONTENT = "select qaSession.qaSessionId from QaSession qaSession where qaSession.qaContentId = :qa";
private static final String COUNT_SESSION_COMPLETE = "from qaSession in class QaSession where qaSession.session_status='COMPLETE'";
private static final String COUNT_SESSION_INCOMPLETE = "from qaSession in class QaSession where qaSession.session_status='INCOMPLETE'";
- private static final String GET_SESSIONS_FROM_CONTENT = "select qas.qaSessionId from QaSession qas where qas.qaContent=:qaContent";
+ private static final String GET_SESSIONS_FROM_CONTENT = "select qas.qaSessionId from QaSession qas where qas.qaContent=:qaContent order by qas.qaSessionId";
+ private static final String GET_SESSIONNAMES_FROM_CONTENT = "select qas.session_name from QaSession qas where qas.qaContent=:qaContent order by qas.qaSessionId";
- public int countSessionComplete()
+ public int countSessionComplete()
{
HibernateTemplate templ = this.getHibernateTemplate();
List list = getSession().createQuery(COUNT_SESSION_COMPLETE)
@@ -107,6 +108,22 @@
}
+ public String getSessionNameById(long qaSessionId)
+ {
+ String query = "from QaSession as qus where qus.qaSessionId = ?";
+ HibernateTemplate templ = this.getHibernateTemplate();
+ List list = getSession().createQuery(query)
+ .setLong(0,qaSessionId)
+ .list();
+
+ if(list != null && list.size() > 0){
+ QaSession qus = (QaSession) list.get(0);
+ return qus.getSession_name() ;
+ }
+ return null;
+ }
+
+
public QaSession getQaSessionOrNullById(long qaSessionId)
{
return getQaSessionById(qaSessionId);
@@ -145,4 +162,14 @@
"qaContent",
qaContent));
}
+
+ public List getSessionNamesFromContent(QaContent qaContent)
+ {
+ return (getHibernateTemplate().findByNamedParam(GET_SESSIONNAMES_FROM_CONTENT,
+ "qaContent",
+ qaContent));
+ }
+
+
+
}
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java,v
diff -u -r1.26 -r1.27
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java 2 Mar 2006 19:12:48 -0000 1.26
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java 2 Mar 2006 21:20:05 -0000 1.27
@@ -100,6 +100,10 @@
public void createQaSession(QaSession qaSession);
+ public List getSessionNamesFromContent(QaContent qaContent);
+
+ public String getSessionNameById(long qaSessionId);
+
public void removeToolSession(Long toolSessionId) throws DataMissingException, ToolException;
public List getSessionsFromContent(QaContent qaContent);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java,v
diff -u -r1.35 -r1.36
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 2 Mar 2006 19:12:48 -0000 1.35
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 2 Mar 2006 21:20:05 -0000 1.36
@@ -233,6 +233,36 @@
}
}
+
+ public List getSessionNamesFromContent(QaContent qaContent)
+ {
+ try
+ {
+ return qaSessionDAO.getSessionNamesFromContent(qaContent);
+ }
+ catch (DataAccessException e)
+ {
+ throw new QaApplicationException("Exception occured when lams is getting session names from content: "
+ + e.getMessage(),
+ e);
+ }
+ }
+
+
+ public String getSessionNameById(long qaSessionId)
+ {
+ try
+ {
+ return qaSessionDAO.getSessionNameById(qaSessionId);
+ }
+ catch (DataAccessException e)
+ {
+ throw new QaApplicationException("Exception occured when lams is getting session name: "
+ + e.getMessage(),
+ e);
+ }
+ }
+
public List getSessionsFromContent(QaContent qaContent) throws QaApplicationException
{
try
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/Attic/MonitoringUtil.java,v
diff -u -r1.14 -r1.15
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java 2 Mar 2006 19:12:24 -0000 1.14
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java 2 Mar 2006 21:20:05 -0000 1.15
@@ -166,6 +166,38 @@
*/
public static Map populateToolSessions(HttpServletRequest request, QaContent qaContent, IQaService qaService)
{
+ List sessionsList=qaService.getSessionNamesFromContent(qaContent);
+ logger.debug("sessionsList size is:..." + sessionsList.size());
+
+ Map sessionsMap=QaUtils.convertToStringMap(sessionsList, "String");
+ logger.debug("generated sessionsMap:..." + sessionsMap);
+ logger.debug("sessionsMap size:..." + sessionsMap.size());
+
+ if (sessionsMap.isEmpty())
+ {
+ logger.debug("sessionsMap size is 0:");
+ sessionsMap.put(new Long(1).toString() , "None");
+ }
+ else
+ {
+ logger.debug("sessionsMap has some entries: " + sessionsMap.size());
+ sessionsMap.put(new Long(sessionsMap.size()+ 1).toString() , "All");
+ }
+
+ logger.debug("final sessionsMap:" + sessionsMap);
+ return sessionsMap;
+ }
+
+ /**
+ * populates all the tool sessions in a map
+ * populateToolSessions(HttpServletRequest request, McContent mcContent)
+ *
+ * @param request
+ * @param mcContent
+ * @return Map
+ */
+ public static Map populateToolSessionsId(HttpServletRequest request, QaContent qaContent, IQaService qaService)
+ {
List sessionsList=qaService.getSessionsFromContent(qaContent);
logger.debug("sessionsList size is:..." + sessionsList.size());
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java,v
diff -u -r1.17 -r1.18
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java 2 Mar 2006 19:12:24 -0000 1.17
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java 2 Mar 2006 21:20:05 -0000 1.18
@@ -107,10 +107,14 @@
}
request.getSession().setAttribute(SUMMARY_TOOL_SESSIONS, summaryToolSessions);
- logger.debug("SUMMARY_TOOL_SESSIONS: " + request.getSession().getAttribute(SUMMARY_TOOL_SESSIONS));
+
+ Map summaryToolSessionsId=MonitoringUtil.populateToolSessionsId(request, qaContent, qaService);
+ logger.debug("summaryToolSessionsId: " + summaryToolSessionsId);
+ request.getSession().setAttribute(SUMMARY_TOOL_SESSIONS_ID, summaryToolSessionsId);
+
+
-
/* SELECTION_CASE == 2 indicates start up */
request.getSession().setAttribute(SELECTION_CASE, new Long(2));
logger.debug("SELECTION_CASE: " + request.getSession().getAttribute(SELECTION_CASE));
Index: lams_tool_laqa/web/monitoring/SummaryContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/SummaryContent.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_laqa/web/monitoring/SummaryContent.jsp 2 Mar 2006 19:12:24 -0000 1.3
+++ lams_tool_laqa/web/monitoring/SummaryContent.jsp 2 Mar 2006 21:20:05 -0000 1.4
@@ -49,35 +49,67 @@
|
|
-
-
+
+
+
+ | |
+
+
+ |
+
+ |
+
+
+
+ |
+
+ |
+
+
-
+
+
\ No newline at end of file