Index: lams_tool_nb/conf/language/ApplicationResources.properties =================================================================== diff -u -r5b9a749229490ab634a8bbf54065c3783b77ea47 -r4aae0391a4892385de3df761a655e0ab8b1c0183 --- lams_tool_nb/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 5b9a749229490ab634a8bbf54065c3783b77ea47) +++ lams_tool_nb/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 4aae0391a4892385de3df761a655e0ab8b1c0183) @@ -58,6 +58,12 @@ error.contentrepository =An error has occurred when saving/deleting instruction file {0}. The files may not be saved correctly. authoring.msg.cancel.save =Do you want to close this window without saving? button.try.again =Try again +advanced.reflectOnActivity = Reflect on noticeboard +button.continue = Continue +titleHeading.reflections = Reflections +titleHeading.reflection = Reflection +message.no.reflections = No reflections have yet been made. +message.no.reflection = No reflection has yet been made. #======= End labels: Exported 52 labels for en AU ===== Index: lams_tool_nb/db/sql/create_lams_tool_nb.sql =================================================================== diff -u -r0020142e02f5cd9631e5602a538189b8077350ef -r4aae0391a4892385de3df761a655e0ab8b1c0183 --- lams_tool_nb/db/sql/create_lams_tool_nb.sql (.../create_lams_tool_nb.sql) (revision 0020142e02f5cd9631e5602a538189b8077350ef) +++ lams_tool_nb/db/sql/create_lams_tool_nb.sql (.../create_lams_tool_nb.sql) (revision 4aae0391a4892385de3df761a655e0ab8b1c0183) @@ -9,6 +9,8 @@ , offline_instructions TEXT , define_later TINYINT(1) , force_offline TINYINT(1) + , reflect_on_activity TINYINT(1) + , reflect_instructions TEXT , content_in_use TINYINT(1) , creator_user_id BIGINT(20) , date_created DATETIME @@ -66,6 +68,8 @@ offline_instructions, define_later, force_offline, + reflect_on_activity, + reflect_instructions, content_in_use, date_created) VALUES (${default_content_id}, @@ -76,4 +80,6 @@ 0, 0, 0, + 'Reflect on noticeboard', + 0, now()); Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardConstants.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r4aae0391a4892385de3df761a655e0ab8b1c0183 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardConstants.java (.../NoticeboardConstants.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardConstants.java (.../NoticeboardConstants.java) (revision 4aae0391a4892385de3df761a655e0ab8b1c0183) @@ -58,8 +58,10 @@ public static final String DISPLAY_MESSAGE = "displayMessage"; public static final String DISPLAY_LEARNER_CONTENT = "displayLearnerContent"; + public static final String REFLECT_ON_ACTIVITY = "reflectOnActivity"; public static final String MONITOR_PAGE = "monitorPage"; + public static final String MONITOR_REFLECTION_PAGE ="monitorReflectionPage"; // ------------------------------ // Action Names @@ -114,6 +116,7 @@ public static final String BUTTON_EDIT = "button.edit"; public static final String BUTTON_UPLOAD = "button.upload"; public static final String LINK_DELETE="link.delete"; + public static final String BUTTON_CONTINUE = "button.continue"; //-------------- @@ -132,4 +135,4 @@ public static final String ERROR_MANDATORY="error.mandatoryField"; public static final String ERR_MISSING_PARAM = "error.missingParam"; public static final String ERROR_FILE_UPLOAD_CONTENT_REPOSITORY = "error.contentrepository"; -} +} \ No newline at end of file Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r4aae0391a4892385de3df761a655e0ab8b1c0183 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.java (.../NoticeboardContent.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.java (.../NoticeboardContent.java) (revision 4aae0391a4892385de3df761a655e0ab8b1c0183) @@ -68,6 +68,10 @@ /** nullable persistent field */ private boolean forceOffline; + private Boolean reflectOnActivity; + + private String reflectInstructions; + /** nullable persistent field */ private boolean contentInUse; @@ -98,6 +102,8 @@ String offlineInstructions, boolean defineLater, boolean forceOffline, + boolean reflectOnActivity, + String reflectInstructions, boolean contentInUse, Long creatorUserId, Date dateCreated, @@ -110,6 +116,8 @@ this.offlineInstructions = offlineInstructions; this.defineLater = defineLater; this.forceOffline = forceOffline; + this.reflectOnActivity = reflectOnActivity; + this.reflectInstructions = reflectInstructions; this.contentInUse = contentInUse; this.creatorUserId = creatorUserId; this.dateCreated = dateCreated; @@ -135,6 +143,7 @@ this.offlineInstructions = offlineInstructions; this.defineLater = false; this.forceOffline = false; + this.reflectOnActivity = false; this.contentInUse = false; this.creatorUserId = null; this.dateCreated = dateCreated; @@ -225,6 +234,32 @@ this.forceOffline = forceOffline; } + /** + * @hibernate.property + * column="reflect_on_activity" + * length="1" + */ + public boolean getReflectOnActivity() { + return reflectOnActivity; + } + + public void setReflectOnActivity(boolean reflectOnActivity) { + this.reflectOnActivity = reflectOnActivity; + } + + /** + * @hibernate.property + * column="reflect_instructions" + * length="65535" + */ + public String getReflectInstructions() { + return reflectInstructions; + } + + public void setReflectInstructions(String reflectInstructions) { + this.reflectInstructions = reflectInstructions; + } + /** * @hibernate.property * column="content_in_use" @@ -382,6 +417,8 @@ nb.getOfflineInstructions(), nb.isDefineLater(), nb.isForceOffline(), + nb.getReflectOnActivity(), + nb.getReflectInstructions(), nb.isContentInUse(), nb.getCreatorUserId(), nb.getDateCreated(), @@ -414,4 +451,4 @@ -} +} \ No newline at end of file Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml =================================================================== diff -u -r24ca84b9e61b98c068eaa369cb194a35e5511162 -r4aae0391a4892385de3df761a655e0ab8b1c0183 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml (.../applicationContext.xml) (revision 24ca84b9e61b98c068eaa369cb194a35e5511162) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml (.../applicationContext.xml) (revision 4aae0391a4892385de3df761a655e0ab8b1c0183) @@ -36,6 +36,7 @@ + Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/INoticeboardUserDAO.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r4aae0391a4892385de3df761a655e0ab8b1c0183 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/INoticeboardUserDAO.java (.../INoticeboardUserDAO.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/INoticeboardUserDAO.java (.../INoticeboardUserDAO.java) (revision 4aae0391a4892385de3df761a655e0ab8b1c0183) @@ -24,6 +24,8 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.noticeboard.dao; +import java.util.List; + import org.lamsfoundation.lams.tool.noticeboard.NoticeboardUser; import org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession; @@ -44,7 +46,7 @@ * @param userId The id of a NoticeboardUser * @return the persistent instance of a NoticeboardUser or null if not found. */ - public NoticeboardUser getNbUserByID(Long userId); + public NoticeboardUser getNbUser(Long userId, Long toolSessionId); /** *

