Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/ReflectionDTO.java
===================================================================
diff -u
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/ReflectionDTO.java (revision 0)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/ReflectionDTO.java (revision 14256ea45ab199cb0fea34e9b987aa55608cd206)
@@ -0,0 +1,131 @@
+/***************************************************************************
+ * 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 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ***********************************************************************/
+/* $$Id$$ */
+package org.lamsfoundation.lams.tool.vote;
+
+
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+
+/**
+ *
DTO that holds reflections from users
+ *
+ *
+ * @author Ozgur Demirtas
+ */
+public class ReflectionDTO implements Comparable
+{
+ protected String userName;
+
+ protected String userId;
+
+ protected String sessionId;
+
+ protected String reflectionUid;
+
+ protected String entry;
+
+
+ public int compareTo(Object o)
+ {
+ ReflectionDTO reflectionDTO = (ReflectionDTO) o;
+
+ if (reflectionDTO == null)
+ return 1;
+ else
+ return 0;
+ }
+
+
+ public String toString() {
+ return new ToStringBuilder(this)
+ .append("userName: ", userName)
+ .append("userId: ", userId)
+ .append("sessionId: ", sessionId)
+ .append("reflectionUid: ", reflectionUid)
+ .append("entry: ", entry)
+ .toString();
+ }
+
+
+
+ /**
+ * @return Returns the entry.
+ */
+ public String getEntry() {
+ return entry;
+ }
+ /**
+ * @param entry The entry to set.
+ */
+ public void setEntry(String entry) {
+ this.entry = entry;
+ }
+ /**
+ * @return Returns the sessionId.
+ */
+ public String getSessionId() {
+ return sessionId;
+ }
+ /**
+ * @param sessionId The sessionId to set.
+ */
+ public void setSessionId(String sessionId) {
+ this.sessionId = sessionId;
+ }
+ /**
+ * @return Returns the reflectionUid.
+ */
+ public String getReflectionUid() {
+ return reflectionUid;
+ }
+ /**
+ * @param reflectionUid The reflectionUid to set.
+ */
+ public void setReflectionUid(String reflectionUid) {
+ this.reflectionUid = reflectionUid;
+ }
+ /**
+ * @return Returns the userId.
+ */
+ public String getUserId() {
+ return userId;
+ }
+ /**
+ * @param userId The userId to set.
+ */
+ public void setUserId(String userId) {
+ this.userId = userId;
+ }
+ /**
+ * @return Returns the userName.
+ */
+ public String getUserName() {
+ return userName;
+ }
+ /**
+ * @param userName The userName to set.
+ */
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+}
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java
===================================================================
diff -u -rfadef2b7b1f00478057ecade707ca37aa24ebe15 -r14256ea45ab199cb0fea34e9b987aa55608cd206
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java (.../VoteAppConstants.java) (revision fadef2b7b1f00478057ecade707ca37aa24ebe15)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java (.../VoteAppConstants.java) (revision 14256ea45ab199cb0fea34e9b987aa55608cd206)
@@ -80,6 +80,7 @@
public static final String ACTIVITY_TITLE_KEY = "activityTitleKey";
public static final String ACTIVITY_INSTRUCTIONS_KEY = "activityInstructionsKey";
public static final String VOTE_GENERAL_MONITORING_DTO = "voteGeneralMonitoringDTO";
+ public static final String LEARNER_NOTEBOOK ="learnerNotebook";
public static final String AUTHORING ="authoring";
public static final String SOURCE_VOTE_STARTER ="sourceVoteStarter";
@@ -104,6 +105,7 @@
public static final String NOTEBOOK ="notebook";
public static final String ENTRY_TEXT ="entryText";
public static final String REFLECTION_SUBJECT ="reflectionSubject";
+ public static final String REFLECTIONS_CONTAINER_DTO ="reflectionsContainerDTO";
/*
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralLearnerFlowDTO.java
===================================================================
diff -u -rfadef2b7b1f00478057ecade707ca37aa24ebe15 -r14256ea45ab199cb0fea34e9b987aa55608cd206
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralLearnerFlowDTO.java (.../VoteGeneralLearnerFlowDTO.java) (revision fadef2b7b1f00478057ecade707ca37aa24ebe15)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralLearnerFlowDTO.java (.../VoteGeneralLearnerFlowDTO.java) (revision 14256ea45ab199cb0fea34e9b987aa55608cd206)
@@ -45,6 +45,8 @@
protected String userEntry;
+ protected String userName;
+
protected String castVoteCount;
protected String maxNominationCountReached;
@@ -571,4 +573,17 @@
this.reflectionSubject = reflectionSubject;
}
+ /**
+ * @return Returns the userName.
+ */
+ public String getUserName() {
+ return userName;
+ }
+ /**
+ * @param userName The userName to set.
+ */
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
}
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ExportServlet.java
===================================================================
diff -u -r5c9c47d5e75fb6d0229862af0f08c84229b6056c -r14256ea45ab199cb0fea34e9b987aa55608cd206
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ExportServlet.java (.../ExportServlet.java) (revision 5c9c47d5e75fb6d0229862af0f08c84229b6056c)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ExportServlet.java (.../ExportServlet.java) (revision 14256ea45ab199cb0fea34e9b987aa55608cd206)
@@ -141,6 +141,9 @@
logger.debug("final exportPortfolioDTO: " + exportPortfolioDTO);
logger.debug("final exportPortfolioDTO userExceptionNoToolSessions: " + exportPortfolioDTO.getUserExceptionNoToolSessions() );
request.getSession().setAttribute(EXPORT_PORTFOLIO_DTO, exportPortfolioDTO);
+
+ voteMonitoringAction.prepareReflectionData(request, content, voteService, userID.toString(),true);
+
logger.debug("ending learner mode: ");
}
@@ -185,6 +188,8 @@
logger.debug("final exportPortfolioDTO: " + exportPortfolioDTO);
logger.debug("final exportPortfolioDTO userExceptionNoToolSessions: " + exportPortfolioDTO.getUserExceptionNoToolSessions() );
request.getSession().setAttribute(EXPORT_PORTFOLIO_DTO, exportPortfolioDTO);
+
+ voteMonitoringAction.prepareReflectionData(request, content, voteService, null,true);
logger.debug("ending teacher mode: ");
}
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java
===================================================================
diff -u -rdb22ea00a9bb00718193230df45bb8078fabb3d8 -r14256ea45ab199cb0fea34e9b987aa55608cd206
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java (.../VoteMonitoringAction.java) (revision db22ea00a9bb00718193230df45bb8078fabb3d8)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java (.../VoteMonitoringAction.java) (revision 14256ea45ab199cb0fea34e9b987aa55608cd206)
@@ -38,8 +38,11 @@
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.exception.ToolException;
import org.lamsfoundation.lams.tool.vote.ExportPortfolioDTO;
+import org.lamsfoundation.lams.tool.vote.ReflectionDTO;
import org.lamsfoundation.lams.tool.vote.VoteAppConstants;
import org.lamsfoundation.lams.tool.vote.VoteApplicationException;
import org.lamsfoundation.lams.tool.vote.VoteComparator;
@@ -51,6 +54,7 @@
import org.lamsfoundation.lams.tool.vote.VoteUtils;
import org.lamsfoundation.lams.tool.vote.pojos.VoteContent;
import org.lamsfoundation.lams.tool.vote.pojos.VoteQueContent;
+import org.lamsfoundation.lams.tool.vote.pojos.VoteQueUsr;
import org.lamsfoundation.lams.tool.vote.pojos.VoteSession;
import org.lamsfoundation.lams.tool.vote.pojos.VoteUsrAttempt;
import org.lamsfoundation.lams.tool.vote.service.IVoteService;
@@ -114,7 +118,7 @@
{
VoteUtils.cleanUpUserExceptions(request);
logger.debug("dispatching unspecified...");
- return null;
+ return null;
}
@@ -255,6 +259,8 @@
logger.debug("voteGeneralAuthoringDTO: " + voteGeneralAuthoringDTO);
request.setAttribute(VOTE_GENERAL_AUTHORING_DTO, voteGeneralAuthoringDTO);
+ prepareReflectionData(request, voteContent, voteService, null,false);
+
logger.debug("end of commonSubmitSessionCode, voteGeneralMonitoringDTO: " + voteGeneralMonitoringDTO);
request.setAttribute(VOTE_GENERAL_MONITORING_DTO, voteGeneralMonitoringDTO);
}
@@ -394,6 +400,8 @@
voteGeneralMonitoringDTO.setIsMonitoredContentInUse(new Boolean(true).toString());
}
+ prepareReflectionData(request, voteContent, voteService, null,false);
+
logger.debug("end of refreshSummaryData, voteGeneralMonitoringDTO" + voteGeneralMonitoringDTO);
request.setAttribute(VOTE_GENERAL_MONITORING_DTO, voteGeneralMonitoringDTO);
}
@@ -543,6 +551,7 @@
}
}
}
+
logger.debug("finish getting user entries: " + listUserEntries);
return listUserEntries;
}
@@ -585,6 +594,8 @@
logger.debug("USER_EXCEPTION_NO_TOOL_SESSIONS is set to true");
}
+ prepareReflectionData(request, voteContent, voteService, null,false);
+
voteGeneralMonitoringDTO.setCurrentMonitoringTab("summary");
logger.debug("end initSummaryContent...");
}
@@ -626,6 +637,8 @@
refreshInstructionsData(request, voteContent, voteService, voteGeneralMonitoringDTO);
logger.debug("post refreshInstructionsData, voteGeneralMonitoringDTO: " + voteGeneralMonitoringDTO);
+ prepareReflectionData(request, voteContent, voteService, null,false);
+
voteGeneralMonitoringDTO.setCurrentMonitoringTab("instructions");
logger.debug("ending initInstructionsContent...");
}
@@ -659,6 +672,8 @@
logger.debug("returned from db listUploadedOnlineFileNames: " + listUploadedOnlineFileNames);
voteGeneralMonitoringDTO.setListUploadedOnlineFileNames(listUploadedOnlineFileNames);
+ prepareReflectionData(request, voteContent, voteService, null,false);
+
logger.debug("end of refreshInstructionsData, voteGeneralMonitoringDTO" + voteGeneralMonitoringDTO);
request.setAttribute(VOTE_GENERAL_MONITORING_DTO, voteGeneralMonitoringDTO);
}
@@ -691,6 +706,8 @@
refreshStatsData(request, voteService,voteGeneralMonitoringDTO);
logger.debug("post refreshStatsData, voteGeneralMonitoringDTO: " + voteGeneralMonitoringDTO );
+ prepareReflectionData(request, voteContent, voteService, null,false);
+
voteGeneralMonitoringDTO.setCurrentMonitoringTab("stats");
logger.debug("ending initStatsContent...");
}
@@ -723,6 +740,7 @@
logger.debug("countSessionComplete: " + countSessionComplete);
voteGeneralMonitoringDTO.setCountSessionComplete(new Integer(countSessionComplete).toString());
+
logger.debug("end of refreshStatsData, voteGeneralMonitoringDTO" + voteGeneralMonitoringDTO);
request.setAttribute(VOTE_GENERAL_MONITORING_DTO, voteGeneralMonitoringDTO);
}
@@ -832,6 +850,8 @@
voteGeneralAuthoringDTO.setMapOptionsContent(mapOptionsContent);
voteGeneralAuthoringDTO.setActiveModule(MONITORING);
+ prepareReflectionData(request, voteContent, voteService, null,false);
+
logger.debug("voteGeneralAuthoringDTO: " + voteGeneralAuthoringDTO);
request.setAttribute(VOTE_GENERAL_AUTHORING_DTO, voteGeneralAuthoringDTO);
@@ -897,6 +917,12 @@
voteGeneralMonitoringDTO.setIsMonitoredContentInUse(new Boolean(false).toString());
+ VoteContent voteContent=voteService.retrieveVote(new Long(toolContentID));
+ logger.debug("existing voteContent:" + voteContent);
+
+ if (voteContent != null)
+ prepareReflectionData(request, voteContent, voteService, null,false);
+
logger.debug("voteGeneralMonitoringDTO: " + voteGeneralMonitoringDTO);
request.setAttribute(VOTE_GENERAL_MONITORING_DTO, voteGeneralMonitoringDTO);
@@ -954,6 +980,12 @@
voteGeneralMonitoringDTO.setIsMonitoredContentInUse(new Boolean(false).toString());
voteGeneralMonitoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
+ VoteContent voteContent=voteService.retrieveVote(new Long(toolContentID));
+ logger.debug("existing voteContent:" + voteContent);
+
+ if (voteContent != null)
+ prepareReflectionData(request, voteContent, voteService, null,false);
+
logger.debug("voteGeneralMonitoringDTO: " + voteGeneralMonitoringDTO);
request.setAttribute(VOTE_GENERAL_MONITORING_DTO, voteGeneralMonitoringDTO);
@@ -1013,7 +1045,13 @@
voteGeneralMonitoringDTO.setIsMonitoredContentInUse(new Boolean(false).toString());
voteGeneralMonitoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
-
+
+ VoteContent voteContent=voteService.retrieveVote(new Long(toolContentID));
+ logger.debug("existing voteContent:" + voteContent);
+
+ if (voteContent != null)
+ prepareReflectionData(request, voteContent, voteService, null,false);
+
logger.debug("voteGeneralMonitoringDTO: " + voteGeneralMonitoringDTO);
request.setAttribute(VOTE_GENERAL_MONITORING_DTO, voteGeneralMonitoringDTO);
@@ -1070,7 +1108,13 @@
voteGeneralMonitoringDTO.setIsMonitoredContentInUse(new Boolean(false).toString());
voteGeneralMonitoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
-
+
+ VoteContent voteContent=voteService.retrieveVote(new Long(toolContentID));
+ logger.debug("existing voteContent:" + voteContent);
+
+ if (voteContent != null)
+ prepareReflectionData(request, voteContent, voteService, null,false);
+
logger.debug("voteGeneralMonitoringDTO: " + voteGeneralMonitoringDTO);
request.setAttribute(VOTE_GENERAL_MONITORING_DTO, voteGeneralMonitoringDTO);
@@ -1124,6 +1168,12 @@
voteGeneralMonitoringDTO.setIsMonitoredContentInUse(new Boolean(false).toString());
voteGeneralMonitoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());
+
+ VoteContent voteContent=voteService.retrieveVote(new Long(toolContentID));
+ logger.debug("existing voteContent:" + voteContent);
+
+ if (voteContent != null)
+ prepareReflectionData(request, voteContent, voteService, null,false);
logger.debug("voteGeneralMonitoringDTO: " + voteGeneralMonitoringDTO);
request.setAttribute(VOTE_GENERAL_MONITORING_DTO, voteGeneralMonitoringDTO);
@@ -1246,6 +1296,10 @@
logger.debug("ending editActivityQuestions, voteGeneralMonitoringDTO: " + voteGeneralMonitoringDTO);
request.setAttribute(VOTE_GENERAL_MONITORING_DTO, voteGeneralMonitoringDTO);
+
+ if (voteContent != null)
+ prepareReflectionData(request, voteContent, voteService, null,false);
+
logger.debug("ending viewOpenVotes, voteGeneralMonitoringDTO: " + voteGeneralMonitoringDTO);
logger.debug("fwd'ing to LOAD_MONITORING: " + LOAD_MONITORING);
return (mapping.findForward(LOAD_MONITORING));
@@ -1293,7 +1347,13 @@
logger.debug("voteGeneralMonitoringDTO: " + voteGeneralMonitoringDTO);
request.setAttribute(VOTE_GENERAL_MONITORING_DTO, voteGeneralMonitoringDTO);
-
+
+ VoteContent voteContent=voteService.retrieveVote(new Long(toolContentID));
+ logger.debug("existing voteContent:" + voteContent);
+
+ if (voteContent != null)
+ prepareReflectionData(request, voteContent, voteService, null,false);
+
logger.debug("ending closeOpenVotes, voteGeneralMonitoringDTO: " + voteGeneralMonitoringDTO);
return (mapping.findForward(LOAD_MONITORING));
@@ -1370,6 +1430,9 @@
logger.debug("voteGeneralMonitoringDTO: " + voteGeneralMonitoringDTO);
request.setAttribute(VOTE_GENERAL_MONITORING_DTO, voteGeneralMonitoringDTO);
+ if (voteContent != null)
+ prepareReflectionData(request, voteContent, voteService, null,false);
+
logger.debug("submitting session to refresh the data from the database: ");
return submitSession(mapping, form, request, response, voteService, voteGeneralMonitoringDTO);
}
@@ -1439,6 +1502,9 @@
voteGeneralMonitoringDTO.setCurrentMonitoredToolSession(currentMonitoredToolSession);
voteGeneralMonitoringDTO.setIsMonitoredContentInUse(new Boolean(true).toString());
+
+ if (voteContent != null)
+ prepareReflectionData(request, voteContent, voteService, null,false);
logger.debug("submitting session to refresh the data from the database: ");
return submitSession(mapping, form, request, response, voteService, voteGeneralMonitoringDTO);
@@ -1493,6 +1559,137 @@
}
+ public void prepareReflectionData(HttpServletRequest request, VoteContent voteContent,
+ IVoteService mcService, String userID, boolean exportMode)
+ {
+ logger.debug("starting prepareReflectionData: " + voteContent);
+ logger.debug("exportMode: " + exportMode);
+ List reflectionsContainerDTO= new LinkedList();
+
+ if (userID == null)
+ {
+ logger.debug("all users mode");
+ for (Iterator sessionIter = voteContent.getVoteSessions().iterator(); sessionIter.hasNext();)
+ {
+ VoteSession qaSession = (VoteSession) sessionIter.next();
+ logger.debug("qaSession: " + qaSession);
+ for (Iterator userIter = qaSession.getVoteQueUsers().iterator(); userIter.hasNext();)
+ {
+ VoteQueUsr user = (VoteQueUsr) userIter.next();
+ logger.debug("user: " + user);
+
+ NotebookEntry notebookEntry = mcService.getEntry(qaSession.getVoteSessionId(),
+ CoreNotebookConstants.NOTEBOOK_TOOL,
+ MY_SIGNATURE, new Integer(user.getQueUsrId().toString()));
+
+ logger.debug("notebookEntry: " + notebookEntry);
+
+ if (notebookEntry != null) {
+ ReflectionDTO reflectionDTO = new ReflectionDTO();
+ reflectionDTO.setUserId(user.getQueUsrId().toString());
+ reflectionDTO.setSessionId(qaSession.getVoteSessionId().toString());
+ reflectionDTO.setUserName(user.getUsername());
+ reflectionDTO.setReflectionUid (notebookEntry.getUid().toString());
+ String notebookEntryPresentable=VoteUtils.replaceNewLines(notebookEntry.getEntry());
+ reflectionDTO.setEntry(notebookEntryPresentable);
+ reflectionsContainerDTO.add(reflectionDTO);
+ }
+
+ }
+ }
+ }
+ else
+ {
+ logger.debug("single user mode");
+ for (Iterator sessionIter = voteContent.getVoteSessions().iterator(); sessionIter.hasNext();)
+ {
+ VoteSession qaSession = (VoteSession) sessionIter.next();
+ logger.debug("qaSession: " + qaSession);
+ for (Iterator userIter = qaSession.getVoteQueUsers().iterator(); userIter.hasNext();)
+ {
+ VoteQueUsr user = (VoteQueUsr) userIter.next();
+ logger.debug("user: " + user);
+
+ if (user.getQueUsrId().toString().equals(userID))
+ {
+ NotebookEntry notebookEntry = mcService.getEntry(qaSession.getVoteSessionId(),
+ CoreNotebookConstants.NOTEBOOK_TOOL,
+ MY_SIGNATURE, new Integer(user.getQueUsrId().toString()));
+
+ logger.debug("notebookEntry: " + notebookEntry);
+
+ if (notebookEntry != null) {
+ ReflectionDTO reflectionDTO = new ReflectionDTO();
+ reflectionDTO.setUserId(user.getQueUsrId().toString());
+ reflectionDTO.setSessionId(qaSession.getVoteSessionId().toString());
+ reflectionDTO.setUserName(user.getUsername());
+ reflectionDTO.setReflectionUid (notebookEntry.getUid().toString());
+ String notebookEntryPresentable=VoteUtils.replaceNewLines(notebookEntry.getEntry());
+ reflectionDTO.setEntry(notebookEntryPresentable);
+ reflectionsContainerDTO.add(reflectionDTO);
+ }
+
+ }
+ }
+ }
+
+ }
+
+
+ logger.debug("reflectionsContainerDTO: " + reflectionsContainerDTO);
+ request.setAttribute(REFLECTIONS_CONTAINER_DTO, reflectionsContainerDTO);
+
+ if (exportMode)
+ {
+ request.getSession().setAttribute(REFLECTIONS_CONTAINER_DTO, reflectionsContainerDTO);
+ }
+ }
+
+ public ActionForward openNotebook(ActionMapping mapping,
+ ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws IOException,
+ ServletException, ToolException
+ {
+ logger.debug("dispatching openNotebook...");
+ IVoteService qaService = VoteServiceProxy.getVoteService(getServlet().getServletContext());
+ logger.debug("qaService: " + qaService);
+
+
+ String uid=request.getParameter("uid");
+ logger.debug("uid: " + uid);
+
+ String userId=request.getParameter("userId");
+ logger.debug("userId: " + userId);
+
+ String userName=request.getParameter("userName");
+ logger.debug("userName: " + userName);
+
+ String sessionId=request.getParameter("sessionId");
+ logger.debug("sessionId: " + sessionId);
+
+
+ NotebookEntry notebookEntry = qaService.getEntry(new Long(sessionId),
+ CoreNotebookConstants.NOTEBOOK_TOOL,
+ MY_SIGNATURE, new Integer(userId));
+
+ logger.debug("notebookEntry: " + notebookEntry);
+
+ VoteGeneralLearnerFlowDTO voteGeneralLearnerFlowDTO= new VoteGeneralLearnerFlowDTO();
+ if (notebookEntry != null) {
+ String notebookEntryPresentable=VoteUtils.replaceNewLines(notebookEntry.getEntry());
+ voteGeneralLearnerFlowDTO.setNotebookEntry(notebookEntryPresentable);
+ voteGeneralLearnerFlowDTO.setUserName(userName);
+ }
+
+ logger.debug("voteGeneralLearnerFlowDTO: " + voteGeneralLearnerFlowDTO);
+ request.setAttribute(VOTE_GENERAL_LEARNER_FLOW_DTO, voteGeneralLearnerFlowDTO);
+
+ logger.debug("fwding to : " + LEARNER_NOTEBOOK);
+ return mapping.findForward(LEARNER_NOTEBOOK);
+ }
+
+
+
protected void repopulateRequestParameters(HttpServletRequest request, VoteMonitoringForm voteMonitoringForm,
VoteGeneralMonitoringDTO voteGeneralMonitoringDTO)
{
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java
===================================================================
diff -u -r2da37d46f5f9f140f21e1c7d93924f7a4ed6188a -r14256ea45ab199cb0fea34e9b987aa55608cd206
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java (.../VoteMonitoringStarterAction.java) (revision 2da37d46f5f9f140f21e1c7d93924f7a4ed6188a)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java (.../VoteMonitoringStarterAction.java) (revision 14256ea45ab199cb0fea34e9b987aa55608cd206)
@@ -197,6 +197,8 @@
request.setAttribute(VOTE_GENERAL_AUTHORING_DTO, voteGeneralAuthoringDTO);
/*...till here */
+ voteMonitoringAction.prepareReflectionData(request, voteContent, voteService, null, false);
+
logger.debug("calling submitSession with selectedToolSessionId" + voteMonitoringForm.getSelectedToolSessionId());
return voteMonitoringAction.submitSession(mapping, voteMonitoringForm, request, response, voteService, voteGeneralMonitoringDTO);
}
Index: lams_tool_vote/web/WEB-INF/struts-config.xml
===================================================================
diff -u -rfadef2b7b1f00478057ecade707ca37aa24ebe15 -r14256ea45ab199cb0fea34e9b987aa55608cd206
--- lams_tool_vote/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision fadef2b7b1f00478057ecade707ca37aa24ebe15)
+++ lams_tool_vote/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 14256ea45ab199cb0fea34e9b987aa55608cd206)
@@ -376,6 +376,12 @@
redirect="false"
/>
+
+
+
+
+
+
+
Index: lams_tool_vote/web/monitoring/LearnerNotebook.jsp
===================================================================
diff -u
--- lams_tool_vote/web/monitoring/LearnerNotebook.jsp (revision 0)
+++ lams_tool_vote/web/monitoring/LearnerNotebook.jsp (revision 14256ea45ab199cb0fea34e9b987aa55608cd206)
@@ -0,0 +1,97 @@
+<%--
+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 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ USA
+
+ http://www.gnu.org/licenses/gpl.txt
+--%>
+
+
+
+<%@ include file="/common/taglibs.jsp"%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_vote/web/monitoring/SummaryContent.jsp
===================================================================
diff -u -ra8e5c42d584e4b8b9b67224179acbc53850d279f -r14256ea45ab199cb0fea34e9b987aa55608cd206
--- lams_tool_vote/web/monitoring/SummaryContent.jsp (.../SummaryContent.jsp) (revision a8e5c42d584e4b8b9b67224179acbc53850d279f)
+++ lams_tool_vote/web/monitoring/SummaryContent.jsp (.../SummaryContent.jsp) (revision 14256ea45ab199cb0fea34e9b987aa55608cd206)
@@ -23,6 +23,7 @@
<%@ taglib uri="tags-bean" prefix="bean"%>
<%@ taglib uri="tags-html" prefix="html"%>
<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ taglib uri="tags-function" prefix="fn" %>
<%@ taglib uri="tags-core" prefix="c"%>
<%@ taglib uri="tags-fmt" prefix="fmt" %>
<%@ taglib uri="fck-editor" prefix="FCK" %>
@@ -51,4 +52,48 @@
+
+
+
+