Index: lams_tool_kaltura/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -rab98c5d3a9e6d12e6ca524283b4e28dcc5a865f0 --- lams_tool_kaltura/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision be07c35c372d904a65581d98660e73f3b13b69db) +++ lams_tool_kaltura/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision ab98c5d3a9e6d12e6ca524283b4e28dcc5a865f0) @@ -4,7 +4,7 @@ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Thu Aug 30 09:17:50 CST 2012 -#=================== labels for Notebook =================# +#=================== labels for Kaltura =================# tool.display.name =Kaltura tool.description =Kaltura Tool @@ -118,5 +118,7 @@ output.desc.learner.number.viewed.videos =Number of videos viewed by user output.desc.learner.number.uploaded.videos =Number of videos uploaded by user label.list.of.videos =List of videos +label.reflections =Notebook Entries +label.monitoring.summary.no.session =No Session Available #======= End labels: Exported 113 labels for en AU ===== Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dto/NotebookEntryDTO.java =================================================================== diff -u -r5fd453ea4cb0fa72cb94a5706e75f68a319de46b -rab98c5d3a9e6d12e6ca524283b4e28dcc5a865f0 --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dto/NotebookEntryDTO.java (.../NotebookEntryDTO.java) (revision 5fd453ea4cb0fa72cb94a5706e75f68a319de46b) +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dto/NotebookEntryDTO.java (.../NotebookEntryDTO.java) (revision ab98c5d3a9e6d12e6ca524283b4e28dcc5a865f0) @@ -13,6 +13,8 @@ private Date createDate; private Date lastModified; + + private String fullName; public NotebookEntryDTO(NotebookEntry entry) { this.uid = entry.getUid(); @@ -52,5 +54,13 @@ public void setUid(Long uid) { this.uid = uid; } + + public String getFullName() { + return fullName; + } + public void setFullName(String fullName) { + this.fullName = fullName; + } + } Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/IKalturaService.java =================================================================== diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -rab98c5d3a9e6d12e6ca524283b4e28dcc5a865f0 --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/IKalturaService.java (.../IKalturaService.java) (revision be07c35c372d904a65581d98660e73f3b13b69db) +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/IKalturaService.java (.../IKalturaService.java) (revision ab98c5d3a9e6d12e6ca524283b4e28dcc5a865f0) @@ -24,11 +24,12 @@ package org.lamsfoundation.lams.tool.kaltura.service; +import java.util.List; import java.util.Set; -import org.apache.struts.upload.FormFile; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.tool.kaltura.dto.AverageRatingDTO; +import org.lamsfoundation.lams.tool.kaltura.dto.NotebookEntryDTO; import org.lamsfoundation.lams.tool.kaltura.model.Kaltura; import org.lamsfoundation.lams.tool.kaltura.model.KalturaItem; import org.lamsfoundation.lams.tool.kaltura.model.KalturaSession; @@ -130,6 +131,8 @@ void updateEntry(NotebookEntry notebookEntry); + List getReflectList(Kaltura kaltura); + String finishToolSession(Long toolSessionId, Long userId) throws KalturaException; boolean isGroupedActivity(long toolContentID); Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java =================================================================== diff -u -r15045d0b9b0dbb930f42a9da7757207e7a325341 -rab98c5d3a9e6d12e6ca524283b4e28dcc5a865f0 --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java (.../KalturaService.java) (revision 15045d0b9b0dbb930f42a9da7757207e7a325341) +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java (.../KalturaService.java) (revision ab98c5d3a9e6d12e6ca524283b4e28dcc5a865f0) @@ -27,6 +27,7 @@ import java.sql.Timestamp; import java.util.Date; import java.util.Hashtable; +import java.util.LinkedList; import java.util.List; import java.util.Set; import java.util.SortedMap; @@ -58,6 +59,7 @@ import org.lamsfoundation.lams.tool.kaltura.dao.IKalturaSessionDAO; import org.lamsfoundation.lams.tool.kaltura.dao.IKalturaUserDAO; import org.lamsfoundation.lams.tool.kaltura.dto.AverageRatingDTO; +import org.lamsfoundation.lams.tool.kaltura.dto.NotebookEntryDTO; import org.lamsfoundation.lams.tool.kaltura.model.Kaltura; import org.lamsfoundation.lams.tool.kaltura.model.KalturaComment; import org.lamsfoundation.lams.tool.kaltura.model.KalturaItem; @@ -85,7 +87,7 @@ public class KalturaService implements ToolSessionManager, ToolContentManager, IKalturaService, ToolContentImport102Manager { - static Logger logger = Logger.getLogger(KalturaService.class.getName()); + private static Logger logger = Logger.getLogger(KalturaService.class.getName()); private IKalturaDAO kalturaDao = null; @@ -315,6 +317,33 @@ } @Override + public List getReflectList(Kaltura kaltura) { + List reflectList = new LinkedList(); + + Set sessions = kaltura.getKalturaSessions(); + for (KalturaSession session : sessions) { + Long sessionId = session.getSessionId(); + // get all users in this session + Set users = session.getKalturaUsers(); + for (KalturaUser user : users) { + + NotebookEntry entry = getEntry(sessionId, user.getUserId().intValue()); + if (entry != null) { + NotebookEntryDTO notebookEntryDTO = new NotebookEntryDTO(entry); + notebookEntryDTO.setFullName(user.getFirstName() + " " + user.getLastName()); + Date postedDate = (entry.getLastModified() != null) ? entry.getLastModified() : entry + .getCreateDate(); + notebookEntryDTO.setLastModified(postedDate); + reflectList.add(notebookEntryDTO); + } + + } + } + + return reflectList; + } + + @Override public String finishToolSession(Long toolSessionId, Long userId) throws KalturaException { KalturaUser user = kalturaUserDao.getByUserIdAndSessionId(userId, toolSessionId); user.setFinishedActivity(true); Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/util/KalturaConstants.java =================================================================== diff -u -rb52f787a7b8d6dc77ef090dc023fc64fa3a9b2f2 -rab98c5d3a9e6d12e6ca524283b4e28dcc5a865f0 --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/util/KalturaConstants.java (.../KalturaConstants.java) (revision b52f787a7b8d6dc77ef090dc023fc64fa3a9b2f2) +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/util/KalturaConstants.java (.../KalturaConstants.java) (revision ab98c5d3a9e6d12e6ca524283b4e28dcc5a865f0) @@ -48,6 +48,7 @@ public static final String ATTR_IS_ALLOW_UPLOADS = "isAllowUpload"; public static final String ATTR_IS_USER_ITEM_AUTHOR = "isUserItemAuthor"; public static final String ATTR_IS_GROUP_MONITORING = "isGroupMonitoring"; + public static final String ATTR_REFLECT_LIST = "reflectList"; // Parameter names public static final String PARAM_ITEM_INDEX = "itemIndex"; Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/MonitoringAction.java =================================================================== diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -rab98c5d3a9e6d12e6ca524283b4e28dcc5a865f0 --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision be07c35c372d904a65581d98660e73f3b13b69db) +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision ab98c5d3a9e6d12e6ca524283b4e28dcc5a865f0) @@ -24,7 +24,6 @@ package org.lamsfoundation.lams.tool.kaltura.web.actions; -import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Set; @@ -42,6 +41,7 @@ import org.apache.struts.action.ActionRedirect; import org.lamsfoundation.lams.tool.kaltura.dto.KalturaSessionDTO; import org.lamsfoundation.lams.tool.kaltura.dto.KalturaUserDTO; +import org.lamsfoundation.lams.tool.kaltura.dto.NotebookEntryDTO; import org.lamsfoundation.lams.tool.kaltura.model.Kaltura; import org.lamsfoundation.lams.tool.kaltura.model.KalturaSession; import org.lamsfoundation.lams.tool.kaltura.model.KalturaUser; @@ -55,7 +55,6 @@ import org.lamsfoundation.lams.web.action.LamsDispatchAction; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; -import org.lamsfoundation.lams.web.util.SessionMap; /** * @author Andrey Balan @@ -93,6 +92,12 @@ sessionDTOs.add(sessionDTO); } request.setAttribute("sessionDTOs", sessionDTOs); + + // Create reflectList if reflection is enabled. + if (kaltura.isReflectOnActivity()) { + List reflectList = kalturaService.getReflectList(kaltura); + request.setAttribute(KalturaConstants.ATTR_REFLECT_LIST, reflectList); + } Date submissionDeadline = kaltura.getSubmissionDeadline(); if (submissionDeadline != null) { Index: lams_tool_kaltura/web/pages/monitoring/advanceOptions.jsp =================================================================== diff -u --- lams_tool_kaltura/web/pages/monitoring/advanceOptions.jsp (revision 0) +++ lams_tool_kaltura/web/pages/monitoring/advanceOptions.jsp (revision ab98c5d3a9e6d12e6ca524283b4e28dcc5a865f0) @@ -0,0 +1,147 @@ +<%@ include file="/common/taglibs.jsp"%> + +