Return the persistent instance of a NoticeboardUser @@ -96,4 +98,5 @@ */ public int getNumberOfUsers(NoticeboardSession nbSession); -} + public List getNbUsersBySession(Long sessionId); +} \ No newline at end of file Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardUserDAO.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r4aae0391a4892385de3df761a655e0ab8b1c0183 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardUserDAO.java (.../NoticeboardUserDAO.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardUserDAO.java (.../NoticeboardUserDAO.java) (revision 4aae0391a4892385de3df761a655e0ab8b1c0183) @@ -48,11 +48,13 @@ /** @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardUserDAO#getNbUserByID(java.lang.Long) */ - public NoticeboardUser getNbUserByID(Long userId) + public NoticeboardUser getNbUser(Long userId, Long sessionId) { - String query = "from NoticeboardUser user where user.userId=?"; - List users = getHibernateTemplate().find(query,userId); - + String query = "from NoticeboardUser user where user.userId=? and user.nbSession.nbSessionId=?"; + Object[] values = new Object[2]; + values[0] = userId; + values[1] = sessionId; + List users = getHibernateTemplate().find(query,values); if(users!=null && users.size() == 0) { return null; @@ -126,5 +128,8 @@ nbSession)).size(); } - -} + public List getNbUsersBySession(Long sessionId) { + String query = "from NoticeboardUser user where user.nbSession.nbSessionId=?"; + return getHibernateTemplate().find(query,sessionId); + } +} \ No newline at end of file Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dto/ReflectionDTO.java =================================================================== diff -u --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dto/ReflectionDTO.java (revision 0) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dto/ReflectionDTO.java (revision 4aae0391a4892385de3df761a655e0ab8b1c0183) @@ -0,0 +1,84 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + +/* $Id$ */ +package org.lamsfoundation.lams.tool.noticeboard.dto; + +import org.lamsfoundation.lams.notebook.model.NotebookEntry; + +/** + * @author jliew + * + */ +public class ReflectionDTO { + + private Long userId; + private String username; + private String fullName; + private String entry; + private Long externalId; + + public ReflectionDTO(NotebookEntry nbEntry) { + this.entry = nbEntry.getEntry(); + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getFullName() { + return fullName; + } + + public void setFullName(String fullName) { + this.fullName = fullName; + } + + public String getEntry() { + return entry; + } + + public void setEntry(String entry) { + this.entry = entry; + } + + public Long getExternalId() { + return externalId; + } + + public void setExternalId(Long externalId) { + this.externalId = externalId; + } + +} Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/INoticeboardService.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r4aae0391a4892385de3df761a655e0ab8b1c0183 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/INoticeboardService.java (.../INoticeboardService.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/INoticeboardService.java (.../INoticeboardService.java) (revision 4aae0391a4892385de3df761a655e0ab8b1c0183) @@ -29,6 +29,7 @@ import org.lamsfoundation.lams.contentrepository.NodeKey; import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; +import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.tool.noticeboard.NoticeboardAttachment; import org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent; import org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession; @@ -171,7 +172,7 @@ * @param nbUserId The user id of the instance of NoticeboardUser * @return the persistent instance of a NoticeboardUser or null if not found. */ - public NoticeboardUser retrieveNoticeboardUser(Long nbUserId); + public NoticeboardUser retrieveNoticeboardUser(Long nbUserId, Long toolSessionId); /** *

Return the persistent instance of a NoticeboardUser @@ -204,9 +205,10 @@ * that specified in the argument. * * @param nbUserId The id of the requested noticeboard object + * @param toolSessionId The id of the nbUser's associated nbSession * */ - public void removeUser(Long nbUserId); + public void removeUser(Long nbUserId, Long toolSessionId); /** *

Delete the given instance of NoticeboardUser

@@ -321,4 +323,9 @@ */ public Long getToolDefaultContentIdBySignature(String toolSignature); -} + public Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry); + + public NotebookEntry getEntry(Long id, Integer idType, String signature, Integer userID); + + public List getUsersBySession(Long sessionId); +} \ No newline at end of file Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r4aae0391a4892385de3df761a655e0ab8b1c0183 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java (.../NoticeboardServicePOJO.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java (.../NoticeboardServicePOJO.java) (revision 4aae0391a4892385de3df761a655e0ab8b1c0183) @@ -47,6 +47,8 @@ import org.lamsfoundation.lams.tool.exception.DataMissingException; import org.lamsfoundation.lams.tool.exception.SessionDataExistsException; import org.lamsfoundation.lams.tool.exception.ToolException; +import org.lamsfoundation.lams.notebook.model.NotebookEntry; +import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.tool.noticeboard.NbApplicationException; import org.lamsfoundation.lams.tool.noticeboard.NoticeboardAttachment; import org.lamsfoundation.lams.tool.noticeboard.NoticeboardConstants; @@ -89,6 +91,8 @@ private IExportToolContentService exportContentService; private static Logger log = Logger.getLogger(NoticeboardServicePOJO.class); + + private ICoreNotebookService coreNotebookService; /* ============================================================================== @@ -421,7 +425,7 @@ /** * @see org.lamsfoundation.lams.tool.noticeboard.service.INoticeboardService#retrieveNoticeboardUser(java.lang.Long) */ - public NoticeboardUser retrieveNoticeboardUser(Long nbUserId) + public NoticeboardUser retrieveNoticeboardUser(Long nbUserId, Long nbSessionId) { if (nbUserId == null) { @@ -432,7 +436,7 @@ try { - nbUser = nbUserDAO.getNbUserByID(nbUserId); + nbUser = nbUserDAO.getNbUser(nbUserId, nbSessionId); } catch (DataAccessException e) { @@ -523,7 +527,7 @@ /** * @see org.lamsfoundation.lams.tool.noticeboard.service.INoticeboardService#removeUser(java.lang.Long) */ - public void removeUser(Long nbUserId) + public void removeUser(Long nbUserId, Long toolSessionId) { if (nbUserId == null) { @@ -533,7 +537,7 @@ } try { - NoticeboardUser user = retrieveNoticeboardUser(nbUserId); + NoticeboardUser user = retrieveNoticeboardUser(nbUserId, toolSessionId); NoticeboardSession session = user.getNbSession(); session.getNbUsers().remove(user); nbUserDAO.removeNbUser(nbUserId); @@ -640,6 +644,21 @@ return totalNumberOfUsers; } + public List getUsersBySession(Long sessionId) { + + if (sessionId!=null) { + try { + return nbUserDAO.getNbUsersBySession(sessionId); + } catch (DataAccessException e) { + throw new NbApplicationException("EXCEPTION: An exception has occurred while trying to get the list of users in the session: " + + e.getMessage(), e); + } + } else { + log.error("Unable to continue. Session id is missing"); + } + return null; + } + /* ============================================================================== * Methods for access to NoticeboardUser objects * ============================================================================== @@ -1046,6 +1065,7 @@ toolContentObj.setOfflineInstructions(null); toolContentObj.setOnlineInstructions(null); toolContentObj.setTitle((String)importValues.get(ToolContentImport102Manager.CONTENT_TITLE)); + toolContentObj.setReflectOnActivity(false); // leave as empty, no need to set them to anything. //toolContentObj.setNbSessions(nbSessions); //toolContentObj.setNbAttachments(nbAttachments); @@ -1074,7 +1094,8 @@ return contentId; } - /* getter setter methods to obtain the service bean */ + /* =============== Used by Spring to "inject" the linked objects =============== */ + /*public INoticeboardContentDAO getNbContentDAO() { return nbContentDAO; @@ -1138,12 +1159,38 @@ public void setNbToolContentHandler(IToolContentHandler nbToolContentHandler) { this.nbToolContentHandler = nbToolContentHandler; } + public IExportToolContentService getExportContentService() { return exportContentService; } - public void setExportContentService(IExportToolContentService exportContentService) { this.exportContentService = exportContentService; } -} + + public ICoreNotebookService getCoreNotebookService() { + return coreNotebookService; + } + + public void setCoreNotebookService(ICoreNotebookService coreNotebookService) { + this.coreNotebookService = coreNotebookService; + } + + /* =============== Wrappers Methods for Notebook Service (Reflective Option) =============== */ + + public Long createNotebookEntry(Long id, Integer idType, String signature, + Integer userID, String entry) { + return coreNotebookService.createNotebookEntry(id, idType, signature, userID, "", entry); + } + + public NotebookEntry getEntry(Long id, Integer idType, String signature, + Integer userID) { + + List list = coreNotebookService.getEntry(id, idType, signature, userID); + if (list == null || list.isEmpty()) { + return null; + } else { + return list.get(0); + } + } +} \ No newline at end of file Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringForm.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r4aae0391a4892385de3df761a655e0ab8b1c0183 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringForm.java (.../NbAuthoringForm.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringForm.java (.../NbAuthoringForm.java) (revision 4aae0391a4892385de3df761a655e0ab8b1c0183) @@ -79,6 +79,9 @@ private String contentFolderID; private String defineLater; + private boolean reflectOnActivity; + private String reflectInstructions; + private FormFile onlineFile; private FormFile offlineFile; @@ -123,6 +126,23 @@ public void setDefineLater(String defineLater) { this.defineLater = defineLater; } + + public boolean getReflectOnActivity() { + return reflectOnActivity; + } + + public void setReflectOnActivity(boolean reflectOnActivity) { + this.reflectOnActivity = reflectOnActivity; + } + + public String getReflectInstructions() { + return reflectInstructions; + } + + public void setReflectInstructions(String reflectInstructions) { + this.reflectInstructions = reflectInstructions; + } + /** * @return Returns the content. */ @@ -253,6 +273,10 @@ nbContent.setContent(getContent()); nbContent.setOnlineInstructions(getOnlineInstructions()); nbContent.setOfflineInstructions(getOfflineInstructions()); + nbContent.setReflectOnActivity(getReflectOnActivity()); + if (getReflectOnActivity()) { + nbContent.setReflectInstructions(getReflectInstructions()); + } nbContent.setDateUpdated(new Date(System.currentTimeMillis())); } @@ -311,4 +335,4 @@ this.deleteFileUuid = deleteFileUuid; } -} +} \ No newline at end of file Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbExportAction.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r4aae0391a4892385de3df761a655e0ab8b1c0183 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbExportAction.java (.../NbExportAction.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbExportAction.java (.../NbExportAction.java) (revision 4aae0391a4892385de3df761a655e0ab8b1c0183) @@ -24,17 +24,28 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.noticeboard.web; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; +import org.lamsfoundation.lams.notebook.model.NotebookEntry; +import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.noticeboard.NbApplicationException; import org.lamsfoundation.lams.tool.noticeboard.NoticeboardConstants; import org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent; +import org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession; import org.lamsfoundation.lams.tool.noticeboard.NoticeboardUser; +import org.lamsfoundation.lams.tool.noticeboard.dto.ReflectionDTO; import org.lamsfoundation.lams.tool.noticeboard.service.INoticeboardService; import org.lamsfoundation.lams.tool.noticeboard.service.NoticeboardServiceProxy; import org.lamsfoundation.lams.tool.noticeboard.util.NbWebUtil; @@ -106,6 +117,18 @@ logger.error(error); throw new NbApplicationException(error); } + + // Get user's reflection if exists + if (content.getReflectOnActivity()) { + log.debug(content.getReflectOnActivity()); + request.setAttribute("learner", true); + NotebookEntry nbEntry = nbService.getEntry(userInThisSession.getNbSession().getNbSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL, + NoticeboardConstants.TOOL_SIGNATURE, userId.intValue()); + log.debug(nbEntry); + if (nbEntry!=null) { + request.setAttribute("nbEntry", nbEntry.getEntry()); + } + } exportForm.populateForm(content); @@ -137,6 +160,30 @@ throw new NbApplicationException(error); } + // Get class's reflections if exists + if (content.getReflectOnActivity()) { + Set sessions = content.getNbSessions(); + Iterator i = sessions.iterator(); + List reflections = new ArrayList(); + while (i.hasNext()) + { + NoticeboardSession session = (NoticeboardSession) i.next(); + List sessionUsers = nbService.getUsersBySession(session.getNbSessionId()); + for (int j=0; j reflections = new ArrayList(); while (i.hasNext()) { NoticeboardSession session = (NoticeboardSession) i.next(); int numUsersInSession = nbService.getNumberOfUsersInSession(session); map.put(session.getNbSessionName(), new Integer(numUsersInSession)); + // Get list of users that have made a reflection entry + if (content.getReflectOnActivity()) { + List sessionUsers = nbService.getUsersBySession(session.getNbSessionId()); + for (int j=0; j This page shouldnt be here.

\ No newline at end of file +<%@ include file="/includes/taglibs.jsp"%> + + + + + + + + + + + + + +
+ + + +
+   + + +
\ No newline at end of file Index: lams_tool_nb/web/exportPortfolio.jsp =================================================================== diff -u -r9d5497654409c743efd5a6bf7db75fc2eb496956 -r4aae0391a4892385de3df761a655e0ab8b1c0183 --- lams_tool_nb/web/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision 9d5497654409c743efd5a6bf7db75fc2eb496956) +++ lams_tool_nb/web/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision 4aae0391a4892385de3df761a655e0ab8b1c0183) @@ -1,6 +1,5 @@ <%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> -<%@ taglib uri="tags-core" prefix="c" %> -<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ include file="/includes/taglibs.jsp"%> @@ -26,11 +25,34 @@

