Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/Attic/McSession.hbm.xml,v
diff -u -r1.7 -r1.8
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml 7 Jan 2006 14:01:23 -0000 1.7
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml 28 Feb 2006 07:31:59 -0000 1.8
@@ -48,6 +48,14 @@
column="session_status"
length="100"
/>
+
+
-
-QA Tool for Lams 1.1
+
+MCQ Tool for Lams 1.1
@@ -501,7 +501,7 @@
-
+
@@ -541,6 +541,13 @@
+
+
+
+
+
+
+
Index: lams_tool_lamc/db/sql/create_lams_tool_mc.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/db/sql/create_lams_tool_mc.sql,v
diff -u -r1.5 -r1.6
--- lams_tool_lamc/db/sql/create_lams_tool_mc.sql 15 Feb 2006 14:41:01 -0000 1.5
+++ lams_tool_lamc/db/sql/create_lams_tool_mc.sql 28 Feb 2006 07:32:00 -0000 1.6
@@ -56,6 +56,7 @@
, mc_session_id BIGINT(20) NOT NULL
, session_start_date DATETIME
, session_end_date DATETIME
+ , session_name VARCHAR(100)
, session_status VARCHAR(100)
, mc_content_id BIGINT(20) NOT NULL
, UNIQUE UQ_tl_lamc11_session_1 (mc_session_id)
@@ -109,7 +110,7 @@
, filename VARCHAR(255) NOT NULL
, PRIMARY KEY (uid)
, INDEX (mc_content_id)
- , CONSTRAINT FK_tl_lamc11_uploadedfile FOREIGN KEY (mc_content_id)
+ , CONSTRAINT FK_tl_lamc11_uploadedFile FOREIGN KEY (mc_content_id)
REFERENCES tl_lamc11_content (uid)
)TYPE=InnoDB;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McSession.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McSession.java,v
diff -u -r1.1 -r1.2
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McSession.java 7 Jan 2006 14:15:40 -0000 1.1
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McSession.java 28 Feb 2006 07:32:00 -0000 1.2
@@ -58,6 +58,8 @@
/** nullable persistent field */
private String sessionStatus;
+
+ private String session_name;
/** nullable persistent field */
private Long mcContentId;
@@ -78,6 +80,15 @@
this.mcQueUsers = mcQueUsers;
}
+ public McSession(Long mcSessionId, Date sessionStartDate, String sessionStatus, String session_name, org.lamsfoundation.lams.tool.mc.pojos.McContent mcContent, Set mcQueUsers) {
+ this.mcSessionId = mcSessionId;
+ this.sessionStartDate = sessionStartDate;
+ this.sessionStatus = sessionStatus;
+ this.session_name = session_name;
+ this.mcContent = mcContent;
+ this.mcQueUsers = mcQueUsers;
+ }
+
public McSession(Long mcSessionId, Date sessionStartDate, String sessionStatus, org.lamsfoundation.lams.tool.mc.pojos.McContent mcContent, Set mcQueUsers) {
this.mcSessionId = mcSessionId;
this.sessionStartDate = sessionStartDate;
@@ -86,7 +97,6 @@
this.mcQueUsers = mcQueUsers;
}
-
/** default constructor */
public McSession() {
}
@@ -187,4 +197,16 @@
public void setMcQueUsers(Set mcQueUsers) {
this.mcQueUsers = mcQueUsers;
}
+ /**
+ * @return Returns the session_name.
+ */
+ public String getSession_name() {
+ return session_name;
+ }
+ /**
+ * @param session_name The session_name to set.
+ */
+ public void setSession_name(String session_name) {
+ this.session_name = session_name;
+ }
}
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java,v
diff -u -r1.52 -r1.53
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java 8 Feb 2006 11:26:24 -0000 1.52
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java 28 Feb 2006 07:32:00 -0000 1.53
@@ -1524,6 +1524,8 @@
public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) throws ToolException
{
logger.debug("start of createToolSession with ids: " + toolSessionId + " and " + toolContentId);
+ logger.debug("toolSessionName: " + toolSessionName);
+
if (toolSessionId == null)
{
logger.error("toolSessionId is null");
@@ -1585,6 +1587,7 @@
McSession mcSession = new McSession(toolSessionId,
new Date(System.currentTimeMillis()),
McSession.INCOMPLETE,
+ toolSessionName,
mcContent,
new TreeSet());
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java,v
diff -u -r1.16 -r1.17
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java 25 Feb 2006 19:27:26 -0000 1.16
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java 28 Feb 2006 07:32:00 -0000 1.17
@@ -265,6 +265,7 @@
/*
* obtain and setup the current user's data
*/
+ /*
String userID = "";
HttpSession ss = SessionManager.getSession();
UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
@@ -279,6 +280,7 @@
logger.debug("retrieved userId: " + userID);
request.getSession().setAttribute(USER_ID, userID);
+ */
String strToolContentId=request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
logger.debug("strToolContentId: " + strToolContentId);