+ + + + + +

+
+ + Index: lams_tool_kaltura/web/pages/monitoring/reflections.jsp =================================================================== diff -u --- lams_tool_kaltura/web/pages/monitoring/reflections.jsp (revision 0) +++ lams_tool_kaltura/web/pages/monitoring/reflections.jsp (revision ab98c5d3a9e6d12e6ca524283b4e28dcc5a865f0) @@ -0,0 +1,27 @@ +<%@ include file="/common/taglibs.jsp"%> + + + +

+ + + + + + + + + + + + +
+ +
+ +
+ + +
+ + \ No newline at end of file Index: lams_tool_kaltura/web/pages/monitoring/summary.jsp =================================================================== diff -u -r9580d50f573c7a5aa3e1cd3cde1c83a517135878 -rab98c5d3a9e6d12e6ca524283b4e28dcc5a865f0 --- lams_tool_kaltura/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 9580d50f573c7a5aa3e1cd3cde1c83a517135878) +++ lams_tool_kaltura/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision ab98c5d3a9e6d12e6ca524283b4e28dcc5a865f0) @@ -36,170 +36,41 @@ } //--> - - - - - - - - - -
- -
- ?dispatch=showGroupLearning&toolSessionID=${session.sessionID}&keepThis=true&TB_iframe=true&height=630&width=800" class="button thickbox" title=""> - ${session.sessionName} - -
- -

- - - - - -

-
- - +<%@include file="reflections.jsp"%> +<%@include file="advanceOptions.jsp"%> + <%@include file="daterestriction.jsp"%>