Index: lams_tool_laqa/conf/hibernate/mappings/QaContent.hbm.xml
===================================================================
diff -u -re4fa840a72a71bfd8608fbb2ac359e59832bf881 -r5fe2b3e8754297d2c9f5d92689842b786d74d05d
--- lams_tool_laqa/conf/hibernate/mappings/QaContent.hbm.xml (.../QaContent.hbm.xml) (revision e4fa840a72a71bfd8608fbb2ac359e59832bf881)
+++ lams_tool_laqa/conf/hibernate/mappings/QaContent.hbm.xml (.../QaContent.hbm.xml) (revision 5fe2b3e8754297d2c9f5d92689842b786d74d05d)
@@ -11,14 +11,23 @@
>
-
+
+
+
+
-
+
@@ -68,15 +68,28 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -246,7 +259,7 @@
-
+
@@ -388,7 +401,7 @@
-
+
@@ -495,7 +508,7 @@
-
+
@@ -557,12 +570,12 @@
-
+
-
+
Index: lams_tool_laqa/db/sql/create_lams_tool_qa.sql
===================================================================
diff -u -rccffbc14f13eb5942c42fba71ac76dbe89acd957 -r5fe2b3e8754297d2c9f5d92689842b786d74d05d
--- lams_tool_laqa/db/sql/create_lams_tool_qa.sql (.../create_lams_tool_qa.sql) (revision ccffbc14f13eb5942c42fba71ac76dbe89acd957)
+++ lams_tool_laqa/db/sql/create_lams_tool_qa.sql (.../create_lams_tool_qa.sql) (revision 5fe2b3e8754297d2c9f5d92689842b786d74d05d)
@@ -1,5 +1,6 @@
-CREATE TABLE tl_laqa11_content (
- qa_content_id BIGINT(20) NOT NULL
+CREATE TABLE lams.tl_laqa11_content (
+ uid BIGINT(20) NOT NULL AUTO_INCREMENT
+ , qa_content_id BIGINT(20) NOT NULL
, title VARCHAR(250) NOT NULL DEFAULT 'Questions and Answers'
, instructions VARCHAR(250) NOT NULL DEFAULT 'Please, take a minute to answer the following questions.'
, creation_date VARCHAR(100)
@@ -16,10 +17,10 @@
, online_instructions VARCHAR(250) DEFAULT 'online instructions'
, end_learning_message VARCHAR(150) DEFAULT 'Thank you!'
, content_locked TINYINT(1) DEFAULT 0
- , PRIMARY KEY (qa_content_id)
+ , PRIMARY KEY (uid)
)TYPE=InnoDB;
-CREATE TABLE tl_laqa11_session (
+CREATE TABLE lams.tl_laqa11_session (
qa_session_id BIGINT(20) NOT NULL
, session_start_date DATETIME
, session_end_date DATETIME
@@ -28,10 +29,10 @@
, PRIMARY KEY (qa_session_id)
, INDEX (qa_content_id)
, CONSTRAINT FK_tl_laqa11_session_1 FOREIGN KEY (qa_content_id)
- REFERENCES lams.tl_laqa11_content (qa_content_id)
+ REFERENCES lams.tl_laqa11_content (uid)
)TYPE=InnoDB;
-CREATE TABLE tl_laqa11_que_usr (
+CREATE TABLE lams.tl_laqa11_que_usr (
uid BIGINT(20) NOT NULL AUTO_INCREMENT
, que_usr_id BIGINT(20) NOT NULL
, username VARCHAR(100)
@@ -43,18 +44,18 @@
REFERENCES lams.tl_laqa11_session (qa_session_id)
)TYPE=InnoDB;
-CREATE TABLE tl_laqa11_que_content (
+CREATE TABLE lams.tl_laqa11_que_content (
qa_que_content_id BIGINT(20) NOT NULL
, question VARCHAR(255)
, display_order INT(5)
, qa_content_id BIGINT(20) NOT NULL
, PRIMARY KEY (qa_que_content_id)
, INDEX (qa_content_id)
, CONSTRAINT FK_tl_laqa11_que_content_1 FOREIGN KEY (qa_content_id)
- REFERENCES lams.tl_laqa11_content (qa_content_id)
+ REFERENCES lams.tl_laqa11_content (uid)
)TYPE=InnoDB;
-CREATE TABLE tl_laqa11_usr_resp (
+CREATE TABLE lams.tl_laqa11_usr_resp (
response_id BIGINT(20) NOT NULL
, hidden TINYINT(1) DEFAULT 0
, answer VARCHAR(255)
@@ -71,18 +72,19 @@
REFERENCES lams.tl_laqa11_que_usr (uid)
)TYPE=InnoDB;
-CREATE TABLE tl_laqa11_uploadedfile (
+CREATE TABLE lams.tl_laqa11_uploadedfile (
submissionId BIGINT(20) NOT NULL AUTO_INCREMENT
, uuid VARCHAR(255) NOT NULL
, isOnline_File TINYINT(1) NOT NULL
, filename VARCHAR(255) NOT NULL
, qa_content_id BIGINT(20) NOT NULL
, PRIMARY KEY (submissionId)
, INDEX (qa_content_id)
- , CONSTRAINT FK_tl_laqa11_que_content_1_1 FOREIGN KEY (qa_content_id)
- REFERENCES lams.tl_laqa11_content (qa_content_id)
+ , CONSTRAINT FK_tl_laqa11_uploadedfile_1 FOREIGN KEY (qa_content_id)
+ REFERENCES lams.tl_laqa11_content (uid)
)TYPE=InnoDB;
+
-- data for content table
INSERT INTO tl_laqa11_content (qa_content_id, creation_date) VALUES (${default_content_id}, NOW());
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml
===================================================================
diff -u -r33127f690e04777acb08682f48994e5c102e4967 -r5fe2b3e8754297d2c9f5d92689842b786d74d05d
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml (.../QaContent.hbm.xml) (revision 33127f690e04777acb08682f48994e5c102e4967)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml (.../QaContent.hbm.xml) (revision 5fe2b3e8754297d2c9f5d92689842b786d74d05d)
@@ -11,14 +11,23 @@
>
-
+
+
+
+
0){
+ QaContent qa = (QaContent) list.get(0);
+ return qa;
+ }
+ return null;
+ }
+
+
+ public QaContent getQaContentByUID(Long uid)
+ {
+ return (QaContent) this.getHibernateTemplate().get(QaContent.class, uid);
+ }
+
public void updateQa(QaContent qa)
{
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java
===================================================================
diff -u -r69f36134758d85e347893150aa05da3ba9479159 -r5fe2b3e8754297d2c9f5d92689842b786d74d05d
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java (.../IQaService.java) (revision 69f36134758d85e347893150aa05da3ba9479159)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java (.../IQaService.java) (revision 5fe2b3e8754297d2c9f5d92689842b786d74d05d)
@@ -24,7 +24,6 @@
import java.util.List;
import org.lamsfoundation.lams.contentrepository.ITicket;
-import org.lamsfoundation.lams.contentrepository.NodeKey;
import org.lamsfoundation.lams.tool.BasicToolVO;
import org.lamsfoundation.lams.tool.exception.DataMissingException;
import org.lamsfoundation.lams.tool.exception.ToolException;
@@ -63,9 +62,10 @@
*/
public QaContent loadQa(long toolContentId);
+
+ public QaContent getQaContentByUID(Long uid);
-
/**
* Return the question content object according to the requested question content id.
* @param qaQueContentId qa question content id
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
===================================================================
diff -u -r69f36134758d85e347893150aa05da3ba9479159 -r5fe2b3e8754297d2c9f5d92689842b786d74d05d
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision 69f36134758d85e347893150aa05da3ba9479159)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision 5fe2b3e8754297d2c9f5d92689842b786d74d05d)
@@ -137,76 +137,7 @@
public QaServicePOJO(){}
- public void setQaDAO(IQaContentDAO qaDAO)
- {
- this.qaDAO = qaDAO;
- }
- public void setQaQueContentDAO(IQaQueContentDAO qaQueContentDAO)
- {
- this.qaQueContentDAO = qaQueContentDAO;
- }
-
- public void setQaSessionDAO(IQaSessionDAO qaSessionDAO)
- {
- this.qaSessionDAO = qaSessionDAO;
- }
-
- public void setQaQueUsrDAO(IQaQueUsrDAO qaQueUsrDAO)
- {
- this.qaQueUsrDAO = qaQueUsrDAO;
- }
-
- public void setQaUsrRespDAO(IQaUsrRespDAO qaUsrRespDAO)
- {
- this.qaUsrRespDAO = qaUsrRespDAO;
- }
-
- /**
- * @return Returns the qaDAO.
- */
- public IQaContentDAO getQaDAO() {
- return qaDAO;
- }
- /**
- * @return Returns the qaSessionDAO.
- */
- public IQaSessionDAO getQaSessionDAO() {
- return qaSessionDAO;
- }
- /**
- * @return Returns the qaUsrRespDAO.
- */
- public IQaUsrRespDAO getQaUsrRespDAO() {
- return qaUsrRespDAO;
- }
-
- /**
- * @return Returns the repositoryService.
- */
- public IRepositoryService getRepositoryService() {
- return repositoryService;
- }
- /**
- * @param repositoryService The repositoryService to set.
- */
- public void setRepositoryService(IRepositoryService repositoryService) {
- this.repositoryService = repositoryService;
- }
-
-
-
- public void setUserManagementService(IUserManagementService userManagementService)
- {
- this.userManagementService = userManagementService;
- }
-
- public void setToolService(ILamsToolService toolService)
- {
- this.toolService = toolService;
- }
-
-
public void createQa(QaContent qaContent) throws QaApplicationException
{
try
@@ -220,8 +151,23 @@
e);
}
}
-
+
+ public QaContent getQaContentByUID(Long uid) throws QaApplicationException
+ {
+ try
+ {
+ return qaDAO.getQaContentByUID(uid);
+ }
+ catch (DataAccessException e)
+ {
+ throw new QaApplicationException("Exception occured when lams is getting qa content by uid: "
+ + e.getMessage(),
+ e);
+ }
+
+ }
+
public QaContent retrieveQa(long toolContentId) throws QaApplicationException
{
try
@@ -435,8 +381,21 @@
e);
}
}
+
+ public List retrieveQaQueContentsByToolContentId(long qaContentId){
+ try
+ {
+ return qaQueContentDAO.getQaQueContentsByContentId(qaContentId);
+ }
+ catch (DataAccessException e)
+ {
+ throw new QaApplicationException("Exception occured when lams is loading qa que usr: "
+ + e.getMessage(),
+ e);
+ }
+ }
+
-
public void updateQa(QaContent qa) throws QaApplicationException
{
try
@@ -1715,17 +1674,73 @@
public void setLearnerService(ILearnerService learnerService) {
this.learnerService = learnerService;
}
+
+ public void setQaDAO(IQaContentDAO qaDAO)
+ {
+ this.qaDAO = qaDAO;
+ }
- public List retrieveQaQueContentsByToolContentId(long qaContentId){
- try
- {
- return qaQueContentDAO.getQaQueContentsByContentId(qaContentId);
- }
- catch (DataAccessException e)
- {
- throw new QaApplicationException("Exception occured when lams is loading qa que usr: "
- + e.getMessage(),
- e);
- }
+ public void setQaQueContentDAO(IQaQueContentDAO qaQueContentDAO)
+ {
+ this.qaQueContentDAO = qaQueContentDAO;
}
+
+ public void setQaSessionDAO(IQaSessionDAO qaSessionDAO)
+ {
+ this.qaSessionDAO = qaSessionDAO;
+ }
+
+ public void setQaQueUsrDAO(IQaQueUsrDAO qaQueUsrDAO)
+ {
+ this.qaQueUsrDAO = qaQueUsrDAO;
+ }
+
+ public void setQaUsrRespDAO(IQaUsrRespDAO qaUsrRespDAO)
+ {
+ this.qaUsrRespDAO = qaUsrRespDAO;
+ }
+
+ /**
+ * @return Returns the qaDAO.
+ */
+ public IQaContentDAO getQaDAO() {
+ return qaDAO;
+ }
+ /**
+ * @return Returns the qaSessionDAO.
+ */
+ public IQaSessionDAO getQaSessionDAO() {
+ return qaSessionDAO;
+ }
+ /**
+ * @return Returns the qaUsrRespDAO.
+ */
+ public IQaUsrRespDAO getQaUsrRespDAO() {
+ return qaUsrRespDAO;
+ }
+
+ /**
+ * @return Returns the repositoryService.
+ */
+ public IRepositoryService getRepositoryService() {
+ return repositoryService;
+ }
+ /**
+ * @param repositoryService The repositoryService to set.
+ */
+ public void setRepositoryService(IRepositoryService repositoryService) {
+ this.repositoryService = repositoryService;
+ }
+
+
+
+ public void setUserManagementService(IUserManagementService userManagementService)
+ {
+ this.userManagementService = userManagementService;
+ }
+
+ public void setToolService(ILamsToolService toolService)
+ {
+ this.toolService = toolService;
+ }
}
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml
===================================================================
diff -u -re4fa840a72a71bfd8608fbb2ac359e59832bf881 -r5fe2b3e8754297d2c9f5d92689842b786d74d05d
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml (.../QaContent.hbm.xml) (revision e4fa840a72a71bfd8608fbb2ac359e59832bf881)
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml (.../QaContent.hbm.xml) (revision 5fe2b3e8754297d2c9f5d92689842b786d74d05d)
@@ -11,14 +11,23 @@
>
-
+
+
+
+