Index: lams_tool_mindmap/db/model/mindmap_tool.clay
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/db/model/mindmap_tool.clay,v
diff -u -r1.1 -r1.2
--- lams_tool_mindmap/db/model/mindmap_tool.clay 3 Apr 2009 00:00:38 -0000 1.1
+++ lams_tool_mindmap/db/model/mindmap_tool.clay 20 Apr 2009 05:03:05 -0000 1.2
@@ -11,7 +11,720 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/IMindmapSessionDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/IMindmapSessionDAO.java,v
diff -u -r1.1 -r1.2
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/IMindmapSessionDAO.java 3 Apr 2009 00:00:38 -0000 1.1
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/IMindmapSessionDAO.java 20 Apr 2009 05:04:43 -0000 1.2
@@ -25,7 +25,6 @@
package org.lamsfoundation.lams.tool.mindmap.dao;
import org.lamsfoundation.lams.dao.IBaseDAO;
-import org.lamsfoundation.lams.tool.mindmap.model.Mindmap;
import org.lamsfoundation.lams.tool.mindmap.model.MindmapSession;
/**
@@ -39,4 +38,6 @@
MindmapSession getBySessionId(Long toolSessionId);
void deleteBySessionID(Long toolSessionID);
+
+ public MindmapSession getSessionByMindmapId(Long mindmapId);
}
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapSessionDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapSessionDAO.java,v
diff -u -r1.1 -r1.2
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapSessionDAO.java 3 Apr 2009 00:00:30 -0000 1.1
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapSessionDAO.java 20 Apr 2009 05:04:43 -0000 1.2
@@ -28,7 +28,6 @@
import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
import org.lamsfoundation.lams.tool.mindmap.dao.IMindmapSessionDAO;
-import org.lamsfoundation.lams.tool.mindmap.model.Mindmap;
import org.lamsfoundation.lams.tool.mindmap.model.MindmapSession;
/**
@@ -38,6 +37,9 @@
public static final String SQL_QUERY_FIND_BY_SESSION_ID = "from "
+ MindmapSession.class.getName() + " where session_id = ?";
+
+ public static final String SQL_QUERY_FIND_BY_MINDMAP_ID = "from "
+ + MindmapSession.class.getName() + " ms where ms.mindmap.uid = ?";
public void saveOrUpdate(MindmapSession session) {
this.getHibernateTemplate().saveOrUpdate(session);
@@ -60,4 +62,12 @@
}
}
+ public MindmapSession getSessionByMindmapId(Long mindmapId) {
+ List list = this.getHibernateTemplate().find(SQL_QUERY_FIND_BY_MINDMAP_ID, mindmapId);
+ if (list == null || list.isEmpty())
+ return null;
+
+ return (MindmapSession) list.get(0);
+ }
+
}
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/MindmapSession.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/MindmapSession.java,v
diff -u -r1.1 -r1.2
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/MindmapSession.java 3 Apr 2009 00:00:36 -0000 1.1
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/MindmapSession.java 20 Apr 2009 05:04:43 -0000 1.2
@@ -31,18 +31,13 @@
import org.apache.log4j.Logger;
/**
- *
* Represents the tool session.
*
* @hibernate.class table="tl_lamind10_session"
*/
-
public class MindmapSession implements java.io.Serializable {
private static Logger log = Logger.getLogger(MindmapSession.class);
- /**
- *
- */
private static final long serialVersionUID = 4407078136514639026L;
// Fields
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/IMindmapService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/IMindmapService.java,v
diff -u -r1.2 -r1.3
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/IMindmapService.java 14 Apr 2009 00:46:15 -0000 1.2
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/IMindmapService.java 20 Apr 2009 05:04:43 -0000 1.3
@@ -223,4 +223,6 @@
public MindmapRequest getRequestByUniqueId(Long uniqueId, Long userId, Long mindmapId, Long globalId);
public Long getLastGlobalIdByMindmapId(Long mindmapId);
+
+ public MindmapSession getSessionByMindmapId(Long mindmapId);
}
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java,v
diff -u -r1.2 -r1.3
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java 14 Apr 2009 00:46:15 -0000 1.2
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java 20 Apr 2009 05:04:43 -0000 1.3
@@ -934,4 +934,9 @@
public MessageService getMindmapMessageService() {
return mindmapMessageService;
}
+
+ public MindmapSession getSessionByMindmapId(Long mindmapId)
+ {
+ return mindmapSessionDAO.getSessionByMindmapId(mindmapId);
+ }
}
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java,v
diff -u -r1.3 -r1.4
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java 17 Apr 2009 07:24:07 -0000 1.3
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java 20 Apr 2009 05:04:42 -0000 1.4
@@ -227,6 +227,10 @@
cloneMindmapNodesForRuntime(fromMindmapNode, null, mindmap, mindmap, mindmapUser);
}
}
+ else {
+ boolean isMonitor = WebUtil.readBooleanParam(request, "monitor", false);
+ request.setAttribute("isMonitor", isMonitor);
+ }
return mapping.findForward("mindmap");
}
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/MonitoringAction.java,v
diff -u -r1.3 -r1.4
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/MonitoringAction.java 17 Apr 2009 07:24:16 -0000 1.3
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/MonitoringAction.java 20 Apr 2009 05:04:42 -0000 1.4
@@ -39,6 +39,7 @@
import org.lamsfoundation.lams.tool.mindmap.dto.MindmapUserDTO;
import org.lamsfoundation.lams.tool.mindmap.model.Mindmap;
import org.lamsfoundation.lams.tool.mindmap.model.MindmapNode;
+import org.lamsfoundation.lams.tool.mindmap.model.MindmapSession;
import org.lamsfoundation.lams.tool.mindmap.model.MindmapUser;
import org.lamsfoundation.lams.tool.mindmap.service.IMindmapService;
import org.lamsfoundation.lams.tool.mindmap.service.MindmapServiceProxy;
@@ -81,6 +82,7 @@
Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
Mindmap mindmap = mindmapService.getMindmapByContentId(toolContentID);
+ MindmapSession session = mindmapService.getSessionByMindmapId(mindmap.getUid());
if (mindmap == null) {
log.error("unspecified(): Mindmap is not found!");
@@ -100,6 +102,7 @@
request.setAttribute("mindmapDTO", mindmapDTO);
request.setAttribute("contentFolderID", contentFolderID);
request.setAttribute("isGroupedActivity", isGroupedActivity);
+ request.setAttribute("toolSessionID", session.getUid());
return mapping.findForward("success");
}
@@ -271,15 +274,16 @@
* @return null
*/
public ActionForward updateContent(ActionMapping mapping, ActionForm form, HttpServletRequest request,
- HttpServletResponse response) {
+ HttpServletResponse response) {
- Long userId = WebUtil.readLongParam(request, "userId", false);
Long toolContentId = WebUtil.readLongParam(request, "mindmapId", false);
- String mindmapContent = WebUtil.readStrParam(request, "content", false);
-
Mindmap mindmap = mindmapService.getMindmapByUid(toolContentId);
+
+ Long userId = WebUtil.readLongParam(request, "userId", false);
MindmapUser mindmapUser = mindmapService.getUserByUID(userId);
+ String mindmapContent = WebUtil.readStrParam(request, "content", false);
+
if (!mindmap.isMultiUserMode()) {
// Saving Mindmap data to XML
XStream xstream = new XStream();
Index: lams_tool_mindmap/web/pages/learning/mindmap.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/pages/learning/mindmap.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_mindmap/web/pages/learning/mindmap.jsp 17 Apr 2009 07:26:30 -0000 1.6
+++ lams_tool_mindmap/web/pages/learning/mindmap.jsp 20 Apr 2009 05:05:27 -0000 1.7
@@ -116,21 +116,34 @@
-
+
-
- button.continue
-
+
+ button.back
+
-
+
-
-
- button.finish
-
-
+
+
+
+
+ button.continue
+
+
+
+
+
+
+
+ button.finish
+
+
+
+
+
Index: lams_tool_mindmap/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/pages/monitoring/summary.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_mindmap/web/pages/monitoring/summary.jsp 14 Apr 2009 00:47:27 -0000 1.2
+++ lams_tool_mindmap/web/pages/monitoring/summary.jsp 20 Apr 2009 05:05:26 -0000 1.3
@@ -132,16 +132,9 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
|
|