Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml
===================================================================
diff -u -r2b4b4fd3565396f60d9436cd3da79551e015bbaf -rc215962e5ad947b556b51a222c65893d31580f29
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml (.../McSession.hbm.xml) (revision 2b4b4fd3565396f60d9436cd3da79551e015bbaf)
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml (.../McSession.hbm.xml) (revision c215962e5ad947b556b51a222c65893d31580f29)
@@ -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
===================================================================
diff -u -r931d25448a093526a8263a167bd2b8d1104eb04b -rc215962e5ad947b556b51a222c65893d31580f29
--- lams_tool_lamc/db/sql/create_lams_tool_mc.sql (.../create_lams_tool_mc.sql) (revision 931d25448a093526a8263a167bd2b8d1104eb04b)
+++ lams_tool_lamc/db/sql/create_lams_tool_mc.sql (.../create_lams_tool_mc.sql) (revision c215962e5ad947b556b51a222c65893d31580f29)
@@ -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
===================================================================
diff -u -rdf74c2ae9ad3fd2a2e559fdc6ab92593204c7090 -rc215962e5ad947b556b51a222c65893d31580f29
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McSession.java (.../McSession.java) (revision df74c2ae9ad3fd2a2e559fdc6ab92593204c7090)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McSession.java (.../McSession.java) (revision c215962e5ad947b556b51a222c65893d31580f29)
@@ -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
===================================================================
diff -u -rc64e7f4aca634d620c7eb8ec005bafc5def0b22c -rc215962e5ad947b556b51a222c65893d31580f29
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision c64e7f4aca634d620c7eb8ec005bafc5def0b22c)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision c215962e5ad947b556b51a222c65893d31580f29)
@@ -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
===================================================================
diff -u -rdef2dd6db95cbaa6ae8116e6a63e948db2c403f5 -rc215962e5ad947b556b51a222c65893d31580f29
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java (.../McMonitoringStarterAction.java) (revision def2dd6db95cbaa6ae8116e6a63e948db2c403f5)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java (.../McMonitoringStarterAction.java) (revision c215962e5ad947b556b51a222c65893d31580f29)
@@ -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);