Index: lams_tool_laqa/.classpath
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/.classpath,v
diff -u -r1.10 -r1.10.10.1
--- lams_tool_laqa/.classpath 30 Oct 2008 03:48:32 -0000 1.10
+++ lams_tool_laqa/.classpath 16 Mar 2011 20:01:47 -0000 1.10.10.1
@@ -12,5 +12,5 @@
-
+
Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaCondition.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaCondition.hbm.xml,v
diff -u -r1.3 -r1.3.10.1
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaCondition.hbm.xml 21 Oct 2008 02:25:35 -0000 1.3
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaCondition.hbm.xml 16 Mar 2011 19:58:18 -0000 1.3.10.1
@@ -30,7 +30,7 @@
Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml,v
diff -u -r1.10.6.1.4.2 -r1.10.6.1.4.3
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml 24 Feb 2011 14:22:41 -0000 1.10.6.1.4.2
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml 16 Mar 2011 19:58:19 -0000 1.10.6.1.4.3
@@ -190,7 +190,7 @@
Fisheye: Tag 1.3.12.2 refers to a dead (removed) revision in file `lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml,v
diff -u -r1.4 -r1.4.10.1
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml 14 Feb 2007 11:17:21 -0000 1.4
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml 16 Mar 2011 19:58:19 -0000 1.4.10.1
@@ -55,15 +55,6 @@
access="property"
column="learnerFinished"
/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
questions = new TreeSet(new QaQueContentComparator());
+ private Set questions = new TreeSet(new QaQueContentComparator());
private static Logger log = Logger.getLogger(QaCondition.class);
- public SortedSet temporaryQuestionDTOSet = new TreeSet(
+ public SortedSet temporaryQuestionDTOSet = new TreeSet(
new QaQuestionContentDTOComparator());
public QaCondition() {
@@ -63,15 +65,15 @@
public QaCondition(QaConditionDTO conditionDTO) {
super(conditionDTO);
- for (QaQueContent question : conditionDTO.getQuestions()) {
- QaQueContent questionCopy = new QaQueContent(question.getQuestion(), question.getDisplayOrder(), null,
- question.isRequired(), null, null, null);
+ for (QaQuestion question : conditionDTO.getQuestions()) {
+ QaQuestion questionCopy = new QaQuestion(question.getQuestion(), question.getDisplayOrder(), null,
+ question.isRequired(), null, null);
getQuestions().add(questionCopy);
}
}
public QaCondition(Long conditionId, Integer conditionUIID, Integer orderId, String name, String displayName,
- String allWords, String phrase, String anyWords, String excludedWords, Set questions) {
+ String allWords, String phrase, String anyWords, String excludedWords, Set questions) {
super(conditionId, conditionUIID, orderId, name, displayName, BranchCondition.OUTPUT_TYPE_COMPLEX, null, null,
null, allWords, phrase, anyWords, excludedWords);
setQuestions(questions);
@@ -87,7 +89,7 @@
// the condition "knows" it's an array of strings, i.e. user's answers
String[] answers = (String[]) value.getValue();
result = true;
- for (QaQueContent question : questions) {
+ for (QaQuestion question : questions) {
String textToMatch = answers[question.getDisplayOrder() - 1];
textToMatch = WebUtil.removeHTMLtags(textToMatch);
result &= matches(textToMatch);
@@ -104,11 +106,11 @@
return result;
}
- public Set getQuestions() {
+ public Set getQuestions() {
return questions;
}
- public void setQuestions(Set questions) {
+ public void setQuestions(Set questions) {
this.questions = questions;
}
@@ -117,7 +119,7 @@
*/
@Override
public Object clone() {
- Set questionsCopy = new TreeSet(new QaQueContentComparator());
+ Set questionsCopy = new TreeSet(new QaQueContentComparator());
questionsCopy.addAll(questions);
return new QaCondition(null, null, orderId, name, displayName, allWords, phrase, anyWords, excludedWords,
questionsCopy);
@@ -132,11 +134,11 @@
@Override
public QaCondition clone(int uiidOffset) {
Integer newConditionUIID = LearningDesign.addOffset(conditionUIID, uiidOffset);
- Set questionsCopy = new TreeSet(new QaQueContentComparator());
+ Set questionsCopy = new TreeSet(new QaQueContentComparator());
- for (QaQueContent question : getQuestions()) {
- QaQueContent questionCopy = new QaQueContent(question.getQuestion(), question.getDisplayOrder(), null,
- question.isRequired(), null, null, null);
+ for (QaQuestion question : getQuestions()) {
+ QaQuestion questionCopy = new QaQuestion(question.getQuestion(), question.getDisplayOrder(), null,
+ question.isRequired(), null, null);
questionsCopy.add(questionCopy);
}
return new QaCondition(null, newConditionUIID, orderId, name, displayName, allWords, phrase, anyWords,
@@ -150,9 +152,9 @@
*/
public QaCondition clone(QaContent qaContent) {
- Set questionsCopy = new TreeSet(new QaQueContentComparator());
- for (QaQueContent conditionQuestion : getQuestions()) {
- for (QaQueContent contentQuestion : (Set) qaContent.getQaQueContents()) {
+ Set questionsCopy = new TreeSet(new QaQueContentComparator());
+ for (QaQuestion conditionQuestion : getQuestions()) {
+ for (QaQuestion contentQuestion : (Set) qaContent.getQaQuestions()) {
if (conditionQuestion.getDisplayOrder() == contentQuestion.getDisplayOrder()) {
questionsCopy.add(contentQuestion);
}
Fisheye: Tag 1.1.10.2 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaConditionDTO.java'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java,v
diff -u -r1.22.4.1.4.1 -r1.22.4.1.4.2
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java 24 Feb 2011 14:22:40 -0000 1.22.4.1.4.1
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java 16 Mar 2011 19:51:48 -0000 1.22.4.1.4.2
@@ -124,7 +124,7 @@
private Date updateDate;
/** persistent field */
- private Set qaQueContents;
+ private Set qaQuestions;
/** persistent field */
private Set qaSessions;
@@ -166,7 +166,7 @@
this.reflectionSubject = reflectionSubject;
this.creationDate = creationDate;
this.updateDate = updateDate;
- this.qaQueContents = qaQueContents;
+ this.qaQuestions = qaQueContents;
this.qaSessions = qaSessions;
this.qaUploadedFiles = qaUploadedFiles;
this.conditions = conditions;
@@ -195,7 +195,7 @@
qa.getReflectionSubject(), qa.getCreationDate(), qa.getUpdateDate(), new TreeSet(), new TreeSet(),
new TreeSet(), new TreeSet(new TextSearchConditionComparator()), qa.isAllowRichEditor());
- newContent.setQaQueContents(qa.deepCopyQaQueContent(newContent));
+ newContent.setQaQuestions(qa.deepCopyQaQueContent(newContent));
newContent.setQaUploadedFiles(qa.deepCopyQaAttachments(toolContentHandler, newContent));
newContent.setConditions(qa.deepCopyConditions(newContent));
@@ -204,9 +204,9 @@
public Set deepCopyQaQueContent(QaContent newQaContent) {
Set newQaQueContent = new TreeSet();
- for (Iterator i = this.getQaQueContents().iterator(); i.hasNext();) {
- QaQueContent queContent = (QaQueContent) i.next();
- newQaQueContent.add(QaQueContent.newInstance(queContent, newQaContent));
+ for (Iterator i = this.getQaQuestions().iterator(); i.hasNext();) {
+ QaQuestion queContent = (QaQuestion) i.next();
+ newQaQueContent.add(QaQuestion.newInstance(queContent, newQaContent));
}
return newQaQueContent;
}
@@ -241,15 +241,15 @@
return new TreeSet();
}
- public Set getQaQueContents() {
- if (qaQueContents == null) {
- setQaQueContents(new TreeSet());
+ public Set getQaQuestions() {
+ if (qaQuestions == null) {
+ setQaQuestions(new TreeSet());
}
- return qaQueContents;
+ return qaQuestions;
}
- public void setQaQueContents(Set qaQueContents) {
- this.qaQueContents = qaQueContents;
+ public void setQaQuestions(Set qaQueContents) {
+ this.qaQuestions = qaQueContents;
}
public Set getQaSessions() {
Fisheye: Tag 1.6.4.1.4.3 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaGeneralAuthoringDTO.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.6.8.2 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaMonitoredAnswersDTO.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.9.8.2 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaMonitoredUserDTO.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.14.8.2 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.java'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.java,v
diff -u -r1.12 -r1.12.8.1
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.java 19 Feb 2009 04:25:01 -0000 1.12
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.java 16 Mar 2011 19:51:48 -0000 1.12.8.1
@@ -24,10 +24,6 @@
package org.lamsfoundation.lams.tool.qa;
import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
import java.util.Set;
import java.util.TreeSet;
@@ -40,20 +36,15 @@
*
* @author Ozgur Demirtas
*
- * TODO To change the template for this generated type comment go to Window -
- * Preferences - Java - Code Style - Code Templates
- */
-
-/**
- *
- * QaQueUsr Value Object The value object that maps to our model database table:
+ * The value object that maps to our model database table:
* tl_laqa11_que_usr The relevant hibernate mapping resides in: QaQueUsr.hbm.xml
*
* Represents tool users.
*/
-public class QaQueUsr implements Serializable, Comparable, Nullable {
- static Logger logger = Logger.getLogger(QaQueUsr.class.getName());
+public class QaQueUsr implements Serializable, Nullable {
+ private static final long serialVersionUID = -6768077344827699440L;
+
/** identifier field */
private Long uid;
@@ -74,57 +65,23 @@
private QaSession qaSession;
/** persistent field */
- private Long qaSessionId;
-
- /** persistent field */
- private QaQueContent qaQueContent;
-
- /** persistent field */
private Set qaUsrResps;
public QaQueUsr() {
};
/** full constructor */
- public QaQueUsr(Long queUsrId, String username, String fullname, QaQueContent qaQueContent, QaSession qaSession,
+ public QaQueUsr(Long queUsrId, String username, String fullname, QaSession qaSession,
Set qaUsrResps)
{
this.queUsrId = queUsrId;
this.username = username;
this.fullname = fullname;
- this.qaQueContent = qaQueContent;
this.qaSession = qaSession;
this.qaUsrResps = qaUsrResps;
}
- /** minimal constructor */
- public QaQueUsr(QaQueContent qaQueContent, QaSession qaSession, Set qaUsrResps)
-
- {
- this.qaQueContent = qaQueContent;
- this.qaSession = qaSession;
- this.qaUsrResps = qaUsrResps;
- }
-
- public QaQueUsr(Long queUsrId, String username, String fullname, QaQueContent qaQueContent, QaSession qaSession) {
- this.queUsrId = queUsrId;
- this.username = username;
- this.fullname = fullname;
- this.qaQueContent = qaQueContent;
- this.qaSession = qaSession;
- }
-
- public QaQueUsr(String username, String fullname, QaQueContent qaQueContent, QaSession qaSession, Set qaUsrResps)
-
- {
- this.username = username;
- this.fullname = fullname;
- this.qaQueContent = qaQueContent;
- this.qaSession = qaSession;
- this.qaUsrResps = qaUsrResps;
- }
-
/**
* Copy construtor; We copy all data except the hibernate id field.
*
@@ -133,8 +90,8 @@
* @return the survey question user object.
*/
public QaQueUsr newInstance(QaQueUsr queUsr) {
- return new QaQueUsr(queUsr.getQueUsrId(), queUsr.getUsername(), queUsr.getFullname(), queUsr.getQaQueContent(),
- queUsr.getQaSession(), queUsr.getQaUsrResps());
+ return new QaQueUsr(queUsr.getQueUsrId(), queUsr.getUsername(), queUsr.getFullname(), queUsr.getQaSession(),
+ queUsr.getQaUsrResps());
}
/**
@@ -153,21 +110,6 @@
}
/**
- * @return Returns the qaQueContent.
- */
- public QaQueContent getQaQueContent() {
- return qaQueContent;
- }
-
- /**
- * @param qaQueContent
- * The qaQueContent to set.
- */
- public void setQaQueContent(QaQueContent qaQueContent) {
- this.qaQueContent = qaQueContent;
- }
-
- /**
* @return Returns the qaSession.
*/
public QaSession getQaSession() {
@@ -238,192 +180,18 @@
if (!(other instanceof QaQueUsr))
return false;
QaQueUsr castOther = (QaQueUsr) other;
- return new EqualsBuilder().append(this.getQueUsrId(), castOther.getQueUsrId())
- //.append(this.getUserId(),castOther.getUserId())
- //.append(this.getQaQueContent(),castOther.getQaQueContent())
- .isEquals();
+ return new EqualsBuilder().append(this.getQueUsrId(), castOther.getQueUsrId()).isEquals();
}
public int hashCode() {
- return new HashCodeBuilder().append(getQueUsrId())
- //.append(getUserId())
- .toHashCode();
+ return new HashCodeBuilder().append(getQueUsrId()).toHashCode();
}
- //---------------------------------------------------------------------
- // Convenient Service Methods
- //---------------------------------------------------------------------
- /**
- * Check up question responsed by current user against a list user
- * responses. Return true if
- *
- * @param responses
- * @return the validation result
- */
- public boolean checkUpQueUsrHas(List responses) {
- if (responses == null)
- throw new IllegalArgumentException("Invalid responses from " + this.getFullname()
- + ": Can't validate null responses" + "against current survey questions");
-
- //make defensive copy to avoid list mutation outside this class.
- ArrayList resps = new ArrayList(responses);
-
- for (Iterator i = resps.iterator(); i.hasNext();) {
- QaUsrResp resp = (QaUsrResp) i.next();
- if (doesQueUserHas(resp))
- return true;
- }
- return false;
- }
-
- /**
- * The helper function to validate the availability of a user response for
- * this question user. The condition to return true is:
- * the requested response has a reference to a question user object and
- * reference id is the same as current question user object.
- *
- * @param response
- * the user response
- * @return the validation result
- */
- public boolean doesQueUserHas(QaUsrResp response) {
- if (response.getQaQueUser() == null)
- throw new IllegalArgumentException("Invalid response :" + " Can't validate the availability"
- + " of a response without the reference to a user");
-
- if (response.getQaQueUser().getQueUsrId() == null || this.getQueUsrId() == null)
- return false;
-
- if (this.getQueUsrId().equals(response.getQaQueUser().getQueUsrId()))
- return true;
- return false;
- }
-
- /**
- * @param responses
- * @param responseSet
- */
- public void removeResponseBy(ArrayList responses) {
- Set responseSet = new TreeSet(this.getQaUsrResps());
- //remove responses no longer exist.
- for (Iterator i = responseSet.iterator(); i.hasNext();) {
- QaUsrResp resp = (QaUsrResp) i.next();
- if (!resp.doesRespExistIn(responses))
- this.getQaUsrResps().remove(resp);
- }
- }
-
- /**
- * Update the user responses of this question user object against a list of
- * new user responses.
- *
- * @param responses
- */
- public void updateQueUsr(List responses) {
- if (responses == null)
- throw new IllegalArgumentException("Invalid responses from " + this.getFullname()
- + ": Can't update null responses" + "against current survey questions");
-
- //make defensive copy to avoid list mutation outside this class.
- ArrayList resps = new ArrayList(responses);
- //clean up all the existing reponses
- removeResponseBy(resps);
- addNewResponsesBy(resps);
- updateExistingResp(resps);
- }
-
- /**
- * @param resps
- * @param responseList
- */
- public void addNewResponsesBy(ArrayList resps) {
- ArrayList responseList = new ArrayList(this.getQaUsrResps());
- //add all associated new responses into the current question user.
- for (Iterator i = resps.iterator(); i.hasNext();) {
- QaUsrResp resp = (QaUsrResp) i.next();
- if (!resp.doesRespExistIn(responseList) && doesQueUserHas(resp))
- addUserResponse(resp);
- }
- }
-
- /**
- * @param responses
- * @param responseSet
- */
- public void updateExistingResp(ArrayList responses) {
- //update existing responses
- for (Iterator i = this.getQaUsrResps().iterator(); i.hasNext();) {
- QaUsrResp resp = (QaUsrResp) i.next();
- if (resp.doesRespExistIn(responses))
- resp.updateResponseBy(responses);
- }
- }
-
- /**
- * @param resp
- */
- public void addUserResponse(QaUsrResp resp) {
- if (resp != null && !resp.isResponseValid())
- throw new IllegalArgumentException("Invalid response for update ");
-
- this.getQaUsrResps().add(resp);
- }
-
- /**
- * Get a list of user response Strings that are correspondent to the
- * authored defined candidate answers. Currently, we include the free text
- * answer to this category as well.
- *
- * @return the list of String user responses
- */
- public List getPredefinedResponse() {
- LinkedList responses = new LinkedList();
-
- for (Iterator i = this.getQaUsrResps().iterator(); i.hasNext();) {
- QaUsrResp res = (QaUsrResp) i.next();
- if (res.isPredefinedResponse()) {
- responses.add(res.getAnswer());
- }
- }
- return responses;
- }
-
- public String getOtherResponse() {
- for (Iterator i = this.getQaUsrResps().iterator(); i.hasNext();) {
- QaUsrResp res = (QaUsrResp) i.next();
- if (!res.isPredefinedResponse())
- return res.getAnswer();
- }
-
- return "";
- }
-
- public int compareTo(Object o) {
-
- QaQueUsr qUser = (QaQueUsr) o;
- return this.getQaQueContent().compareTo(qUser.getQaQueContent());
- }
-
public boolean isNull() {
return false;
}
/**
- * @return Returns the qaSessionId.
- */
- public Long getQaSessionId() {
- return qaSessionId;
- }
-
- /**
- * @param qaSessionId
- * The qaSessionId to set.
- */
- public void setQaSessionId(Long qaSessionId) {
- this.qaSessionId = qaSessionId;
- }
-
- /**
* @return Returns the uid.
*/
public Long getUid() {
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQuestion.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.2.10.2 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQuestionContentDTO.java'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaSession.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaSession.java,v
diff -u -r1.12 -r1.12.8.1
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaSession.java 19 Feb 2009 04:25:01 -0000 1.12
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaSession.java 16 Mar 2011 19:51:48 -0000 1.12.8.1
@@ -75,9 +75,6 @@
/** persistent field */
private Set qaQueUsers;
- /** persistent field */
- private Long qaContentId;
-
public QaSession() {
};
@@ -185,14 +182,6 @@
return false;
}
- public Long getQaContentId() {
- return qaContentId;
- }
-
- public void setQaContentId(Long qaContentId) {
- this.qaContentId = qaContentId;
- }
-
public Long getUid() {
return uid;
}
Fisheye: Tag 1.2.8.1 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaStatsDTO.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.7.8.1 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaStringComparator.java'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaUploadedFile.java,v
diff -u -r1.15 -r1.15.8.1
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.java 19 Feb 2009 04:25:01 -0000 1.15
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.java 16 Mar 2011 19:51:48 -0000 1.15.8.1
@@ -31,7 +31,6 @@
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.log4j.Logger;
import org.lamsfoundation.lams.contentrepository.ItemNotFoundException;
-import org.lamsfoundation.lams.contentrepository.NodeKey;
import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
@@ -44,9 +43,9 @@
*/
/**
- * QaQueContent Value Object The value object that maps to our model database
+ * QaQuestion Value Object The value object that maps to our model database
* table: tl_laqa11_que_content The relevant hibernate mapping resides in:
- * QaQueContent.hbm.xml
+ * QaQuestion.hbm.xml
*
* Holds question content within a particular content
*/
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.java,v
diff -u -r1.10 -r1.10.8.1
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.java 19 Feb 2009 04:25:01 -0000 1.10
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.java 16 Mar 2011 19:51:48 -0000 1.10.8.1
@@ -25,8 +25,6 @@
import java.io.Serializable;
import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
@@ -52,77 +50,49 @@
private String answer;
/** nullable persistent field */
- private boolean hidden;
-
- /** nullable persistent field */
private Date attemptTime;
/** nullable persistent field */
- private QaQueContent qaQueContent;
+ private QaQuestion qaQuestion;
private boolean visible;
/** nullable persistent field */
- private Long qaQueContentId; //added to enable deletion by the resp dao
-
- /** nullable persistent field */
- private Long queUsrId; //added to enable deletion by the resp dao
-
- /** nullable persistent field */
private QaQueUsr qaQueUser;
/** nullable persistent field */
private String timezone;
/** full constructor */
- public QaUsrResp(Long responseId, String answer, boolean hidden, Date attemptTime, String timezone,
- QaQueContent qaQueContent, QaQueUsr qaQueUser) {
+ public QaUsrResp(Long responseId, String answer, Date attemptTime, String timezone,
+ QaQuestion qaQuestion, QaQueUsr qaQueUser) {
this.responseId = responseId;
this.answer = answer;
- this.hidden = hidden;
this.attemptTime = attemptTime;
this.timezone = timezone;
- this.qaQueContent = qaQueContent;
+ this.qaQuestion = qaQuestion;
this.qaQueUser = qaQueUser;
}
- public QaUsrResp(String answer, boolean hidden, Date attemptTime, String timezone, QaQueContent qaQueContent,
+ public QaUsrResp(String answer, Date attemptTime, String timezone, QaQuestion qaQuestion,
QaQueUsr qaQueUser) {
this.answer = answer;
- this.hidden = hidden;
this.attemptTime = attemptTime;
this.timezone = timezone;
- this.qaQueContent = qaQueContent;
+ this.qaQuestion = qaQuestion;
this.qaQueUser = qaQueUser;
}
- public QaUsrResp(String answer, boolean hidden, Date attemptTime, String timezone, QaQueContent qaQueContent,
+ public QaUsrResp(String answer, Date attemptTime, String timezone, QaQuestion qaQuestion,
QaQueUsr qaQueUser, boolean visible) {
this.answer = answer;
- this.hidden = hidden;
this.attemptTime = attemptTime;
this.timezone = timezone;
- this.qaQueContent = qaQueContent;
+ this.qaQuestion = qaQuestion;
this.qaQueUser = qaQueUser;
this.visible = visible;
}
- public QaUsrResp(String answer, boolean hidden, Date attemptTime, String timezone, QaQueContent qaQueContent,
- Long qaQueUsrUid) {
- this.answer = answer;
- this.hidden = hidden;
- this.attemptTime = attemptTime;
- this.timezone = timezone;
- this.qaQueContent = qaQueContent;
- this.queUsrId = qaQueUsrUid;
- }
-
- public QaUsrResp(String answer, Date attemptTime, QaQueContent question) {
- this.answer = answer;
- this.attemptTime = attemptTime;
- this.qaQueContent = question;
- }
-
/** default constructor */
public QaUsrResp() {
}
@@ -136,8 +106,8 @@
* @return the new qa user response cloned from original object
*/
public static QaUsrResp newInstance(QaUsrResp response) {
- return new QaUsrResp(response.getResponseId(), response.getAnswer(), response.isHidden(), response
- .getAttemptTime(), response.getTimezone(), response.getQaQueContent(), response.qaQueUser);
+ return new QaUsrResp(response.getResponseId(), response.getAnswer(), response
+ .getAttemptTime(), response.getTimezone(), response.getQaQuestion(), response.qaQueUser);
}
public String toString() {
@@ -187,18 +157,18 @@
}
/**
- * @return Returns the qaQueContent.
+ * @return Returns the qaQuestion.
*/
- public QaQueContent getQaQueContent() {
- return qaQueContent;
+ public QaQuestion getQaQuestion() {
+ return qaQuestion;
}
/**
- * @param qaQueContent
- * The qaQueContent to set.
+ * @param qaQuestion
+ * The qaQuestion to set.
*/
- public void setQaQueContent(QaQueContent qaQueContent) {
- this.qaQueContent = qaQueContent;
+ public void setQaQuestion(QaQuestion qaQuestion) {
+ this.qaQuestion = qaQuestion;
}
/**
@@ -231,74 +201,6 @@
this.responseId = responseId;
}
- /**
- * @param responses
- * @return
- */
- public boolean doesRespExistIn(List responses) {
- for (Iterator i = responses.iterator(); i.hasNext();) {
- QaUsrResp resp = (QaUsrResp) i.next();
- if ((resp.getAnswer().trim()).equals(this.getAnswer().trim())
- && resp.getQaQueUser().getQueUsrId() == this.getQaQueUser().getQueUsrId())
- return true;
- }
- return false;
- }
-
- /**
- * @param responses
- */
- public void updateResponseBy(List responses) {
- for (Iterator i = responses.iterator(); i.hasNext();) {
- QaUsrResp resp = (QaUsrResp) i.next();
- if (resp.getQaQueUser().getQueUsrId() == this.getQaQueUser().getQueUsrId())
- // && resp.getQaAnsContent().getDisplayOrder()==this.getQaAnsContent().getDisplayOrder())
- this.updateResponse(resp);
-
- }
- }
-
- /**
- * The response is not valid if it doesn't have a reference to question
- * object and question user object.
- *
- * @param resp
- * the response to be validated
- * @return the validation result.
- */
- public boolean isResponseValid() {
- return this.getQaQueUser() != null && this.getQaQueContent() != null;
- // &&this.getQaAnsContent()!=null;
- }
-
- /**
- * Update current object according to the new response object.
- *
- * @param resp
- */
- public void updateResponse(QaUsrResp resp) {
- if (!resp.isResponseValid())
- throw new IllegalArgumentException("Invalid response for update ");
-
- this.setAnswer(resp.getAnswer());
- this.setAttemptTime(resp.getAttemptTime());
- this.setQaQueContent(resp.getQaQueContent());
-
- this.setQaQueUser(resp.getQaQueUser());
-
- }
-
- /**
- * Validate whether the current response is correspondent to an author
- * defined answer.
- *
- * @return boolean value
- */
- public boolean isPredefinedResponse() {
- //may need to add more logic here
- return false;
- }
-
public int compareTo(Object o) {
QaUsrResp response = (QaUsrResp) o;
@@ -311,51 +213,6 @@
}
/**
- * @return Returns the qaQueContentId.
- */
- public Long getQaQueContentId() {
- return qaQueContentId;
- }
-
- /**
- * @param qaQueContentId
- * The qaQueContentId to set.
- */
- public void setQaQueContentId(Long qaQueContentId) {
- this.qaQueContentId = qaQueContentId;
- }
-
- /**
- * @return Returns the queUsrId.
- */
- public Long getQueUsrId() {
- return queUsrId;
- }
-
- /**
- * @param queUsrId
- * The queUsrId to set.
- */
- public void setQueUsrId(Long queUsrId) {
- this.queUsrId = queUsrId;
- }
-
- /**
- * @return Returns the hidden.
- */
- public boolean isHidden() {
- return hidden;
- }
-
- /**
- * @param hidden
- * The hidden to set.
- */
- public void setHidden(boolean hidden) {
- this.hidden = hidden;
- }
-
- /**
* @return Returns the timezone.
*/
public String getTimezone() {
Fisheye: Tag 1.59.8.3 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaWizardCategory.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaWizardCategory.java,v
diff -u -r1.3 -r1.3.8.1
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaWizardCategory.java 19 Feb 2009 04:25:01 -0000 1.3
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaWizardCategory.java 16 Mar 2011 19:51:49 -0000 1.3.8.1
@@ -24,8 +24,6 @@
package org.lamsfoundation.lams.tool.qa;
import java.io.Serializable;
-import java.util.HashSet;
-import java.util.Iterator;
import java.util.Set;
import java.util.TreeSet;
Fisheye: Tag 1.2.8.1 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaWizardDTO.java'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaWizardQuestion.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaWizardQuestion.java,v
diff -u -r1.3 -r1.3.8.1
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaWizardQuestion.java 19 Feb 2009 04:25:01 -0000 1.3
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaWizardQuestion.java 16 Mar 2011 19:51:48 -0000 1.3.8.1
@@ -24,8 +24,6 @@
package org.lamsfoundation.lams.tool.qa;
import java.io.Serializable;
-import java.util.Set;
-import java.util.TreeSet;
import org.apache.log4j.Logger;
Fisheye: Tag 1.4.8.1 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/ReflectionDTO.java'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml,v
diff -u -r1.24.6.1 -r1.24.6.2
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml 24 Feb 2011 14:22:40 -0000 1.24.6.1
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml 16 Mar 2011 19:51:49 -0000 1.24.6.2
@@ -41,7 +41,7 @@
Ticket to login and access the Content Repository.
@@ -1543,10 +1187,10 @@
}
/**
- * @return Returns the qaQueContentDAO.
+ * @return Returns the qaQuestionDAO.
*/
- public IQaQueContentDAO getQaQueContentDAO() {
- return qaQueContentDAO;
+ public IQaQuestionDAO getQaQuestionDAO() {
+ return qaQuestionDAO;
}
/**
@@ -1582,8 +1226,8 @@
this.qaDAO = qaDAO;
}
- public void setQaQueContentDAO(IQaQueContentDAO qaQueContentDAO) {
- this.qaQueContentDAO = qaQueContentDAO;
+ public void setQaQuestionDAO(IQaQuestionDAO qaQuestionDAO) {
+ this.qaQuestionDAO = qaQuestionDAO;
}
public void setQaSessionDAO(IQaSessionDAO qaSessionDAO) {
@@ -1736,12 +1380,12 @@
// setQaSessions(Set qaSessions);
// set up question from body
- QaQueContent question = new QaQueContent();
+ QaQuestion question = new QaQuestion();
String content = WebUtil.convertNewlines((String) importValues.get(ToolContentImport102Manager.CONTENT_BODY));
question.setQuestion(content);
question.setDisplayOrder(1);
question.setQaContent(toolContentObj);
- toolContentObj.getQaQueContents().add(question);
+ toolContentObj.getQaQuestions().add(question);
qaDAO.saveOrUpdateQa(toolContentObj);
@@ -1756,7 +1400,7 @@
QaContent qaContent = null;
if (toolContentId != null) {
- qaContent = loadQa(toolContentId.longValue());
+ qaContent = getQa(toolContentId.longValue());
}
if (qaContent == null) {
throw new DataMissingException("Unable to set reflective data titled " + title
@@ -1812,7 +1456,7 @@
}
public QaContent getQaContentBySessionId(Long sessionId) {
- QaSession session = qaSessionDAO.getQaSessionOrNullById(sessionId);
+ QaSession session = qaSessionDAO.getQaSessionById(sessionId);
// to skip CGLib problem
Long contentId = session.getQaContent().getQaContentId();
QaContent qaContent = qaDAO.getQaById(contentId);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServiceProxy.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServiceProxy.java,v
diff -u -r1.11 -r1.11.8.1
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServiceProxy.java 19 Feb 2009 04:25:02 -0000 1.11
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServiceProxy.java 16 Mar 2011 19:55:28 -0000 1.11.8.1
@@ -24,6 +24,7 @@
package org.lamsfoundation.lams.tool.qa.service;
import javax.servlet.ServletContext;
+
import org.lamsfoundation.lams.tool.ToolContentManager;
import org.lamsfoundation.lams.tool.ToolSessionManager;
import org.springframework.web.context.WebApplicationContext;
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaApplicationException.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaComparator.java'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaQueContentComparator.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaQueContentComparator.java,v
diff -u -r1.2 -r1.2.8.1
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaQueContentComparator.java 19 Feb 2009 04:25:02 -0000 1.2
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaQueContentComparator.java 16 Mar 2011 19:55:28 -0000 1.2.8.1
@@ -2,20 +2,20 @@
import java.util.Comparator;
-import org.lamsfoundation.lams.tool.qa.QaQueContent;
+import org.lamsfoundation.lams.tool.qa.QaQuestion;
/**
- * Comparator for QaQueContent. Only the display order is
+ * Comparator for QaQuestion. Only the display order is
* compared.
*
* @author Marcin Cieslak
*/
-public class QaQueContentComparator implements Comparator {
+public class QaQueContentComparator implements Comparator {
/**
* {@inheritDoc}
*/
- public int compare(QaQueContent o1, QaQueContent o2) {
+ public int compare(QaQuestion o1, QaQuestion o2) {
if (o1 != null && o2 != null) {
return o1.getDisplayOrder() - o2.getDisplayOrder();
} else if (o1 != null) {
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaQuestionContentDTOComparator.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaQuestionContentDTOComparator.java,v
diff -u -r1.2 -r1.2.8.1
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaQuestionContentDTOComparator.java 19 Feb 2009 04:25:02 -0000 1.2
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaQuestionContentDTOComparator.java 16 Mar 2011 19:55:28 -0000 1.2.8.1
@@ -2,20 +2,20 @@
import java.util.Comparator;
-import org.lamsfoundation.lams.tool.qa.QaQuestionContentDTO;
+import org.lamsfoundation.lams.tool.qa.dto.QaQuestionDTO;
/**
- * Comparator for QaQuestionContentDTO. Only the display order
+ * Comparator for QaQuestionDTO. Only the display order
* is compared.
*
* @author Marcin Cieslak
*/
-public class QaQuestionContentDTOComparator implements Comparator {
+public class QaQuestionContentDTOComparator implements Comparator {
/**
* {@inheritDoc}
*/
- public int compare(QaQuestionContentDTO o1, QaQuestionContentDTO o2) {
+ public int compare(QaQuestionDTO o1, QaQuestionDTO o2) {
if (o1 != null && o2 != null) {
return Integer.parseInt(o1.getDisplayOrder()) - Integer.parseInt(o2.getDisplayOrder());
} else if (o1 != null) {
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaStringComparator.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaUtils.java'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java,v
diff -u -r1.49.4.1.4.5 -r1.49.4.1.4.6
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java 24 Feb 2011 14:22:40 -0000 1.49.4.1.4.5
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java 16 Mar 2011 19:56:50 -0000 1.49.4.1.4.6
@@ -41,14 +41,15 @@
import org.apache.log4j.Logger;
import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator;
import org.lamsfoundation.lams.tool.qa.QaAppConstants;
-import org.lamsfoundation.lams.tool.qa.QaComparator;
import org.lamsfoundation.lams.tool.qa.QaCondition;
import org.lamsfoundation.lams.tool.qa.QaContent;
-import org.lamsfoundation.lams.tool.qa.QaQueContent;
-import org.lamsfoundation.lams.tool.qa.QaQuestionContentDTO;
+import org.lamsfoundation.lams.tool.qa.QaQuestion;
+import org.lamsfoundation.lams.tool.qa.dto.QaQuestionDTO;
import org.lamsfoundation.lams.tool.qa.service.IQaService;
+import org.lamsfoundation.lams.tool.qa.util.QaComparator;
import org.lamsfoundation.lams.tool.qa.util.QaQueContentComparator;
import org.lamsfoundation.lams.tool.qa.util.QaQuestionContentDTOComparator;
+import org.lamsfoundation.lams.tool.qa.web.form.QaAuthoringForm;
import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
import org.lamsfoundation.lams.web.session.SessionManager;
import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -83,9 +84,9 @@
AuthoringUtil.logger.debug("replacedNodeIndex:" + replacedNodeIndex);
AuthoringUtil.logger.debug("replacing nodes:" + intOriginalQuestionIndex + " and " + replacedNodeIndex);
- QaQuestionContentDTO mainNode = extractNodeAtDisplayOrder(listQuestionContentDTO, intOriginalQuestionIndex);
+ QaQuestionDTO mainNode = extractNodeAtDisplayOrder(listQuestionContentDTO, intOriginalQuestionIndex);
- QaQuestionContentDTO replacedNode = extractNodeAtDisplayOrder(listQuestionContentDTO, replacedNodeIndex);
+ QaQuestionDTO replacedNode = extractNodeAtDisplayOrder(listQuestionContentDTO, replacedNodeIndex);
List listFinalQuestionContentDTO = new LinkedList();
@@ -96,31 +97,31 @@
}
protected static List reorderSwappedListQuestionContentDTO(List listQuestionContentDTO,
- int intOriginalQuestionIndex, int replacedNodeIndex, QaQuestionContentDTO mainNode,
- QaQuestionContentDTO replacedNode, Set conditions) {
+ int intOriginalQuestionIndex, int replacedNodeIndex, QaQuestionDTO mainNode,
+ QaQuestionDTO replacedNode, Set conditions) {
AuthoringUtil.logger.debug("reorderSwappedListQuestionContentDTO:");
List listFinalQuestionContentDTO = new LinkedList();
int queIndex = 0;
Iterator listIterator = listQuestionContentDTO.iterator();
while (listIterator.hasNext()) {
- QaQuestionContentDTO qaQuestionContentDTO = (QaQuestionContentDTO) listIterator.next();
+ QaQuestionDTO qaQuestionDTO = (QaQuestionDTO) listIterator.next();
queIndex++;
- QaQuestionContentDTO tempNode = null;
+ QaQuestionDTO tempNode = null;
- if (!qaQuestionContentDTO.getDisplayOrder().equals(new Integer(intOriginalQuestionIndex).toString())
- && !qaQuestionContentDTO.getDisplayOrder().equals(new Integer(replacedNodeIndex).toString())) {
+ if (!qaQuestionDTO.getDisplayOrder().equals(new Integer(intOriginalQuestionIndex).toString())
+ && !qaQuestionDTO.getDisplayOrder().equals(new Integer(replacedNodeIndex).toString())) {
AuthoringUtil.logger.debug("normal copy ");
- tempNode = new QaQuestionContentDTO(qaQuestionContentDTO.getQuestion(),
- qaQuestionContentDTO.getDisplayOrder(), qaQuestionContentDTO.getFeedback(), qaQuestionContentDTO.isRequired());
- } else if (qaQuestionContentDTO.getDisplayOrder().equals(new Integer(intOriginalQuestionIndex).toString())) {
+ tempNode = new QaQuestionDTO(qaQuestionDTO.getQuestion(),
+ qaQuestionDTO.getDisplayOrder(), qaQuestionDTO.getFeedback(), qaQuestionDTO.isRequired());
+ } else if (qaQuestionDTO.getDisplayOrder().equals(new Integer(intOriginalQuestionIndex).toString())) {
AuthoringUtil.logger.debug("move type 1 ");
- tempNode = new QaQuestionContentDTO(replacedNode.getQuestion(),
+ tempNode = new QaQuestionDTO(replacedNode.getQuestion(),
replacedNode.getDisplayOrder(),replacedNode.getFeedback(), replacedNode.isRequired());
- } else if (qaQuestionContentDTO.getDisplayOrder().equals(new Integer(replacedNodeIndex).toString())) {
+ } else if (qaQuestionDTO.getDisplayOrder().equals(new Integer(replacedNodeIndex).toString())) {
AuthoringUtil.logger.debug("move type 1 ");
- tempNode = new QaQuestionContentDTO(mainNode.getQuestion(),
+ tempNode = new QaQuestionDTO(mainNode.getQuestion(),
mainNode.getDisplayOrder(), mainNode.getFeedback(), mainNode.isRequired());
}
@@ -129,9 +130,9 @@
// references in conditions also need to be changed
if (conditions != null) {
for (QaCondition condition : conditions) {
- SortedSet newQuestionDTOSet = new TreeSet(
+ SortedSet newQuestionDTOSet = new TreeSet(
new QaQuestionContentDTOComparator());
- for (QaQuestionContentDTO dto : (List) listFinalQuestionContentDTO) {
+ for (QaQuestionDTO dto : (List) listFinalQuestionContentDTO) {
if (condition.temporaryQuestionDTOSet.contains(dto)) {
newQuestionDTOSet.add(dto);
}
@@ -142,18 +143,18 @@
return listFinalQuestionContentDTO;
}
- protected static QaQuestionContentDTO extractNodeAtDisplayOrder(List listQuestionContentDTO,
+ protected static QaQuestionDTO extractNodeAtDisplayOrder(List listQuestionContentDTO,
int intOriginalQuestionIndex) {
AuthoringUtil.logger.debug("intOriginalQuestionIndex:" + intOriginalQuestionIndex);
Iterator listIterator = listQuestionContentDTO.iterator();
while (listIterator.hasNext()) {
- QaQuestionContentDTO qaQuestionContentDTO = (QaQuestionContentDTO) listIterator.next();
+ QaQuestionDTO qaQuestionDTO = (QaQuestionDTO) listIterator.next();
AuthoringUtil.logger.debug("intOriginalQuestionIndex versus displayOrder:"
+ new Integer(intOriginalQuestionIndex).toString() + " versus "
- + qaQuestionContentDTO.getDisplayOrder());
- if (new Integer(intOriginalQuestionIndex).toString().equals(qaQuestionContentDTO.getDisplayOrder())) {
- return qaQuestionContentDTO;
+ + qaQuestionDTO.getDisplayOrder());
+ if (new Integer(intOriginalQuestionIndex).toString().equals(qaQuestionDTO.getDisplayOrder())) {
+ return qaQuestionDTO;
}
}
return null;
@@ -185,15 +186,15 @@
int queIndex = 0;
Iterator listIterator = listQuestionContentDTO.iterator();
while (listIterator.hasNext()) {
- QaQuestionContentDTO qaQuestionContentDTO = (QaQuestionContentDTO) listIterator.next();
+ QaQuestionDTO qaQuestionDTO = (QaQuestionDTO) listIterator.next();
- String question = qaQuestionContentDTO.getQuestion();
+ String question = qaQuestionDTO.getQuestion();
- String displayOrder = qaQuestionContentDTO.getDisplayOrder();
+ String displayOrder = qaQuestionDTO.getDisplayOrder();
AuthoringUtil.logger.debug("displayOrder:" + displayOrder);
- String feedback = qaQuestionContentDTO.getFeedback();
- boolean required = qaQuestionContentDTO.isRequired();
+ String feedback = qaQuestionDTO.getFeedback();
+ boolean required = qaQuestionDTO.isRequired();
AuthoringUtil.logger.debug("displayOrder versus excludeQuestionIndex :" + displayOrder + " versus "
+ excludeQuestionIndex);
@@ -202,12 +203,12 @@
if (!displayOrder.equals(excludeQuestionIndex)) {
++queIndex;
- qaQuestionContentDTO.setQuestion(question);
- qaQuestionContentDTO.setDisplayOrder(new Integer(queIndex).toString());
- qaQuestionContentDTO.setFeedback(feedback);
- qaQuestionContentDTO.setRequired(required);
+ qaQuestionDTO.setQuestion(question);
+ qaQuestionDTO.setDisplayOrder(new Integer(queIndex).toString());
+ qaQuestionDTO.setFeedback(feedback);
+ qaQuestionDTO.setRequired(required);
- listFinalQuestionContentDTO.add(qaQuestionContentDTO);
+ listFinalQuestionContentDTO.add(qaQuestionDTO);
}
}
}
@@ -221,29 +222,29 @@
int queIndex = 0;
Iterator listIterator = listQuestionContentDTO.iterator();
while (listIterator.hasNext()) {
- QaQuestionContentDTO qaQuestionContentDTO = (QaQuestionContentDTO) listIterator.next();
+ QaQuestionDTO qaQuestionDTO = (QaQuestionDTO) listIterator.next();
- String question = qaQuestionContentDTO.getQuestion();
- String displayOrder = qaQuestionContentDTO.getDisplayOrder();
- String feedback = qaQuestionContentDTO.getFeedback();
- boolean required = qaQuestionContentDTO.isRequired();
+ String question = qaQuestionDTO.getQuestion();
+ String displayOrder = qaQuestionDTO.getDisplayOrder();
+ String feedback = qaQuestionDTO.getFeedback();
+ boolean required = qaQuestionDTO.isRequired();
if (question != null && !question.equals("")) {
++queIndex;
- qaQuestionContentDTO.setQuestion(question);
- qaQuestionContentDTO.setDisplayOrder(new Integer(queIndex).toString());
- qaQuestionContentDTO.setFeedback(feedback);
- qaQuestionContentDTO.setRequired(required);
+ qaQuestionDTO.setQuestion(question);
+ qaQuestionDTO.setDisplayOrder(new Integer(queIndex).toString());
+ qaQuestionDTO.setFeedback(feedback);
+ qaQuestionDTO.setRequired(required);
- listFinalQuestionContentDTO.add(qaQuestionContentDTO);
+ listFinalQuestionContentDTO.add(qaQuestionDTO);
}
}
return listFinalQuestionContentDTO;
}
protected static List reorderUpdateListQuestionContentDTO(List listQuestionContentDTO,
- QaQuestionContentDTO qaQuestionContentDTONew, String editableQuestionIndex) {
+ QaQuestionDTO qaQuestionContentDTONew, String editableQuestionIndex) {
AuthoringUtil.logger.debug("reorderUpdateListQuestionContentDTO");
AuthoringUtil.logger.debug("editableQuestionIndex:" + editableQuestionIndex);
@@ -252,29 +253,29 @@
int queIndex = 0;
Iterator listIterator = listQuestionContentDTO.iterator();
while (listIterator.hasNext()) {
- QaQuestionContentDTO qaQuestionContentDTO = (QaQuestionContentDTO) listIterator.next();
+ QaQuestionDTO qaQuestionDTO = (QaQuestionDTO) listIterator.next();
++queIndex;
- String question = qaQuestionContentDTO.getQuestion();
- String displayOrder = qaQuestionContentDTO.getDisplayOrder();
- String feedback = qaQuestionContentDTO.getFeedback();
- boolean required = qaQuestionContentDTO.isRequired();
+ String question = qaQuestionDTO.getQuestion();
+ String displayOrder = qaQuestionDTO.getDisplayOrder();
+ String feedback = qaQuestionDTO.getFeedback();
+ boolean required = qaQuestionDTO.isRequired();
if (displayOrder.equals(editableQuestionIndex)) {
- qaQuestionContentDTO.setQuestion(qaQuestionContentDTONew.getQuestion());
- qaQuestionContentDTO.setDisplayOrder(qaQuestionContentDTONew.getDisplayOrder());
- qaQuestionContentDTO.setFeedback(qaQuestionContentDTONew.getFeedback());
- qaQuestionContentDTO.setRequired(required);
+ qaQuestionDTO.setQuestion(qaQuestionContentDTONew.getQuestion());
+ qaQuestionDTO.setDisplayOrder(qaQuestionContentDTONew.getDisplayOrder());
+ qaQuestionDTO.setFeedback(qaQuestionContentDTONew.getFeedback());
+ qaQuestionDTO.setRequired(required);
- listFinalQuestionContentDTO.add(qaQuestionContentDTO);
+ listFinalQuestionContentDTO.add(qaQuestionDTO);
} else {
- qaQuestionContentDTO.setQuestion(question);
- qaQuestionContentDTO.setDisplayOrder(displayOrder);
- qaQuestionContentDTO.setFeedback(feedback);
- qaQuestionContentDTO.setRequired(required);
+ qaQuestionDTO.setQuestion(question);
+ qaQuestionDTO.setDisplayOrder(displayOrder);
+ qaQuestionDTO.setFeedback(feedback);
+ qaQuestionDTO.setRequired(required);
- listFinalQuestionContentDTO.add(qaQuestionContentDTO);
+ listFinalQuestionContentDTO.add(qaQuestionDTO);
}
}
@@ -305,7 +306,7 @@
}
}
- public QaContent saveOrUpdateQaContent(List listQuestionContentDTO, IQaService qaService,
+ public QaContent saveOrUpdateQaContent(List listQuestionContentDTO, IQaService qaService,
QaAuthoringForm qaAuthoringForm, HttpServletRequest request, QaContent qaContent, String strToolContentID,
Set conditions) {
UserDTO toolUser = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
@@ -431,15 +432,15 @@
qaService.updateQa(qaContent);
}
- qaContent = qaService.loadQa(new Long(strToolContentID).longValue());
+ qaContent = qaService.getQa(new Long(strToolContentID).longValue());
qaContent = createQuestionContent(listQuestionContentDTO, qaService, qaContent);
- qaContent = qaService.loadQa(new Long(strToolContentID).longValue());
+ qaContent = qaService.getQa(new Long(strToolContentID).longValue());
for (QaCondition condition : conditions) {
- condition.setQuestions(new TreeSet(new QaQueContentComparator()));
- for (QaQuestionContentDTO dto : condition.temporaryQuestionDTOSet) {
- for (QaQueContent queContent : (Set) qaContent.getQaQueContents()) {
+ condition.setQuestions(new TreeSet(new QaQueContentComparator()));
+ for (QaQuestionDTO dto : condition.temporaryQuestionDTOSet) {
+ for (QaQuestion queContent : (Set) qaContent.getQaQuestions()) {
if (dto.getDisplayOrder().equals(String.valueOf(queContent.getDisplayOrder()))) {
condition.getQuestions().add(queContent);
}
@@ -452,23 +453,17 @@
}
/**
- * removes unused question entries from db removeRedundantQuestions (Map
- * mapQuestionContent, IQaService qaService, QaAuthoringForm
- * qaAuthoringForm)
+ * removes unused question entries from db
*
* @param mapQuestionContent
* @param qaService
* @param qaAuthoringForm
*/
- public void removeRedundantQuestions(ListlistQuestionContentDTO, IQaService qaService, QaAuthoringForm qaAuthoringForm,
+ public void removeRedundantQuestions(ListlistQuestionContentDTO, IQaService qaService, QaAuthoringForm qaAuthoringForm,
HttpServletRequest request, String toolContentID) {
- AuthoringUtil.logger.debug("removing unused entries... ");
- AuthoringUtil.logger.debug("toolContentID: " + toolContentID);
- QaContent qaContent = qaService.loadQa(new Long(toolContentID).longValue());
-
+ QaContent qaContent = qaService.getQa(new Long(toolContentID).longValue());
if (qaContent != null) {
- AuthoringUtil.logger.debug("qaContent uid: " + qaContent.getUid());
List allQuestions = qaService.getAllQuestionEntries(qaContent.getUid());
Iterator listIterator = allQuestions.iterator();
@@ -477,12 +472,12 @@
while (listIterator.hasNext()) {
++mapIndex;
- QaQueContent queContent = (QaQueContent) listIterator.next();
+ QaQuestion queContent = (QaQuestion) listIterator.next();
- AuthoringUtil.logger.info("Checking whether to remove question with id=" + queContent.getUid() + ", displayOrder=" + queContent.getDisplayOrder() + ", question=" + queContent.getQuestion());
+ //Checking whether to remove question with id queContent.getUid()
entryUsed = false;
int displayOrder = 0;
- for ( QaQuestionContentDTO questionDTO : listQuestionContentDTO ) {
+ for ( QaQuestionDTO questionDTO : listQuestionContentDTO ) {
++displayOrder;
if (StringUtils.equals(queContent.getQuestion(), questionDTO.getQuestion())) {
entryUsed = true;
@@ -492,11 +487,10 @@
if (entryUsed == false) {
- QaQueContent removeableQaQueContent = qaService.getQuestionContentByQuestionText(queContent
+ QaQuestion removeableQaQueContent = qaService.getQuestionContentByQuestionText(queContent
.getQuestion(), qaContent.getUid());
if (removeableQaQueContent != null) {
- // qaContent.getQaQueContents().remove(removeableQaQueContent);
- AuthoringUtil.logger.info("Removing question with id=" + removeableQaQueContent.getUid() + ", displayOrder=" + removeableQaQueContent.getDisplayOrder() + ", question=" + removeableQaQueContent.getQuestion());
+ //Removing question with id removeableQaQueContent.getUid()
qaService.removeQaQueContent(removeableQaQueContent);
}
@@ -507,21 +501,18 @@
}
/**
- * createQuestionContent(TreeMap mapQuestionContent, HttpServletRequest
- * request) return void
- *
* persist the questions in the Map the user has submitted
*
* LDEV-2526 note that questions have already been removed before this method is called, but
* their displayOrder fields haven't been updated yet. Note also that the given
* mapQuestionContent maps question numbers to question strings.
*/
- protected QaContent createQuestionContent(List listQuestionContentDTO, IQaService qaService,
+ protected QaContent createQuestionContent(List listQuestionContentDTO, IQaService qaService,
QaContent qaContent) {
AuthoringUtil.logger.debug("createQuestionContent: content uid is: " + qaContent.getUid());
int displayOrder = 0;
- for ( QaQuestionContentDTO questionContentDTO : listQuestionContentDTO ) {
+ for ( QaQuestionDTO questionContentDTO : listQuestionContentDTO ) {
// LDEV-2526 Assuming here that removed questions exist in mapQuestionContent, but that the value is empty
// (this whole thing needs a rewrite). If empty, do not attempt to persist it.
@@ -533,11 +524,11 @@
++displayOrder;
- QaQueContent existingQaQueContent = qaService.getQuestionContentByQuestionText(questionText, qaContent.getUid());
+ QaQuestion existingQaQueContent = qaService.getQuestionContentByQuestionText(questionText, qaContent.getUid());
if (existingQaQueContent == null) {
- QaQueContent queContent = new QaQueContent(questionText, displayOrder, questionContentDTO.getFeedback(),
- questionContentDTO.isRequired(), qaContent, null, null);
- qaContent.getQaQueContents().add(queContent);
+ QaQuestion queContent = new QaQuestion(questionText, displayOrder, questionContentDTO.getFeedback(),
+ questionContentDTO.isRequired(), qaContent, null);
+ qaContent.getQaQuestions().add(queContent);
queContent.setQaContent(qaContent);
AuthoringUtil.logger.info("Creating new question with question=" + queContent.getQuestion() + ", displayOrder=" + queContent.getDisplayOrder());
@@ -557,9 +548,9 @@
return qaContent;
}
- public static boolean checkDuplicateQuestions(List listQuestionContentDTO, String newQuestion) {
+ public static boolean checkDuplicateQuestions(List listQuestionContentDTO, String newQuestion) {
AuthoringUtil.logger.debug("checkDuplicateQuestions: ");
- for (QaQuestionContentDTO questionDTO : listQuestionContentDTO ) {
+ for (QaQuestionDTO questionDTO : listQuestionContentDTO ) {
if ( questionDTO.getQuestion() != null && questionDTO.getQuestion().equals(newQuestion) ) {
return true;
}
@@ -568,9 +559,7 @@
}
/**
- * sorts the questions by the display order reOrganizeDisplayOrder(Map
- * mapQuestionContent, IQaService qaService, QaAuthoringForm
- * qaAuthoringForm, QaContent qaContent)
+ * sorts the questions by the display order
*
* @param mapQuestionContent
* @param qaService
@@ -580,26 +569,20 @@
public void reOrganizeDisplayOrder(IQaService qaService, QaAuthoringForm qaAuthoringForm,
QaContent qaContent) {
if (qaContent != null) {
- AuthoringUtil.logger.debug("content uid: " + qaContent.getUid());
List sortedQuestions = qaService.getAllQuestionEntriesSorted(qaContent.getUid().longValue());
Iterator listIterator = sortedQuestions.iterator();
int displayOrder = 1;
while (listIterator.hasNext()) {
- QaQueContent queContent = (QaQueContent) listIterator.next();
- AuthoringUtil.logger.debug("queContent: " + queContent.getQuestion() + " "
- + queContent.getDisplayOrder());
+ QaQuestion queContent = (QaQuestion) listIterator.next();
- QaQueContent existingQaQueContent = qaService.getQuestionContentByQuestionText(
+ QaQuestion existingQaQueContent = qaService.getQuestionContentByQuestionText(
queContent.getQuestion(), qaContent.getUid());
- AuthoringUtil.logger.debug("Changing the displayOrder from=" + existingQaQueContent.getDisplayOrder() + " to=" + displayOrder
- + " for existing question with id=" + existingQaQueContent.getUid() + ", contentId=" + existingQaQueContent.getQaContentId());
existingQaQueContent.setDisplayOrder(displayOrder);
qaService.saveOrUpdateQaQueContent(existingQaQueContent);
displayOrder++;
}
}
- AuthoringUtil.logger.debug("done with reOrganizeDisplayOrder...");
}
/**
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ClearSessionAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ClearSessionAction.java,v
diff -u -r1.6 -r1.6.8.1
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ClearSessionAction.java 19 Feb 2009 04:25:02 -0000 1.6
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ClearSessionAction.java 16 Mar 2011 19:56:48 -0000 1.6.8.1
@@ -28,7 +28,6 @@
import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
import org.lamsfoundation.lams.tool.ToolAccessMode;
-import org.lamsfoundation.lams.web.util.AttributeNames;
/**
* This class give a chance to clear HttpSession when user save/close authoring
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ExportServlet.java,v
diff -u -r1.18.8.1 -r1.18.8.2
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ExportServlet.java 7 Mar 2011 22:28:42 -0000 1.18.8.1
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ExportServlet.java 16 Mar 2011 19:56:48 -0000 1.18.8.2
@@ -30,14 +30,14 @@
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.lamsfoundation.lams.tool.ToolAccessMode;
-import org.lamsfoundation.lams.tool.qa.GeneralLearnerFlowDTO;
import org.lamsfoundation.lams.tool.qa.QaAppConstants;
-import org.lamsfoundation.lams.tool.qa.QaApplicationException;
import org.lamsfoundation.lams.tool.qa.QaContent;
import org.lamsfoundation.lams.tool.qa.QaQueUsr;
import org.lamsfoundation.lams.tool.qa.QaSession;
+import org.lamsfoundation.lams.tool.qa.dto.GeneralLearnerFlowDTO;
import org.lamsfoundation.lams.tool.qa.service.IQaService;
import org.lamsfoundation.lams.tool.qa.service.QaServiceProxy;
+import org.lamsfoundation.lams.tool.qa.util.QaApplicationException;
import org.lamsfoundation.lams.tool.qa.util.QaBundler;
import org.lamsfoundation.lams.web.servlet.AbstractExportPortfolioServlet;
@@ -88,7 +88,7 @@
IQaService service = QaServiceProxy.getQaService(getServletContext());
QaContent content = null;
if (toolContentID != null) {
- content = service.retrieveQa(toolContentID);
+ content = service.getQa(toolContentID);
} else {
QaSession session = service.retrieveQaSession(toolSessionID);
if (session != null)
@@ -102,29 +102,21 @@
}
public void learner(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies) {
- logger.debug("starting learner mode...");
-
IQaService qaService = QaServiceProxy.getQaService(getServletContext());
- logger.debug("userID:" + userID);
- logger.debug("toolSessionID:" + toolSessionID);
-
if (userID == null || toolSessionID == null) {
String error = "Tool session Id or user Id is null. Unable to continue";
logger.error(error);
throw new QaApplicationException(error);
}
- QaSession qaSession = qaService.retrieveQaSessionOrNullById(toolSessionID.longValue());
+ QaSession qaSession = qaService.getSessionById(toolSessionID.longValue());
// If the learner hasn't answered yet, then they won't exist in the session.
// Yet we might be asked for their page, as the activity has been commenced.
// So need to do a "blank" page in that case
- QaQueUsr learner = qaService.getQaUserBySession(userID, qaSession.getUid());
- logger.debug("UserID: " + learner.getUid());
-
+ QaQueUsr learner = qaService.getUserByIdAndSession(userID, qaSession.getQaSessionId());
QaContent content = qaSession.getQaContent();
- logger.debug("content id: " + content.getQaContentId());
if (content == null) {
String error = "The content for this activity has not been defined yet.";
@@ -137,7 +129,7 @@
logger.debug("start refreshSummaryData for learner mode.");
GeneralLearnerFlowDTO generalLearnerFlowDTO = LearningUtil.buildGeneralLearnerFlowDTO(content);
- generalLearnerFlowDTO.setUserUid(learner != null ? learner.getUid().toString() : null);
+ generalLearnerFlowDTO.setUserUid(learner != null ? learner.getQueUsrId().toString() : null);
// if learner is null, don't want to show other people's answers
if (learner != null) {
@@ -169,7 +161,7 @@
throw new QaApplicationException(error);
}
- QaContent content = qaService.loadQa(toolContentID.longValue());
+ QaContent content = qaService.getQa(toolContentID.longValue());
if (content == null) {
String error = "Data is missing from the database. Unable to Continue";
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java,v
diff -u -r1.41.8.2 -r1.41.8.3
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java 24 Feb 2011 14:22:39 -0000 1.41.8.2
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java 16 Mar 2011 19:56:49 -0000 1.41.8.3
@@ -24,27 +24,27 @@
package org.lamsfoundation.lams.tool.qa.web;
import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
import java.util.Map;
+import java.util.Set;
import java.util.TreeMap;
-import java.util.TreeSet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.tool.qa.GeneralLearnerFlowDTO;
import org.lamsfoundation.lams.tool.qa.QaAppConstants;
-import org.lamsfoundation.lams.tool.qa.QaComparator;
import org.lamsfoundation.lams.tool.qa.QaContent;
-import org.lamsfoundation.lams.tool.qa.QaQueContent;
import org.lamsfoundation.lams.tool.qa.QaQueUsr;
-import org.lamsfoundation.lams.tool.qa.QaQuestionContentDTO;
+import org.lamsfoundation.lams.tool.qa.QaQuestion;
import org.lamsfoundation.lams.tool.qa.QaSession;
import org.lamsfoundation.lams.tool.qa.QaUsrResp;
-import org.lamsfoundation.lams.tool.qa.QaUtils;
+import org.lamsfoundation.lams.tool.qa.dto.GeneralLearnerFlowDTO;
+import org.lamsfoundation.lams.tool.qa.dto.QaQuestionDTO;
import org.lamsfoundation.lams.tool.qa.service.IQaService;
+import org.lamsfoundation.lams.tool.qa.util.QaComparator;
+import org.lamsfoundation.lams.tool.qa.web.form.QaLearningForm;
import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
import org.lamsfoundation.lams.web.session.SessionManager;
import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -60,8 +60,7 @@
static Logger logger = Logger.getLogger(LearningUtil.class.getName());
public static void saveFormRequestData(HttpServletRequest request, QaLearningForm qaLearningForm) {
- logger.debug("saving form request data...");
- String toolSessionID = request.getParameter("toolSessionID");
+ String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
qaLearningForm.setToolSessionID(toolSessionID);
String userID = request.getParameter("userID");
@@ -72,12 +71,9 @@
String totalQuestionCount = request.getParameter("totalQuestionCount");
qaLearningForm.setTotalQuestionCount(totalQuestionCount);
-
- logger.debug("done saving form request data.");
}
public static GeneralLearnerFlowDTO buildGeneralLearnerFlowDTO(QaContent qaContent) {
- logger.debug("starting buildMcGeneralLearnerFlowDTO: " + qaContent.getUid());
GeneralLearnerFlowDTO generalLearnerFlowDTO = new GeneralLearnerFlowDTO();
generalLearnerFlowDTO.setActivityTitle(qaContent.getTitle());
generalLearnerFlowDTO.setActivityInstructions(qaContent.getInstructions());
@@ -94,157 +90,80 @@
generalLearnerFlowDTO.setAllowRichEditor(new Boolean(qaContent.isAllowRichEditor()).toString());
generalLearnerFlowDTO.setAllowRateAnswers(new Boolean(qaContent.isAllowRateAnswers()).toString());
- generalLearnerFlowDTO.setTotalQuestionCount(new Integer(qaContent.getQaQueContents().size()));
+ generalLearnerFlowDTO.setTotalQuestionCount(new Integer(qaContent.getQaQuestions().size()));
- Map mapQuestions = new TreeMap();
-
- Iterator contentIterator = qaContent.getQaQueContents().iterator();
- while (contentIterator.hasNext()) {
- QaQueContent qaQueContent = (QaQueContent) contentIterator.next();
- if (qaQueContent != null) {
- int displayOrder = qaQueContent.getDisplayOrder();
- if (displayOrder != 0) {
- /*
- * add the question to the questions Map in the displayOrder
- */
- QaQuestionContentDTO questionDTO = new QaQuestionContentDTO(qaQueContent);
- mapQuestions.put(questionDTO.getDisplayOrder(), questionDTO );
- }
+ //create mapQuestions
+ Map mapQuestions = new TreeMap();
+ for (QaQuestion question : qaContent.getQaQuestions()) {
+ int displayOrder = question.getDisplayOrder();
+ if (displayOrder != 0) {
+ //add the question to the questions Map in the displayOrder
+ QaQuestionDTO questionDTO = new QaQuestionDTO(question);
+ mapQuestions.put(questionDTO.getDisplayOrder(), questionDTO);
}
}
-
generalLearnerFlowDTO.setMapQuestionContentLearner(mapQuestions);
+
return generalLearnerFlowDTO;
}
- /**
- * createUsersAndResponses(Map mapAnswers, HttpServletRequest request)
- * create users of the responses
- *
- * @param mapAnswers,
- * request return void
- *
- */
- protected void createUsersAndResponses(Map mapAnswers, HttpServletRequest request, IQaService qaService,
- Long toolContentID, Long toolSessionID) {
- logger.debug("toolContentID: " + toolContentID);
- logger.debug("toolSessionID: " + toolSessionID);
+// /**
+// * Create users of the responses
+// *
+// * @param mapAnswers
+// *
+// */
+// public static void storeResponses(Map mapAnswers, IQaService qaService, Long toolContentID, Long toolSessionID) {
+//
+// // get back login user DTO
+// HttpSession ss = SessionManager.getSession();
+// UserDTO toolUser = (UserDTO) ss.getAttribute(AttributeNames.USER);
+// Long userId = new Long(toolUser.getUserID().longValue());
+//
+// // obtain QaContent to be used in creating QaQueUsr
+// QaContent qaContent = qaService.getQa(toolContentID.longValue());
+//
+// QaQueUsr user = qaService.getUserByIdAndSession(userId, toolSessionID);
+//
+// // check if Attempt to Entry is allowed, if so create the responses
+// if (!user.isResponseFinalized() || !qaContent.isLockWhenFinished()) {
+//
+// Set questionsToStore;
+// if (qaContent.isQuestionsSequenced()) {
+// String currentQuestionIndex = qaLearningForm.getCurrentQuestionIndex();
+// QaQuestion currentQuestion = qaService.getQuestionContentByDisplayOrder(new Long(currentQuestionIndex), qaContent.getQaContentId());
+// questionsToStore = new LinkedHashSet();
+// questionsToStore.add(currentQuestion);
+//
+// } else {
+// questionsToStore = qaContent.getQaQuestions();
+// }
+//
+// for (QaQuestion question : questionsToStore) {
+//
+// String displayOrder = new Long(question.getDisplayOrder()).toString();
+// String answer = (String) mapAnswers.get(displayOrder);
+//
+// QaUsrResp response = qaService.getResponseByUserAndQuestion(user.getQueUsrId(), question.getUid());
+// // if response doesn't exist
+// if (response == null) {
+// response = new QaUsrResp(answer, new Date(System.currentTimeMillis()), "", question, user, true);
+// qaService.createQaUsrResp(response);
+//
+// //if answer has changed
+// } else if (! answer.equals(response.getAnswer())) {
+// response.setAnswer(answer);
+// response.setAttemptTime(new Date(System.currentTimeMillis()));
+// response.setTimezone("");
+// qaService.updateUserResponse(response);
+// }
+// }
+//
+// }
+// }
- HttpSession ss = SessionManager.getSession();
- /* get back login user DTO */
- UserDTO toolUser = (UserDTO) ss.getAttribute(AttributeNames.USER);
- logger.debug("retrieving toolUser userId: " + toolUser.getUserID());
-
- String userName = toolUser.getLogin();
- String fullName = toolUser.getFirstName() + " " + toolUser.getLastName();
-
- Long userId = new Long(toolUser.getUserID().longValue());
-
- /*
- * obtain QaContent to be used in creating QaQueUsr
- */
- QaContent qaContent = qaService.retrieveQa(toolContentID.longValue());
-
- QaSession qaSession = qaService.retrieveQaSessionOrNullById(toolSessionID.longValue());
-
- Iterator contentIterator = qaContent.getQaQueContents().iterator();
-
- QaQueUsr qaQueUsr = new QaQueUsr(userId, userName, fullName, null, qaSession, new TreeSet());
-
-
- logger.debug("session uid: " + qaSession.getUid());
- /*note that it is possible for a user to already exist from another tool session. In this case don't add any more user record*/
- QaQueUsr qaQueUsrLocal = qaService.getQaUserBySession(userId, qaSession.getUid());
-
- if ((qaQueUsr != null) && (qaQueUsrLocal == null)) {
- qaQueUsr = createUser(request, toolSessionID, qaService);
- } else {
- qaQueUsr = qaQueUsrLocal;
- }
-
- boolean isResponseFinalized = qaQueUsr.isResponseFinalized();
-
- boolean lockWhenFinished = qaContent.isLockWhenFinished();
-
- boolean enableAttemptEntry = false;
- boolean userAttemptExist = false;
-
- if (!isResponseFinalized) {
- enableAttemptEntry = true;
- }
-
- if (isResponseFinalized && (!lockWhenFinished)) {
- userAttemptExist = true;
- enableAttemptEntry = true;
- }
-
- if (enableAttemptEntry) {
- logger.debug("enableAttemptEntry is true, so creating the responses: ");
- while (contentIterator.hasNext()) {
- QaQueContent qaQueContent = (QaQueContent) contentIterator.next();
- if (qaQueContent != null) {
-
- String displayOrder = new Long(qaQueContent.getDisplayOrder()).toString();
- String answer = (String) mapAnswers.get(displayOrder);
-
-
-
- String timezoneId = "";
-
- List attempts = qaService.getAttemptsForUserAndQuestionContent(qaQueUsr.getUid(), qaQueContent
- .getUid());
-
- if (userAttemptExist) {
- qaService.removeAttemptsForUserAndQuestionContent(qaQueUsr.getUid(), qaQueContent.getUid());
-
- QaUsrResp qaUsrResp = new QaUsrResp(answer, false, new Date(System.currentTimeMillis()),
- timezoneId, qaQueContent, qaQueUsr, true);
-
- if (qaUsrResp != null) {
- qaService.createQaUsrResp(qaUsrResp);
- }
- } else {
- if ((attempts != null) && (attempts.size() > 0)) {
- } else {
- QaUsrResp qaUsrResp = new QaUsrResp(answer, false, new Date(System.currentTimeMillis()),
- timezoneId, qaQueContent, qaQueUsr, true);
-
- if (qaUsrResp != null) {
- qaService.createQaUsrResp(qaUsrResp);
- }
- }
- }
- }
- }
-
- }
- if (qaQueUsr != null) {
- qaQueUsr.setResponseFinalized(true);
- logger.debug("finalized user input");
- qaService.updateQaQueUsr(qaQueUsr);
- }
- }
-
- public static QaQueUsr createUser(HttpServletRequest request, Long toolSessionID, IQaService qaService) {
- logger.debug("creating a new user in the tool db, toolSessionID: " + toolSessionID);
-
- Long queUsrId = QaUtils.getUserId();
- String username = QaUtils.getUserName();
- String fullname = QaUtils.getUserFullName();
-
- QaSession qaSession = qaService.retrieveQaSessionOrNullById(toolSessionID.longValue());
-
- QaQueUsr qaQueUsr = new QaQueUsr(queUsrId, username, fullname, null, qaSession, new TreeSet());
-
- qaService.createQaQueUsr(qaQueUsr);
- return qaQueUsr;
- }
-
- protected String getRemainingQuestionCount(int currentQuestionIndex, String totalQuestionCount) {
- logger.debug("totalQuestionCount: " + totalQuestionCount);
+ public static String getRemainingQuestionCount(int currentQuestionIndex, String totalQuestionCount) {
int remainingQuestionCount = new Long(totalQuestionCount).intValue() - currentQuestionIndex + 1;
- logger.debug("remainingQuestionCount: " + remainingQuestionCount);
-
return new Integer(remainingQuestionCount).toString();
}
@@ -255,26 +174,66 @@
* @param qaLearningForm
* return void
*/
- protected String feedBackAnswersProgress(HttpServletRequest request, int currentQuestionIndex,
+ public static String feedBackAnswersProgress(HttpServletRequest request, int currentQuestionIndex,
String totalQuestionCount) {
- logger.debug("totalQuestionCount: " + totalQuestionCount);
int remainingQuestionCount = new Long(totalQuestionCount).intValue() - currentQuestionIndex + 1;
- logger.debug("remainingQuestionCount: " + remainingQuestionCount);
String userFeedback = "";
- if (remainingQuestionCount != 0)
+ if (remainingQuestionCount != 0) {
userFeedback = "Remaining question count: " + remainingQuestionCount;
- else
+ } else {
userFeedback = "End of the questions.";
+ }
return userFeedback;
}
- public void setContentInUse(long toolContentID, IQaService qaService) {
- QaContent qaContent = qaService.loadQa(toolContentID);
-
+ /**
+ * content with id has been marked LOCKED and updated in the db
+ *
+ * @param toolContentID
+ * @param qaService
+ */
+ public static void setContentInUse(long toolContentID, IQaService qaService) {
+ QaContent qaContent = qaService.getQa(toolContentID);
qaContent.setContentLocked(true);
- logger.debug("content with id : " + toolContentID + "has been marked LOCKED");
qaService.updateQa(qaContent);
- logger.debug("content with id : " + toolContentID + "has been marked LOCKED and updated in the db");
}
+
+ /**
+ */
+ public static void populateAnswers(Map sessionMap, QaContent qaContent, QaQueUsr qaQueUsr,
+ Map mapQuestions, GeneralLearnerFlowDTO generalLearnerFlowDTO,
+ IQaService qaService) {
+
+ //create mapAnswers
+ Map mapAnswers = (Map) sessionMap.get(MAP_ALL_RESULTS_KEY);
+ if (mapAnswers == null) {
+ mapAnswers = new TreeMap(new QaComparator());
+
+ // get responses from DB
+ Map mapAnswersFromDb = new TreeMap();
+ for (QaQuestion question : qaContent.getQaQuestions()) {
+ Long questionUid = question.getUid();
+ QaUsrResp dbResponse = qaService.getResponseByUserAndQuestion(qaQueUsr.getQueUsrId(), questionUid);
+ if (dbResponse != null) {
+ mapAnswersFromDb.put(String.valueOf(question.getDisplayOrder()), dbResponse.getAnswer());
+ }
+ }
+
+ // maybe we have come in from the review screen, if so get the answers from db.
+ if (mapAnswersFromDb.size() > 0) {
+ mapAnswers.putAll(mapAnswersFromDb);
+ } else {
+ for (Map.Entry pairs : mapQuestions.entrySet()) {
+ mapAnswers.put(pairs.getKey().toString(), "");
+ }
+ }
+ }
+ String currentAnswer = (String) mapAnswers.get("1");
+ generalLearnerFlowDTO.setCurrentQuestionIndex(new Integer(1));
+ generalLearnerFlowDTO.setCurrentAnswer(currentAnswer);
+ sessionMap.put(MAP_SEQUENTIAL_ANSWERS_KEY, mapAnswers);
+ generalLearnerFlowDTO.setMapAnswers(mapAnswers);
+ sessionMap.put(MAP_ALL_RESULTS_KEY, mapAnswers);
+ }
}
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/Attic/MonitoringUtil.java,v
diff -u -r1.42.8.2 -r1.42.8.3
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java 24 Feb 2011 14:22:39 -0000 1.42.8.2
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java 16 Mar 2011 19:56:49 -0000 1.42.8.3
@@ -35,20 +35,20 @@
import org.apache.log4j.Logger;
import org.lamsfoundation.lams.notebook.model.NotebookEntry;
import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
-import org.lamsfoundation.lams.tool.qa.QaAllGroupsDTO;
import org.lamsfoundation.lams.tool.qa.QaAppConstants;
import org.lamsfoundation.lams.tool.qa.QaContent;
-import org.lamsfoundation.lams.tool.qa.QaMonitoredAnswersDTO;
-import org.lamsfoundation.lams.tool.qa.QaMonitoredUserDTO;
-import org.lamsfoundation.lams.tool.qa.QaQueContent;
import org.lamsfoundation.lams.tool.qa.QaQueUsr;
+import org.lamsfoundation.lams.tool.qa.QaQuestion;
import org.lamsfoundation.lams.tool.qa.QaSession;
-import org.lamsfoundation.lams.tool.qa.QaStatsDTO;
-import org.lamsfoundation.lams.tool.qa.QaStringComparator;
import org.lamsfoundation.lams.tool.qa.QaUsrResp;
-import org.lamsfoundation.lams.tool.qa.QaUtils;
import org.lamsfoundation.lams.tool.qa.dto.AverageRatingDTO;
+import org.lamsfoundation.lams.tool.qa.dto.QaAllGroupsDTO;
+import org.lamsfoundation.lams.tool.qa.dto.QaMonitoredAnswersDTO;
+import org.lamsfoundation.lams.tool.qa.dto.QaMonitoredUserDTO;
+import org.lamsfoundation.lams.tool.qa.dto.QaStatsDTO;
import org.lamsfoundation.lams.tool.qa.service.IQaService;
+import org.lamsfoundation.lams.tool.qa.util.QaStringComparator;
+import org.lamsfoundation.lams.tool.qa.util.QaUtils;
/**
*
@@ -61,123 +61,46 @@
static Logger logger = Logger.getLogger(MonitoringUtil.class.getName());
/**
- * determine whether all the tool sessions for a particular content has been
- * COMPLETED boolean isSessionsSync(HttpServletRequest request, long
- * toolContentId)
- *
- * @param toolContentId
- * @return boolean
- */
- public boolean isSessionsSync(QaContent qaContent) {
- /*
- * iterate all the tool sessions, if even one session is INCOMPLETE, the function returns false
- */
- if (qaContent != null) {
- Iterator sessionIterator = qaContent.getQaSessions().iterator();
- while (sessionIterator.hasNext()) {
- QaSession qaSession = (QaSession) sessionIterator.next();
- if (qaSession.getSession_status().equalsIgnoreCase(QaSession.INCOMPLETE))
- return false;
- }
- }
-
- return true;
- }
-
- /**
- * updateResponse(HttpServletRequest request, String responseId, String
- * updatedResponse)
- *
- * @param qaService
- * @param responseId
- * @param updatedResponse
- */
- public void updateResponse(IQaService qaService, String responseId, String updatedResponse) {
- logger.debug("load response with responseId: " + new Long(responseId).longValue());
- QaUsrResp qaUsrResp = qaService.retrieveQaUsrResp(new Long(responseId).longValue());
- qaUsrResp.setAnswer(updatedResponse);
- qaService.updateQaUsrResp(qaUsrResp);
- }
-
- /**
- * hideResponse(HttpServletRequest request, String responseId)
- *
- * @param qaService
- * @param responseId
- */
- public void hideResponse(IQaService qaService, String responseId) {
- logger.debug("load response with responseId for hiding: " + new Long(responseId).longValue());
- QaUsrResp qaUsrResp = qaService.retrieveQaUsrResp(new Long(responseId).longValue());
- qaUsrResp.setHidden(true);
- qaService.updateQaUsrResp(qaUsrResp);
- }
-
- /**
- * unHideResponse(HttpServletRequest request, String responseId)
- *
- * @param request
- * @param responseId
- */
- public void unHideResponse(IQaService qaService, String responseId) {
- logger.debug("load response with responseId for un-hiding: " + new Long(responseId).longValue());
- QaUsrResp qaUsrResp = qaService.retrieveQaUsrResp(new Long(responseId).longValue());
- qaUsrResp.setHidden(false);
- qaService.updateQaUsrResp(qaUsrResp);
- }
-
- /**
* populates all the tool sessions in a map
- * populateToolSessions(HttpServletRequest request, McContent mcContent)
*
* @param request
* @param mcContent
* @return Map
*/
public static Map populateToolSessions(HttpServletRequest request, QaContent qaContent, IQaService qaService) {
List sessionsList = qaService.getSessionNamesFromContent(qaContent);
- logger.debug("sessionsList size is:..." + sessionsList.size());
-
+
Map sessionsMap = QaUtils.convertToStringMap(sessionsList, "String");
-
if (sessionsMap.isEmpty()) {
- logger.debug("sessionsMap size is 0:");
sessionsMap.put(new Long(1).toString(), "None");
} else {
- logger.debug("sessionsMap has some entries: " + sessionsMap.size());
sessionsMap.put(new Long(sessionsMap.size() + 1).toString(), "All");
}
return sessionsMap;
}
/**
* populates all the tool sessions in a map
- * populateToolSessions(HttpServletRequest request, McContent mcContent)
*
* @param request
* @param mcContent
* @return Map
*/
public static Map populateToolSessionsId(HttpServletRequest request, QaContent qaContent, IQaService qaService) {
List sessionsList = qaService.getSessionsFromContent(qaContent);
- logger.debug("sessionsList size is:..." + sessionsList.size());
Map sessionsMap = QaUtils.convertToStringMap(sessionsList, "Long");
- logger.debug("sessionsMap size:..." + sessionsMap.size());
-
if (sessionsMap.isEmpty()) {
- logger.debug("sessionsMap size is 0:");
sessionsMap.put(new Long(1).toString(), "None");
} else {
- logger.debug("sessionsMap has some entries: " + sessionsMap.size());
sessionsMap.put(new Long(sessionsMap.size() + 1).toString(), "All");
}
return sessionsMap;
}
/**
* ends up populating the attempt history for all the users of all the tool
- * sessions for a content buildGroupsQuestionData(HttpServletRequest
- * request, McContent mcContent)
+ * sessions for a content
*
* User id is needed if isUserNamesVisible is false && is learnerRequest =
* true, as it is required to work out if the data being analysed is the
@@ -189,14 +112,11 @@
*/
public static List buildGroupsQuestionData(HttpServletRequest request, QaContent qaContent, IQaService qaService,
boolean isUserNamesVisible, boolean isLearnerRequest, String currentSessionId, String userId) {
- logger.debug("buildGroupsQuestionData: " + currentSessionId);
-
List listQuestions = qaService.getAllQuestionEntries(qaContent.getUid());
String sessionName = "";
if ((currentSessionId != null) && (!currentSessionId.equals("All"))) {
- QaSession qaSession = qaService.retrieveQaSessionOrNullById(new Long(currentSessionId).longValue());
-
+ QaSession qaSession = qaService.getSessionById(new Long(currentSessionId).longValue());
sessionName = qaSession.getSession_name();
}
request.setAttribute(CURRENT_SESSION_NAME, sessionName);
@@ -205,18 +125,17 @@
Iterator itListQuestions = listQuestions.iterator();
while (itListQuestions.hasNext()) {
- QaQueContent qaQueContent = (QaQueContent) itListQuestions.next();
+ QaQuestion qaQuestion = (QaQuestion) itListQuestions.next();
- if (qaQueContent != null) {
+ if (qaQuestion != null) {
QaMonitoredAnswersDTO qaMonitoredAnswersDTO = new QaMonitoredAnswersDTO();
- qaMonitoredAnswersDTO.setQuestionUid(qaQueContent.getUid().toString());
- qaMonitoredAnswersDTO.setQuestion(qaQueContent.getQuestion());
- qaMonitoredAnswersDTO.setFeedback(qaQueContent.getFeedback());
+ qaMonitoredAnswersDTO.setQuestionUid(qaQuestion.getUid().toString());
+ qaMonitoredAnswersDTO.setQuestion(qaQuestion.getQuestion());
+ qaMonitoredAnswersDTO.setFeedback(qaQuestion.getFeedback());
qaMonitoredAnswersDTO.setSessionName(sessionName);
- logger.debug("using allUsersData to retrieve users data: " + isUserNamesVisible);
- Map questionAttemptData = buildGroupsAttemptData(request, qaContent, qaService, qaQueContent,
- qaQueContent.getUid().toString(), isUserNamesVisible, isLearnerRequest, currentSessionId,
+ Map questionAttemptData = buildGroupsAttemptData(request, qaContent, qaService,
+ qaQuestion.getUid().toString(), isUserNamesVisible, isLearnerRequest, currentSessionId,
userId);
qaMonitoredAnswersDTO.setQuestionAttempts(questionAttemptData);
listMonitoredAnswersContainerDTO.add(qaMonitoredAnswersDTO);
@@ -232,13 +151,10 @@
* or to work out which is the user's answers (for not show all answers).
*/
public static Map buildGroupsAttemptData(HttpServletRequest request, QaContent qaContent, IQaService qaService,
- QaQueContent qaQueContent, String questionUid, boolean isUserNamesVisible, boolean isLearnerRequest,
- String currentSessionId, String userId) {
- logger.debug("doing buildGroupsAttemptData...");
+ String questionUid, boolean isUserNamesVisible, boolean isLearnerRequest, String currentSessionId,
+ String userId) {
+ List> listMonitoredAttemptsContainerDTO = new LinkedList>();
- Map mapMonitoredAttemptsContainerDTO = new TreeMap(new QaStringComparator());
- List listMonitoredAttemptsContainerDTO = new LinkedList();
-
Map summaryToolSessions = populateToolSessionsId(request, qaContent, qaService);
Iterator itMap = summaryToolSessions.entrySet().iterator();
@@ -258,9 +174,9 @@
if (qaSession != null) {
List listUsers = qaService.getUserBySessionOnly(qaSession);
- Map sessionUsersAttempts = populateSessionUsersAttempts(request, qaService, qaSession
- .getQaSessionId(), listUsers, questionUid, isUserNamesVisible,
- isLearnerRequest, userId);
+ Map sessionUsersAttempts = populateSessionUsersAttempts(
+ qaService, qaSession.getQaSessionId(), listUsers, questionUid,
+ isUserNamesVisible, isLearnerRequest, userId);
listMonitoredAttemptsContainerDTO.add(sessionUsersAttempts);
}
}
@@ -271,120 +187,92 @@
List listUsers = qaService.getUserBySessionOnly(qaSession);
- Map sessionUsersAttempts = populateSessionUsersAttempts(request, qaService, new Long(
+ Map sessionUsersAttempts = populateSessionUsersAttempts(qaService, new Long(
currentSessionId), listUsers, questionUid, isUserNamesVisible, isLearnerRequest, userId);
listMonitoredAttemptsContainerDTO.add(sessionUsersAttempts);
}
}
} else {
/*request is for learner report, use only the passed tool session in the report. */
- logger.debug("using currentSessionId for the learner report:" + currentSessionId);
QaSession qaSession = qaService.retrieveQaSession(new Long(currentSessionId).longValue());
if (qaSession != null) {
List listUsers = null;
if (qaContent.isShowOtherAnswers()) {
listUsers = qaService.getUserBySessionOnly(qaSession);
} else {
listUsers = new ArrayList();
- QaQueUsr currentUser = qaService.getQaUserBySession(new Long(userId).longValue(), qaSession
- .getUid());
+ QaQueUsr currentUser = qaService.getUserByIdAndSession(new Long(userId).longValue(), qaSession
+ .getQaSessionId());
if (currentUser != null)
listUsers.add(currentUser);
}
- logger.debug("listQaUsers for session id:" + qaSession.getQaSessionId() + " = " + listUsers);
- Map sessionUsersAttempts = populateSessionUsersAttempts(request, qaService, qaSession.getQaSessionId(),
+ Map sessionUsersAttempts = populateSessionUsersAttempts(qaService, qaSession.getQaSessionId(),
listUsers, questionUid, isUserNamesVisible, isLearnerRequest, userId);
listMonitoredAttemptsContainerDTO.add(sessionUsersAttempts);
}
}
- mapMonitoredAttemptsContainerDTO = convertToMap(listMonitoredAttemptsContainerDTO);
- return mapMonitoredAttemptsContainerDTO;
+ return convertToMap(listMonitoredAttemptsContainerDTO);
}
/**
- * Populates all the user's attempt data of a particular tool session
- * populateSessionUsersAttempts(HttpServletRequest request,List listUsers)
+ * Populates all the user's attempt data of a particular tool session.
* User id is needed if isUserNamesVisible is false && is learnerRequest =
* true, as it is required to work out if the data being analysed is the
* current user.
- *
- * @param request
- * @param listUsers
- * @return List
*/
- public static Map populateSessionUsersAttempts(HttpServletRequest request, IQaService qaService, Long sessionId,
- List listUsers, String questionUid, boolean isUserNamesVisible, boolean isLearnerRequest, String userId) {
+ private static Map populateSessionUsersAttempts(IQaService qaService, Long sessionId,
+ List listUsers, String questionUid, boolean isUserNamesVisible, boolean isLearnerRequest, String userId) {
- logger.debug("doing populateSessionUsersAttempts...");
-
- Map mapMonitoredUserContainerDTO = new TreeMap(new QaStringComparator());
- List listMonitoredUserContainerDTO = new LinkedList();
- Iterator itUsers = listUsers.iterator();
+ List listMonitoredUserContainerDTO = new LinkedList();
QaContent qaContent = qaService.getQaContentBySessionId(sessionId);
- while (itUsers.hasNext()) {
- QaQueUsr qaQueUsr = (QaQueUsr) itUsers.next();
+ for (QaQueUsr qaQueUsr : (List) listUsers) {
+ QaUsrResp response = qaService.getResponseByUserAndQuestion(qaQueUsr.getQueUsrId(), new Long(questionUid));
+ if (response != null) {
+ QaMonitoredUserDTO qaMonitoredUserDTO = new QaMonitoredUserDTO();
+ qaMonitoredUserDTO.setAttemptTime(response.getAttemptTime());
+ qaMonitoredUserDTO.setTimeZone(response.getTimezone());
+ qaMonitoredUserDTO.setUid(response.getResponseId().toString());
- if (qaQueUsr != null) {
- List listUserAttempts = qaService.getAttemptsForUserAndQuestionContent(qaQueUsr.getUid(), new Long(
- questionUid));
+ if (!isUserNamesVisible && isLearnerRequest && !userId.equals(qaQueUsr.getQueUsrId().toString())) {
+ // this is not current user, put his name as blank
+ qaMonitoredUserDTO.setUserName(" ");
+ } else {
+ // this is current user, put his name normally
+ qaMonitoredUserDTO.setUserName(qaQueUsr.getFullname());
+ }
- Iterator itAttempts = listUserAttempts.iterator();
- while (itAttempts.hasNext()) {
- QaUsrResp qaUsrResp = (QaUsrResp) itAttempts.next();
+ qaMonitoredUserDTO.setQueUsrId(qaQueUsr.getQueUsrId().toString());
+ qaMonitoredUserDTO.setSessionId(sessionId.toString());
+ qaMonitoredUserDTO.setResponse(response.getAnswer());
- if (qaUsrResp != null) {
- QaMonitoredUserDTO qaMonitoredUserDTO = new QaMonitoredUserDTO();
- qaMonitoredUserDTO.setAttemptTime(qaUsrResp.getAttemptTime());
- qaMonitoredUserDTO.setTimeZone(qaUsrResp.getTimezone());
- qaMonitoredUserDTO.setUid(qaUsrResp.getResponseId().toString());
+ String responsePresentable = QaUtils.replaceNewLines(response.getAnswer());
+ qaMonitoredUserDTO.setResponsePresentable(responsePresentable);
- if (!isUserNamesVisible && isLearnerRequest
- && !userId.equals(qaQueUsr.getQueUsrId().toString())) {
- logger.debug("this is not current user, put his name as blank.");
- qaMonitoredUserDTO.setUserName(" ");
- } else {
- logger.debug("this is current user, put his name normally.");
- qaMonitoredUserDTO.setUserName(qaQueUsr.getFullname());
- }
+ qaMonitoredUserDTO.setQuestionUid(questionUid);
+ qaMonitoredUserDTO.setVisible(new Boolean(response.isVisible()).toString());
- qaMonitoredUserDTO.setQueUsrId(qaQueUsr.getUid().toString());
- qaMonitoredUserDTO.setSessionId(sessionId.toString());
- qaMonitoredUserDTO.setResponse(qaUsrResp.getAnswer());
-
- String responsePresentable = QaUtils.replaceNewLines(qaUsrResp.getAnswer());
- qaMonitoredUserDTO.setResponsePresentable(responsePresentable);
-
- qaMonitoredUserDTO.setQuestionUid(questionUid);
- qaMonitoredUserDTO.setVisible(new Boolean(qaUsrResp.isVisible()).toString());
-
- //set averageRating
- if (qaContent.isAllowRateAnswers()) {
- AverageRatingDTO averageRating = qaService.getAverageRatingDTOByResponse(qaUsrResp.getResponseId());
- qaMonitoredUserDTO.setAverageRating(averageRating.getRating());
- qaMonitoredUserDTO.setNumberOfVotes(averageRating.getNumberOfVotes());
- }
-
- listMonitoredUserContainerDTO.add(qaMonitoredUserDTO);
- }
+ // set averageRating
+ if (qaContent.isAllowRateAnswers()) {
+ AverageRatingDTO averageRating = qaService.getAverageRatingDTOByResponse(response.getResponseId());
+ qaMonitoredUserDTO.setAverageRating(averageRating.getRating());
+ qaMonitoredUserDTO.setNumberOfVotes(averageRating.getNumberOfVotes());
}
+
+ listMonitoredUserContainerDTO.add(qaMonitoredUserDTO);
}
}
- mapMonitoredUserContainerDTO = convertToMcMonitoredUserDTOMap(listMonitoredUserContainerDTO);
- return mapMonitoredUserContainerDTO;
+ return convertToMcMonitoredUserDTOMap(listMonitoredUserContainerDTO);
}
- public static Map convertToMcMonitoredUserDTOMap(List list) {
- Map map = new TreeMap(new QaStringComparator());
+ private static Map convertToMcMonitoredUserDTOMap(List list) {
+ Map map = new TreeMap(new QaStringComparator());
- Iterator listIterator = list.iterator();
Long mapIndex = new Long(1);
-
- while (listIterator.hasNext()) {
- QaMonitoredUserDTO data = (QaMonitoredUserDTO) listIterator.next();
+ for (QaMonitoredUserDTO data : list) {
map.put(mapIndex.toString(), data);
- mapIndex = new Long(mapIndex.longValue() + 1);
+ mapIndex = mapIndex + 1;
}
return map;
}
@@ -395,13 +283,12 @@
Iterator itMap = map.entrySet().iterator();
while (itMap.hasNext()) {
Map.Entry pairs = (Map.Entry) itMap.next();
- logger.debug("using the summary tool sessions pair: " + pairs.getKey() + " = " + pairs.getValue());
newMap.put(pairs.getKey(), QaUtils.replaceNewLines(pairs.getValue().toString()));
}
return newMap;
}
- public static Map convertToMap(List list) {
+ private static Map convertToMap(List list) {
Map map = new TreeMap(new QaStringComparator());
Iterator listIterator = list.iterator();
@@ -421,8 +308,6 @@
QaSession qaSession = (QaSession) iteratorSession.next();
if (qaSession != null) {
- logger.debug("qaSession id: " + qaSession.getQaSessionId());
-
Iterator iteratorUser = qaSession.getQaQueUsers().iterator();
while (iteratorUser.hasNext()) {
QaQueUsr qaQueUsr = (QaQueUsr) iteratorUser.next();
@@ -468,8 +353,6 @@
}
}
}
- logger.debug("countAllUsers: " + countAllUsers);
- logger.debug("countSessionComplete: " + countSessionComplete);
qaStatsDTO.setCountAllUsers(new Integer(countAllUsers).toString());
qaStatsDTO.setCountSessionComplete(new Integer(countSessionComplete).toString());
@@ -489,7 +372,6 @@
}
public static List buildGroupBasedSessionData(HttpServletRequest request, QaContent qaContent, IQaService qaService) {
- logger.debug("buildGroupBasedSessionData: " + qaContent.getUid());
List listQuestions = qaService.getAllQuestionEntries(qaContent.getUid());
List listAllGroupsContainerDTO = new LinkedList();
@@ -507,18 +389,18 @@
if (qaSession != null) {
Iterator itListQuestions = listQuestions.iterator();
while (itListQuestions.hasNext()) {
- QaQueContent qaQueContent = (QaQueContent) itListQuestions.next();
+ QaQuestion qaQuestion = (QaQuestion) itListQuestions.next();
- if (qaQueContent != null) {
+ if (qaQuestion != null) {
QaMonitoredAnswersDTO qaMonitoredAnswersDTO = new QaMonitoredAnswersDTO();
- qaMonitoredAnswersDTO.setQuestionUid(qaQueContent.getUid().toString());
- qaMonitoredAnswersDTO.setQuestion(qaQueContent.getQuestion());
- qaMonitoredAnswersDTO.setFeedback(qaQueContent.getFeedback());
+ qaMonitoredAnswersDTO.setQuestionUid(qaQuestion.getUid().toString());
+ qaMonitoredAnswersDTO.setQuestion(qaQuestion.getQuestion());
+ qaMonitoredAnswersDTO.setFeedback(qaQuestion.getFeedback());
qaMonitoredAnswersDTO.setSessionId(currentSessionId);
qaMonitoredAnswersDTO.setSessionName(currentSessionName);
- Map questionAttemptData = buildGroupsAttemptData(request, qaContent, qaService, qaQueContent,
- qaQueContent.getUid().toString(), true, false, currentSessionId, null);
+ Map questionAttemptData = buildGroupsAttemptData(request, qaContent, qaService, qaQuestion
+ .getUid().toString(), true, false, currentSessionId, null);
qaMonitoredAnswersDTO.setQuestionAttempts(questionAttemptData);
listMonitoredAnswersContainerDTO.add(qaMonitoredAnswersDTO);
}
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java,v
diff -u -r1.28.8.2 -r1.28.8.3
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java 1 Nov 2010 10:44:07 -0000 1.28.8.2
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java 16 Mar 2011 19:56:48 -0000 1.28.8.3
@@ -31,7 +31,6 @@
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-import java.util.Map;
import java.util.SortedSet;
import javax.servlet.ServletException;
@@ -51,20 +50,21 @@
import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
import org.lamsfoundation.lams.tool.exception.ToolException;
-import org.lamsfoundation.lams.tool.qa.EditActivityDTO;
import org.lamsfoundation.lams.tool.qa.QaAppConstants;
-import org.lamsfoundation.lams.tool.qa.QaApplicationException;
import org.lamsfoundation.lams.tool.qa.QaCondition;
import org.lamsfoundation.lams.tool.qa.QaConfigItem;
import org.lamsfoundation.lams.tool.qa.QaContent;
-import org.lamsfoundation.lams.tool.qa.QaGeneralAuthoringDTO;
-import org.lamsfoundation.lams.tool.qa.QaQueContent;
-import org.lamsfoundation.lams.tool.qa.QaQuestionContentDTO;
+import org.lamsfoundation.lams.tool.qa.QaQuestion;
import org.lamsfoundation.lams.tool.qa.QaUploadedFile;
-import org.lamsfoundation.lams.tool.qa.QaUtils;
+import org.lamsfoundation.lams.tool.qa.dto.EditActivityDTO;
+import org.lamsfoundation.lams.tool.qa.dto.QaGeneralAuthoringDTO;
+import org.lamsfoundation.lams.tool.qa.dto.QaQuestionDTO;
import org.lamsfoundation.lams.tool.qa.service.IQaService;
import org.lamsfoundation.lams.tool.qa.service.QaServiceProxy;
+import org.lamsfoundation.lams.tool.qa.util.QaApplicationException;
import org.lamsfoundation.lams.tool.qa.util.QaToolContentHandler;
+import org.lamsfoundation.lams.tool.qa.util.QaUtils;
+import org.lamsfoundation.lams.tool.qa.web.form.QaAuthoringForm;
import org.lamsfoundation.lams.util.FileValidatorUtil;
import org.lamsfoundation.lams.util.WebUtil;
import org.lamsfoundation.lams.web.action.LamsDispatchAction;
@@ -232,7 +232,7 @@
String defaultContentIdStr = request.getParameter(QaAppConstants.DEFAULT_CONTENT_ID_STR);
- List listQuestionContentDTO = (List) sessionMap.get(QaAppConstants.LIST_QUESTION_CONTENT_DTO_KEY);
+ List listQuestionContentDTO = (List) sessionMap.get(QaAppConstants.LIST_QUESTION_CONTENT_DTO_KEY);
ActionMessages errors = new ActionMessages();
@@ -287,7 +287,7 @@
request.setAttribute(QaAppConstants.QA_GENERAL_AUTHORING_DTO, qaGeneralAuthoringDTO);
- QaContent qaContentTest = qaService.loadQa(new Long(strToolContentID).longValue());
+ QaContent qaContentTest = qaService.getQa(new Long(strToolContentID).longValue());
if (!errors.isEmpty()) {
saveErrors(request, errors);
@@ -420,7 +420,7 @@
String editQuestionBoxRequest = request.getParameter("editQuestionBoxRequest");
- QaContent qaContent = qaService.loadQa(new Long(strToolContentID).longValue());
+ QaContent qaContent = qaService.getQa(new Long(strToolContentID).longValue());
QaGeneralAuthoringDTO qaGeneralAuthoringDTO = new QaGeneralAuthoringDTO();
@@ -451,13 +451,13 @@
QaAction.logger.debug("duplicates: " + duplicates);
if (!duplicates) {
- QaQuestionContentDTO qaQuestionContentDTO = null;
+ QaQuestionDTO qaQuestionDTO = null;
Iterator listIterator = listQuestionContentDTO.iterator();
while (listIterator.hasNext()) {
- qaQuestionContentDTO = (QaQuestionContentDTO) listIterator.next();
+ qaQuestionDTO = (QaQuestionDTO) listIterator.next();
- String question = qaQuestionContentDTO.getQuestion();
- String displayOrder = qaQuestionContentDTO.getDisplayOrder();
+ String question = qaQuestionDTO.getQuestion();
+ String displayOrder = qaQuestionDTO.getDisplayOrder();
if (displayOrder != null && !displayOrder.equals("")) {
@@ -468,25 +468,25 @@
}
}
- qaQuestionContentDTO.setQuestion(newQuestion);
- qaQuestionContentDTO.setFeedback(feedback);
- qaQuestionContentDTO.setDisplayOrder(editableQuestionIndex);
- qaQuestionContentDTO.setRequired(requiredBoolean);
+ qaQuestionDTO.setQuestion(newQuestion);
+ qaQuestionDTO.setFeedback(feedback);
+ qaQuestionDTO.setDisplayOrder(editableQuestionIndex);
+ qaQuestionDTO.setRequired(requiredBoolean);
listQuestionContentDTO = AuthoringUtil.reorderUpdateListQuestionContentDTO(listQuestionContentDTO,
- qaQuestionContentDTO, editableQuestionIndex);
+ qaQuestionDTO, editableQuestionIndex);
} else {
QaAction.logger.debug("duplicate question entry, not adding");
}
} else {
QaAction.logger.debug("request for edit and save.");
- QaQuestionContentDTO qaQuestionContentDTO = null;
+ QaQuestionDTO qaQuestionDTO = null;
Iterator listIterator = listQuestionContentDTO.iterator();
while (listIterator.hasNext()) {
- qaQuestionContentDTO = (QaQuestionContentDTO) listIterator.next();
+ qaQuestionDTO = (QaQuestionDTO) listIterator.next();
- String question = qaQuestionContentDTO.getQuestion();
- String displayOrder = qaQuestionContentDTO.getDisplayOrder();
+ String question = qaQuestionDTO.getQuestion();
+ String displayOrder = qaQuestionDTO.getDisplayOrder();
if (displayOrder != null && !displayOrder.equals("")) {
if (displayOrder.equals(editableQuestionIndex)) {
@@ -496,13 +496,13 @@
}
}
- qaQuestionContentDTO.setQuestion(newQuestion);
- qaQuestionContentDTO.setFeedback(feedback);
- qaQuestionContentDTO.setDisplayOrder(editableQuestionIndex);
- qaQuestionContentDTO.setRequired(requiredBoolean);
+ qaQuestionDTO.setQuestion(newQuestion);
+ qaQuestionDTO.setFeedback(feedback);
+ qaQuestionDTO.setDisplayOrder(editableQuestionIndex);
+ qaQuestionDTO.setRequired(requiredBoolean);
listQuestionContentDTO = AuthoringUtil.reorderUpdateListQuestionContentDTO(listQuestionContentDTO,
- qaQuestionContentDTO, editableQuestionIndex);
+ qaQuestionDTO, editableQuestionIndex);
}
} else {
QaAction.logger.debug("entry blank, not adding");
@@ -626,9 +626,9 @@
boolean duplicates = AuthoringUtil.checkDuplicateQuestions(listQuestionContentDTO, newQuestion);
if (!duplicates) {
- QaQuestionContentDTO qaQuestionContentDTO = new QaQuestionContentDTO(newQuestion, new Long(listSize + 1).toString(),
+ QaQuestionDTO qaQuestionDTO = new QaQuestionDTO(newQuestion, new Long(listSize + 1).toString(),
feedback, requiredBoolean);
- listQuestionContentDTO.add(qaQuestionContentDTO);
+ listQuestionContentDTO.add(qaQuestionDTO);
} else {
QaAction.logger.debug("entry duplicate, not adding");
@@ -802,15 +802,15 @@
boolean requiredBoolean = false;
Iterator listIterator = listQuestionContentDTO.iterator();
while (listIterator.hasNext()) {
- QaQuestionContentDTO qaQuestionContentDTO = (QaQuestionContentDTO) listIterator.next();
- String question = qaQuestionContentDTO.getQuestion();
- String displayOrder = qaQuestionContentDTO.getDisplayOrder();
+ QaQuestionDTO qaQuestionDTO = (QaQuestionDTO) listIterator.next();
+ String question = qaQuestionDTO.getQuestion();
+ String displayOrder = qaQuestionDTO.getDisplayOrder();
if (displayOrder != null && !displayOrder.equals("")) {
if (displayOrder.equals(questionIndex)) {
- editableFeedback = qaQuestionContentDTO.getFeedback();
- editableQuestion = qaQuestionContentDTO.getQuestion();
- requiredBoolean = qaQuestionContentDTO.isRequired();
+ editableFeedback = qaQuestionDTO.getFeedback();
+ editableQuestion = qaQuestionDTO.getQuestion();
+ requiredBoolean = qaQuestionDTO.isRequired();
break;
}
@@ -826,7 +826,7 @@
String defaultContentIdStr = request.getParameter(QaAppConstants.DEFAULT_CONTENT_ID_STR);
- QaContent qaContent = qaService.loadQa(new Long(strToolContentID).longValue());
+ QaContent qaContent = qaService.getQa(new Long(strToolContentID).longValue());
QaGeneralAuthoringDTO qaGeneralAuthoringDTO = new QaGeneralAuthoringDTO();
@@ -892,13 +892,13 @@
List listQuestionContentDTO = (List) sessionMap.get(QaAppConstants.LIST_QUESTION_CONTENT_DTO_KEY);
- QaQuestionContentDTO qaQuestionContentDTO = null;
+ QaQuestionDTO qaQuestionDTO = null;
Iterator listIterator = listQuestionContentDTO.iterator();
while (listIterator.hasNext()) {
- qaQuestionContentDTO = (QaQuestionContentDTO) listIterator.next();
+ qaQuestionDTO = (QaQuestionDTO) listIterator.next();
- String question = qaQuestionContentDTO.getQuestion();
- String displayOrder = qaQuestionContentDTO.getDisplayOrder();
+ String question = qaQuestionDTO.getQuestion();
+ String displayOrder = qaQuestionDTO.getDisplayOrder();
if (displayOrder != null && !displayOrder.equals("")) {
if (displayOrder.equals(questionIndex)) {
@@ -908,16 +908,16 @@
}
}
- qaQuestionContentDTO.setQuestion("");
+ qaQuestionDTO.setQuestion("");
SortedSet list = (SortedSet) sessionMap.get(QaAppConstants.ATTR_CONDITION_SET);
Iterator conditionIter = list.iterator();
while (conditionIter.hasNext()) {
QaCondition condition = conditionIter.next();
- Iterator dtoIter = condition.temporaryQuestionDTOSet.iterator();
+ Iterator dtoIter = condition.temporaryQuestionDTOSet.iterator();
while (dtoIter.hasNext()) {
- if (dtoIter.next() == qaQuestionContentDTO) {
+ if (dtoIter.next() == qaQuestionDTO) {
dtoIter.remove();
}
}
@@ -948,11 +948,11 @@
String defaultContentIdStr = request.getParameter(QaAppConstants.DEFAULT_CONTENT_ID_STR);
- QaContent qaContent = qaService.loadQa(new Long(strToolContentID).longValue());
+ QaContent qaContent = qaService.getQa(new Long(strToolContentID).longValue());
if (qaContent == null) {
QaAction.logger.debug("using defaultContentIdStr: " + defaultContentIdStr);
- qaContent = qaService.loadQa(new Long(defaultContentIdStr).longValue());
+ qaContent = qaService.getQa(new Long(defaultContentIdStr).longValue());
}
QaGeneralAuthoringDTO qaGeneralAuthoringDTO = new QaGeneralAuthoringDTO();
@@ -1063,7 +1063,7 @@
String defaultContentIdStr = request.getParameter(QaAppConstants.DEFAULT_CONTENT_ID_STR);
- QaContent qaContent = qaService.loadQa(new Long(strToolContentID).longValue());
+ QaContent qaContent = qaService.getQa(new Long(strToolContentID).longValue());
QaGeneralAuthoringDTO qaGeneralAuthoringDTO = new QaGeneralAuthoringDTO();
qaGeneralAuthoringDTO.setContentFolderID(contentFolderID);
@@ -1171,7 +1171,7 @@
String defaultContentIdStr = request.getParameter(QaAppConstants.DEFAULT_CONTENT_ID_STR);
- QaContent qaContent = qaService.loadQa(new Long(strToolContentID).longValue());
+ QaContent qaContent = qaService.getQa(new Long(strToolContentID).longValue());
QaGeneralAuthoringDTO qaGeneralAuthoringDTO = new QaGeneralAuthoringDTO();
@@ -1275,7 +1275,7 @@
String defaultContentIdStr = request.getParameter(QaAppConstants.DEFAULT_CONTENT_ID_STR);
- QaContent qaContent = qaService.loadQa(new Long(strToolContentID).longValue());
+ QaContent qaContent = qaService.getQa(new Long(strToolContentID).longValue());
QaGeneralAuthoringDTO qaGeneralAuthoringDTO = new QaGeneralAuthoringDTO();
@@ -1375,7 +1375,7 @@
request.setAttribute(QaAppConstants.LIST_QUESTION_CONTENT_DTO, listQuestionContentDTO);
- QaContent qaContent = qaService.loadQa(new Long(strToolContentID).longValue());
+ QaContent qaContent = qaService.getQa(new Long(strToolContentID).longValue());
QaGeneralAuthoringDTO qaGeneralAuthoringDTO = new QaGeneralAuthoringDTO();
@@ -1738,7 +1738,7 @@
String defaultContentIdStr = request.getParameter(QaAppConstants.DEFAULT_CONTENT_ID_STR);
- QaContent qaContent = qaService.loadQa(new Long(strToolContentID).longValue());
+ QaContent qaContent = qaService.getQa(new Long(strToolContentID).longValue());
QaGeneralAuthoringDTO qaGeneralAuthoringDTO = new QaGeneralAuthoringDTO();
qaGeneralAuthoringDTO.setContentFolderID(contentFolderID);
@@ -1789,14 +1789,14 @@
List listQuestionContentDTO = new LinkedList();
- Iterator queIterator = qaContent.getQaQueContents().iterator();
+ Iterator queIterator = qaContent.getQaQuestions().iterator();
while (queIterator.hasNext()) {
- QaQueContent qaQueContent = (QaQueContent) queIterator.next();
+ QaQuestion qaQuestion = (QaQuestion) queIterator.next();
- if (qaQueContent != null) {
- QaQuestionContentDTO qaQuestionContentDTO = new QaQuestionContentDTO(qaQueContent);
- qaQuestionContentDTO.setDisplayOrder(new Integer(qaQueContent.getDisplayOrder()).toString());
- listQuestionContentDTO.add(qaQuestionContentDTO);
+ if (qaQuestion != null) {
+ QaQuestionDTO qaQuestionDTO = new QaQuestionDTO(qaQuestion);
+ qaQuestionDTO.setDisplayOrder(new Integer(qaQuestion.getDisplayOrder()).toString());
+ listQuestionContentDTO.add(qaQuestionDTO);
}
}
request.setAttribute(QaAppConstants.LIST_QUESTION_CONTENT_DTO, listQuestionContentDTO);
@@ -1819,7 +1819,7 @@
* @return
*/
protected boolean existsContent(long toolContentID, IQaService qaService) {
- QaContent qaContent = qaService.loadQa(toolContentID);
+ QaContent qaContent = qaService.getQa(toolContentID);
if (qaContent == null) {
return false;
}
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAdminAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAdminAction.java,v
diff -u -r1.3 -r1.3.8.1
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAdminAction.java 19 Feb 2009 04:25:02 -0000 1.3
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAdminAction.java 16 Mar 2011 19:56:48 -0000 1.3.8.1
@@ -23,17 +23,9 @@
/* $Id$ */
package org.lamsfoundation.lams.tool.qa.web;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
-import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.StringReader;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
import java.util.SortedSet;
import java.util.TreeSet;
@@ -43,8 +35,6 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import org.apache.commons.fileupload.DiskFileUpload;
-import org.apache.commons.fileupload.FileItem;
import org.apache.log4j.Logger;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -56,7 +46,7 @@
import org.lamsfoundation.lams.tool.qa.QaWizardQuestion;
import org.lamsfoundation.lams.tool.qa.service.IQaService;
import org.lamsfoundation.lams.tool.qa.service.QaServiceProxy;
-import org.lamsfoundation.lams.util.FileUtil;
+import org.lamsfoundation.lams.tool.qa.web.form.QaAdminForm;
import org.lamsfoundation.lams.web.action.LamsDispatchAction;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Fisheye: Tag 1.3.8.1 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAdminForm.java'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAuthoringConditionAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAuthoringConditionAction.java,v
diff -u -r1.6 -r1.6.8.1
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAuthoringConditionAction.java 19 Feb 2009 04:25:02 -0000 1.6
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAuthoringConditionAction.java 16 Mar 2011 19:56:48 -0000 1.6.8.1
@@ -46,9 +46,10 @@
import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator;
import org.lamsfoundation.lams.tool.qa.QaAppConstants;
import org.lamsfoundation.lams.tool.qa.QaCondition;
-import org.lamsfoundation.lams.tool.qa.QaQuestionContentDTO;
+import org.lamsfoundation.lams.tool.qa.dto.QaQuestionDTO;
import org.lamsfoundation.lams.tool.qa.service.IQaService;
import org.lamsfoundation.lams.tool.qa.service.QaServiceProxy;
+import org.lamsfoundation.lams.tool.qa.web.form.QaConditionForm;
import org.lamsfoundation.lams.util.WebUtil;
import org.lamsfoundation.lams.web.util.SessionMap;
import org.springframework.web.context.WebApplicationContext;
@@ -311,11 +312,11 @@
* @param request
* @return
*/
- private List getQuestionList(SessionMap sessionMap) {
- List list = (List) sessionMap
+ private List getQuestionList(SessionMap sessionMap) {
+ List list = (List) sessionMap
.get(QaAppConstants.LIST_QUESTION_CONTENT_DTO_KEY);
if (list == null) {
- list = new LinkedList();
+ list = new LinkedList();
sessionMap.put(QaAppConstants.LIST_QUESTION_CONTENT_DTO_KEY, list);
}
return list;
@@ -378,13 +379,13 @@
String sessionMapID = conditionForm.getSessionMapID();
SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
- List questions = getQuestionList(sessionMap);
+ List questions = getQuestionList(sessionMap);
// Initialise the LabelValueBeans in the possibleOptions array.
LabelValueBean[] lvBeans = new LabelValueBean[questions.size()];
int i = 0;
- for (QaQuestionContentDTO question : questions) {
+ for (QaQuestionDTO question : questions) {
String nonHTMLQuestion = question.getQuestion();
if (nonHTMLQuestion != null) {
nonHTMLQuestion = WebUtil.removeHTMLtags(nonHTMLQuestion);
@@ -432,11 +433,11 @@
}
Integer[] selectedItems = form.getSelectedItems();
- List questions = getQuestionList(sessionMap);
+ List questions = getQuestionList(sessionMap);
condition.temporaryQuestionDTOSet.clear();
for (Integer selectedItem : selectedItems) {
- for (QaQuestionContentDTO question : questions) {
+ for (QaQuestionDTO question : questions) {
if (selectedItem.equals(new Integer(question.getDisplayOrder()))) {
condition.temporaryQuestionDTOSet.add(question);
}
Fisheye: Tag 1.25.4.1.4.3 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAuthoringForm.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.3.10.1 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaConditionForm.java'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaDLStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/Attic/QaDLStarterAction.java,v
diff -u -r1.10 -r1.10.8.1
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaDLStarterAction.java 19 Feb 2009 23:59:13 -0000 1.10
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaDLStarterAction.java 16 Mar 2011 19:56:48 -0000 1.10.8.1
@@ -68,10 +68,11 @@
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.lamsfoundation.lams.tool.qa.QaAppConstants;
-import org.lamsfoundation.lams.tool.qa.QaApplicationException;
-import org.lamsfoundation.lams.tool.qa.QaUtils;
import org.lamsfoundation.lams.tool.qa.service.IQaService;
import org.lamsfoundation.lams.tool.qa.service.QaServiceProxy;
+import org.lamsfoundation.lams.tool.qa.util.QaApplicationException;
+import org.lamsfoundation.lams.tool.qa.util.QaUtils;
+import org.lamsfoundation.lams.tool.qa.web.form.QaAuthoringForm;
public class QaDLStarterAction extends Action implements QaAppConstants {
static Logger logger = Logger.getLogger(QaDLStarterAction.class.getName());
Fisheye: Tag 1.11.8.1 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaEmptyForm.java'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java,v
diff -u -r1.37.4.1.4.2 -r1.37.4.1.4.3
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java 24 Feb 2011 14:22:40 -0000 1.37.4.1.4.2
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java 16 Mar 2011 19:56:49 -0000 1.37.4.1.4.3
@@ -98,20 +98,15 @@
import java.io.IOException;
import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
import java.util.Map;
import java.util.TreeMap;
-import java.util.TreeSet;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.math.NumberUtils;
import org.apache.log4j.Logger;
import org.apache.struts.Globals;
import org.apache.struts.action.ActionForm;
@@ -124,20 +119,20 @@
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.qa.GeneralLearnerFlowDTO;
import org.lamsfoundation.lams.tool.qa.QaAppConstants;
-import org.lamsfoundation.lams.tool.qa.QaComparator;
import org.lamsfoundation.lams.tool.qa.QaContent;
-import org.lamsfoundation.lams.tool.qa.QaQueContent;
import org.lamsfoundation.lams.tool.qa.QaQueUsr;
-import org.lamsfoundation.lams.tool.qa.QaQuestionContentDTO;
+import org.lamsfoundation.lams.tool.qa.QaQuestion;
import org.lamsfoundation.lams.tool.qa.QaSession;
import org.lamsfoundation.lams.tool.qa.QaUsrResp;
-import org.lamsfoundation.lams.tool.qa.QaUtils;
-import org.lamsfoundation.lams.tool.qa.ResponseRating;
import org.lamsfoundation.lams.tool.qa.dto.AverageRatingDTO;
+import org.lamsfoundation.lams.tool.qa.dto.GeneralLearnerFlowDTO;
+import org.lamsfoundation.lams.tool.qa.dto.QaQuestionDTO;
import org.lamsfoundation.lams.tool.qa.service.IQaService;
import org.lamsfoundation.lams.tool.qa.service.QaServiceProxy;
+import org.lamsfoundation.lams.tool.qa.util.QaComparator;
+import org.lamsfoundation.lams.tool.qa.util.QaUtils;
+import org.lamsfoundation.lams.tool.qa.web.form.QaLearningForm;
import org.lamsfoundation.lams.usermanagement.User;
import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
import org.lamsfoundation.lams.util.WebUtil;
@@ -148,17 +143,17 @@
public class QaLearningAction extends LamsDispatchAction implements QaAppConstants {
static Logger logger = Logger.getLogger(QaLearningAction.class.getName());
+
+ private static IQaService qaService;
public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
HttpServletResponse response) throws IOException, ServletException, ToolException {
- logger.debug("dispatching unspecified...");
+ logger.warn("dispatching unspecified...");
return null;
}
/**
- * submits users responses ActionForward submitAnswersContent(ActionMapping
- * mapping, ActionForm form, HttpServletRequest request, HttpServletResponse
- * response) throws IOException, ServletException
+ * submits users responses
*
* @param mapping
* @param form
@@ -170,20 +165,13 @@
*/
public ActionForward submitAnswersContent(ActionMapping mapping, ActionForm form, HttpServletRequest request,
HttpServletResponse response) throws IOException, ServletException {
- logger.debug("dispatching submitAnswersContent...");
+ initializeQAService();
QaLearningForm qaLearningForm = (QaLearningForm) form;
LearningUtil.saveFormRequestData(request, qaLearningForm);
-
- IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
-
String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
- qaLearningForm.setToolSessionID(toolSessionID);
- QaSession qaSession = qaService.retrieveQaSessionOrNullById(new Long(toolSessionID).longValue());
-
- String toolContentID = qaSession.getQaContent().getQaContentId().toString();
-
+ QaSession qaSession = qaService.getSessionById(new Long(toolSessionID).longValue());
QaContent qaContent = qaSession.getQaContent();
GeneralLearnerFlowDTO generalLearnerFlowDTO = LearningUtil.buildGeneralLearnerFlowDTO(qaContent);
@@ -193,11 +181,10 @@
String questionListingMode = generalLearnerFlowDTO.getQuestionListingMode();
- Map mapAnswers = new TreeMap(new QaComparator());
- Map mapAnswersPresentable = new TreeMap(new QaComparator());
- Map mapFeedback = new TreeMap(new QaComparator());
+ Map mapAnswers = new TreeMap(new QaComparator());
+ Map mapAnswersPresentable = new TreeMap(new QaComparator());
- String destination = INDIVIDUAL_LEARNER_RESULTS;
+ String forwardName = INDIVIDUAL_LEARNER_RESULTS;
ActionMessages errors = new ActionMessages();
String httpSessionID = qaLearningForm.getHttpSessionID();
@@ -214,51 +201,36 @@
mapAnswers.put(questionIndexString, answer);
mapAnswersPresentable.put(questionIndexString, answerPresentable);
- Map questionContentMap = generalLearnerFlowDTO.getMapQuestionContentLearner();
- QaQuestionContentDTO dto = questionContentMap.get(questionIndexString);
+ Map questionContentMap = generalLearnerFlowDTO.getMapQuestionContentLearner();
+ QaQuestionDTO dto = questionContentMap.get(questionIndexString);
if ( dto.isRequired() && isEmpty(answer)) {
errors.add(Globals.ERROR_KEY, new ActionMessage("error.required", questionIndexString));
- destination = LOAD_LEARNER;
+ forwardName = LOAD_LEARNER;
}
+
+ //store
+ qaService.updateResponseWithNewAnswer(answer, toolSessionID, new Long(questionIndex));
}
saveErrors(request, errors);
} else {
- // processing the last question in sequential mode
-/* if (totalQuestionCount.equals("1")) {
- String answerPresentable = QaUtils.replaceNewLines(qaLearningForm.getAnswer());
+ mapAnswers = storeSequentialAnswer(qaLearningForm, request, generalLearnerFlowDTO, true);
- mapAnswers.put("1", qaLearningForm.getAnswer());
- mapAnswersPresentable.put("1", answerPresentable);
+ mapAnswersPresentable = (Map) sessionMap.get(MAP_ALL_RESULTS_KEY);
+ mapAnswersPresentable = MonitoringUtil.removeNewLinesMap(mapAnswersPresentable);
- Map questionContentMap = generalLearnerFlowDTO.getMapQuestionContentLearner();
- QaQuestionContentDTO dto = questionContentMap.get("1");
- if ( dto.isRequired() && isEmpty(answerPresentable)) {
- errors.add(Globals.ERROR_KEY, new ActionMessage("error.required", "1"));
- destination = LOAD_LEARNER;
- }
-
- } else { */
- mapAnswers = populateAnswersMap(qaLearningForm, request, generalLearnerFlowDTO, true, true);
-
- mapAnswersPresentable = (Map) sessionMap.get(MAP_ALL_RESULTS_KEY);
- mapAnswersPresentable = MonitoringUtil.removeNewLinesMap(mapAnswersPresentable);
-
- // only need to check the final question as the others will have been checked when the user clicked next.
- Map questionContentMap = generalLearnerFlowDTO.getMapQuestionContentLearner();
- int numQuestions = questionContentMap.size();
- String finalQuestionIndex = new Integer(numQuestions).toString();
- QaQuestionContentDTO dto = questionContentMap.get(finalQuestionIndex);
- if ( dto.isRequired() && isEmpty((String)mapAnswersPresentable.get(finalQuestionIndex))) {
- errors.add(Globals.ERROR_KEY, new ActionMessage("error.required", finalQuestionIndex));
- destination = LOAD_LEARNER;
- }
-/* } */
-
+ // only need to check the final question as the others will have been checked when the user clicked next.
+ Map questionMap = generalLearnerFlowDTO.getMapQuestionContentLearner();
+ int numQuestions = questionMap.size();
+ String finalQuestionIndex = new Integer(numQuestions).toString();
+ QaQuestionDTO dto = questionMap.get(finalQuestionIndex);
+ if (dto.isRequired() && isEmpty((String) mapAnswersPresentable.get(finalQuestionIndex))) {
+ errors.add(Globals.ERROR_KEY, new ActionMessage("error.required", finalQuestionIndex));
+ forwardName = LOAD_LEARNER;
+ }
}
generalLearnerFlowDTO.setMapAnswers(mapAnswers);
-
generalLearnerFlowDTO.setMapAnswersPresentable(mapAnswersPresentable);
/*mapAnswers will be used in the viewAllAnswers screen*/
@@ -272,30 +244,59 @@
boolean lockWhenFinished = qaContent.isLockWhenFinished();
generalLearnerFlowDTO.setLockWhenFinished(new Boolean(lockWhenFinished).toString());
-
- boolean allowRichEditor = qaContent.isAllowRichEditor();
- generalLearnerFlowDTO.setAllowRichEditor(new Boolean(allowRichEditor).toString());
-
- generalLearnerFlowDTO.setAllowRateAnswers(new Boolean(qaContent.isAllowRateAnswers()).toString());
-
- boolean showOtherAnswers = qaContent.isShowOtherAnswers();
- generalLearnerFlowDTO.setShowOtherAnswers(new Boolean(showOtherAnswers).toString());
-
generalLearnerFlowDTO.setReflection(new Boolean(qaContent.isReflect()).toString());
request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
qaLearningForm.resetAll();
- return (mapping.findForward(destination));
+ return (mapping.findForward(forwardName));
}
+
+ /**
+ * auto saves responses
+ *
+ * @param mapping
+ * @param form
+ * @param request
+ * @param response
+ * @return
+ * @throws IOException
+ * @throws ServletException
+ */
+ public ActionForward autoSaveAnswers(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws IOException, ServletException {
+ initializeQAService();
+ QaLearningForm qaLearningForm = (QaLearningForm) form;
+ LearningUtil.saveFormRequestData(request, qaLearningForm);
+ String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
+ QaSession qaSession = qaService.getSessionById(new Long(toolSessionID).longValue());
+ QaContent qaContent = qaSession.getQaContent();
+ int intTotalQuestionCount = qaContent.getQaQuestions().size();
+
+ if (! qaContent.isQuestionsSequenced()) {
+
+ for (int questionIndex = INITIAL_QUESTION_COUNT.intValue(); questionIndex <= intTotalQuestionCount; questionIndex++) {
+ String newAnswer = request.getParameter("answer" + questionIndex);
+ qaService.updateResponseWithNewAnswer(newAnswer, toolSessionID, new Long(questionIndex));
+ }
+
+ } else {
+ String currentQuestionIndex = qaLearningForm.getCurrentQuestionIndex();
+ String newAnswer = qaLearningForm.getAnswer();
+ QaQuestion currentQuestion = qaService.getQuestionByContentAndDisplayOrder(new Long(currentQuestionIndex), qaContent.getUid());
+
+ boolean isRequiredQuestionMissed = currentQuestion.isRequired() && isEmpty(newAnswer);
+ if (!isRequiredQuestionMissed) {
+ qaService.updateResponseWithNewAnswer(newAnswer, toolSessionID, new Long(currentQuestionIndex));
+ }
+ }
+ return null;
+ }
+
/**
* enables retaking the activity
*
- * ActionForward redoQuestions(ActionMapping mapping, ActionForm form,
- * HttpServletRequest request, HttpServletResponse response) throws
- * IOException, ServletException
- *
* @param mapping
* @param form
* @param request
@@ -306,28 +307,17 @@
*/
public ActionForward redoQuestions(ActionMapping mapping, ActionForm form, HttpServletRequest request,
HttpServletResponse response) throws IOException, ServletException {
- logger.debug("dispatching redoQuestions...");
+ initializeQAService();
QaLearningForm qaLearningForm = (QaLearningForm) form;
LearningUtil.saveFormRequestData(request, qaLearningForm);
- IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
-
String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
- qaLearningForm.setToolSessionID(toolSessionID);
-
- QaSession qaSession = qaService.retrieveQaSessionOrNullById(new Long(toolSessionID).longValue());
-
- String toolContentID = qaSession.getQaContent().getQaContentId().toString();
-
+ QaSession qaSession = qaService.getSessionById(new Long(toolSessionID).longValue());
QaContent qaContent = qaSession.getQaContent();
GeneralLearnerFlowDTO generalLearnerFlowDTO = LearningUtil.buildGeneralLearnerFlowDTO(qaContent);
- Map mapQuestions = new TreeMap();
- Map mapAnswers = new TreeMap(new QaComparator());
-
- generalLearnerFlowDTO.setCurrentQuestionIndex(new Integer(1));
qaLearningForm.setCurrentQuestionIndex(new Integer(1).toString());
String httpSessionID = qaLearningForm.getHttpSessionID();
@@ -336,233 +326,82 @@
request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
qaLearningForm.setHttpSessionID(sessionMap.getSessionID());
generalLearnerFlowDTO.setHttpSessionID(sessionMap.getSessionID());
-
- generalLearnerFlowDTO.setActivityTitle(qaContent.getTitle());
- generalLearnerFlowDTO.setActivityInstructions(qaContent.getInstructions());
-
- logger.debug("using TOOL_CONTENT_ID: " + qaContent.getQaContentId());
generalLearnerFlowDTO.setToolContentID(qaContent.getQaContentId().toString());
- /*
- * The content we retrieved above must have been created before in Authoring time.
- * And the passed tool session id refers to it.
- */
-
- generalLearnerFlowDTO.setReportTitleLearner(qaContent.getReportTitle());
-
- /*
- * Is the tool activity been checked as Run Offline in the property inspector?
- */
- generalLearnerFlowDTO.setActivityOffline(new Boolean(qaContent.isRunOffline()).toString());
-
- generalLearnerFlowDTO.setUserNameVisible(new Boolean(qaContent.isUsernameVisible()).toString());
- generalLearnerFlowDTO.setShowOtherAnswers(new Boolean(qaContent.isShowOtherAnswers()).toString());
-
- boolean allowRichEditor = qaContent.isAllowRichEditor();
- generalLearnerFlowDTO.setAllowRichEditor(new Boolean(allowRichEditor).toString());
-
- generalLearnerFlowDTO.setAllowRateAnswers(new Boolean(qaContent.isAllowRateAnswers()).toString());
-
- /*
- * Learning mode requires this setting for jsp to generate the user's report
- */
- String feedBackType = "";
- if (qaContent.isQuestionsSequenced()) {
- generalLearnerFlowDTO.setQuestionListingMode(QUESTION_LISTING_MODE_SEQUENTIAL);
- feedBackType = FEEDBACK_TYPE_SEQUENTIAL;
- } else {
- generalLearnerFlowDTO.setQuestionListingMode(QUESTION_LISTING_MODE_COMBINED);
- feedBackType = FEEDBACK_TYPE_COMBINED;
- }
-
- HttpSession ss = SessionManager.getSession();
- /* get back login user DTO */
- UserDTO toolUser = (UserDTO) ss.getAttribute(AttributeNames.USER);
- logger.debug("retrieving toolUser userId: " + toolUser.getUserID());
-
- String userName = toolUser.getLogin();
- String fullName = toolUser.getFirstName() + " " + toolUser.getLastName();
-
- Long userId = new Long(toolUser.getUserID().longValue());
- logger.debug("userId: " + userId);
-
- QaQueUsr qaQueUsr = qaService.getQaUserBySession(userId, qaSession.getUid());
-
- Long qaQueUsrUid = null;
- boolean isResponseFinalized = false;
- if (qaQueUsr != null) {
- qaQueUsrUid = qaQueUsr.getUid();
- logger.debug("qaQueUsrUid: " + qaQueUsrUid);
-
- isResponseFinalized = qaQueUsr.isResponseFinalized();
- }
-
- Map mapAnswersFromDb = new TreeMap(new QaComparator());
- /*
- * fetch question content from content
- */
- Iterator contentIterator = qaContent.getQaQueContents().iterator();
-
- int questionCount = 0;
- while (contentIterator.hasNext()) {
- QaQueContent qaQueContent = (QaQueContent) contentIterator.next();
- if (qaQueContent != null) {
- Long questionUid = qaQueContent.getUid();
-
-
- int displayOrder = qaQueContent.getDisplayOrder();
- if (displayOrder != 0) {
- ++questionCount;
- QaQuestionContentDTO questionDTO = new QaQuestionContentDTO(qaQueContent);
- mapQuestions.put(questionDTO.getDisplayOrder(), questionDTO);
-
- if (qaQueUsr != null) {
- List listUserAttempts = qaService
- .getAttemptsForUserAndQuestionContent(qaQueUsrUid, questionUid);
-
- if (listUserAttempts.size() > 1) {
- logger.debug("Warning: There should not be more than 1 attempts for the question.");
- }
-
- Iterator itAttempts = listUserAttempts.iterator();
- while (itAttempts.hasNext()) {
- QaUsrResp qaUsrResp = (QaUsrResp) itAttempts.next();
- mapAnswersFromDb.put(questionDTO.getDisplayOrder(), qaUsrResp.getAnswer());
- }
- }
- }
- }
- }
-
- mapAnswers = (Map) sessionMap.get(MAP_ALL_RESULTS_KEY);
-
- qaLearningForm.setHttpSessionID(sessionMap.getSessionID());
- generalLearnerFlowDTO.setHttpSessionID(sessionMap.getSessionID());
-
- generalLearnerFlowDTO.setMapQuestionContentLearner(mapQuestions);
+ //create mapQuestions
+ Map mapQuestions = generalLearnerFlowDTO.getMapQuestionContentLearner();
generalLearnerFlowDTO.setMapQuestions(mapQuestions);
-
- if (mapAnswers == null) {
- mapAnswers = new TreeMap(new QaComparator());
- // maybe we have come in from the review screen, if so get the answers from db.
- if (mapAnswersFromDb.size() > 0) {
- Iterator itMapAnswers = mapAnswersFromDb.entrySet().iterator();
- while (itMapAnswers.hasNext()) {
- Map.Entry pairs = (Map.Entry) itMapAnswers.next();
- mapAnswers.put(pairs.getKey().toString(), pairs.getValue());
- }
- mapAnswers.putAll(mapAnswersFromDb);
- } else {
- Iterator itMapQuestions = mapQuestions.entrySet().iterator();
- while (itMapQuestions.hasNext()) {
- Map.Entry pairs = (Map.Entry) itMapQuestions.next();
- mapAnswers.put(pairs.getKey(), "");
-
- }
- }
- }
-
- String currentAnswer = (String) mapAnswers.get("1");
- generalLearnerFlowDTO.setCurrentAnswer(currentAnswer);
-
- sessionMap.put(MAP_SEQUENTIAL_ANSWERS_KEY, mapAnswers);
-
- generalLearnerFlowDTO.setMapAnswers(mapAnswers);
- sessionMap.put(MAP_ALL_RESULTS_KEY, mapAnswers);
- request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
-
- request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
-
generalLearnerFlowDTO.setTotalQuestionCount(new Integer(mapQuestions.size()));
- qaLearningForm.setTotalQuestionCount(new Integer(mapQuestions.size()).toString());
generalLearnerFlowDTO.setRemainingQuestionCount(new Integer(mapQuestions.size()).toString());
+ qaLearningForm.setTotalQuestionCount(new Integer(mapQuestions.size()).toString());
+
+ //populate answers
+ QaQueUsr qaQueUsr = getCurrentUser(toolSessionID);
+ LearningUtil.populateAnswers(sessionMap, qaContent, qaQueUsr, mapQuestions, generalLearnerFlowDTO, qaService);
request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
-
qaLearningForm.resetAll();
- logger.debug("forwarding to: " + LOAD_LEARNER);
return (mapping.findForward(LOAD_LEARNER));
}
/**
- * Stores all results and moves onto the next step. If view other users
- * answers = true, then goes to the view all answers screen, otherwise goes
- * straight to the reflection screen (if any).
+ * Stores all results and moves onto the next step. If view other users answers = true, then goes to the view all
+ * answers screen, otherwise goes straight to the reflection screen (if any).
*
- * returns Learner Report for a session ActionForward
- * viewAllResults(ActionMapping mapping, ActionForm form, HttpServletRequest
- * request, HttpServletResponse response) throws IOException,
- * ServletException)
- *
- * @param mapping
- * @param form
- * @param request
- * @param response
- * @return
+ * @return Learner Report for a session
* @throws IOException
* @throws ServletException
*/
public ActionForward storeAllResults(ActionMapping mapping, ActionForm form, HttpServletRequest request,
HttpServletResponse response) throws IOException, ServletException {
- logger.debug("dispatching viewAllResults...");
+
+ initializeQAService();
QaLearningForm qaLearningForm = (QaLearningForm) form;
-
LearningUtil.saveFormRequestData(request, qaLearningForm);
- IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
-
String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
- qaLearningForm.setToolSessionID(toolSessionID);
-
String userID = request.getParameter("userID");
-
- QaSession qaSession = qaService.retrieveQaSessionOrNullById(new Long(toolSessionID).longValue());
-
- String toolContentID = qaSession.getQaContent().getQaContentId().toString();
-
+ QaSession qaSession = qaService.getSessionById(new Long(toolSessionID).longValue());
+ Long toolContentID = qaSession.getQaContent().getQaContentId();
QaContent qaContent = qaSession.getQaContent();
- GeneralLearnerFlowDTO generalLearnerFlowDTO = LearningUtil.buildGeneralLearnerFlowDTO(qaContent);
-
- String isUserNamesVisibleBoolean = generalLearnerFlowDTO.getUserNameVisible();
- boolean isUserNamesVisible = new Boolean(isUserNamesVisibleBoolean).booleanValue();
-
String httpSessionID = qaLearningForm.getHttpSessionID();
-
- qaLearningForm.setHttpSessionID(httpSessionID);
- generalLearnerFlowDTO.setHttpSessionID(httpSessionID);
-
SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
-
Map mapAnswers = (Map) sessionMap.get(MAP_ALL_RESULTS_KEY);
-
- /*recreate the users and responses*/
- LearningUtil learningUtil = new LearningUtil();
- learningUtil.createUsersAndResponses(mapAnswers, request, qaService, new Long(toolContentID), new Long(
- toolSessionID));
+
+// LearningUtil.storeResponses(mapAnswers, qaService, toolContentID, new Long(toolSessionID));
+ //mark response as finalised
+ QaQueUsr qaQueUsr = getCurrentUser(toolSessionID);
+ qaQueUsr.setResponseFinalized(true);
+ qaService.updateQaQueUsr(qaQueUsr);
+
qaLearningForm.resetUserActions();
qaLearningForm.setSubmitAnswersContent(null);
- learningUtil.setContentInUse(new Long(toolContentID).longValue(), qaService);
- logger.debug("content has been set in use");
+ //content has been set in use
+ LearningUtil.setContentInUse(toolContentID, qaService);
if (qaContent.isShowOtherAnswers()) {
- return prepareViewAllAnswers(mapping, request, qaLearningForm, qaService, toolSessionID, userID, qaSession,
- toolContentID, qaContent, generalLearnerFlowDTO, isUserNamesVisible);
+ GeneralLearnerFlowDTO generalLearnerFlowDTO = LearningUtil.buildGeneralLearnerFlowDTO(qaContent);
+ generalLearnerFlowDTO.setHttpSessionID(httpSessionID);
+ String isUserNamesVisibleBoolean = generalLearnerFlowDTO.getUserNameVisible();
+ boolean isUserNamesVisible = new Boolean(isUserNamesVisibleBoolean).booleanValue();
+
+ return prepareViewAllAnswers(mapping, request, qaLearningForm, toolSessionID, userID, qaSession,
+ qaContent, generalLearnerFlowDTO, isUserNamesVisible);
+
} else if (qaContent.isReflect()) {
- return forwardtoReflection(mapping, request, qaContent, qaService, toolSessionID, userID, qaLearningForm);
+ return forwardtoReflection(mapping, request, qaContent, toolSessionID, userID, qaLearningForm);
+
} else {
return endLearning(mapping, qaLearningForm, request, response);
}
}
/** Set up the data for the view all answers screen */
private ActionForward prepareViewAllAnswers(ActionMapping mapping, HttpServletRequest request,
- QaLearningForm qaLearningForm, IQaService qaService, String toolSessionID, String userID,
- QaSession qaSession, String toolContentID, QaContent qaContent,
- GeneralLearnerFlowDTO generalLearnerFlowDTO, boolean isUserNamesVisible) {
- logger.debug("start generating learning report...");
- logger.debug("toolContentID: " + toolContentID);
+ QaLearningForm qaLearningForm, String toolSessionID, String userID, QaSession qaSession,
+ QaContent qaContent, GeneralLearnerFlowDTO generalLearnerFlowDTO, boolean isUserNamesVisible) {
QaMonitoringAction qaMonitoringAction = new QaMonitoringAction();
qaMonitoringAction.refreshSummaryData(request, qaContent, qaService, isUserNamesVisible, true, toolSessionID,
@@ -583,28 +422,16 @@
generalLearnerFlowDTO.setAllowRateAnswers(new Boolean(qaContent.isAllowRateAnswers()).toString());
- HttpSession ss = SessionManager.getSession();
- /* get back login user DTO */
- UserDTO toolUser = (UserDTO) ss.getAttribute(AttributeNames.USER);
- logger.debug("retrieving toolUser userId: " + toolUser.getUserID());
+ QaQueUsr qaQueUsr = getCurrentUser(toolSessionID);
+ generalLearnerFlowDTO.setUserUid(qaQueUsr.getQueUsrId().toString());
- String userName = toolUser.getLogin();
- String fullName = toolUser.getFirstName() + " " + toolUser.getLastName();
-
- Long userId = new Long(toolUser.getUserID().longValue());
- logger.debug("userId: " + userId);
-
- QaQueUsr qaQueUsr = qaService.getQaUserBySession(userId, qaSession.getUid());
-
- generalLearnerFlowDTO.setUserUid(qaQueUsr.getUid().toString());
-
int sessionUserCount = 0;
if (qaSession.getQaQueUsers() != null) {
sessionUserCount = qaSession.getQaQueUsers().size();
}
if (sessionUserCount > 1) {
- logger.debug("there are multiple user responses");
+ //there are multiple user responses
generalLearnerFlowDTO.setExistMultipleUserResponses(new Boolean(true).toString());
}
@@ -621,16 +448,10 @@
}
request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
-
- logger.debug("fwd'ing to INDIVIDUAL_LEARNER_REPORT: " + INDIVIDUAL_LEARNER_REPORT);
return (mapping.findForward(INDIVIDUAL_LEARNER_REPORT));
}
/**
- * ActionForward refreshAllResults(ActionMapping mapping, ActionForm form,
- * HttpServletRequest request, HttpServletResponse response) throws
- * IOException, ServletException
- *
* @param mapping
* @param form
* @param request
@@ -641,19 +462,17 @@
*/
public ActionForward refreshAllResults(ActionMapping mapping, ActionForm form, HttpServletRequest request,
HttpServletResponse response) throws IOException, ServletException {
- logger.debug("dispatching refreshAllResults...");
+ initializeQAService();
QaLearningForm qaLearningForm = (QaLearningForm) form;
LearningUtil.saveFormRequestData(request, qaLearningForm);
- IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
-
String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
qaLearningForm.setToolSessionID(toolSessionID);
String userID = request.getParameter("userID");
- QaSession qaSession = qaService.retrieveQaSessionOrNullById(new Long(toolSessionID).longValue());
+ QaSession qaSession = qaService.getSessionById(new Long(toolSessionID).longValue());
String toolContentID = qaSession.getQaContent().getQaContentId().toString();
@@ -674,16 +493,11 @@
Map mapAnswers = (Map) sessionMap.get(MAP_ALL_RESULTS_KEY);
/*recreate the users and responses*/
- LearningUtil learningUtil = new LearningUtil();
-
qaLearningForm.resetUserActions();
qaLearningForm.setSubmitAnswersContent(null);
- learningUtil.setContentInUse(new Long(toolContentID).longValue(), qaService);
+ LearningUtil.setContentInUse(new Long(toolContentID).longValue(), qaService);
- logger.debug("start generating learning report...");
- logger.debug("toolContentID: " + toolContentID);
-
QaMonitoringAction qaMonitoringAction = new QaMonitoringAction();
qaMonitoringAction.refreshSummaryData(request, qaContent, qaService, isUserNamesVisible, true, toolSessionID,
userID, generalLearnerFlowDTO, false, toolSessionID);
@@ -704,30 +518,15 @@
generalLearnerFlowDTO.setAllowRateAnswers(new Boolean(qaContent.isAllowRateAnswers()).toString());
- HttpSession ss = SessionManager.getSession();
- /* get back login user DTO */
- UserDTO toolUser = (UserDTO) ss.getAttribute(AttributeNames.USER);
- logger.debug("retrieving toolUser userId: " + toolUser.getUserID());
+ QaQueUsr qaQueUsr = getCurrentUser(toolSessionID);
+ generalLearnerFlowDTO.setUserUid(qaQueUsr.getQueUsrId().toString());
- String userName = toolUser.getLogin();
- String fullName = toolUser.getFirstName() + " " + toolUser.getLastName();
-
- Long userId = new Long(toolUser.getUserID().longValue());
- logger.debug("userId: " + userId);
-
- QaQueUsr qaQueUsr = qaService.getQaUserBySession(userId, qaSession.getUid());
- logger.debug("qaQueUsr: " + qaQueUsr);
- logger.debug("qaQueUsr uid : " + qaQueUsr.getUid());
-
- generalLearnerFlowDTO.setUserUid(qaQueUsr.getUid().toString());
-
int sessionUserCount = 0;
if (qaSession.getQaQueUsers() != null) {
sessionUserCount = qaSession.getQaQueUsers().size();
}
if (sessionUserCount > 1) {
- logger.debug("there are multiple user responses");
generalLearnerFlowDTO.setExistMultipleUserResponses(new Boolean(true).toString());
}
@@ -742,9 +541,6 @@
/**
* moves to the next question and modifies the map ActionForward
- * getNextQuestion(ActionMapping mapping, ActionForm form,
- * HttpServletRequest request, HttpServletResponse response) throws
- * IOException, ServletException, ToolException
*
* @param mapping
* @param form
@@ -757,29 +553,22 @@
*/
public ActionForward getNextQuestion(ActionMapping mapping, ActionForm form, HttpServletRequest request,
HttpServletResponse response) throws IOException, ServletException, ToolException {
- logger.debug("dispatching getNextQuestion...");
+ initializeQAService();
QaLearningForm qaLearningForm = (QaLearningForm) form;
LearningUtil.saveFormRequestData(request, qaLearningForm);
- IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
-
String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
qaLearningForm.setToolSessionID(toolSessionID);
-
String httpSessionID = qaLearningForm.getHttpSessionID();
-
qaLearningForm.setHttpSessionID(httpSessionID);
- QaSession qaSession = qaService.retrieveQaSessionOrNullById(new Long(toolSessionID).longValue());
-
- String toolContentID = qaSession.getQaContent().getQaContentId().toString();
-
+ QaSession qaSession = qaService.getSessionById(new Long(toolSessionID).longValue());
QaContent qaContent = qaSession.getQaContent();
GeneralLearnerFlowDTO generalLearnerFlowDTO = LearningUtil.buildGeneralLearnerFlowDTO(qaContent);
- populateAnswersMap(qaLearningForm, request, generalLearnerFlowDTO, true, false);
+ storeSequentialAnswer(qaLearningForm, request, generalLearnerFlowDTO, true);
qaLearningForm.resetAll();
return (mapping.findForward(LOAD_LEARNER));
@@ -792,84 +581,70 @@
* @param request
* @param generalLearnerFlowDTO
* @param getNextQuestion
- * @param learnerDone
* @return
*/
- public Map populateAnswersMap(ActionForm form, HttpServletRequest request,
- GeneralLearnerFlowDTO generalLearnerFlowDTO, boolean getNextQuestion, boolean learnerDone) {
- logger.debug("learnerDone: " + learnerDone);
- logger.debug("nextQuestionOffet: " + getNextQuestion);
+ private Map storeSequentialAnswer(ActionForm form, HttpServletRequest request,
+ GeneralLearnerFlowDTO generalLearnerFlowDTO, boolean getNextQuestion) {
QaLearningForm qaLearningForm = (QaLearningForm) form;
-
String httpSessionID = qaLearningForm.getHttpSessionID();
- logger.debug("httpSessionID: " + httpSessionID);
-
SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
- Map mapSequentialAnswers = (Map) sessionMap.get(MAP_SEQUENTIAL_ANSWERS_KEY);
-
String currentQuestionIndex = qaLearningForm.getCurrentQuestionIndex();
Map mapAnswers = (Map) sessionMap.get(MAP_ALL_RESULTS_KEY);
-
if (mapAnswers == null)
mapAnswers = new TreeMap(new QaComparator());
String newAnswer = qaLearningForm.getAnswer();
- logger.debug("getting answer for question: " + currentQuestionIndex + "as: " + newAnswer);
- logger.debug("mapSequentialAnswers size:" + mapSequentialAnswers.size());
-
+ Map mapSequentialAnswers = (Map) sessionMap.get(MAP_SEQUENTIAL_ANSWERS_KEY);
if (mapSequentialAnswers.size() >= new Integer(currentQuestionIndex).intValue()) {
- logger.debug("mapSequentialAnswers size:" + mapSequentialAnswers.size() + " and currentQuestionIndex: "
- + currentQuestionIndex);
mapSequentialAnswers.remove(new Long(currentQuestionIndex).toString());
}
mapSequentialAnswers.put(new Long(currentQuestionIndex).toString(), newAnswer);
-
mapAnswers.put(currentQuestionIndex, newAnswer);
int nextQuestionOffset = getNextQuestion ? 1 : -1;
// is this question required and are they trying to go to the next question?
// if so, check if the answer is blank and generate an error if it is blank.
- Map questionContentMap = generalLearnerFlowDTO.getMapQuestionContentLearner();
- QaQuestionContentDTO dto = questionContentMap.get(currentQuestionIndex);
- if ( getNextQuestion && dto.isRequired() && isEmpty(newAnswer)) {
+ Map questionContentMap = generalLearnerFlowDTO.getMapQuestionContentLearner();
+ QaQuestionDTO dto = questionContentMap.get(currentQuestionIndex);
+ boolean isRequiredQuestionMissed = dto.isRequired() && isEmpty(newAnswer);
+ if ( getNextQuestion && isRequiredQuestionMissed) {
ActionMessages errors = new ActionMessages();
errors.add(Globals.ERROR_KEY, new ActionMessage("error.required", currentQuestionIndex));
saveErrors(request, errors);
nextQuestionOffset = 0;
}
+ //store
+ if ( ! isRequiredQuestionMissed) {
+ qaService.updateResponseWithNewAnswer(newAnswer, qaLearningForm.getToolSessionID(), new Long(currentQuestionIndex));
+ }
+
sessionMap.put(MAP_ALL_RESULTS_KEY, mapAnswers);
request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
qaLearningForm.setHttpSessionID(sessionMap.getSessionID());
generalLearnerFlowDTO.setHttpSessionID(sessionMap.getSessionID());
request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
int intCurrentQuestionIndex = new Integer(currentQuestionIndex).intValue() + nextQuestionOffset;
-
- LearningUtil learningUtil = new LearningUtil();
- logger.debug("current map size:" + mapSequentialAnswers.size());
-
String currentAnswer = "";
if (mapAnswers.size() >= intCurrentQuestionIndex) {
currentAnswer = (String) mapAnswers.get(new Long(intCurrentQuestionIndex).toString());
}
generalLearnerFlowDTO.setCurrentAnswer(currentAnswer);
- logger.debug("currentQuestionIndex will be: " + intCurrentQuestionIndex);
+ //currentQuestionIndex will be:
generalLearnerFlowDTO.setCurrentQuestionIndex(new Integer(intCurrentQuestionIndex));
String totalQuestionCount = qaLearningForm.getTotalQuestionCount();
- logger.debug("totalQuestionCount: " + totalQuestionCount);
- String userFeedback = learningUtil
+ String userFeedback = LearningUtil
.feedBackAnswersProgress(request, intCurrentQuestionIndex, totalQuestionCount);
generalLearnerFlowDTO.setUserFeedback(userFeedback);
- String remQCount = learningUtil.getRemainingQuestionCount(intCurrentQuestionIndex, totalQuestionCount);
- logger.debug("remQCount: " + remQCount);
+ String remQCount = LearningUtil.getRemainingQuestionCount(intCurrentQuestionIndex, totalQuestionCount);
generalLearnerFlowDTO.setRemainingQuestionCount(remQCount);
qaLearningForm.resetUserActions(); /*resets all except submitAnswersContent */
@@ -883,9 +658,13 @@
return mapSequentialAnswers;
}
+
- /** Is this string empty? Need to strip out all HTML tags first otherwise an empty DIV might look like a valid answer
- * Smileys and math functions only put in an img tag so explicitly look for that. */
+
+ /**
+ * Is this string empty? Need to strip out all HTML tags first otherwise an empty DIV might look like a valid answer
+ * Smileys and math functions only put in an img tag so explicitly look for that.
+ */
private boolean isEmpty(String answer) {
if ( answer.indexOf(" -1 || answer.indexOf(" -1 )
return false;
@@ -895,9 +674,6 @@
/**
* moves to the previous question and modifies the map ActionForward
- * getPreviousQuestion(ActionMapping mapping, ActionForm form,
- * HttpServletRequest request, HttpServletResponse response) throws
- * IOException, ServletException, ToolException
*
* @param mapping
* @param form
@@ -910,29 +686,21 @@
*/
public ActionForward getPreviousQuestion(ActionMapping mapping, ActionForm form, HttpServletRequest request,
HttpServletResponse response) throws IOException, ServletException, ToolException {
- logger.debug("dispatching getPreviousQuestion...");
- QaLearningForm qaLearningForm = (QaLearningForm) form;
+ initializeQAService();
+ QaLearningForm qaLearningForm = (QaLearningForm) form;
LearningUtil.saveFormRequestData(request, qaLearningForm);
- IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
-
String httpSessionID = qaLearningForm.getHttpSessionID();
-
qaLearningForm.setHttpSessionID(httpSessionID);
-
String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
qaLearningForm.setToolSessionID(toolSessionID);
-
- QaSession qaSession = qaService.retrieveQaSessionOrNullById(new Long(toolSessionID).longValue());
-
- String toolContentID = qaSession.getQaContent().getQaContentId().toString();
-
+ QaSession qaSession = qaService.getSessionById(new Long(toolSessionID).longValue());
QaContent qaContent = qaSession.getQaContent();
GeneralLearnerFlowDTO generalLearnerFlowDTO = LearningUtil.buildGeneralLearnerFlowDTO(qaContent);
- populateAnswersMap(qaLearningForm, request, generalLearnerFlowDTO, false, false);
+ storeSequentialAnswer(qaLearningForm, request, generalLearnerFlowDTO, false);
qaLearningForm.resetAll();
return (mapping.findForward(LOAD_LEARNER));
@@ -954,13 +722,13 @@
public ActionForward rateResponse(ActionMapping mapping, ActionForm form, HttpServletRequest request,
HttpServletResponse response) throws JSONException, IOException {
- IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
+ initializeQAService();
float rating = Float.parseFloat((String) request.getParameter("rate"));
Long responseId = WebUtil.readLongParam(request, "idBox");
Long toolSessionID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
- UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
- Long userId = new Long(user.getUserID().intValue());
+ QaQueUsr user = getCurrentUser(toolSessionID.toString());
+ Long userId = new Long(user.getQueUsrId());
AverageRatingDTO averageRatingDTO = qaService.rateResponse(responseId, userId, toolSessionID, rating);
@@ -973,9 +741,7 @@
}
/**
- * finishes the user's tool activity endLearning(HttpServletRequest request,
- * IQaService qaService, HttpServletResponse response) throws IOException,
- * ToolException
+ * finishes the user's tool activity
*
* @param request
* @param qaService
@@ -985,46 +751,21 @@
*/
public ActionForward endLearning(ActionMapping mapping, ActionForm form, HttpServletRequest request,
HttpServletResponse response) throws IOException, ServletException, ToolException {
- logger.debug("dispatching endLearning...");
+ initializeQAService();
QaLearningForm qaLearningForm = (QaLearningForm) form;
LearningUtil.saveFormRequestData(request, qaLearningForm);
- IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
-
String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
qaLearningForm.setToolSessionID(toolSessionID);
String userID = request.getParameter("userID");
- logger.debug("userID: " + userID);
qaLearningForm.setUserID(userID);
- QaSession qaSession = qaService.retrieveQaSessionOrNullById(new Long(toolSessionID).longValue());
+ QaSession qaSession = qaService.getSessionById(new Long(toolSessionID).longValue());
- QaQueUsr qaQueUsr = qaService.getQaUserBySession(new Long(userID), qaSession.getUid());
-
- /* it is possible that qaQueUsr can be null if the content is set as runoffline and reflection is on*/
- if (qaQueUsr == null) {
- logger.debug("attempt creating user record since it must exist for the runOffline + reflection screens");
- HttpSession ss = SessionManager.getSession();
-
- UserDTO toolUser = (UserDTO) ss.getAttribute(AttributeNames.USER);
- logger.debug("retrieving toolUser userId: " + toolUser.getUserID());
-
- String userName = toolUser.getLogin();
- String fullName = toolUser.getFirstName() + " " + toolUser.getLastName();
-
- Long userId = new Long(toolUser.getUserID().longValue());
-
- qaQueUsr = new QaQueUsr(userId, userName, fullName, null, qaSession, new TreeSet());
-
-
- logger.debug("session uid: " + qaSession.getUid());
- qaService.createQaQueUsr(qaQueUsr);
- }
-
+ QaQueUsr qaQueUsr = qaService.getUserByIdAndSession(new Long(userID), qaSession.getQaSessionId());
qaQueUsr.setLearnerFinished(true);
- logger.debug("learner is finished:" + qaQueUsr.getUid());
qaService.updateQaQueUsr(qaQueUsr);
/*
@@ -1034,8 +775,6 @@
/*get back login user DTO*/
UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
- logger.debug("set status to COMPLETE");
-
qaSession.setSession_end_date(new Date(System.currentTimeMillis()));
qaSession.setSession_status(COMPLETED);
qaService.updateQaSession(qaSession);
@@ -1056,13 +795,11 @@
public ActionForward updateReflection(ActionMapping mapping, ActionForm form, HttpServletRequest request,
HttpServletResponse response) throws IOException, ServletException, ToolException {
- logger.debug("dispatching updateReflection...");
+ initializeQAService();
QaLearningForm qaLearningForm = (QaLearningForm) form;
LearningUtil.saveFormRequestData(request, qaLearningForm);
- IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
-
String httpSessionID = qaLearningForm.getHttpSessionID();
qaLearningForm.setHttpSessionID(httpSessionID);
@@ -1073,11 +810,11 @@
String userID = request.getParameter("userID");
qaLearningForm.setUserID(userID);
- QaSession qaSession = qaService.retrieveQaSessionOrNullById(new Long(toolSessionID).longValue());
+ QaSession qaSession = qaService.getSessionById(new Long(toolSessionID).longValue());
QaContent qaContent = qaSession.getQaContent();
- QaQueUsr qaQueUsr = qaService.getQaUserBySession(new Long(userID), qaSession.getUid());
+ QaQueUsr qaQueUsr = qaService.getUserByIdAndSession(new Long(userID), qaSession.getQaSessionId());
String entryText = request.getParameter("entryText");
qaLearningForm.setEntryText(entryText);
@@ -1139,9 +876,6 @@
}
/**
- * ActionForward submitReflection(ActionMapping mapping, ActionForm form,
- * HttpServletRequest request, HttpServletResponse response) throws
- * IOException, ServletException, ToolException
*
* @param mapping
* @param form
@@ -1154,13 +888,11 @@
*/
public ActionForward submitReflection(ActionMapping mapping, ActionForm form, HttpServletRequest request,
HttpServletResponse response) throws IOException, ServletException, ToolException {
- logger.debug("dispatching submitReflection...");
+ initializeQAService();
QaLearningForm qaLearningForm = (QaLearningForm) form;
LearningUtil.saveFormRequestData(request, qaLearningForm);
- IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
-
String httpSessionID = qaLearningForm.getHttpSessionID();
qaLearningForm.setHttpSessionID(httpSessionID);
@@ -1169,33 +901,10 @@
qaLearningForm.setToolSessionID(toolSessionID);
String userID = request.getParameter("userID");
- logger.debug("userID: " + userID);
qaLearningForm.setUserID(userID);
String reflectionEntry = request.getParameter(ENTRY_TEXT);
- QaSession qaSession = qaService.retrieveQaSessionOrNullById(new Long(toolSessionID).longValue());
-
- QaQueUsr qaQueUsr = qaService.getQaUserBySession(new Long(userID), qaSession.getUid());
-
- /* it is possible that qaQueUsr can be null if the content is set as runoffline and reflection is on*/
- if (qaQueUsr == null) {
- logger.debug("attempt creating user record since it must exist for the runOffline + reflection screens");
- HttpSession ss = SessionManager.getSession();
-
- UserDTO toolUser = (UserDTO) ss.getAttribute(AttributeNames.USER);
- logger.debug("retrieving toolUser userId: " + toolUser.getUserID());
-
- String userName = toolUser.getLogin();
- String fullName = toolUser.getFirstName() + " " + toolUser.getLastName();
-
- Long userId = new Long(toolUser.getUserID().longValue());
-
- qaQueUsr = new QaQueUsr(userId, userName, fullName, null, qaSession, new TreeSet());
-
- qaService.createQaQueUsr(qaQueUsr);
- }
-
qaService.createNotebookEntry(new Long(toolSessionID), CoreNotebookConstants.NOTEBOOK_TOOL, MY_SIGNATURE,
new Integer(userID), reflectionEntry);
@@ -1204,9 +913,6 @@
}
/**
- * ActionForward forwardtoReflection(ActionMapping mapping, ActionForm form,
- * HttpServletRequest request, HttpServletResponse response) throws
- * IOException, ServletException, ToolException
*
* @param mapping
* @param form
@@ -1219,37 +925,36 @@
*/
public ActionForward forwardtoReflection(ActionMapping mapping, ActionForm form, HttpServletRequest request,
HttpServletResponse response) throws IOException, ServletException, ToolException {
- logger.debug("dispatching forwardtoReflection...");
+ initializeQAService();
QaLearningForm qaLearningForm = (QaLearningForm) form;
- IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
-
+
String httpSessionID = qaLearningForm.getHttpSessionID();
qaLearningForm.setHttpSessionID(httpSessionID);
String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
- QaSession qaSession = qaService.retrieveQaSessionOrNullById(new Long(toolSessionID).longValue());
+ QaSession qaSession = qaService.getSessionById(new Long(toolSessionID).longValue());
QaContent qaContent = qaSession.getQaContent();
String userID = request.getParameter("userID");
logger.debug("userID: " + userID);
qaLearningForm.setUserID(userID);
- return forwardtoReflection(mapping, request, qaContent, qaService, toolSessionID, userID, qaLearningForm);
+ return forwardtoReflection(mapping, request, qaContent, toolSessionID, userID, qaLearningForm);
}
private ActionForward forwardtoReflection(ActionMapping mapping, HttpServletRequest request, QaContent qaContent,
- IQaService qaService, String toolSessionID, String userID, QaLearningForm qaLearningForm) {
+ String toolSessionID, String userID, QaLearningForm qaLearningForm) {
GeneralLearnerFlowDTO generalLearnerFlowDTO = new GeneralLearnerFlowDTO();
generalLearnerFlowDTO.setActivityTitle(qaContent.getTitle());
String reflectionSubject = qaContent.getReflectionSubject();
reflectionSubject = QaUtils.replaceNewLines(reflectionSubject);
generalLearnerFlowDTO.setReflectionSubject(reflectionSubject);
- logger.debug("attempt getting notebookEntry: ");
+ //attempt getting notebookEntry
NotebookEntry notebookEntry = qaService.getEntry(new Long(toolSessionID), CoreNotebookConstants.NOTEBOOK_TOOL,
MY_SIGNATURE, new Integer(userID));
@@ -1264,8 +969,23 @@
qaLearningForm.resetUserActions(); /*resets all except submitAnswersContent */
qaLearningForm.resetAll();
- logger.debug("fwd'ing to: " + NOTEBOOK);
return (mapping.findForward(NOTEBOOK));
}
+ private void initializeQAService() {
+ if (qaService == null) {
+ qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
+ }
+ }
+
+ private QaQueUsr getCurrentUser(String toolSessionID) {
+
+ // get back login user DTO
+ HttpSession ss = SessionManager.getSession();
+ UserDTO toolUser = (UserDTO) ss.getAttribute(AttributeNames.USER);
+ Long userId = new Long(toolUser.getUserID().longValue());
+
+ return qaService.getUserByIdAndSession(userId, new Long(toolSessionID));
+ }
+
}
\ No newline at end of file
Fisheye: Tag 1.23.8.1 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningForm.java'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java,v
diff -u -r1.70.4.1.4.2 -r1.70.4.1.4.3
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java 24 Feb 2011 14:22:39 -0000 1.70.4.1.4.2
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java 16 Mar 2011 19:56:48 -0000 1.70.4.1.4.3
@@ -45,18 +45,20 @@
import org.apache.struts.action.ActionMessages;
import org.lamsfoundation.lams.notebook.model.NotebookEntry;
import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
-import org.lamsfoundation.lams.tool.qa.GeneralLearnerFlowDTO;
+import org.lamsfoundation.lams.tool.ToolAccessMode;
import org.lamsfoundation.lams.tool.qa.QaAppConstants;
-import org.lamsfoundation.lams.tool.qa.QaApplicationException;
-import org.lamsfoundation.lams.tool.qa.QaComparator;
import org.lamsfoundation.lams.tool.qa.QaContent;
-import org.lamsfoundation.lams.tool.qa.QaQueContent;
import org.lamsfoundation.lams.tool.qa.QaQueUsr;
-import org.lamsfoundation.lams.tool.qa.QaQuestionContentDTO;
+import org.lamsfoundation.lams.tool.qa.QaQuestion;
import org.lamsfoundation.lams.tool.qa.QaSession;
-import org.lamsfoundation.lams.tool.qa.QaUtils;
+import org.lamsfoundation.lams.tool.qa.dto.GeneralLearnerFlowDTO;
+import org.lamsfoundation.lams.tool.qa.dto.QaQuestionDTO;
import org.lamsfoundation.lams.tool.qa.service.IQaService;
import org.lamsfoundation.lams.tool.qa.service.QaServiceProxy;
+import org.lamsfoundation.lams.tool.qa.util.QaApplicationException;
+import org.lamsfoundation.lams.tool.qa.util.QaComparator;
+import org.lamsfoundation.lams.tool.qa.util.QaUtils;
+import org.lamsfoundation.lams.tool.qa.web.form.QaLearningForm;
import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
import org.lamsfoundation.lams.util.WebUtil;
import org.lamsfoundation.lams.web.session.SessionManager;
@@ -126,96 +128,26 @@
* LockOnFinish flag, then the tool should lock learner's entries once they have
* completed the activity. If they return to the activity (e.g. via the progress
* bar) then the entries should be read only.
- *
*/
-/**
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- */
-
public class QaLearningStarterAction extends Action implements QaAppConstants {
static Logger logger = Logger.getLogger(QaLearningStarterAction.class.getName());
+
+ private static IQaService qaService;
public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
HttpServletResponse response) throws IOException, ServletException, QaApplicationException {
QaUtils.cleanUpSessionAbsolute(request);
-
- IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
-
- /* holds the question contents for a given tool session and relevant content */
- Map mapQuestionStrings = new TreeMap(new QaComparator());
- Map mapQuestions = new TreeMap();
-
- /*holds the answers */
- Map mapAnswers = new TreeMap(new QaComparator());
-
- QaLearningForm qaLearningForm = (QaLearningForm) form;
-
- GeneralLearnerFlowDTO generalLearnerFlowDTO = new GeneralLearnerFlowDTO();
- generalLearnerFlowDTO.setCurrentQuestionIndex(new Integer(1));
- generalLearnerFlowDTO.setCurrentAnswer("");
-
-
- String httpSessionID = qaLearningForm.getHttpSessionID();
-
- SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
-
- if (sessionMap == null) {
- sessionMap = new SessionMap();
- Map mapSequentialAnswers = new HashMap();
- sessionMap.put(MAP_SEQUENTIAL_ANSWERS_KEY, mapSequentialAnswers);
- request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
+ if (qaService == null) {
+ qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
}
-
- qaLearningForm.setHttpSessionID(sessionMap.getSessionID());
- generalLearnerFlowDTO.setHttpSessionID(sessionMap.getSessionID());
-
+
+ QaLearningForm qaLearningForm = (QaLearningForm) form;
/*validate learning mode parameters*/
- boolean validateParameters = validateParameters(request, mapping, qaLearningForm);
- if (!validateParameters) {
- logger.debug("error during validation");
- }
-
- // this is the user id of the current user, set up in validateParameters
- String userID = qaLearningForm.getUserID();
- logger.debug("userID: " + userID);
-
- /*
- * use the incoming tool session id and later derive toolContentId from it.
- */
+ validateParameters(request, mapping, qaLearningForm);
+ String mode = qaLearningForm.getMode();
String toolSessionID = qaLearningForm.getToolSessionID();
- logger.debug("toolSessionID: " + toolSessionID);
- generalLearnerFlowDTO.setToolSessionID(toolSessionID);
- qaLearningForm.setToolSessionID(toolSessionID);
/*
* By now, the passed tool session id MUST exist in the db by calling:
@@ -226,68 +158,63 @@
if (!QaUtils.existsSession(new Long(toolSessionID).longValue(), qaService)) {
QaUtils.cleanUpSessionAbsolute(request);
- logger.debug("error: The tool expects mcSession.");
+ logger.error("error: The tool expects mcSession.");
return (mapping.findForward(ERROR_LIST_LEARNER));
}
- /*
- * by now, we made sure that the passed tool session id exists in the db as a new record
- * Make sure we can retrieve it and relavent content
- */
-
- QaSession qaSession = qaService.retrieveQaSessionOrNullById(new Long(toolSessionID).longValue());
- /*
- * find out what content this tool session is referring to
- * get the content for this tool session (many to one mapping)
- */
-
- /*
- * Each passed tool session id points to a particular content. Many to one mapping.
- */
+ QaSession qaSession = qaService.getSessionById(new Long(toolSessionID).longValue());
QaContent qaContent = qaSession.getQaContent();
if (qaContent == null) {
QaUtils.cleanUpSessionAbsolute(request);
- logger.debug("error: The tool expects qaContent.");
+ logger.error("error: The tool expects qaContent.");
return (mapping.findForward(ERROR_LIST_LEARNER));
}
+
+ QaQueUsr qaUser = null;
+ if ((mode != null) && mode.equals(ToolAccessMode.TEACHER.toString())) {
+ // monitoring mode - user is specified in URL
+ // assessmentUser may be null if the user was force completed.
+ qaUser = getSpecifiedUser(toolSessionID,
+ WebUtil.readIntParam(request, AttributeNames.PARAM_USER_ID, false));
+ } else {
+ qaUser = getCurrentUser(toolSessionID);
+ }
+ Long userId = qaUser.getQueUsrId();
+ qaLearningForm.setUserID(qaUser.getQueUsrId().toString());
- generalLearnerFlowDTO.setActivityTitle(qaContent.getTitle());
- generalLearnerFlowDTO.setActivityInstructions(qaContent.getInstructions());
+ /* holds the question contents for a given tool session and relevant content */
+ Map mapQuestionStrings = new TreeMap(new QaComparator());
+ Map mapQuestions = new TreeMap();
- logger.debug("is tool reflective: " + qaContent.isReflect());
+ String httpSessionID = qaLearningForm.getHttpSessionID();
+ SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
+ if (sessionMap == null) {
+ sessionMap = new SessionMap();
+ Map mapSequentialAnswers = new HashMap();
+ sessionMap.put(MAP_SEQUENTIAL_ANSWERS_KEY, mapSequentialAnswers);
+ request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
+ qaLearningForm.setHttpSessionID(sessionMap.getSessionID());
+ }
+
+ GeneralLearnerFlowDTO generalLearnerFlowDTO = LearningUtil.buildGeneralLearnerFlowDTO(qaContent);
+ generalLearnerFlowDTO.setUserUid(qaUser.getQueUsrId().toString());
+ generalLearnerFlowDTO.setHttpSessionID(sessionMap.getSessionID());
+ generalLearnerFlowDTO.setToolSessionID(toolSessionID);
+ generalLearnerFlowDTO.setToolContentID(qaContent.getQaContentId().toString());
+ generalLearnerFlowDTO.setReportTitleLearner(qaContent.getReportTitle());
+
generalLearnerFlowDTO.setReflection(new Boolean(qaContent.isReflect()).toString());
generalLearnerFlowDTO.setReflectionSubject(qaContent.getReflectionSubject());
- logger.debug("attempt getting notebookEntry: ");
NotebookEntry notebookEntry = qaService.getEntry(new Long(toolSessionID), CoreNotebookConstants.NOTEBOOK_TOOL,
- MY_SIGNATURE, new Integer(userID));
-
-
+ MY_SIGNATURE, userId.intValue());
if (notebookEntry != null) {
String notebookEntryPresentable = QaUtils.replaceNewLines(notebookEntry.getEntry());
- //String notebookEntryPresentable=notebookEntry.getEntry();
+ qaLearningForm.setEntryText(notebookEntryPresentable);
generalLearnerFlowDTO.setNotebookEntry(notebookEntryPresentable);
}
- logger.debug("using TOOL_CONTENT_ID: " + qaContent.getQaContentId());
- generalLearnerFlowDTO.setToolContentID(qaContent.getQaContentId().toString());
-
/*
- * The content we retrieved above must have been created before in Authoring time.
- * And the passed tool session id refers to it.
- */
-
- generalLearnerFlowDTO.setReportTitleLearner(qaContent.getReportTitle());
-
- /*
- * Is the tool activity been checked as Run Offline in the property inspector?
- */
- generalLearnerFlowDTO.setActivityOffline(new Boolean(qaContent.isRunOffline()).toString());
-
- generalLearnerFlowDTO.setUserNameVisible(new Boolean(qaContent.isUsernameVisible()).toString());
- generalLearnerFlowDTO.setShowOtherAnswers(new Boolean(qaContent.isShowOtherAnswers()).toString());
-
- /*
* Is the tool activity been checked as Define Later in the property inspector?
*/
if (qaContent.isDefineLater()) {
@@ -296,59 +223,40 @@
}
/*
- * Learning mode requires this setting for jsp to generate the user's report
- */
- String feedBackType = "";
- if (qaContent.isQuestionsSequenced()) {
- generalLearnerFlowDTO.setQuestionListingMode(QUESTION_LISTING_MODE_SEQUENTIAL);
- feedBackType = FEEDBACK_TYPE_SEQUENTIAL;
- } else {
- generalLearnerFlowDTO.setQuestionListingMode(QUESTION_LISTING_MODE_COMBINED);
- feedBackType = FEEDBACK_TYPE_COMBINED;
- }
-
- /*
* fetch question content from content
*/
- Iterator contentIterator = qaContent.getQaQueContents().iterator();
+ Iterator contentIterator = qaContent.getQaQuestions().iterator();
while (contentIterator.hasNext()) {
- QaQueContent qaQueContent = (QaQueContent) contentIterator.next();
- if (qaQueContent != null) {
- int displayOrder = qaQueContent.getDisplayOrder();
+ QaQuestion qaQuestion = (QaQuestion) contentIterator.next();
+ if (qaQuestion != null) {
+ int displayOrder = qaQuestion.getDisplayOrder();
if (displayOrder != 0) {
/*
* add the question to the questions Map in the displayOrder
*/
- QaQuestionContentDTO questionDTO = new QaQuestionContentDTO(qaQueContent);
+ QaQuestionDTO questionDTO = new QaQuestionDTO(qaQuestion);
mapQuestions.put(questionDTO.getDisplayOrder(), questionDTO);
- mapQuestionStrings.put(new Integer(displayOrder).toString(), qaQueContent.getQuestion());
+ mapQuestionStrings.put(new Integer(displayOrder).toString(), qaQuestion.getQuestion());
}
}
}
generalLearnerFlowDTO.setMapQuestions(mapQuestionStrings);
generalLearnerFlowDTO.setMapQuestionContentLearner(mapQuestions);
-
- Iterator itMapQuestions = mapQuestions.entrySet().iterator();
-
- while (itMapQuestions.hasNext()) {
- Map.Entry pairs = (Map.Entry) itMapQuestions.next();
- mapAnswers.put(pairs.getKey(), "");
-
- }
-
- generalLearnerFlowDTO.setMapAnswers(mapAnswers);
-
generalLearnerFlowDTO.setTotalQuestionCount(new Integer(mapQuestions.size()));
qaLearningForm.setTotalQuestionCount(new Integer(mapQuestions.size()).toString());
+ String feedBackType = "";
+ if (qaContent.isQuestionsSequenced()) {
+ feedBackType = FEEDBACK_TYPE_SEQUENTIAL;
+ } else {
+ feedBackType = FEEDBACK_TYPE_COMBINED;
+ }
String userFeedback = feedBackType + generalLearnerFlowDTO.getTotalQuestionCount() + QUESTIONS;
-
generalLearnerFlowDTO.setUserFeedback(userFeedback);
- logger.debug("remaining question count: " + generalLearnerFlowDTO.getTotalQuestionCount().toString());
generalLearnerFlowDTO.setRemainingQuestionCount(generalLearnerFlowDTO.getTotalQuestionCount().toString());
generalLearnerFlowDTO.setInitialScreen(new Boolean(true).toString());
@@ -362,67 +270,36 @@
learner
*/
/*handling PREVIEW mode*/
- String mode = qaLearningForm.getMode();
- logger.debug("mode: " + mode);
- if ((mode != null) && (mode.equals("author"))) {
- logger.debug("Author requests for a preview of the content.");
- }
- int sessionUserCount = 0;
- if (qaSession.getQaQueUsers() != null) {
- sessionUserCount = qaSession.getQaQueUsers().size();
- }
-
- if (sessionUserCount > 1) {
- logger.debug("there are multiple user responses");
+ if ((qaSession.getQaQueUsers() != null) && (qaSession.getQaQueUsers().size() > 1)) {
+ //there are multiple user responses
generalLearnerFlowDTO.setExistMultipleUserResponses(new Boolean(true).toString());
}
/* by now, we know that the mode is either teacher or learner
* check if the mode is teacher and request is for Learner Progress
*/
- logger.debug("current userID: " + userID);
- String learnerProgressUserIdString = WebUtil.readStrParam(request, AttributeNames.PARAM_USER_ID, true);
+ if (mode.equals("teacher")) {
+ //start generating learner progress report for toolSessionID
- if ((learnerProgressUserIdString != null) && (mode.equals("teacher"))) {
- logger.debug("start generating learner progress report for toolSessionID: " + toolSessionID);
-
/* the report should have the all entries for the users in this tool session,
* and display under the "my answers" section the answers for the user id in the url */
- qaLearningForm.setUserID(learnerProgressUserIdString);
Long learnerProgressUserId = WebUtil.readLongParam(request, AttributeNames.PARAM_USER_ID, false);
QaMonitoringAction qaMonitoringAction = new QaMonitoringAction();
generalLearnerFlowDTO.setRequestLearningReport(new Boolean(true).toString());
generalLearnerFlowDTO.setRequestLearningReportProgress(new Boolean(true).toString());
generalLearnerFlowDTO.setTeacherViewOnly(new Boolean(true).toString());
qaMonitoringAction.refreshSummaryData(request, qaContent, qaService, qaContent.isUsernameVisible(), true,
- toolSessionID, learnerProgressUserIdString, generalLearnerFlowDTO, false, toolSessionID);
+ toolSessionID, userId.toString(), generalLearnerFlowDTO, false, toolSessionID);
- logger.debug("presenting teacher's report");
-
- QaQueUsr qaQueUsrLocal = qaService.getQaUserBySession(learnerProgressUserId, qaSession.getUid());
-
- if (qaQueUsrLocal != null) {
- logger.debug("qaQueUsrLocal uid : " + qaQueUsrLocal.getUid());
- generalLearnerFlowDTO.setUserUid(qaQueUsrLocal.getUid().toString());
- } else {
- generalLearnerFlowDTO.setUserUid(null);
- }
-
- logger.debug("fwd'ing to for learner progress" + INDIVIDUAL_LEARNER_REPORT);
-
return (mapping.findForward(INDIVIDUAL_LEARNER_REPORT));
}
- /* by now, we know that the mode is learner*/
- /* find out if the content is set to run offline or online. If it is set to run offline , the learners are informed about that. */
- boolean isRunOffline = QaUtils.isRunOffline(qaContent);
- logger.debug("isRunOffline: " + isRunOffline);
- if (isRunOffline == true) {
+ // find out if the content is set to run offline or online. If it is set to run offline , the learners are
+ // informed about that.
+ if (qaContent.isRunOffline()) {
QaUtils.cleanUpSessionAbsolute(request);
- logger.debug("warning to learner: the activity is offline.");
- logger.debug("fwding to :" + RUN_OFFLINE);
return (mapping.findForward(RUN_OFFLINE));
}
@@ -434,111 +311,46 @@
* if the user's tool session id AND user id exists in the tool tables go to learner's report.
*/
/* if the 'All Responses' has been clicked no more user entry is accepted, and isResponseFinalized() returns true*/
- logger.debug("userID:" + userID);
Long currentToolSessionID = new Long(qaLearningForm.getToolSessionID());
- logger.debug("currentToolSessionID: " + currentToolSessionID);
- logger.debug("current session uid: " + qaSession.getUid());
- boolean lockWhenFinished = qaContent.isLockWhenFinished();
- logger.debug("lockWhenFinished: " + lockWhenFinished);
- boolean allowRichEditor = qaContent.isAllowRichEditor();
- generalLearnerFlowDTO.setAllowRichEditor(new Boolean(allowRichEditor).toString());
- generalLearnerFlowDTO.setAllowRateAnswers(new Boolean(qaContent.isAllowRateAnswers()).toString());
+ //if Response is Finalized
+ if (qaUser.isResponseFinalized()) {
+ QaSession checkSession = qaUser.getQaSession();
- String sessionStatus = qaSession.getSession_status();
- logger.debug("sessionStatus: " + sessionStatus);
-
+ if (checkSession != null) {
+ Long checkQaSessionId = checkSession.getQaSessionId();
- if (userID != null) {
- QaQueUsr qaQueUsr = qaService.getQaUserBySession(new Long(userID), qaSession.getUid());
+ if (checkQaSessionId.toString().equals(currentToolSessionID.toString())) {
- if ((qaQueUsr != null) && (qaQueUsr.isResponseFinalized())) {
- logger.debug("is current user's response finalised: " + qaQueUsr.isResponseFinalized());
- QaSession checkSession = qaQueUsr.getQaSession();
- logger.debug("checkSession:" + checkSession);
+ // the learner is in the same session and has already responsed to this content
- if (checkSession != null) {
- Long checkQaSessionId = checkSession.getQaSessionId();
- logger.debug("checkQaSessionId:" + checkQaSessionId);
+ generalLearnerFlowDTO.setLockWhenFinished(new Boolean(qaContent.isLockWhenFinished()).toString());
- if (checkQaSessionId.toString().equals(currentToolSessionID.toString())) {
+ QaMonitoringAction qaMonitoringAction = new QaMonitoringAction();
+ /*
+ * the report should have all the users' entries OR the report should have only the current
+ * session's entries
+ */
+ generalLearnerFlowDTO.setRequestLearningReport(new Boolean(true).toString());
- logger.debug("the learner is in the same session and has already responsed to this content");
- logger.debug("lockWhenFinished: " + lockWhenFinished);
+ boolean isUserNamesVisible = qaContent.isUsernameVisible();
+ qaMonitoringAction.refreshSummaryData(request, qaContent, qaService, isUserNamesVisible, true,
+ currentToolSessionID.toString(), userId.toString(), generalLearnerFlowDTO, false, toolSessionID);
- boolean isLearnerFinished = qaQueUsr.isLearnerFinished();
- logger.debug("isLearnerFinished: " + isLearnerFinished);
-
- generalLearnerFlowDTO.setLockWhenFinished(new Boolean(lockWhenFinished).toString());
-
- logger.debug("isUserNamesVisible: " + qaContent.isUsernameVisible());
- Boolean isUserNamesVisibleBoolean = new Boolean(qaContent.isUsernameVisible());
- boolean isUserNamesVisible = isUserNamesVisibleBoolean.booleanValue();
-
- QaMonitoringAction qaMonitoringAction = new QaMonitoringAction();
- /*the report should have all the users' entries OR
- * the report should have only the current session's entries*/
-
- generalLearnerFlowDTO.setRequestLearningReport(new Boolean(true).toString());
-
- qaMonitoringAction.refreshSummaryData(request, qaContent, qaService, isUserNamesVisible, true,
- currentToolSessionID.toString(), userID, generalLearnerFlowDTO, false, toolSessionID);
-
- mapAnswers = (Map) sessionMap.get(MAP_ALL_RESULTS_KEY);
-
- HttpSession ss = SessionManager.getSession();
- /* get back login user DTO */
- UserDTO toolUser = (UserDTO) ss.getAttribute(AttributeNames.USER);
- Long userId = new Long(toolUser.getUserID().longValue());
-
- QaQueUsr qaQueUsrLocal = qaService.getQaUserBySession(userId, qaSession.getUid());
- logger.debug("qaQueUsrLocal: " + qaQueUsrLocal);
- logger.debug("qaQueUsrLocal uid : " + qaQueUsrLocal.getUid());
-
- generalLearnerFlowDTO.setUserUid(qaQueUsrLocal.getUid().toString());
- String noteBookEntry = generalLearnerFlowDTO.getNotebookEntry();
- qaLearningForm.setEntryText(noteBookEntry);
-
- logger.debug("attempt getting notebookEntry: ");
- NotebookEntry notebookEntryLocal = qaService.getEntry(new Long(toolSessionID),
- CoreNotebookConstants.NOTEBOOK_TOOL, MY_SIGNATURE, new Integer(userID));
-
- if (notebookEntryLocal != null) {
- String notebookEntryPresentable = QaUtils.replaceNewLines(notebookEntryLocal.getEntry());
- logger.debug("notebookEntryPresentable: " + notebookEntryPresentable);
- generalLearnerFlowDTO.setNotebookEntry(notebookEntryPresentable);
- qaLearningForm.setEntryText(notebookEntryPresentable);
- }
-
- if (isLearnerFinished) {
- logger.debug("isLearnerFinished is true");
- generalLearnerFlowDTO.setRequestLearningReportViewOnly(new Boolean(true).toString());
-
- request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
-
- logger.debug("fwd'ing to." + REVISITED_LEARNER_REP);
- return (mapping.findForward(REVISITED_LEARNER_REP));
- } else {
- logger.debug("NOT true both isLearnerFinished and lockWhenFinished");
- generalLearnerFlowDTO.setRequestLearningReportViewOnly(new Boolean(false).toString());
-
- request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
- }
-
- logger.debug("fwd'ing to." + INDIVIDUAL_LEARNER_REPORT);
+ if (qaUser.isLearnerFinished()) {
+ generalLearnerFlowDTO.setRequestLearningReportViewOnly(new Boolean(true).toString());
+ return (mapping.findForward(REVISITED_LEARNER_REP));
+ } else {
+ generalLearnerFlowDTO.setRequestLearningReportViewOnly(new Boolean(false).toString());
return (mapping.findForward(INDIVIDUAL_LEARNER_REPORT));
}
}
}
- } else {
- logger.debug("userId is null, it should not be, report this.");
}
+
+ //**---- showing AnswersContent.jsp ----**
+ LearningUtil.populateAnswers(sessionMap, qaContent, qaUser, mapQuestions, generalLearnerFlowDTO, qaService);
- /*
- * present user with the questions.
- */
- request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
- logger.debug("forwarding to: " + LOAD_LEARNER);
return (mapping.findForward(LOAD_LEARNER));
}
@@ -549,80 +361,63 @@
* @param mapping
* @return ActionForward
*/
- protected boolean validateParameters(HttpServletRequest request, ActionMapping mapping,
+ protected void validateParameters(HttpServletRequest request, ActionMapping mapping,
QaLearningForm qaLearningForm) {
/*
- * obtain and setup the current user's data
- */
- String userID = "";
- HttpSession ss = SessionManager.getSession();
-
- if (ss != null) {
- UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
- if ((user != null) && (user.getUserID() != null)) {
- userID = user.getUserID().toString();
- logger.debug("retrieved userId: " + userID);
- qaLearningForm.setUserID(userID);
- }
- }
-
- /*
* process incoming tool session id and later derive toolContentId from it.
*/
String strToolSessionId = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
long toolSessionId = 0;
if ((strToolSessionId == null) || (strToolSessionId.length() == 0)) {
- persistError(request, "error.toolSessionId.required");
- return false;
+ ActionMessages errors = new ActionMessages();
+ errors.add(Globals.ERROR_KEY, new ActionMessage("error.toolSessionId.required"));
+ logger.error("error.toolSessionId.required");
+ saveErrors(request, errors);
+ return;
} else {
try {
toolSessionId = new Long(strToolSessionId).longValue();
- logger.debug("passed TOOL_SESSION_ID : " + new Long(toolSessionId));
qaLearningForm.setToolSessionID(new Long(toolSessionId).toString());
} catch (NumberFormatException e) {
- logger.debug("add error.sessionId.numberFormatException to ActionMessages.");
- return false;
+ logger.error("add error.sessionId.numberFormatException to ActionMessages.");
+ return;
}
}
/*mode can be learner, teacher or author */
String mode = request.getParameter(MODE);
- logger.debug("mode: " + mode);
-
if ((mode == null) || (mode.length() == 0)) {
- return false;
+ logger.error("Mode is empty");
+ return;
}
-
if ((!mode.equals("learner")) && (!mode.equals("teacher")) && (!mode.equals("author"))) {
- return false;
+ logger.error("Wrong mode");
+ return;
}
-
- logger.debug("session LEARNING_MODE set to:" + mode);
qaLearningForm.setMode(mode);
- return true;
}
+
+ private QaQueUsr getCurrentUser(String toolSessionId) {
- boolean isSessionCompleted(String userSessionId, IQaService qaService) {
- logger.debug("userSessionId:" + userSessionId);
- QaSession qaSession = qaService.retrieveQaSessionOrNullById(new Long(userSessionId).longValue());
- logger.debug("voteSession status : " + qaSession.getSession_status());
- if ((qaSession.getSession_status() != null) && (qaSession.getSession_status().equals(COMPLETED))) {
- logger.debug("this session is COMPLETED voteSession status : " + userSessionId);
- return true;
+ // get back login user DTO
+ HttpSession ss = SessionManager.getSession();
+ UserDTO toolUser = (UserDTO) ss.getAttribute(AttributeNames.USER);
+ Long userId = new Long(toolUser.getUserID().longValue());
+
+ QaQueUsr qaUser = qaService.getUserByIdAndSession(userId, new Long(toolSessionId));
+ if (qaUser == null) {
+ qaUser = qaService.createUser(new Long(toolSessionId));
}
- return false;
+
+ return qaUser;
}
- /**
- * persists error messages to request scope
- *
- * @param request
- * @param message
- */
- public void persistError(HttpServletRequest request, String message) {
- ActionMessages errors = new ActionMessages();
- errors.add(Globals.ERROR_KEY, new ActionMessage(message));
- logger.debug("add " + message + " to ActionMessages:");
- saveErrors(request, errors);
+ private QaQueUsr getSpecifiedUser(String toolSessionId, Integer userId) {
+ QaQueUsr qaUser = qaService.getUserByIdAndSession(new Long(userId.intValue()), new Long(toolSessionId));
+ if (qaUser == null) {
+ logger.error("Unable to find specified user for Q&A activity. Screens are likely to fail. SessionId="
+ + new Long(toolSessionId) + " UserId=" + userId);
+ }
+ return qaUser;
}
}
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java,v
diff -u -r1.61.8.3 -r1.61.8.4
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java 4 Mar 2011 17:45:44 -0000 1.61.8.3
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java 16 Mar 2011 19:56:49 -0000 1.61.8.4
@@ -116,22 +116,24 @@
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.qa.EditActivityDTO;
-import org.lamsfoundation.lams.tool.qa.GeneralLearnerFlowDTO;
-import org.lamsfoundation.lams.tool.qa.GeneralMonitoringDTO;
import org.lamsfoundation.lams.tool.qa.QaAppConstants;
import org.lamsfoundation.lams.tool.qa.QaCondition;
import org.lamsfoundation.lams.tool.qa.QaContent;
-import org.lamsfoundation.lams.tool.qa.QaGeneralAuthoringDTO;
-import org.lamsfoundation.lams.tool.qa.QaQueContent;
import org.lamsfoundation.lams.tool.qa.QaQueUsr;
-import org.lamsfoundation.lams.tool.qa.QaQuestionContentDTO;
+import org.lamsfoundation.lams.tool.qa.QaQuestion;
import org.lamsfoundation.lams.tool.qa.QaSession;
import org.lamsfoundation.lams.tool.qa.QaUsrResp;
-import org.lamsfoundation.lams.tool.qa.QaUtils;
-import org.lamsfoundation.lams.tool.qa.ReflectionDTO;
+import org.lamsfoundation.lams.tool.qa.dto.EditActivityDTO;
+import org.lamsfoundation.lams.tool.qa.dto.GeneralLearnerFlowDTO;
+import org.lamsfoundation.lams.tool.qa.dto.GeneralMonitoringDTO;
+import org.lamsfoundation.lams.tool.qa.dto.QaGeneralAuthoringDTO;
+import org.lamsfoundation.lams.tool.qa.dto.QaQuestionDTO;
+import org.lamsfoundation.lams.tool.qa.dto.ReflectionDTO;
import org.lamsfoundation.lams.tool.qa.service.IQaService;
import org.lamsfoundation.lams.tool.qa.service.QaServiceProxy;
+import org.lamsfoundation.lams.tool.qa.util.QaUtils;
+import org.lamsfoundation.lams.tool.qa.web.form.QaAuthoringForm;
+import org.lamsfoundation.lams.tool.qa.web.form.QaMonitoringForm;
import org.lamsfoundation.lams.util.WebUtil;
import org.lamsfoundation.lams.web.action.LamsDispatchAction;
import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -176,7 +178,7 @@
qaMonitoringForm.setEditResponse(editResponse);
- QaContent qaContent = qaService.loadQa(new Long(strToolContentID).longValue());
+ QaContent qaContent = qaService.getQa(new Long(strToolContentID).longValue());
Map summaryToolSessions = MonitoringUtil.populateToolSessions(request, qaContent, qaService);
@@ -187,7 +189,7 @@
QaMonitoringAction.logger.debug("summaryToolSessionsId: " + summaryToolSessionsId);
request.setAttribute(QaAppConstants.SUMMARY_TOOL_SESSIONS_ID, summaryToolSessionsId);
- if (qaService.studentActivityOccurredGlobal(qaContent)) {
+ if (qaService.isStudentActivityOccurredGlobal(qaContent)) {
generalMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(false).toString());
QaMonitoringAction.logger.debug("USER_EXCEPTION_NO_TOOL_SESSIONS is set to false");
} else {
@@ -293,7 +295,7 @@
qaMonitoringForm.setEditResponse(editResponse);
- QaContent qaContent = qaService.loadQa(new Long(strToolContentID).longValue());
+ QaContent qaContent = qaService.getQa(new Long(strToolContentID).longValue());
Map summaryToolSessions = MonitoringUtil.populateToolSessions(request, qaContent, qaService);
@@ -304,7 +306,7 @@
QaMonitoringAction.logger.debug("summaryToolSessionsId: " + summaryToolSessionsId);
request.setAttribute(QaAppConstants.SUMMARY_TOOL_SESSIONS_ID, summaryToolSessionsId);
- if (qaService.studentActivityOccurredGlobal(qaContent)) {
+ if (qaService.isStudentActivityOccurredGlobal(qaContent)) {
QaMonitoringAction.logger.debug("USER_EXCEPTION_NO_TOOL_SESSIONS is set to false");
generalMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(false).toString());
} else {
@@ -403,7 +405,7 @@
* it is possible that the content is being used by some learners. In this situation, the content is marked as
* "in use" and content in use is not modifiable
*/
- QaContent qaContent = qaService.loadQa(new Long(strToolContentID).longValue());
+ QaContent qaContent = qaService.getQa(new Long(strToolContentID).longValue());
QaMonitoringAction.logger.debug("qaContent:" + qaContent.getUid());
Map summaryToolSessions = MonitoringUtil.populateToolSessions(request, qaContent, qaService);
@@ -415,7 +417,7 @@
request.setAttribute(QaAppConstants.SUMMARY_TOOL_SESSIONS_ID, summaryToolSessionsId);
GeneralMonitoringDTO generalMonitoringDTO = new GeneralMonitoringDTO();
- if (qaService.studentActivityOccurredGlobal(qaContent)) {
+ if (qaService.isStudentActivityOccurredGlobal(qaContent)) {
QaMonitoringAction.logger.debug("student activity occurred on this content:" + qaContent);
generalMonitoringDTO.setUserExceptionContentInUse(new Boolean(true).toString());
QaMonitoringAction.logger.debug("forwarding to: " + QaAppConstants.LOAD_MONITORING);
@@ -530,7 +532,7 @@
qaMonitoringForm.setEditResponse(editResponse);
- QaContent qaContent = qaService.loadQa(new Long(strToolContentID).longValue());
+ QaContent qaContent = qaService.getQa(new Long(strToolContentID).longValue());
/* this section is related to summary tab. Starts here. */
@@ -545,7 +547,7 @@
request.setAttribute(QaAppConstants.SUMMARY_TOOL_SESSIONS_ID, summaryToolSessionsId);
/* true means there is at least 1 response */
- if (qaService.studentActivityOccurredGlobal(qaContent)) {
+ if (qaService.isStudentActivityOccurredGlobal(qaContent)) {
QaMonitoringAction.logger.debug("USER_EXCEPTION_NO_TOOL_SESSIONS is set to false");
generalMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(false).toString());
} else {
@@ -641,7 +643,7 @@
qaMonitoringForm.setHttpSessionID(httpSessionID);
- QaContent qaContent = qaService.loadQa(new Long(strToolContentID).longValue());
+ QaContent qaContent = qaService.getQa(new Long(strToolContentID).longValue());
qaMonitoringForm.setTitle(qaContent.getTitle());
@@ -652,7 +654,7 @@
prepareReflectionData(request, qaContent, qaService, null, false, "All");
- if (qaService.studentActivityOccurredGlobal(qaContent)) {
+ if (qaService.isStudentActivityOccurredGlobal(qaContent)) {
QaMonitoringAction.logger.debug("USER_EXCEPTION_NO_TOOL_SESSIONS is set to false");
generalMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(false).toString());
} else {
@@ -675,12 +677,12 @@
List listQuestionContentDTO = new LinkedList();
- Iterator queIterator = qaContent.getQaQueContents().iterator();
+ Iterator queIterator = qaContent.getQaQuestions().iterator();
while (queIterator.hasNext()) {
- QaQueContent qaQueContent = (QaQueContent) queIterator.next();
- if (qaQueContent != null) {
- QaQuestionContentDTO qaQuestionContentDTO = new QaQuestionContentDTO(qaQueContent);
- listQuestionContentDTO.add(qaQuestionContentDTO);
+ QaQuestion qaQuestion = (QaQuestion) queIterator.next();
+ if (qaQuestion != null) {
+ QaQuestionDTO qaQuestionDTO = new QaQuestionDTO(qaQuestion);
+ listQuestionContentDTO.add(qaQuestionDTO);
}
}
@@ -755,7 +757,7 @@
} else {
request.setAttribute(QaAppConstants.SELECTION_CASE, new Long(1));
- QaSession qaSession = qaService.retrieveQaSessionOrNullById(new Long(currentMonitoredToolSession)
+ QaSession qaSession = qaService.getSessionById(new Long(currentMonitoredToolSession)
.longValue());
QaMonitoringAction.logger.debug("retrieving qaSession name: " + qaSession.getSession_name());
request.setAttribute(QaAppConstants.CURRENT_SESSION_NAME, qaSession.getSession_name());
@@ -776,7 +778,7 @@
QaMonitoringAction.logger.debug("editResponse: " + editResponse);
qaMonitoringForm.setEditResponse(editResponse);
- QaContent qaContent = qaService.loadQa(new Long(strToolContentID).longValue());
+ QaContent qaContent = qaService.getQa(new Long(strToolContentID).longValue());
Map summaryToolSessions = MonitoringUtil.populateToolSessions(request, qaContent, qaService);
@@ -857,12 +859,12 @@
QaMonitoringAction.logger.debug("responseId: " + responseId);
request.getSession().setAttribute(QaAppConstants.EDITABLE_RESPONSE_ID, responseId);
- QaUsrResp qaUsrResp = qaService.retrieveQaUsrResp(new Long(responseId).longValue());
+ QaUsrResp qaUsrResp = qaService.getResponseById(new Long(responseId).longValue());
refreshUserInput(request, qaMonitoringForm);
- QaContent qaContent = qaUsrResp.getQaQueContent().getQaContent();
+ QaContent qaContent = qaUsrResp.getQaQuestion().getQaContent();
String currentMonitoredToolSession = qaMonitoringForm.getSelectedToolSessionId();
@@ -877,7 +879,7 @@
} else {
request.setAttribute(QaAppConstants.SELECTION_CASE, new Long(1));
- QaSession qaSession = qaService.retrieveQaSessionOrNullById(new Long(currentMonitoredToolSession)
+ QaSession qaSession = qaService.getSessionById(new Long(currentMonitoredToolSession)
.longValue());
QaMonitoringAction.logger.debug("retrieving qaSession name: " + qaSession.getSession_name());
request.setAttribute(QaAppConstants.CURRENT_SESSION_NAME, qaSession.getSession_name());
@@ -954,12 +956,12 @@
QaMonitoringAction.logger.debug("responseId: " + responseId);
request.getSession().setAttribute(QaAppConstants.EDITABLE_RESPONSE_ID, responseId);
- QaUsrResp qaUsrResp = qaService.retrieveQaUsrResp(new Long(responseId).longValue());
+ QaUsrResp qaUsrResp = qaService.getResponseById(new Long(responseId).longValue());
refreshUserInput(request, qaMonitoringForm);
- QaContent qaContent = qaUsrResp.getQaQueContent().getQaContent();
+ QaContent qaContent = qaUsrResp.getQaQuestion().getQaContent();
String currentMonitoredToolSession = qaMonitoringForm.getSelectedToolSessionId();
@@ -1057,7 +1059,7 @@
String updatedResponse = request.getParameter("updatedResponse");
- QaUsrResp qaUsrResp = qaService.retrieveQaUsrResp(new Long(responseId).longValue());
+ QaUsrResp qaUsrResp = qaService.getResponseById(new Long(responseId).longValue());
/*
@@ -1068,7 +1070,7 @@
qaUsrResp.getQaQueUser().getUsername(), qaUsrResp.getAnswer(), updatedResponse);
qaUsrResp.setAnswer(updatedResponse);
- qaService.updateQaUsrResp(qaUsrResp);
+ qaService.updateUserResponse(qaUsrResp);
QaMonitoringAction.logger.debug("response updated.");
refreshUserInput(request, qaMonitoringForm);
@@ -1083,7 +1085,7 @@
if (currentMonitoredToolSession.equals("All")) {
request.setAttribute(QaAppConstants.SELECTION_CASE, new Long(2));
- QaSession qaSession = qaService.retrieveQaSessionOrNullById(new Long(currentMonitoredToolSession)
+ QaSession qaSession = qaService.getSessionById(new Long(currentMonitoredToolSession)
.longValue());
QaMonitoringAction.logger.debug("retrieving qaSession name: " + qaSession.getSession_name());
request.setAttribute(QaAppConstants.CURRENT_SESSION_NAME, qaSession.getSession_name());
@@ -1093,7 +1095,7 @@
request.setAttribute(QaAppConstants.CURRENT_MONITORED_TOOL_SESSION, currentMonitoredToolSession);
- QaContent qaContent = qaUsrResp.getQaQueContent().getQaContent();
+ QaContent qaContent = qaUsrResp.getQaQuestion().getQaContent();
Map summaryToolSessions = MonitoringUtil.populateToolSessions(request, qaContent, qaService);
@@ -1161,7 +1163,7 @@
String updatedResponse = request.getParameter("updatedResponse");
- QaUsrResp qaUsrResp = qaService.retrieveQaUsrResp(new Long(responseId).longValue());
+ QaUsrResp qaUsrResp = qaService.getResponseById(new Long(responseId).longValue());
/*
@@ -1172,7 +1174,7 @@
qaUsrResp.getQaQueUser().getUsername(), qaUsrResp.getAnswer(), updatedResponse);
qaUsrResp.setAnswer(updatedResponse);
- qaService.updateQaUsrResp(qaUsrResp);
+ qaService.updateUserResponse(qaUsrResp);
QaMonitoringAction.logger.debug("response updated.");
refreshUserInput(request, qaMonitoringForm);
@@ -1191,7 +1193,7 @@
}
- QaContent qaContent = qaUsrResp.getQaQueContent().getQaContent();
+ QaContent qaContent = qaUsrResp.getQaQuestion().getQaContent();
Map summaryToolSessions = MonitoringUtil.populateToolSessions(request, qaContent, qaService);
@@ -1285,17 +1287,12 @@
String responseId = qaMonitoringForm.getResponseId();
- QaMonitoringAction.logger.debug("responseId: " + responseId);
-
- QaUsrResp qaUsrResp = qaService.retrieveQaUsrResp(new Long(responseId).longValue());
-
-
+ QaUsrResp qaUsrResp = qaService.getResponseById(new Long(responseId).longValue());
qaService.removeUserResponse(qaUsrResp);
- QaMonitoringAction.logger.debug("response deleted.");
refreshUserInput(request, qaMonitoringForm);
- QaContent qaContent = qaUsrResp.getQaQueContent().getQaContent();
+ QaContent qaContent = qaUsrResp.getQaQuestion().getQaContent();
Map summaryToolSessions = MonitoringUtil.populateToolSessions(request, qaContent, qaService);
@@ -1365,7 +1362,7 @@
QaMonitoringAction.logger.debug("contentFolderID: " + contentFolderID);
qaMonitoringForm.setContentFolderID(contentFolderID);
- QaContent qaContent = qaService.loadQa(new Long(strToolContentID).longValue());
+ QaContent qaContent = qaService.getQa(new Long(strToolContentID).longValue());
Map summaryToolSessions = MonitoringUtil.populateToolSessions(request, qaContent, qaService);
@@ -1405,16 +1402,14 @@
}
/**
- * persists error messages to request scope persistError(HttpServletRequest
- * request, String message)
+ * persists error messages to request scope
*
* @param request
* @param message
*/
public void persistError(HttpServletRequest request, String message) {
ActionMessages errors = new ActionMessages();
errors.add(Globals.ERROR_KEY, new ActionMessage(message));
- QaMonitoringAction.logger.debug("add " + message + " to ActionMessages:");
saveErrors(request, errors);
}
@@ -1437,10 +1432,6 @@
public void refreshSummaryData(HttpServletRequest request, QaContent qaContent, IQaService qaService,
boolean isUserNamesVisible, boolean isLearnerRequest, String currentSessionId, String userId,
GeneralLearnerFlowDTO generalLearnerFlowDTO, boolean setEditResponse, String currentMonitoredToolSession) {
- QaMonitoringAction.logger.debug("starting refreshSummaryData");
- QaMonitoringAction.logger.debug("currentMonitoredToolSession: " + currentMonitoredToolSession);
- QaMonitoringAction.logger.debug("isUserNamesVisible: " + isUserNamesVisible);
- QaMonitoringAction.logger.debug("isLearnerRequest: " + isLearnerRequest);
GeneralMonitoringDTO generalMonitoringDTO = new GeneralMonitoringDTO();
@@ -1457,7 +1448,7 @@
generalMonitoringDTO.setActivityInstructions(qaContent.getInstructions());
}
- if (qaService.studentActivityOccurredGlobal(qaContent)) {
+ if (qaService.isStudentActivityOccurredGlobal(qaContent)) {
QaMonitoringAction.logger.debug("USER_EXCEPTION_NO_TOOL_SESSIONS is set to false");
generalMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(false).toString());
} else {
@@ -1482,33 +1473,27 @@
request.setAttribute(QaAppConstants.EDIT_ACTIVITY_DTO, editActivityDTO);
Map summaryToolSessionsId = MonitoringUtil.populateToolSessionsId(request, qaContent, qaService);
- QaMonitoringAction.logger.debug("summaryToolSessionsId: " + summaryToolSessionsId);
request.setAttribute(QaAppConstants.SUMMARY_TOOL_SESSIONS_ID, summaryToolSessionsId);
currentSessionId = currentMonitoredToolSession;
- QaMonitoringAction.logger.debug("using allUsersData to retrieve data: " + isUserNamesVisible);
List listMonitoredAnswersContainerDTO = MonitoringUtil.buildGroupsQuestionData(request, qaContent, qaService,
isUserNamesVisible, isLearnerRequest, currentSessionId, userId);
/* getting stats screen content from here... */
int countAllUsers = qaService.getTotalNumberOfUsers(qaContent);
- QaMonitoringAction.logger.debug("countAllUsers: " + countAllUsers);
-
if (countAllUsers == 0) {
- QaMonitoringAction.logger.debug("error: countAllUsers is 0");
+ //error: countAllUsers is 0
generalMonitoringDTO.setUserExceptionNoStudentActivity(new Boolean(true).toString());
}
generalMonitoringDTO.setCountAllUsers(new Integer(countAllUsers).toString());
int countSessionComplete = qaService.countSessionComplete(qaContent);
- QaMonitoringAction.logger.debug("countSessionComplete: " + countSessionComplete);
generalMonitoringDTO.setCountSessionComplete(new Integer(countSessionComplete).toString());
- QaMonitoringAction.logger.debug("ending refreshStatsData with generalMonitoringDTO: " + generalMonitoringDTO);
/* till here */
generalMonitoringDTO.setEditResponse(new Boolean(setEditResponse).toString());
@@ -1524,13 +1509,9 @@
/* ...till here * */
if (generalLearnerFlowDTO != null) {
-
- QaMonitoringAction.logger
- .debug("placing LIST_MONITORED_ANSWERS_CONTAINER_DTO within generalLearnerFlowDTO");
generalLearnerFlowDTO.setListMonitoredAnswersContainerDTO(listMonitoredAnswersContainerDTO);
if (isLearnerRequest) {
- QaMonitoringAction.logger.debug("isLearnerRequest is true.");
generalLearnerFlowDTO.setRequestLearningReportProgress(new Boolean(true).toString());
}
request.setAttribute(QaAppConstants.GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
@@ -1542,7 +1523,6 @@
/* find out if there are any reflection entries, from here */
boolean notebookEntriesExist = MonitoringUtil.notebookEntriesExist(qaService, qaContent);
- QaMonitoringAction.logger.debug("notebookEntriesExist : " + notebookEntriesExist);
if (notebookEntriesExist) {
request.setAttribute(QaAppConstants.NOTEBOOK_ENTRIES_EXIST, new Boolean(true).toString());
@@ -1574,7 +1554,7 @@
QaMonitoringAction.logger.debug("strToolContentID: " + strToolContentID);
qaMonitoringForm.setToolContentID(strToolContentID);
- QaContent qaContent = qaService.loadQa(new Long(strToolContentID).longValue());
+ QaContent qaContent = qaService.getQa(new Long(strToolContentID).longValue());
Map summaryToolSessions = MonitoringUtil.populateToolSessions(request, qaContent, qaService);
@@ -1645,8 +1625,7 @@
QaMonitoringForm qaMonitoringForm = (QaMonitoringForm) form;
String currentUid = qaMonitoringForm.getCurrentUid();
- QaMonitoringAction.logger.debug("currentUid: " + currentUid);
- QaUsrResp qaUsrResp = qaService.getAttemptByUID(new Long(currentUid));
+ QaUsrResp qaUsrResp = qaService.getResponseById(new Long(currentUid));
qaUsrResp.setVisible(true);
qaService.updateUserResponse(qaUsrResp);
@@ -1665,7 +1644,7 @@
qaMonitoringForm.setEditResponse(editResponse);
- QaContent qaContent = qaService.loadQa(new Long(strToolContentID).longValue());
+ QaContent qaContent = qaService.getQa(new Long(strToolContentID).longValue());
Map summaryToolSessions = MonitoringUtil.populateToolSessions(request, qaContent, qaService);
@@ -1695,7 +1674,7 @@
} else {
request.setAttribute(QaAppConstants.SELECTION_CASE, new Long(1));
- QaSession qaSession = qaService.retrieveQaSessionOrNullById(new Long(currentMonitoredToolSession)
+ QaSession qaSession = qaService.getSessionById(new Long(currentMonitoredToolSession)
.longValue());
QaMonitoringAction.logger.debug("retrieving qaSession name: " + qaSession.getSession_name());
request.setAttribute(QaAppConstants.CURRENT_SESSION_NAME, qaSession.getSession_name());
@@ -1736,16 +1715,12 @@
public ActionForward showGroupResponse(ActionMapping mapping, ActionForm form, HttpServletRequest request,
HttpServletResponse response) throws IOException, ServletException, ToolException {
- QaMonitoringAction.logger.debug("dispatching showGroupResponse...");
-
IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
-
QaMonitoringForm qaMonitoringForm = (QaMonitoringForm) form;
String currentUid = qaMonitoringForm.getCurrentUid();
- QaMonitoringAction.logger.debug("currentUid: " + currentUid);
- QaUsrResp qaUsrResp = qaService.getAttemptByUID(new Long(currentUid));
+ QaUsrResp qaUsrResp = qaService.getResponseById(new Long(currentUid));
qaUsrResp.setVisible(true);
qaService.updateUserResponse(qaUsrResp);
@@ -1764,7 +1739,7 @@
qaMonitoringForm.setEditResponse(editResponse);
- QaContent qaContent = qaService.loadQa(new Long(strToolContentID).longValue());
+ QaContent qaContent = qaService.getQa(new Long(strToolContentID).longValue());
Map summaryToolSessions = MonitoringUtil.populateToolSessions(request, qaContent, qaService);
@@ -1830,34 +1805,28 @@
public ActionForward hideResponse(ActionMapping mapping, ActionForm form, HttpServletRequest request,
HttpServletResponse response) throws IOException, ServletException, ToolException {
- QaMonitoringAction.logger.debug("dispatching hideResponse...");
IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
-
QaMonitoringForm qaMonitoringForm = (QaMonitoringForm) form;
String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
- QaMonitoringAction.logger.debug("contentFolderID: " + contentFolderID);
qaMonitoringForm.setContentFolderID(contentFolderID);
String currentUid = qaMonitoringForm.getCurrentUid();
- QaMonitoringAction.logger.debug("currentUid: " + currentUid);
- QaUsrResp qaUsrResp = qaService.getAttemptByUID(new Long(currentUid));
+ QaUsrResp qaUsrResp = qaService.getResponseById(new Long(currentUid));
qaUsrResp.setVisible(false);
qaService.updateUserResponse(qaUsrResp);
qaService.hideResponse(qaUsrResp);
-
String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
- QaMonitoringAction.logger.debug("strToolContentID: " + strToolContentID);
qaMonitoringForm.setToolContentID(strToolContentID);
String editResponse = request.getParameter(QaAppConstants.EDIT_RESPONSE);
qaMonitoringForm.setEditResponse(editResponse);
- QaContent qaContent = qaService.loadQa(new Long(strToolContentID).longValue());
+ QaContent qaContent = qaService.getQa(new Long(strToolContentID).longValue());
Map summaryToolSessions = MonitoringUtil.populateToolSessions(request, qaContent, qaService);
@@ -1878,7 +1847,7 @@
if (currentMonitoredToolSession.equals("All")) {
request.setAttribute(QaAppConstants.SELECTION_CASE, new Long(2));
- QaSession qaSession = qaService.retrieveQaSessionOrNullById(new Long(currentMonitoredToolSession)
+ QaSession qaSession = qaService.getSessionById(new Long(currentMonitoredToolSession)
.longValue());
QaMonitoringAction.logger.debug("retrieving qaSession name: " + qaSession.getSession_name());
request.setAttribute(QaAppConstants.CURRENT_SESSION_NAME, qaSession.getSession_name());
@@ -1926,19 +1895,16 @@
public ActionForward hideGroupResponse(ActionMapping mapping, ActionForm form, HttpServletRequest request,
HttpServletResponse response) throws IOException, ServletException, ToolException {
- QaMonitoringAction.logger.debug("dispatching hideGroupResponse...");
IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
QaMonitoringForm qaMonitoringForm = (QaMonitoringForm) form;
String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
- QaMonitoringAction.logger.debug("contentFolderID: " + contentFolderID);
qaMonitoringForm.setContentFolderID(contentFolderID);
String currentUid = qaMonitoringForm.getCurrentUid();
- QaMonitoringAction.logger.debug("currentUid: " + currentUid);
- QaUsrResp qaUsrResp = qaService.getAttemptByUID(new Long(currentUid));
+ QaUsrResp qaUsrResp = qaService.getResponseById(new Long(currentUid));;
qaUsrResp.setVisible(false);
qaService.updateUserResponse(qaUsrResp);
@@ -1953,7 +1919,7 @@
qaMonitoringForm.setEditResponse(editResponse);
- QaContent qaContent = qaService.loadQa(new Long(strToolContentID).longValue());
+ QaContent qaContent = qaService.getQa(new Long(strToolContentID).longValue());
Map summaryToolSessions = MonitoringUtil.populateToolSessions(request, qaContent, qaService);
@@ -2054,7 +2020,7 @@
request.setAttribute(QaAppConstants.GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
- QaSession qaSession = qaService.retrieveQaSessionOrNullById(new Long(sessionId).longValue());
+ QaSession qaSession = qaService.getSessionById(new Long(sessionId).longValue());
QaContent qaContent = qaSession.getQaContent();
@@ -2067,7 +2033,7 @@
generalMonitoringDTO.setAttachmentList(attachmentList);
- if (qaService.studentActivityOccurredGlobal(qaContent)) {
+ if (qaService.isStudentActivityOccurredGlobal(qaContent)) {
QaMonitoringAction.logger.debug("USER_EXCEPTION_NO_TOOL_SESSIONS is set to false");
generalMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(false).toString());
} else {
@@ -2176,7 +2142,7 @@
QaMonitoringAction.logger.debug("qaGeneralAuthoringDTO now: " + qaGeneralAuthoringDTO);
request.setAttribute(QaAppConstants.QA_GENERAL_AUTHORING_DTO, qaGeneralAuthoringDTO);
- QaContent qaContentTest = qaService.loadQa(new Long(strToolContentID).longValue());
+ QaContent qaContentTest = qaService.getQa(new Long(strToolContentID).longValue());
QaMonitoringAction.logger.debug("errors: " + errors);
if (!errors.isEmpty()) {
@@ -2265,7 +2231,7 @@
/* start monitoring code */
- if (qaService.studentActivityOccurredGlobal(qaContent)) {
+ if (qaService.isStudentActivityOccurredGlobal(qaContent)) {
QaMonitoringAction.logger.debug("USER_EXCEPTION_NO_TOOL_SESSIONS is set to false");
qaGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(false).toString());
} else {
@@ -2345,12 +2311,12 @@
String defaultContentIdStr = request.getParameter(QaAppConstants.DEFAULT_CONTENT_ID_STR);
QaMonitoringAction.logger.debug("defaultContentIdStr: " + defaultContentIdStr);
- QaContent qaContent = qaService.loadQa(new Long(strToolContentID).longValue());
+ QaContent qaContent = qaService.getQa(new Long(strToolContentID).longValue());
if (qaContent == null) {
QaMonitoringAction.logger.debug("using defaultContentIdStr: " + defaultContentIdStr);
- qaContent = qaService.loadQa(new Long(defaultContentIdStr).longValue());
+ qaContent = qaService.getQa(new Long(defaultContentIdStr).longValue());
}
@@ -2384,13 +2350,13 @@
QaMonitoringAction.logger.debug("duplicates: " + duplicates);
if (!duplicates) {
- QaQuestionContentDTO qaQuestionContentDTO = null;
+ QaQuestionDTO qaQuestionDTO = null;
Iterator listIterator = listQuestionContentDTO.iterator();
while (listIterator.hasNext()) {
- qaQuestionContentDTO = (QaQuestionContentDTO) listIterator.next();
+ qaQuestionDTO = (QaQuestionDTO) listIterator.next();
- String question = qaQuestionContentDTO.getQuestion();
- String displayOrder = qaQuestionContentDTO.getDisplayOrder();
+ String question = qaQuestionDTO.getQuestion();
+ String displayOrder = qaQuestionDTO.getDisplayOrder();
if (displayOrder != null && !displayOrder.equals("")) {
if (displayOrder.equals(editableQuestionIndex)) {
@@ -2401,25 +2367,25 @@
}
- qaQuestionContentDTO.setQuestion(newQuestion);
- qaQuestionContentDTO.setFeedback(feedback);
- qaQuestionContentDTO.setDisplayOrder(editableQuestionIndex);
- qaQuestionContentDTO.setRequired(requiredBoolean);
+ qaQuestionDTO.setQuestion(newQuestion);
+ qaQuestionDTO.setFeedback(feedback);
+ qaQuestionDTO.setDisplayOrder(editableQuestionIndex);
+ qaQuestionDTO.setRequired(requiredBoolean);
listQuestionContentDTO = AuthoringUtil.reorderUpdateListQuestionContentDTO(listQuestionContentDTO,
- qaQuestionContentDTO, editableQuestionIndex);
+ qaQuestionDTO, editableQuestionIndex);
} else {
QaMonitoringAction.logger.debug("duplicate question entry, not adding");
}
} else {
QaMonitoringAction.logger.debug("request for edit and save.");
- QaQuestionContentDTO qaQuestionContentDTO = null;
+ QaQuestionDTO qaQuestionDTO = null;
Iterator listIterator = listQuestionContentDTO.iterator();
while (listIterator.hasNext()) {
- qaQuestionContentDTO = (QaQuestionContentDTO) listIterator.next();
+ qaQuestionDTO = (QaQuestionDTO) listIterator.next();
- String question = qaQuestionContentDTO.getQuestion();
- String displayOrder = qaQuestionContentDTO.getDisplayOrder();
+ String question = qaQuestionDTO.getQuestion();
+ String displayOrder = qaQuestionDTO.getDisplayOrder();
if (displayOrder != null && !displayOrder.equals("")) {
@@ -2431,13 +2397,13 @@
}
- qaQuestionContentDTO.setQuestion(newQuestion);
- qaQuestionContentDTO.setFeedback(feedback);
- qaQuestionContentDTO.setDisplayOrder(editableQuestionIndex);
- qaQuestionContentDTO.setRequired(requiredBoolean);
+ qaQuestionDTO.setQuestion(newQuestion);
+ qaQuestionDTO.setFeedback(feedback);
+ qaQuestionDTO.setDisplayOrder(editableQuestionIndex);
+ qaQuestionDTO.setRequired(requiredBoolean);
listQuestionContentDTO = AuthoringUtil.reorderUpdateListQuestionContentDTO(listQuestionContentDTO,
- qaQuestionContentDTO, editableQuestionIndex);
+ qaQuestionDTO, editableQuestionIndex);
}
} else {
QaMonitoringAction.logger.debug("entry blank, not adding");
@@ -2493,7 +2459,7 @@
GeneralMonitoringDTO qaGeneralMonitoringDTO = new GeneralMonitoringDTO();
qaGeneralMonitoringDTO.setDefineLaterInEditMode(new Boolean(false).toString());
- if (qaService.studentActivityOccurredGlobal(qaContent)) {
+ if (qaService.isStudentActivityOccurredGlobal(qaContent)) {
QaMonitoringAction.logger.debug("USER_EXCEPTION_NO_TOOL_SESSIONS is set to false");
qaGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(false).toString());
} else {
@@ -2570,12 +2536,12 @@
String defaultContentIdStr = request.getParameter(QaAppConstants.DEFAULT_CONTENT_ID_STR);
QaMonitoringAction.logger.debug("defaultContentIdStr: " + defaultContentIdStr);
- QaContent qaContent = qaService.loadQa(new Long(strToolContentID).longValue());
+ QaContent qaContent = qaService.getQa(new Long(strToolContentID).longValue());
if (qaContent == null) {
QaMonitoringAction.logger.debug("using defaultContentIdStr: " + defaultContentIdStr);
- qaContent = qaService.loadQa(new Long(defaultContentIdStr).longValue());
+ qaContent = qaService.getQa(new Long(defaultContentIdStr).longValue());
}
@@ -2606,9 +2572,9 @@
QaMonitoringAction.logger.debug("duplicates: " + duplicates);
if (!duplicates) {
- QaQuestionContentDTO qaQuestionContentDTO = new QaQuestionContentDTO(newQuestion,
+ QaQuestionDTO qaQuestionDTO = new QaQuestionDTO(newQuestion,
new Long(listSize + 1).toString(), feedback, requiredBoolean);
- listQuestionContentDTO.add(qaQuestionContentDTO);
+ listQuestionContentDTO.add(qaQuestionDTO);
} else {
QaMonitoringAction.logger.debug("entry duplicate, not adding");
@@ -2664,7 +2630,7 @@
GeneralMonitoringDTO qaGeneralMonitoringDTO = new GeneralMonitoringDTO();
qaGeneralMonitoringDTO.setDefineLaterInEditMode(new Boolean(false).toString());
- if (qaService.studentActivityOccurredGlobal(qaContent)) {
+ if (qaService.isStudentActivityOccurredGlobal(qaContent)) {
QaMonitoringAction.logger.debug("USER_EXCEPTION_NO_TOOL_SESSIONS is set to false");
qaGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(false).toString());
} else {
@@ -2741,12 +2707,12 @@
String defaultContentIdStr = request.getParameter(QaAppConstants.DEFAULT_CONTENT_ID_STR);
QaMonitoringAction.logger.debug("defaultContentIdStr: " + defaultContentIdStr);
- QaContent qaContent = qaService.loadQa(new Long(strToolContentID).longValue());
+ QaContent qaContent = qaService.getQa(new Long(strToolContentID).longValue());
if (qaContent == null) {
QaMonitoringAction.logger.debug("using defaultContentIdStr: " + defaultContentIdStr);
- qaContent = qaService.loadQa(new Long(defaultContentIdStr).longValue());
+ qaContent = qaService.getQa(new Long(defaultContentIdStr).longValue());
}
@@ -2776,7 +2742,7 @@
GeneralMonitoringDTO qaGeneralMonitoringDTO = new GeneralMonitoringDTO();
qaGeneralMonitoringDTO.setDefineLaterInEditMode(new Boolean(false).toString());
- if (qaService.studentActivityOccurredGlobal(qaContent)) {
+ if (qaService.isStudentActivityOccurredGlobal(qaContent)) {
QaMonitoringAction.logger.debug("USER_EXCEPTION_NO_TOOL_SESSIONS is set to false");
qaGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(false).toString());
} else {
@@ -2853,16 +2819,16 @@
String editableFeedback = "";
Iterator listIterator = listQuestionContentDTO.iterator();
while (listIterator.hasNext()) {
- QaQuestionContentDTO qaQuestionContentDTO = (QaQuestionContentDTO) listIterator.next();
+ QaQuestionDTO qaQuestionDTO = (QaQuestionDTO) listIterator.next();
- String question = qaQuestionContentDTO.getQuestion();
- String displayOrder = qaQuestionContentDTO.getDisplayOrder();
+ String question = qaQuestionDTO.getQuestion();
+ String displayOrder = qaQuestionDTO.getDisplayOrder();
if (displayOrder != null && !displayOrder.equals("")) {
if (displayOrder.equals(questionIndex)) {
- editableFeedback = qaQuestionContentDTO.getFeedback();
- editableQuestion = qaQuestionContentDTO.getQuestion();
+ editableFeedback = qaQuestionDTO.getFeedback();
+ editableQuestion = qaQuestionDTO.getQuestion();
break;
}
@@ -2885,12 +2851,12 @@
String defaultContentIdStr = request.getParameter(QaAppConstants.DEFAULT_CONTENT_ID_STR);
QaMonitoringAction.logger.debug("defaultContentIdStr: " + defaultContentIdStr);
- QaContent qaContent = qaService.loadQa(new Long(strToolContentID).longValue());
+ QaContent qaContent = qaService.getQa(new Long(strToolContentID).longValue());
if (qaContent == null) {
QaMonitoringAction.logger.debug("using defaultContentIdStr: " + defaultContentIdStr);
- qaContent = qaService.loadQa(new Long(defaultContentIdStr).longValue());
+ qaContent = qaService.getQa(new Long(defaultContentIdStr).longValue());
}
@@ -2924,7 +2890,7 @@
GeneralMonitoringDTO qaGeneralMonitoringDTO = new GeneralMonitoringDTO();
qaGeneralMonitoringDTO.setDefineLaterInEditMode(new Boolean(false).toString());
- if (qaService.studentActivityOccurredGlobal(qaContent)) {
+ if (qaService.isStudentActivityOccurredGlobal(qaContent)) {
QaMonitoringAction.logger.debug("USER_EXCEPTION_NO_TOOL_SESSIONS is set to false");
qaGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(false).toString());
} else {
@@ -2996,15 +2962,15 @@
List listQuestionContentDTO = (List) sessionMap.get(QaAppConstants.LIST_QUESTION_CONTENT_DTO_KEY);
- QaQuestionContentDTO qaQuestionContentDTO = null;
+ QaQuestionDTO qaQuestionDTO = null;
Iterator listIterator = listQuestionContentDTO.iterator();
while (listIterator.hasNext()) {
- qaQuestionContentDTO = (QaQuestionContentDTO) listIterator.next();
+ qaQuestionDTO = (QaQuestionDTO) listIterator.next();
- String question = qaQuestionContentDTO.getQuestion();
- String displayOrder = qaQuestionContentDTO.getDisplayOrder();
+ String question = qaQuestionDTO.getQuestion();
+ String displayOrder = qaQuestionDTO.getDisplayOrder();
QaMonitoringAction.logger.debug("displayOrder:" + displayOrder);
if (displayOrder != null && !displayOrder.equals("")) {
@@ -3016,7 +2982,7 @@
}
- qaQuestionContentDTO.setQuestion("");
+ qaQuestionDTO.setQuestion("");
listQuestionContentDTO = AuthoringUtil.reorderListQuestionContentDTO(listQuestionContentDTO, questionIndex);
@@ -3046,12 +3012,12 @@
String defaultContentIdStr = request.getParameter(QaAppConstants.DEFAULT_CONTENT_ID_STR);
QaMonitoringAction.logger.debug("defaultContentIdStr: " + defaultContentIdStr);
- QaContent qaContent = qaService.loadQa(new Long(strToolContentID).longValue());
+ QaContent qaContent = qaService.getQa(new Long(strToolContentID).longValue());
if (qaContent == null) {
QaMonitoringAction.logger.debug("using defaultContentIdStr: " + defaultContentIdStr);
- qaContent = qaService.loadQa(new Long(defaultContentIdStr).longValue());
+ qaContent = qaService.getQa(new Long(defaultContentIdStr).longValue());
}
@@ -3095,7 +3061,7 @@
/* start monitoring code */
GeneralMonitoringDTO qaGeneralMonitoringDTO = new GeneralMonitoringDTO();
- if (qaService.studentActivityOccurredGlobal(qaContent)) {
+ if (qaService.isStudentActivityOccurredGlobal(qaContent)) {
QaMonitoringAction.logger.debug("USER_EXCEPTION_NO_TOOL_SESSIONS is set to false");
qaGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(false).toString());
} else {
@@ -3196,12 +3162,12 @@
String defaultContentIdStr = request.getParameter(QaAppConstants.DEFAULT_CONTENT_ID_STR);
QaMonitoringAction.logger.debug("defaultContentIdStr: " + defaultContentIdStr);
- QaContent qaContent = qaService.loadQa(new Long(strToolContentID).longValue());
+ QaContent qaContent = qaService.getQa(new Long(strToolContentID).longValue());
if (qaContent == null) {
QaMonitoringAction.logger.debug("using defaultContentIdStr: " + defaultContentIdStr);
- qaContent = qaService.loadQa(new Long(defaultContentIdStr).longValue());
+ qaContent = qaService.getQa(new Long(defaultContentIdStr).longValue());
}
@@ -3243,7 +3209,7 @@
/* start monitoring code */
GeneralMonitoringDTO qaGeneralMonitoringDTO = new GeneralMonitoringDTO();
- if (qaService.studentActivityOccurredGlobal(qaContent)) {
+ if (qaService.isStudentActivityOccurredGlobal(qaContent)) {
QaMonitoringAction.logger.debug("USER_EXCEPTION_NO_TOOL_SESSIONS is set to false");
qaGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(false).toString());
} else {
@@ -3345,12 +3311,12 @@
String defaultContentIdStr = request.getParameter(QaAppConstants.DEFAULT_CONTENT_ID_STR);
QaMonitoringAction.logger.debug("defaultContentIdStr: " + defaultContentIdStr);
- QaContent qaContent = qaService.loadQa(new Long(strToolContentID).longValue());
+ QaContent qaContent = qaService.getQa(new Long(strToolContentID).longValue());
if (qaContent == null) {
QaMonitoringAction.logger.debug("using defaultContentIdStr: " + defaultContentIdStr);
- qaContent = qaService.loadQa(new Long(defaultContentIdStr).longValue());
+ qaContent = qaService.getQa(new Long(defaultContentIdStr).longValue());
}
@@ -3393,7 +3359,7 @@
/* start monitoring code */
GeneralMonitoringDTO qaGeneralMonitoringDTO = new GeneralMonitoringDTO();
- if (qaService.studentActivityOccurredGlobal(qaContent)) {
+ if (qaService.isStudentActivityOccurredGlobal(qaContent)) {
QaMonitoringAction.logger.debug("USER_EXCEPTION_NO_TOOL_SESSIONS is set to false");
qaGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(false).toString());
} else {
Fisheye: Tag 1.21.8.1 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringForm.java'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java,v
diff -u -r1.53.8.2 -r1.53.8.3
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java 2 Nov 2010 15:36:19 -0000 1.53.8.2
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java 16 Mar 2011 19:56:50 -0000 1.53.8.3
@@ -29,7 +29,6 @@
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-import java.util.TreeMap;
import java.util.SortedSet;
import java.util.TreeSet;
@@ -46,18 +45,19 @@
import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionMessages;
import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator;
-import org.lamsfoundation.lams.tool.qa.EditActivityDTO;
-import org.lamsfoundation.lams.tool.qa.GeneralLearnerFlowDTO;
-import org.lamsfoundation.lams.tool.qa.GeneralMonitoringDTO;
import org.lamsfoundation.lams.tool.qa.QaAppConstants;
-import org.lamsfoundation.lams.tool.qa.QaApplicationException;
import org.lamsfoundation.lams.tool.qa.QaCondition;
import org.lamsfoundation.lams.tool.qa.QaContent;
-import org.lamsfoundation.lams.tool.qa.QaQueContent;
-import org.lamsfoundation.lams.tool.qa.QaQuestionContentDTO;
-import org.lamsfoundation.lams.tool.qa.QaUtils;
+import org.lamsfoundation.lams.tool.qa.QaQuestion;
+import org.lamsfoundation.lams.tool.qa.dto.EditActivityDTO;
+import org.lamsfoundation.lams.tool.qa.dto.GeneralLearnerFlowDTO;
+import org.lamsfoundation.lams.tool.qa.dto.GeneralMonitoringDTO;
+import org.lamsfoundation.lams.tool.qa.dto.QaQuestionDTO;
import org.lamsfoundation.lams.tool.qa.service.IQaService;
import org.lamsfoundation.lams.tool.qa.service.QaServiceProxy;
+import org.lamsfoundation.lams.tool.qa.util.QaApplicationException;
+import org.lamsfoundation.lams.tool.qa.util.QaUtils;
+import org.lamsfoundation.lams.tool.qa.web.form.QaMonitoringForm;
import org.lamsfoundation.lams.util.WebUtil;
import org.lamsfoundation.lams.web.util.AttributeNames;
import org.lamsfoundation.lams.web.util.SessionMap;
@@ -129,11 +129,11 @@
String toolContentID = qaMonitoringForm.getToolContentID();
logger.debug("toolContentID: " + toolContentID);
- QaContent qaContent = qaService.loadQa(new Long(toolContentID).longValue());
+ QaContent qaContent = qaService.getQa(new Long(toolContentID).longValue());
logger.debug("existing qaContent:" + qaContent.getUid());
/*true means there is at least 1 response*/
- if (qaService.studentActivityOccurredGlobal(qaContent)) {
+ if (qaService.isStudentActivityOccurredGlobal(qaContent)) {
logger.debug("USER_EXCEPTION_NO_TOOL_SESSIONS is set to false");
generalMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(false).toString());
} else {
@@ -181,13 +181,13 @@
List listQuestionContentDTO = new LinkedList();
- Iterator queIterator = qaContent.getQaQueContents().iterator();
+ Iterator queIterator = qaContent.getQaQuestions().iterator();
while (queIterator.hasNext()) {
- QaQueContent qaQueContent = (QaQueContent) queIterator.next();
- if (qaQueContent != null) {
- QaQuestionContentDTO qaQuestionContentDTO = new QaQuestionContentDTO(qaQueContent);
- listQuestionContentDTO.add(qaQuestionContentDTO);
+ QaQuestion qaQuestion = (QaQuestion) queIterator.next();
+ if (qaQuestion != null) {
+ QaQuestionDTO qaQuestionDTO = new QaQuestionDTO(qaQuestion);
+ listQuestionContentDTO.add(qaQuestionDTO);
}
}
@@ -249,7 +249,7 @@
String toolContentID = qaMonitoringForm.getToolContentID();
logger.debug("toolContentID:" + toolContentID);
- QaContent qaContent = qaService.loadQa(new Long(toolContentID).longValue());
+ QaContent qaContent = qaService.getQa(new Long(toolContentID).longValue());
logger.debug("existing qaContent:" + qaContent.getUid());
if (qaContent == null) {
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerAction.java,v
diff -u -r1.4.8.1 -r1.4.8.2
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerAction.java 1 Nov 2010 10:34:10 -0000 1.4.8.1
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerAction.java 16 Mar 2011 19:56:50 -0000 1.4.8.2
@@ -38,9 +38,10 @@
import org.apache.struts.action.ActionMessages;
import org.lamsfoundation.lams.tool.qa.QaAppConstants;
import org.lamsfoundation.lams.tool.qa.QaContent;
-import org.lamsfoundation.lams.tool.qa.QaQueContent;
+import org.lamsfoundation.lams.tool.qa.QaQuestion;
import org.lamsfoundation.lams.tool.qa.service.IQaService;
import org.lamsfoundation.lams.tool.qa.service.QaServiceProxy;
+import org.lamsfoundation.lams.tool.qa.web.form.QaPedagogicalPlannerForm;
import org.lamsfoundation.lams.util.WebUtil;
import org.lamsfoundation.lams.web.action.LamsDispatchAction;
import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -61,7 +62,7 @@
HttpServletResponse response) {
QaPedagogicalPlannerForm plannerForm = (QaPedagogicalPlannerForm) form;
Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
- QaContent qaContent = getQaService().retrieveQa(toolContentID);
+ QaContent qaContent = getQaService().getQa(toolContentID);
String command = WebUtil.readStrParam(request, AttributeNames.PARAM_COMMAND, true);
if (command == null) {
plannerForm.fillForm(qaContent);
@@ -97,7 +98,7 @@
ActionMessages errors = plannerForm.validate();
if (errors.isEmpty()) {
- QaContent qaContent = getQaService().retrieveQa(plannerForm.getToolContentID());
+ QaContent qaContent = getQaService().getQa(plannerForm.getToolContentID());
int questionIndex = 0;
String question = null;
@@ -107,30 +108,29 @@
if (StringUtils.isEmpty(question)) {
plannerForm.removeQuestion(questionIndex);
} else {
- if (questionIndex < qaContent.getQaQueContents().size()) {
- QaQueContent qaQueContent = getQaService().getQuestionContentByDisplayOrder(
+ if (questionIndex < qaContent.getQaQuestions().size()) {
+ QaQuestion qaQuestion = getQaService().getQuestionByContentAndDisplayOrder(
(long) questionIndex + 1, qaContent.getUid());
- qaQueContent.setQuestion(question);
- getQaService().saveOrUpdateQaQueContent(qaQueContent);
+ qaQuestion.setQuestion(question);
+ getQaService().saveOrUpdateQaQueContent(qaQuestion);
} else {
- QaQueContent qaQueContent = new QaQueContent();
- qaQueContent.setDisplayOrder(questionIndex + 1);
- qaQueContent.setRequired(false);
- qaQueContent.setQaContent(qaContent);
- qaQueContent.setQaContentId(qaContent.getQaContentId());
- qaQueContent.setQuestion(question);
- getQaService().saveOrUpdateQaQueContent(qaQueContent);
+ QaQuestion qaQuestion = new QaQuestion();
+ qaQuestion.setDisplayOrder(questionIndex + 1);
+ qaQuestion.setRequired(false);
+ qaQuestion.setQaContent(qaContent);
+ qaQuestion.setQuestion(question);
+ getQaService().saveOrUpdateQaQueContent(qaQuestion);
}
questionIndex++;
}
} while (question != null);
- if (questionIndex < qaContent.getQaQueContents().size()) {
+ if (questionIndex < qaContent.getQaQuestions().size()) {
getQaService().removeQuestionsFromCache(qaContent);
- for (; questionIndex < qaContent.getQaQueContents().size(); questionIndex++) {
- QaQueContent qaQueContent = getQaService().getQuestionContentByDisplayOrder(
+ for (; questionIndex < qaContent.getQaQuestions().size(); questionIndex++) {
+ QaQuestion qaQuestion = getQaService().getQuestionByContentAndDisplayOrder(
(long) questionIndex + 1, qaContent.getUid());
- getQaService().removeQaQueContent(qaQueContent);
+ getQaService().removeQaQueContent(qaQuestion);
}
}
} else {
Fisheye: Tag 1.3.8.1 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerForm.java'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java,v
diff -u -r1.71.4.1.4.2 -r1.71.4.1.4.3
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java 24 Feb 2011 14:22:39 -0000 1.71.4.1.4.2
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java 16 Mar 2011 19:56:49 -0000 1.71.4.1.4.3
@@ -125,13 +125,10 @@
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-import java.util.Map;
import java.util.SortedSet;
-import java.util.TreeMap;
import java.util.TreeSet;
import javax.servlet.ServletException;
@@ -148,16 +145,16 @@
import org.apache.struts.action.ActionMessages;
import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator;
import org.lamsfoundation.lams.tool.qa.QaAppConstants;
-import org.lamsfoundation.lams.tool.qa.QaApplicationException;
-import org.lamsfoundation.lams.tool.qa.QaComparator;
import org.lamsfoundation.lams.tool.qa.QaCondition;
import org.lamsfoundation.lams.tool.qa.QaContent;
-import org.lamsfoundation.lams.tool.qa.QaGeneralAuthoringDTO;
-import org.lamsfoundation.lams.tool.qa.QaQueContent;
-import org.lamsfoundation.lams.tool.qa.QaQuestionContentDTO;
-import org.lamsfoundation.lams.tool.qa.QaUtils;
+import org.lamsfoundation.lams.tool.qa.QaQuestion;
+import org.lamsfoundation.lams.tool.qa.dto.QaGeneralAuthoringDTO;
+import org.lamsfoundation.lams.tool.qa.dto.QaQuestionDTO;
import org.lamsfoundation.lams.tool.qa.service.IQaService;
import org.lamsfoundation.lams.tool.qa.service.QaServiceProxy;
+import org.lamsfoundation.lams.tool.qa.util.QaApplicationException;
+import org.lamsfoundation.lams.tool.qa.util.QaUtils;
+import org.lamsfoundation.lams.tool.qa.web.form.QaAuthoringForm;
import org.lamsfoundation.lams.util.WebUtil;
import org.lamsfoundation.lams.web.util.AttributeNames;
import org.lamsfoundation.lams.web.util.SessionMap;
@@ -325,13 +322,13 @@
} else {
QaStarterAction.logger.debug("getting existing content");
/* it is possible that the content is in use by learners. */
- qaContent = qaService.loadQa(new Long(strToolContentID).longValue());
+ qaContent = qaService.getQa(new Long(strToolContentID).longValue());
- if (qaService.studentActivityOccurredGlobal(qaContent)) {
+ if (qaService.isStudentActivityOccurredGlobal(qaContent)) {
QaUtils.cleanUpSessionAbsolute(request);
+ //add error.content.inUse to ActionMessages.
persistError(request, "error.content.inUse");
- QaStarterAction.logger.debug("add error.content.inUse to ActionMessages.");
return mapping.findForward(QaAppConstants.ERROR_LIST);
}
qaContent = retrieveContent(request, mapping, qaAuthoringForm, new Long(
@@ -397,7 +394,7 @@
QaStarterAction.logger.debug("isDefaultContent: " + isDefaultContent);
QaStarterAction.logger.debug("getting content with id:" + toolContentID);
- QaContent qaContent = qaService.retrieveQa(toolContentID);
+ QaContent qaContent = qaService.getQa(toolContentID);
if (isDefaultContent && qaContent.getConditions().isEmpty()) {
qaContent.getConditions().add(qaService.createDefaultComplexCondition(qaContent));
}
@@ -438,24 +435,24 @@
sessionMap.put(QaAppConstants.ACTIVITY_TITLE_KEY, qaGeneralAuthoringDTO.getActivityTitle());
sessionMap.put(QaAppConstants.ACTIVITY_INSTRUCTIONS_KEY, qaGeneralAuthoringDTO.getActivityInstructions());
- List listQuestionContentDTO = new LinkedList();
+ List listQuestionContentDTO = new LinkedList();
/*
* get the existing question content
*/
boolean isFirst = false;
- Iterator queIterator = qaContent.getQaQueContents().iterator();
+ Iterator queIterator = qaContent.getQaQuestions().iterator();
while (queIterator.hasNext()) {
- QaQueContent qaQueContent = (QaQueContent) queIterator.next();
- if (qaQueContent != null) {
- QaQuestionContentDTO qaQuestionContentDTO = new QaQuestionContentDTO(qaQueContent);
- listQuestionContentDTO.add(qaQuestionContentDTO);
+ QaQuestion qaQuestion = (QaQuestion) queIterator.next();
+ if (qaQuestion != null) {
+ QaQuestionDTO qaQuestionDTO = new QaQuestionDTO(qaQuestion);
+ listQuestionContentDTO.add(qaQuestionDTO);
/**
* make the first entry the default(first) one for jsp
*/
if (isFirst) {
- qaGeneralAuthoringDTO.setDefaultQuestionContent(qaQueContent.getQuestion());
+ qaGeneralAuthoringDTO.setDefaultQuestionContent(qaQuestion.getQuestion());
isFirst = false;
}
}
@@ -469,8 +466,8 @@
SortedSet conditionSet = new TreeSet(new TextSearchConditionComparator());
for (QaCondition condition : qaContent.getConditions()) {
conditionSet.add(condition);
- for (QaQuestionContentDTO dto : listQuestionContentDTO) {
- for (QaQueContent question : condition.getQuestions()) {
+ for (QaQuestionDTO dto : listQuestionContentDTO) {
+ for (QaQuestion question : condition.getQuestions()) {
if (dto.getDisplayOrder().equals(String.valueOf(question.getDisplayOrder()))) {
condition.temporaryQuestionDTOSet.add(dto);
}
@@ -540,7 +537,7 @@
try {
QaStarterAction.logger.debug("retrieve uid of the content based on default content id determined above: "
+ defaultContentID);
- QaContent qaContent = qaService.loadQa(defaultContentID);
+ QaContent qaContent = qaService.getQa(defaultContentID);
if (qaContent == null) {
QaStarterAction.logger.debug("Exception occured: No default content");
persistError(request, "error.defaultContent.notSetup");
@@ -572,7 +569,7 @@
* db
*/
protected boolean existsContent(long toolContentID, IQaService qaService) {
- QaContent qaContent = qaService.loadQa(toolContentID);
+ QaContent qaContent = qaService.getQa(toolContentID);
if (qaContent == null) {
return false;
}
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaAdminForm.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaAuthoringForm.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaConditionForm.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaEmptyForm.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaLearningForm.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaMonitoringForm.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaPedagogicalPlannerForm.java'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/Attic/QaContent.hbm.xml,v
diff -u -r1.15 -r1.15.12.1
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml 31 Aug 2006 08:40:23 -0000 1.15
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml 16 Mar 2011 19:58:18 -0000 1.15.12.1
@@ -186,7 +186,7 @@
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaDataAccessTestCase.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/Attic/QaDataAccessTestCase.java,v
diff -u -r1.19.12.1 -r1.19.12.2
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaDataAccessTestCase.java 24 Feb 2011 14:22:42 -0000 1.19.12.1
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaDataAccessTestCase.java 16 Mar 2011 19:58:18 -0000 1.19.12.2
@@ -26,7 +26,7 @@
import org.lamsfoundation.lams.test.AbstractLamsTestCase;
import org.lamsfoundation.lams.tool.qa.dao.hibernate.QaContentDAO;
-import org.lamsfoundation.lams.tool.qa.dao.hibernate.QaQueContentDAO;
+import org.lamsfoundation.lams.tool.qa.dao.hibernate.QaQuestionDAO;
import org.lamsfoundation.lams.tool.qa.dao.hibernate.QaQueUsrDAO;
import org.lamsfoundation.lams.tool.qa.dao.hibernate.QaSessionDAO;
import org.lamsfoundation.lams.tool.qa.dao.hibernate.QaUsrRespDAO;
@@ -62,12 +62,12 @@
protected QaContentDAO qaContentDAO;
protected QaSessionDAO qaSessionDAO;
protected QaQueUsrDAO qaQueUsrDAO;
- protected QaQueContentDAO qaQueContentDAO;
+ protected QaQuestionDAO qaQuestionDAO;
protected QaUsrRespDAO qaUsrRespDAO;
protected QaSession qaSession;
- protected QaQueContent qaQueContent;
+ protected QaQuestion qaQuestion;
public QaDataAccessTestCase(String name)
@@ -81,7 +81,7 @@
qaContentDAO = (QaContentDAO) this.context.getBean("qaContentDAO");
qaSessionDAO = (QaSessionDAO) this.context.getBean("qaSessionDAO");
qaQueUsrDAO = (QaQueUsrDAO) this.context.getBean("qaQueUsrDAO");
- qaQueContentDAO = (QaQueContentDAO) this.context.getBean("qaQueContentDAO");
+ qaQuestionDAO = (QaQuestionDAO) this.context.getBean("qaQuestionDAO");
qaUsrRespDAO = (QaUsrRespDAO) this.context.getBean("qaUsrRespDAO");
}
@@ -104,26 +104,26 @@
/*
protected QaQueUsr getExistingUser(String username, String fullname)
{
- QaQueContent qaQueContent = qaQueContentDAO.getQaQueById(TEST_EXISTING_QUE_CONTENT_ID);
+ QaQuestion qaQuestion = qaQuestionDAO.getQaQueById(TEST_EXISTING_QUE_CONTENT_ID);
QaSession qaSession = qaSessionDAO.getQaSessionById(TEST_EXISTING_SESSION_ID);
QaQueUsr qaQueUsr= new QaQueUsr(new Long(TEST_NEW_USER_ID),
username,
fullname,
- qaQueContent,
+ qaQuestion,
qaSession,
new TreeSet());
qaQueUsrDAO.createUsr(qaQueUsr);
return qaQueUsr;
}
- protected QaUsrResp getNewResponse(String response, QaQueContent qaQueContent)
+ protected QaUsrResp getNewResponse(String response, QaQuestion qaQuestion)
{
QaUsrResp qaUsrResp= new QaUsrResp(response, false,
new Date(System.currentTimeMillis()),
"",
- qaQueContent,
+ qaQuestion,
getExistingUser("randomstriker","Michael Random"));
qaUsrRespDAO.createUserResponse(qaUsrResp);
return qaUsrResp;
@@ -146,18 +146,14 @@
qa.setOnlineInstructions("");
qa.setOfflineInstructions("");
qa.setReportTitle("");
- qa.setQaQueContents(new TreeSet());
+ qa.setQaQuestions(new TreeSet());
qa.setQaSessions(new TreeSet());
//create new qa que content
- QaQueContent qaQueContent = new QaQueContent("What planet are you from",
- 4,
- qa,
- new TreeSet(),
- new TreeSet());
+ QaQuestion qaQuestion = new QaQuestion("What planet are you from", 4, "", false, qa, new TreeSet());
+
+ qa.getQaQuestions().add(qaQuestion);
- qa.getQaQueContents().add(qaQueContent);
-
//create the new content
qaContentDAO.createQa(qa);
}
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/Attic/QaQueContent.hbm.xml,v
diff -u -r1.14 -r1.14.12.1
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml 20 Sep 2006 21:28:58 -0000 1.14
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml 16 Mar 2011 19:58:18 -0000 1.14.12.1
@@ -5,7 +5,7 @@
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/Attic/QaUsrResp.hbm.xml,v
diff -u -r1.13 -r1.13.12.1
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml 20 Sep 2006 21:28:58 -0000 1.13
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml 16 Mar 2011 19:58:18 -0000 1.13.12.1
@@ -80,7 +80,7 @@