+ + +

+

+

+ + +

+ + + + + + + + + + + + +
+ + Index: lams_tool_nb/web/learnerContent.jsp =================================================================== diff -u -reac1a7689dc88e224668832952fc27c8b732a8a9 -r4aae0391a4892385de3df761a655e0ab8b1c0183 --- lams_tool_nb/web/learnerContent.jsp (.../learnerContent.jsp) (revision eac1a7689dc88e224668832952fc27c8b732a8a9) +++ lams_tool_nb/web/learnerContent.jsp (.../learnerContent.jsp) (revision 4aae0391a4892385de3df761a655e0ab8b1c0183) @@ -24,9 +24,18 @@ - - - + + + + + + + + + + + + Index: lams_tool_nb/web/message.jsp =================================================================== diff -u -r9393c098e5dfd603e2d37347cd1e531a25aa424a -r4aae0391a4892385de3df761a655e0ab8b1c0183 --- lams_tool_nb/web/message.jsp (.../message.jsp) (revision 9393c098e5dfd603e2d37347cd1e531a25aa424a) +++ lams_tool_nb/web/message.jsp (.../message.jsp) (revision 4aae0391a4892385de3df761a655e0ab8b1c0183) @@ -7,7 +7,18 @@

- - - + + + + + + + + + + + + + +

