Fisheye: Tag c87bb47eb670934f10192c08922f83367bc36230 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/qb/QbOption.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag c87bb47eb670934f10192c08922f83367bc36230 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/qb/QbQuestion.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag c87bb47eb670934f10192c08922f83367bc36230 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/qb/QbToolQuestion.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/src/java/org/lamsfoundation/lams/qb/model/QbOption.java =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/qb/model/QbOption.java (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/qb/model/QbOption.java (revision c87bb47eb670934f10192c08922f83367bc36230) @@ -0,0 +1,110 @@ +package org.lamsfoundation.lams.qb.model; + +import java.io.Serializable; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; + +import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; + +/** + * One of possible answers for a question in Question Bank. + * + * @author Marcin Cieslak + */ +@Entity +@Table(name = "lams_qb_option") +public class QbOption implements Serializable, Cloneable, Comparable { + private static final long serialVersionUID = -2354311780882736829L; + + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) + Long uid; + + @Column + private String name; + + @Column + private boolean correct = false; + + @Column(name = "display_order") + private int displayOrder = 1; + + @ManyToOne(optional = false) + @JoinColumn(name = "qb_question_uid") + private QbQuestion qbQuestion; + + @Override + public QbOption clone() { + QbOption clone = null; + try { + clone = (QbOption) super.clone(); + clone.qbQuestion = null; + } catch (CloneNotSupportedException e) { + // it should never happen + e.printStackTrace(); + } + return clone; + } + + @Override + public boolean equals(Object o) { + QbOption other = (QbOption) o; + return new EqualsBuilder().append(this.name, other.name).append(this.correct, other.correct) + .append(this.displayOrder, other.displayOrder).isEquals(); + } + + @Override + public int hashCode() { + return new HashCodeBuilder().append(this.name).append(this.correct).toHashCode(); + } + + @Override + public int compareTo(QbOption o) { + return Integer.compare(this.displayOrder, o.displayOrder); + } + + public Long getUid() { + return uid; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public boolean isCorrect() { + return correct; + } + + public void setCorrect(boolean correct) { + this.correct = correct; + } + + public int getDisplayOrder() { + return displayOrder; + } + + public void setDisplayOrder(int displayOrder) { + this.displayOrder = displayOrder; + } + + public QbQuestion getQbQuestion() { + return qbQuestion; + } + + public void setQbQuestion(QbQuestion question) { + this.qbQuestion = question; + } +} \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java (revision c87bb47eb670934f10192c08922f83367bc36230) @@ -0,0 +1,187 @@ +package org.lamsfoundation.lams.qb.model; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.OneToMany; +import javax.persistence.Table; + +import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; + +/** + * A question in Question Bank. + * + * @author Marcin Cieslak + */ +@Entity +@Table(name = "lams_qb_question") +public class QbQuestion implements Serializable, Cloneable { + private static final long serialVersionUID = -6287273838239262151L; + + // questions can be of different type + // not all tools can produce/consume all question types + public static final int TYPE_MULTIPLE_CHOICE_SINGLE_ANSWER = 1; + + // primary key + // another candidate is questionId + version, but single uid can fe searched faster + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long uid; + + // is the question searchable in Question Bank + // or rathe it is a tool's private data + @Column + private Boolean local = true; + + // one of question types + @Column + private Integer type; + + // "tracking ID" for a question + // multiple versions can share the same question ID so their stats are aggregated + @Column(name = "question_id") + private Integer questionId; + + // the same question can have multiple versions + @Column + private Integer version = 1; + + // text of the question + @Column + private String name; + + @Column + private Integer mark; + + @Column + private String feedback; + + @OneToMany(mappedBy = "qbQuestion", fetch = FetchType.EAGER, cascade = CascadeType.ALL, orphanRemoval = true) + private List qbOptions = new ArrayList<>(); + + // compares if current question data and the other one (probably modified with new data) are the same + // it detects if question is the same or should another question/version be created + public boolean isModified(QbQuestion modifiedQuestion) { + return !equals(modifiedQuestion); + } + + // checks if important parts of another question are the same as current question's + @Override + public boolean equals(Object o) { + QbQuestion other = (QbQuestion) o; + // options are also checked if they are equal + return new EqualsBuilder().append(name, other.name).append(feedback, other.feedback).append(mark, other.mark) + .append(qbOptions.toArray(), other.getQbOptions().toArray()).isEquals(); + } + + @Override + public int hashCode() { + return new HashCodeBuilder().append(name).append(feedback).append(mark).toHashCode(); + } + + @Override + public QbQuestion clone() { + QbQuestion clone = null; + try { + clone = (QbQuestion) super.clone(); + } catch (CloneNotSupportedException e) { + // it should never happen + e.printStackTrace(); + } + // make a deep copy of options + List optionsClone = new ArrayList<>(qbOptions.size()); + clone.setQbOptions(optionsClone); + for (QbOption option : qbOptions) { + QbOption optionClone = option.clone(); + optionClone.setQbQuestion(clone); + optionsClone.add(optionClone); + } + return clone; + } + + public void clearID() { + this.uid = null; + for (QbOption option : qbOptions) { + option.uid = null; + } + } + + public Long getUid() { + return uid; + } + + public Boolean getLocal() { + return local; + } + + public void setLocal(Boolean local) { + this.local = local; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public Integer getQuestionId() { + return questionId; + } + + public void setQuestionId(Integer questionId) { + this.questionId = questionId; + } + + public Integer getVersion() { + return version; + } + + public void setVersion(Integer version) { + this.version = version; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = StringUtils.isBlank(name) ? null : name.trim(); + } + + public Integer getMark() { + return mark; + } + + public void setMark(Integer mark) { + this.mark = mark; + } + + public String getFeedback() { + return feedback; + } + + public void setFeedback(String feedback) { + this.feedback = StringUtils.isBlank(feedback) ? null : feedback.trim(); + } + + public List getQbOptions() { + return qbOptions; + } + + public void setQbOptions(List options) { + this.qbOptions = options; + } +} \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/qb/model/QbToolQuestion.java =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/qb/model/QbToolQuestion.java (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/qb/model/QbToolQuestion.java (revision c87bb47eb670934f10192c08922f83367bc36230) @@ -0,0 +1,50 @@ +package org.lamsfoundation.lams.qb.model; + +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; + +/** + * + * Serves as a super class for all tools' questions. + * Storing references to QB questions in a single table allows easy tracking of a question's usage thorough LAMS. + * + * @author Marcin Cieslak + */ +@Entity +@Table(name = "lams_qb_tool_question") +@Inheritance(strategy = InheritanceType.JOINED) +public abstract class QbToolQuestion { + @Id + @Column(name = "tool_question_uid") + @GeneratedValue(strategy = GenerationType.IDENTITY) + protected Long uid; + + // part of question's data is stored in Question Bank's DB tables + // getters and setters of this data (question, mark, feedback) are mapped to QbQuestion + @ManyToOne(optional = false, fetch = FetchType.EAGER, cascade = { CascadeType.DETACH, CascadeType.MERGE, + CascadeType.PERSIST, CascadeType.REFRESH }) + @JoinColumn(name = "qb_question_uid") + protected QbQuestion qbQuestion; + + public Long getUid() { + return this.uid; + } + + public QbQuestion getQbQuestion() { + return qbQuestion; + } + + public void setQbQuestion(QbQuestion qbQuestion) { + this.qbQuestion = qbQuestion; + } +} Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcOptionsContentDAO.java =================================================================== diff -u -r650202864c49257c570cd5c4d496ca3789db7846 -rc87bb47eb670934f10192c08922f83367bc36230 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcOptionsContentDAO.java (.../IMcOptionsContentDAO.java) (revision 650202864c49257c570cd5c4d496ca3789db7846) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcOptionsContentDAO.java (.../IMcOptionsContentDAO.java) (revision c87bb47eb670934f10192c08922f83367bc36230) @@ -25,7 +25,7 @@ import java.util.List; import org.lamsfoundation.lams.dao.IBaseDAO; -import org.lamsfoundation.lams.qb.QbOption; +import org.lamsfoundation.lams.qb.model.QbOption; import org.lamsfoundation.lams.tool.mc.dto.McOptionDTO; /** Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java =================================================================== diff -u -r650202864c49257c570cd5c4d496ca3789db7846 -rc87bb47eb670934f10192c08922f83367bc36230 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java (.../McOptionsContentDAO.java) (revision 650202864c49257c570cd5c4d496ca3789db7846) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java (.../McOptionsContentDAO.java) (revision c87bb47eb670934f10192c08922f83367bc36230) @@ -26,7 +26,7 @@ import java.util.List; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; -import org.lamsfoundation.lams.qb.QbOption; +import org.lamsfoundation.lams.qb.model.QbOption; import org.lamsfoundation.lams.tool.mc.dao.IMcOptionsContentDAO; import org.lamsfoundation.lams.tool.mc.dto.McOptionDTO; import org.lamsfoundation.lams.tool.mc.model.McOptsContent; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/AnswerDTO.java =================================================================== diff -u -r650202864c49257c570cd5c4d496ca3789db7846 -rc87bb47eb670934f10192c08922f83367bc36230 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/AnswerDTO.java (.../AnswerDTO.java) (revision 650202864c49257c570cd5c4d496ca3789db7846) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/AnswerDTO.java (.../AnswerDTO.java) (revision c87bb47eb670934f10192c08922f83367bc36230) @@ -25,7 +25,7 @@ import java.util.List; import org.apache.commons.lang.builder.ToStringBuilder; -import org.lamsfoundation.lams.qb.QbOption; +import org.lamsfoundation.lams.qb.model.QbOption; import org.lamsfoundation.lams.tool.mc.model.McOptsContent; /** Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McOptionDTO.java =================================================================== diff -u -r650202864c49257c570cd5c4d496ca3789db7846 -rc87bb47eb670934f10192c08922f83367bc36230 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McOptionDTO.java (.../McOptionDTO.java) (revision 650202864c49257c570cd5c4d496ca3789db7846) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McOptionDTO.java (.../McOptionDTO.java) (revision c87bb47eb670934f10192c08922f83367bc36230) @@ -22,7 +22,7 @@ package org.lamsfoundation.lams.tool.mc.dto; -import org.lamsfoundation.lams.qb.QbOption; +import org.lamsfoundation.lams.qb.model.QbOption; /** * DTO that holds candiate answers data for summary page Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McOptsContent.java =================================================================== diff -u -r650202864c49257c570cd5c4d496ca3789db7846 -rc87bb47eb670934f10192c08922f83367bc36230 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McOptsContent.java (.../McOptsContent.java) (revision 650202864c49257c570cd5c4d496ca3789db7846) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McOptsContent.java (.../McOptsContent.java) (revision c87bb47eb670934f10192c08922f83367bc36230) @@ -22,7 +22,7 @@ package org.lamsfoundation.lams.tool.mc.model; -import org.lamsfoundation.lams.qb.QbOption; +import org.lamsfoundation.lams.qb.model.QbOption; /** * Acts as a DTO which envelops QbOption and adds extra, transient fields. Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McQueContent.java =================================================================== diff -u -r650202864c49257c570cd5c4d496ca3789db7846 -rc87bb47eb670934f10192c08922f83367bc36230 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McQueContent.java (.../McQueContent.java) (revision 650202864c49257c570cd5c4d496ca3789db7846) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McQueContent.java (.../McQueContent.java) (revision c87bb47eb670934f10192c08922f83367bc36230) @@ -34,9 +34,9 @@ import javax.persistence.Transient; import org.apache.commons.lang.builder.ToStringBuilder; -import org.lamsfoundation.lams.qb.QbOption; -import org.lamsfoundation.lams.qb.QbQuestion; -import org.lamsfoundation.lams.qb.QbToolQuestion; +import org.lamsfoundation.lams.qb.model.QbOption; +import org.lamsfoundation.lams.qb.model.QbQuestion; +import org.lamsfoundation.lams.qb.model.QbToolQuestion; /** *

Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java =================================================================== diff -u -r650202864c49257c570cd5c4d496ca3789db7846 -rc87bb47eb670934f10192c08922f83367bc36230 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java (.../McUsrAttempt.java) (revision 650202864c49257c570cd5c4d496ca3789db7846) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java (.../McUsrAttempt.java) (revision c87bb47eb670934f10192c08922f83367bc36230) @@ -37,7 +37,7 @@ import javax.persistence.Transient; import org.apache.commons.lang.builder.ToStringBuilder; -import org.lamsfoundation.lams.qb.QbOption; +import org.lamsfoundation.lams.qb.model.QbOption; /** *

Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java =================================================================== diff -u -r650202864c49257c570cd5c4d496ca3789db7846 -rc87bb47eb670934f10192c08922f83367bc36230 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java (.../IMcService.java) (revision 650202864c49257c570cd5c4d496ca3789db7846) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java (.../IMcService.java) (revision c87bb47eb670934f10192c08922f83367bc36230) @@ -27,7 +27,7 @@ import java.util.Set; import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.qb.QbOption; +import org.lamsfoundation.lams.qb.model.QbOption; import org.lamsfoundation.lams.tool.Tool; import org.lamsfoundation.lams.tool.ToolSessionExportOutputData; import org.lamsfoundation.lams.tool.exception.DataMissingException; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/MCOutputFactory.java =================================================================== diff -u -r650202864c49257c570cd5c4d496ca3789db7846 -rc87bb47eb670934f10192c08922f83367bc36230 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/MCOutputFactory.java (.../MCOutputFactory.java) (revision 650202864c49257c570cd5c4d496ca3789db7846) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/MCOutputFactory.java (.../MCOutputFactory.java) (revision c87bb47eb670934f10192c08922f83367bc36230) @@ -28,7 +28,7 @@ import java.util.SortedMap; import java.util.TreeMap; -import org.lamsfoundation.lams.qb.QbOption; +import org.lamsfoundation.lams.qb.model.QbOption; import org.lamsfoundation.lams.tool.OutputFactory; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolOutputDefinition; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java =================================================================== diff -u -r650202864c49257c570cd5c4d496ca3789db7846 -rc87bb47eb670934f10192c08922f83367bc36230 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java (.../McService.java) (revision 650202864c49257c570cd5c4d496ca3789db7846) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java (.../McService.java) (revision c87bb47eb670934f10192c08922f83367bc36230) @@ -60,8 +60,8 @@ import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; -import org.lamsfoundation.lams.qb.QbOption; -import org.lamsfoundation.lams.qb.QbQuestion; +import org.lamsfoundation.lams.qb.model.QbOption; +import org.lamsfoundation.lams.qb.model.QbQuestion; import org.lamsfoundation.lams.rest.RestTags; import org.lamsfoundation.lams.rest.ToolRestManager; import org.lamsfoundation.lams.tool.Tool; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java =================================================================== diff -u -r650202864c49257c570cd5c4d496ca3789db7846 -rc87bb47eb670934f10192c08922f83367bc36230 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java (.../AuthoringUtil.java) (revision 650202864c49257c570cd5c4d496ca3789db7846) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java (.../AuthoringUtil.java) (revision c87bb47eb670934f10192c08922f83367bc36230) @@ -32,7 +32,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.qb.QbOption; +import org.lamsfoundation.lams.qb.model.QbOption; import org.lamsfoundation.lams.tool.mc.McAppConstants; import org.lamsfoundation.lams.tool.mc.dto.McOptionDTO; import org.lamsfoundation.lams.tool.mc.dto.McQuestionDTO; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java =================================================================== diff -u -r650202864c49257c570cd5c4d496ca3789db7846 -rc87bb47eb670934f10192c08922f83367bc36230 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java (.../McLearningController.java) (revision 650202864c49257c570cd5c4d496ca3789db7846) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java (.../McLearningController.java) (revision c87bb47eb670934f10192c08922f83367bc36230) @@ -40,7 +40,7 @@ import org.apache.log4j.Logger; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; -import org.lamsfoundation.lams.qb.QbOption; +import org.lamsfoundation.lams.qb.model.QbOption; import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.tool.exception.DataMissingException; import org.lamsfoundation.lams.tool.exception.ToolException; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McPedagogicalPlannerController.java =================================================================== diff -u -r650202864c49257c570cd5c4d496ca3789db7846 -rc87bb47eb670934f10192c08922f83367bc36230 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McPedagogicalPlannerController.java (.../McPedagogicalPlannerController.java) (revision 650202864c49257c570cd5c4d496ca3789db7846) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McPedagogicalPlannerController.java (.../McPedagogicalPlannerController.java) (revision c87bb47eb670934f10192c08922f83367bc36230) @@ -33,8 +33,8 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; -import org.lamsfoundation.lams.qb.QbOption; -import org.lamsfoundation.lams.qb.QbQuestion; +import org.lamsfoundation.lams.qb.model.QbOption; +import org.lamsfoundation.lams.qb.model.QbQuestion; import org.lamsfoundation.lams.tool.mc.McAppConstants; import org.lamsfoundation.lams.tool.mc.dto.McOptionDTO; import org.lamsfoundation.lams.tool.mc.model.McContent; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/TblMonitoringController.java =================================================================== diff -u -r650202864c49257c570cd5c4d496ca3789db7846 -rc87bb47eb670934f10192c08922f83367bc36230 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/TblMonitoringController.java (.../TblMonitoringController.java) (revision 650202864c49257c570cd5c4d496ca3789db7846) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/TblMonitoringController.java (.../TblMonitoringController.java) (revision c87bb47eb670934f10192c08922f83367bc36230) @@ -7,7 +7,7 @@ import javax.servlet.http.HttpServletRequest; -import org.lamsfoundation.lams.qb.QbOption; +import org.lamsfoundation.lams.qb.model.QbOption; import org.lamsfoundation.lams.tool.mc.dto.McOptionDTO; import org.lamsfoundation.lams.tool.mc.dto.McQuestionDTO; import org.lamsfoundation.lams.tool.mc.model.McContent;