Index: lams_tool_nb/web/monitoring/m_Statistics.jsp =================================================================== diff -u -reac1a7689dc88e224668832952fc27c8b732a8a9 -r4aae0391a4892385de3df761a655e0ab8b1c0183 --- lams_tool_nb/web/monitoring/m_Statistics.jsp (.../m_Statistics.jsp) (revision eac1a7689dc88e224668832952fc27c8b732a8a9) +++ lams_tool_nb/web/monitoring/m_Statistics.jsp (.../m_Statistics.jsp) (revision 4aae0391a4892385de3df761a655e0ab8b1c0183) @@ -1,7 +1,7 @@ <%@ include file="/includes/taglibs.jsp"%> - + @@ -11,7 +11,7 @@

- +

Index: lams_tool_nb/web/monitoring/m_Summary.jsp =================================================================== diff -u -reac1a7689dc88e224668832952fc27c8b732a8a9 -r4aae0391a4892385de3df761a655e0ab8b1c0183 --- lams_tool_nb/web/monitoring/m_Summary.jsp (.../m_Summary.jsp) (revision eac1a7689dc88e224668832952fc27c8b732a8a9) +++ lams_tool_nb/web/monitoring/m_Summary.jsp (.../m_Summary.jsp) (revision 4aae0391a4892385de3df761a655e0ab8b1c0183) @@ -1,8 +1,38 @@ -<%@ taglib uri="tags-fmt" prefix="fmt"%> -<%@ taglib uri="tags-core" prefix="c"%> +<%@ include file="/includes/taglibs.jsp"%> -

+

-

+

<%@ include file="m_Statistics.jsp"%> + + +

+ + + + + + + + + + + + + + + + + +
+ +
+ + + + +
+ + + \ No newline at end of file Index: lams_tool_nb/web/monitoring/reflection.jsp =================================================================== diff -u --- lams_tool_nb/web/monitoring/reflection.jsp (revision 0) +++ lams_tool_nb/web/monitoring/reflection.jsp (revision 4aae0391a4892385de3df761a655e0ab8b1c0183) @@ -0,0 +1,31 @@ +<%@ include file="/includes/taglibs.jsp"%> + +

+ +

+ +
+ +
+ + + + + + + + + +
+

+ +

+
+

+ +

+
+ +
+ + \ No newline at end of file Index: lams_tool_nb/web/reflect.jsp =================================================================== diff -u --- lams_tool_nb/web/reflect.jsp (revision 0) +++ lams_tool_nb/web/reflect.jsp (revision 4aae0391a4892385de3df761a655e0ab8b1c0183) @@ -0,0 +1,36 @@ +<%@ include file="/includes/taglibs.jsp"%> + +

+ +

+
+
+ + + + + + + + + + + + + +
+ +
+ +
+
+ + + + + +
+
+ +
+