Index: lams_tool_lamc/conf/hibernate/mappings/McContent.hbm.xml
===================================================================
diff -u
--- lams_tool_lamc/conf/hibernate/mappings/McContent.hbm.xml (revision 0)
+++ lams_tool_lamc/conf/hibernate/mappings/McContent.hbm.xml (revision 48c973dcec3754f35dce1f2468a5739067b47179)
@@ -0,0 +1,233 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_lamc/conf/hibernate/mappings/McOptionsContent.hbm.xml
===================================================================
diff -u
--- lams_tool_lamc/conf/hibernate/mappings/McOptionsContent.hbm.xml (revision 0)
+++ lams_tool_lamc/conf/hibernate/mappings/McOptionsContent.hbm.xml (revision 48c973dcec3754f35dce1f2468a5739067b47179)
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+ @hibernate.class
+ table="tl_lamc11_options_content"
+
+
+
+
+ @hibernate.id
+ generator-class="assigned"
+ type="java.lang.Long"
+ column="uid"
+
+
+
+
+
+
+
+
+ @hibernate.property
+ column="qa_que_option_id"
+ length="20"
+ not-null="true"
+
+
+
+
+ @hibernate.property
+ column="correct_option"
+ length="1"
+ not-null="true"
+
+
+
+
+ @hibernate.property
+ column="qa_que_option_text"
+ length="250"
+
+
+
+
+
+
+
+
+ @hibernate.many-to-one
+ not-null="true"
+ @hibernate.column name="qa_que_content_id"
+
+
+
+
+
+
+ @hibernate.set
+ lazy="true"
+ inverse="true"
+ cascade="none"
+
+ @hibernate.collection-key
+ column="qa_que_option_id"
+
+ @hibernate.collection-one-to-many
+ class="org.lamsfoundation.lams.tool.mc.TlLamc11UsrAttempt"
+
+
+
+
+
+
+
+
+
Index: lams_tool_lamc/conf/hibernate/mappings/McQueContent.hbm.xml
===================================================================
diff -u
--- lams_tool_lamc/conf/hibernate/mappings/McQueContent.hbm.xml (revision 0)
+++ lams_tool_lamc/conf/hibernate/mappings/McQueContent.hbm.xml (revision 48c973dcec3754f35dce1f2468a5739067b47179)
@@ -0,0 +1,109 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_lamc/conf/hibernate/mappings/McQueUsr.hbm.xml
===================================================================
diff -u
--- lams_tool_lamc/conf/hibernate/mappings/McQueUsr.hbm.xml (revision 0)
+++ lams_tool_lamc/conf/hibernate/mappings/McQueUsr.hbm.xml (revision 48c973dcec3754f35dce1f2468a5739067b47179)
@@ -0,0 +1,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_lamc/conf/hibernate/mappings/McSession.hbm.xml
===================================================================
diff -u
--- lams_tool_lamc/conf/hibernate/mappings/McSession.hbm.xml (revision 0)
+++ lams_tool_lamc/conf/hibernate/mappings/McSession.hbm.xml (revision 48c973dcec3754f35dce1f2468a5739067b47179)
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_lamc/conf/hibernate/mappings/McUsrAttempt.hbm.xml
===================================================================
diff -u
--- lams_tool_lamc/conf/hibernate/mappings/McUsrAttempt.hbm.xml (revision 0)
+++ lams_tool_lamc/conf/hibernate/mappings/McUsrAttempt.hbm.xml (revision 48c973dcec3754f35dce1f2468a5739067b47179)
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
+ @hibernate.class
+ table="tl_lamc11_usr_attempt"
+
+
+
+
+ @hibernate.id
+ generator-class="assigned"
+ type="java.lang.Long"
+ column="uid"
+
+
+
+
+
+
+
+
+ @hibernate.property
+ column="attempt_id"
+ length="20"
+ not-null="true"
+
+
+
+
+ @hibernate.property
+ column="attempt_time"
+ length="19"
+
+
+
+
+ @hibernate.property
+ column="time_zone"
+ length="255"
+
+
+
+
+
+
+
+
+ @hibernate.many-to-one
+ not-null="true"
+ @hibernate.column name="qa_que_content_id"
+
+
+
+
+
+
+ @hibernate.many-to-one
+ not-null="true"
+ @hibernate.column name="que_usr_id"
+
+
+
+
+
+
+ @hibernate.many-to-one
+ not-null="true"
+ @hibernate.column name="qa_que_option_id"
+
+
+
+
+
+
Fisheye: Tag 48c973dcec3754f35dce1f2468a5739067b47179 refers to a dead (removed) revision in file `lams_tool_lamc/conf/hibernate/mappings/QaContent.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 48c973dcec3754f35dce1f2468a5739067b47179 refers to a dead (removed) revision in file `lams_tool_lamc/conf/hibernate/mappings/QaQueContent.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 48c973dcec3754f35dce1f2468a5739067b47179 refers to a dead (removed) revision in file `lams_tool_lamc/conf/hibernate/mappings/QaQueUsr.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 48c973dcec3754f35dce1f2468a5739067b47179 refers to a dead (removed) revision in file `lams_tool_lamc/conf/hibernate/mappings/QaSession.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 48c973dcec3754f35dce1f2468a5739067b47179 refers to a dead (removed) revision in file `lams_tool_lamc/conf/hibernate/mappings/QaUploadedFile.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 48c973dcec3754f35dce1f2468a5739067b47179 refers to a dead (removed) revision in file `lams_tool_lamc/conf/hibernate/mappings/QaUsrResp.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml
===================================================================
diff -u -r19d6ab09baf339ddaf00248008f994d2a38f1079 -r48c973dcec3754f35dce1f2468a5739067b47179
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml (.../McContent.hbm.xml) (revision 19d6ab09baf339ddaf00248008f994d2a38f1079)
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml (.../McContent.hbm.xml) (revision 48c973dcec3754f35dce1f2468a5739067b47179)
@@ -2,7 +2,7 @@
-
+
-
-
+
+
+
+
+
+
+
+
+
+
-
+
+
-
-
-
-
+
+
+
-
+
-
-
-
-
-
-
+
+
+
+
+
-
+
+
+
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml
===================================================================
diff -u -r19d6ab09baf339ddaf00248008f994d2a38f1079 -r48c973dcec3754f35dce1f2468a5739067b47179
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml (.../McQueContent.hbm.xml) (revision 19d6ab09baf339ddaf00248008f994d2a38f1079)
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml (.../McQueContent.hbm.xml) (revision 48c973dcec3754f35dce1f2468a5739067b47179)
@@ -12,111 +12,73 @@
-->
-
- @hibernate.class
- table="tl_lamc11_que_content"
-
-
-
- @hibernate.id
- generator-class="assigned"
- type="java.lang.Long"
- column="uid"
-
-
-
-
+
-
- @hibernate.property
- column="qa_que_content_id"
- length="20"
- not-null="true"
-
+
-
- @hibernate.property
- column="question"
- length="255"
-
+
-
- @hibernate.property
- column="display_order"
- length="5"
-
-
+
-
- @hibernate.many-to-one
- not-null="true"
- @hibernate.column name="qa_content_id"
-
-
+
-
+
+
+
+
+
Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml
===================================================================
diff -u -r19d6ab09baf339ddaf00248008f994d2a38f1079 -r48c973dcec3754f35dce1f2468a5739067b47179
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml (.../McSession.hbm.xml) (revision 19d6ab09baf339ddaf00248008f994d2a38f1079)
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml (.../McSession.hbm.xml) (revision 48c973dcec3754f35dce1f2468a5739067b47179)
@@ -68,7 +68,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Fisheye: Tag 48c973dcec3754f35dce1f2468a5739067b47179 refers to a dead (removed) revision in file `lams_tool_lamc/conf/middlegen/lams_tool_qa-prefs.properties'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_lamc/conf/war/META-INF/MANIFEST.MF
===================================================================
diff -u -r653f0f0eff40af5e6891c22ef2b8efe9bf2f75af -r48c973dcec3754f35dce1f2468a5739067b47179
--- lams_tool_lamc/conf/war/META-INF/MANIFEST.MF (.../MANIFEST.MF) (revision 653f0f0eff40af5e6891c22ef2b8efe9bf2f75af)
+++ lams_tool_lamc/conf/war/META-INF/MANIFEST.MF (.../MANIFEST.MF) (revision 48c973dcec3754f35dce1f2468a5739067b47179)
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Ant-Version: Apache Ant 1.5.3
Created-By: 1.4.2_08-b03 (Sun Microsystems Inc.)
-Class-Path: ./lams.jar ./lams-tool-laqa11.jar ./lams-contentrepository.jar ./lams-learning.jar
+Class-Path: ./lams.jar ./lams-tool-lamc11.jar ./lams-contentrepository.jar ./lams-learning.jar
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml
===================================================================
diff -u
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml (revision 0)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml (revision 48c973dcec3754f35dce1f2468a5739067b47179)
@@ -0,0 +1,233 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.java
===================================================================
diff -u -r19d6ab09baf339ddaf00248008f994d2a38f1079 -r48c973dcec3754f35dce1f2468a5739067b47179
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.java (.../McContent.java) (revision 19d6ab09baf339ddaf00248008f994d2a38f1079)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.java (.../McContent.java) (revision 48c973dcec3754f35dce1f2468a5739067b47179)
@@ -3,6 +3,7 @@
import java.io.Serializable;
import java.util.Date;
import java.util.Set;
+import java.util.SortedSet;
import org.apache.commons.lang.builder.ToStringBuilder;
@@ -22,6 +23,12 @@
private String instructions;
/** nullable persistent field */
+ private boolean defineLater;
+
+ /** nullable persistent field */
+ private boolean runOffline;
+
+ /** nullable persistent field */
private String creationDate;
/** nullable persistent field */
@@ -34,24 +41,21 @@
private boolean usernameVisible;
/** nullable persistent field */
- private long createdBy;
+ private String reportTitle;
/** nullable persistent field */
private String monitoringReportTitle;
/** nullable persistent field */
- private String reportTitle;
+ private long createdBy;
/** nullable persistent field */
- private boolean runOffline;
+ private boolean synchInMonitor;
/** nullable persistent field */
- private boolean defineLater;
+ private boolean contentLocked;
/** nullable persistent field */
- private boolean synchInMonitor;
-
- /** nullable persistent field */
private String offlineInstructions;
/** nullable persistent field */
@@ -60,59 +64,44 @@
/** nullable persistent field */
private String endLearningMessage;
- /** nullable persistent field */
- private boolean contentInUse;
+ /** persistent field */
+ private SortedSet mcQueContents;
- /** nullable persistent field */
- private Integer passMark;
-
- /** nullable persistent field */
- private boolean showFeedback;
-
- /** nullable persistent field */
- private boolean showTopUsers;
-
/** persistent field */
private Set mcSessions;
- /** persistent field */
- private Set mcQueContents;
-
/** full constructor */
- public McContent(Long mcContentId, String title, String instructions, String creationDate, Date updateDate, boolean questionsSequenced, boolean usernameVisible, long createdBy, String monitoringReportTitle, String reportTitle, boolean runOffline, boolean defineLater, boolean synchInMonitor, String offlineInstructions, String onlineInstructions, String endLearningMessage, boolean contentInUse, Integer passMark, boolean showFeedback, boolean showTopUsers, Set mcSessions, Set mcQueContents) {
+ public McContent(Long mcContentId, String title, String instructions, boolean defineLater, boolean runOffline, String creationDate, Date updateDate, boolean questionsSequenced, boolean usernameVisible, String reportTitle, String monitoringReportTitle, long createdBy, boolean synchInMonitor, boolean contentLocked, String offlineInstructions, String onlineInstructions, String endLearningMessage, SortedSet mcQueContents, Set mcSessions) {
this.mcContentId = mcContentId;
this.title = title;
this.instructions = instructions;
+ this.defineLater = defineLater;
+ this.runOffline = runOffline;
this.creationDate = creationDate;
this.updateDate = updateDate;
this.questionsSequenced = questionsSequenced;
this.usernameVisible = usernameVisible;
- this.createdBy = createdBy;
- this.monitoringReportTitle = monitoringReportTitle;
this.reportTitle = reportTitle;
- this.runOffline = runOffline;
- this.defineLater = defineLater;
+ this.monitoringReportTitle = monitoringReportTitle;
+ this.createdBy = createdBy;
this.synchInMonitor = synchInMonitor;
+ this.contentLocked = contentLocked;
this.offlineInstructions = offlineInstructions;
this.onlineInstructions = onlineInstructions;
this.endLearningMessage = endLearningMessage;
- this.contentInUse = contentInUse;
- this.passMark = passMark;
- this.showFeedback = showFeedback;
- this.showTopUsers = showTopUsers;
- this.mcSessions = mcSessions;
this.mcQueContents = mcQueContents;
+ this.mcSessions = mcSessions;
}
/** default constructor */
public McContent() {
}
/** minimal constructor */
- public McContent(Long mcContentId, Set mcSessions, Set mcQueContents) {
+ public McContent(Long mcContentId, SortedSet mcQueContents, Set mcSessions) {
this.mcContentId = mcContentId;
- this.mcSessions = mcSessions;
this.mcQueContents = mcQueContents;
+ this.mcSessions = mcSessions;
}
public Long getUid() {
@@ -147,6 +136,22 @@
this.instructions = instructions;
}
+ public boolean isDefineLater() {
+ return this.defineLater;
+ }
+
+ public void setDefineLater(boolean defineLater) {
+ this.defineLater = defineLater;
+ }
+
+ public boolean isRunOffline() {
+ return this.runOffline;
+ }
+
+ public void setRunOffline(boolean runOffline) {
+ this.runOffline = runOffline;
+ }
+
public String getCreationDate() {
return this.creationDate;
}
@@ -179,12 +184,12 @@
this.usernameVisible = usernameVisible;
}
- public long getCreatedBy() {
- return this.createdBy;
+ public String getReportTitle() {
+ return this.reportTitle;
}
- public void setCreatedBy(long createdBy) {
- this.createdBy = createdBy;
+ public void setReportTitle(String reportTitle) {
+ this.reportTitle = reportTitle;
}
public String getMonitoringReportTitle() {
@@ -195,30 +200,14 @@
this.monitoringReportTitle = monitoringReportTitle;
}
- public String getReportTitle() {
- return this.reportTitle;
+ public long getCreatedBy() {
+ return this.createdBy;
}
- public void setReportTitle(String reportTitle) {
- this.reportTitle = reportTitle;
+ public void setCreatedBy(long createdBy) {
+ this.createdBy = createdBy;
}
- public boolean isRunOffline() {
- return this.runOffline;
- }
-
- public void setRunOffline(boolean runOffline) {
- this.runOffline = runOffline;
- }
-
- public boolean isDefineLater() {
- return this.defineLater;
- }
-
- public void setDefineLater(boolean defineLater) {
- this.defineLater = defineLater;
- }
-
public boolean isSynchInMonitor() {
return this.synchInMonitor;
}
@@ -227,6 +216,14 @@
this.synchInMonitor = synchInMonitor;
}
+ public boolean isContentLocked() {
+ return this.contentLocked;
+ }
+
+ public void setContentLocked(boolean contentLocked) {
+ this.contentLocked = contentLocked;
+ }
+
public String getOfflineInstructions() {
return this.offlineInstructions;
}
@@ -251,38 +248,14 @@
this.endLearningMessage = endLearningMessage;
}
- public boolean isContentInUse() {
- return this.contentInUse;
+ public SortedSet getMcQueContents() {
+ return this.mcQueContents;
}
- public void setContentInUse(boolean contentInUse) {
- this.contentInUse = contentInUse;
+ public void setMcQueContents(SortedSet mcQueContents) {
+ this.mcQueContents = mcQueContents;
}
- public Integer getPassMark() {
- return this.passMark;
- }
-
- public void setPassMark(Integer passMark) {
- this.passMark = passMark;
- }
-
- public boolean isShowFeedback() {
- return this.showFeedback;
- }
-
- public void setShowFeedback(boolean showFeedback) {
- this.showFeedback = showFeedback;
- }
-
- public boolean isShowTopUsers() {
- return this.showTopUsers;
- }
-
- public void setShowTopUsers(boolean showTopUsers) {
- this.showTopUsers = showTopUsers;
- }
-
public Set getMcSessions() {
return this.mcSessions;
}
@@ -291,14 +264,6 @@
this.mcSessions = mcSessions;
}
- public Set getMcQueContents() {
- return this.mcQueContents;
- }
-
- public void setMcQueContents(Set mcQueContents) {
- this.mcQueContents = mcQueContents;
- }
-
public String toString() {
return new ToStringBuilder(this)
.append("uid", getUid())
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptionsContent.hbm.xml
===================================================================
diff -u
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptionsContent.hbm.xml (revision 0)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptionsContent.hbm.xml (revision 48c973dcec3754f35dce1f2468a5739067b47179)
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+ @hibernate.class
+ table="tl_lamc11_options_content"
+
+
+
+
+ @hibernate.id
+ generator-class="assigned"
+ type="java.lang.Long"
+ column="uid"
+
+
+
+
+
+
+
+
+ @hibernate.property
+ column="qa_que_option_id"
+ length="20"
+ not-null="true"
+
+
+
+
+ @hibernate.property
+ column="correct_option"
+ length="1"
+ not-null="true"
+
+
+
+
+ @hibernate.property
+ column="qa_que_option_text"
+ length="250"
+
+
+
+
+
+
+
+
+ @hibernate.many-to-one
+ not-null="true"
+ @hibernate.column name="qa_que_content_id"
+
+
+
+
+
+
+ @hibernate.set
+ lazy="true"
+ inverse="true"
+ cascade="none"
+
+ @hibernate.collection-key
+ column="qa_que_option_id"
+
+ @hibernate.collection-one-to-many
+ class="org.lamsfoundation.lams.tool.mc.TlLamc11UsrAttempt"
+
+
+
+
+
+
+
+
+
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml
===================================================================
diff -u
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml (revision 0)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml (revision 48c973dcec3754f35dce1f2468a5739067b47179)
@@ -0,0 +1,109 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.java
===================================================================
diff -u
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.java (revision 0)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.java (revision 48c973dcec3754f35dce1f2468a5739067b47179)
@@ -0,0 +1,89 @@
+package org.lamsfoundation.lams.tool.mc;
+
+import java.io.Serializable;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+
+/** @author Hibernate CodeGenerator */
+public class McQueContent implements Serializable {
+
+ /** identifier field */
+ private Long uid;
+
+ /** persistent field */
+ private Long qaQueContentId;
+
+ /** nullable persistent field */
+ private String question;
+
+ /** nullable persistent field */
+ private Integer displayOrder;
+
+ /** persistent field */
+ private org.lamsfoundation.lams.tool.mc.McContent mcContent;
+
+ /** full constructor */
+ public McQueContent(Long qaQueContentId, String question, Integer displayOrder, org.lamsfoundation.lams.tool.mc.McContent mcContent) {
+ this.qaQueContentId = qaQueContentId;
+ this.question = question;
+ this.displayOrder = displayOrder;
+ this.mcContent = mcContent;
+ }
+
+ /** default constructor */
+ public McQueContent() {
+ }
+
+ /** minimal constructor */
+ public McQueContent(Long qaQueContentId, org.lamsfoundation.lams.tool.mc.McContent mcContent) {
+ this.qaQueContentId = qaQueContentId;
+ this.mcContent = mcContent;
+ }
+
+ public Long getUid() {
+ return this.uid;
+ }
+
+ public void setUid(Long uid) {
+ this.uid = uid;
+ }
+
+ public Long getQaQueContentId() {
+ return this.qaQueContentId;
+ }
+
+ public void setQaQueContentId(Long qaQueContentId) {
+ this.qaQueContentId = qaQueContentId;
+ }
+
+ public String getQuestion() {
+ return this.question;
+ }
+
+ public void setQuestion(String question) {
+ this.question = question;
+ }
+
+ public Integer getDisplayOrder() {
+ return this.displayOrder;
+ }
+
+ public void setDisplayOrder(Integer displayOrder) {
+ this.displayOrder = displayOrder;
+ }
+
+ public org.lamsfoundation.lams.tool.mc.McContent getMcContent() {
+ return this.mcContent;
+ }
+
+ public void setMcContent(org.lamsfoundation.lams.tool.mc.McContent mcContent) {
+ this.mcContent = mcContent;
+ }
+
+ public String toString() {
+ return new ToStringBuilder(this)
+ .append("uid", getUid())
+ .toString();
+ }
+
+}
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml
===================================================================
diff -u
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml (revision 0)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml (revision 48c973dcec3754f35dce1f2468a5739067b47179)
@@ -0,0 +1,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml
===================================================================
diff -u
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml (revision 0)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml (revision 48c973dcec3754f35dce1f2468a5739067b47179)
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McSession.java
===================================================================
diff -u -r19d6ab09baf339ddaf00248008f994d2a38f1079 -r48c973dcec3754f35dce1f2468a5739067b47179
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McSession.java (.../McSession.java) (revision 19d6ab09baf339ddaf00248008f994d2a38f1079)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McSession.java (.../McSession.java) (revision 48c973dcec3754f35dce1f2468a5739067b47179)
@@ -3,7 +3,6 @@
import java.io.Serializable;
import java.util.Date;
import java.util.Set;
-import org.lamsfoundation.lams.tool.mc.McContent;
import org.apache.commons.lang.builder.ToStringBuilder;
@@ -29,13 +28,13 @@
private Long mcContentId;
/** nullable persistent field */
- private McContent mcContent;
+ private org.lamsfoundation.lams.tool.mc.McContent mcContent;
/** persistent field */
private Set mcQueUsers;
/** full constructor */
- public McSession(Long mcSessionId, Date session_start_date, Date session_end_date, String session_status, Long mcContentId, McContent mcContent, Set mcQueUsers) {
+ public McSession(Long mcSessionId, Date session_start_date, Date session_end_date, String session_status, Long mcContentId, org.lamsfoundation.lams.tool.mc.McContent mcContent, Set mcQueUsers) {
this.mcSessionId = mcSessionId;
this.session_start_date = session_start_date;
this.session_end_date = session_end_date;
@@ -103,11 +102,11 @@
this.mcContentId = mcContentId;
}
- public McContent getMcContent() {
+ public org.lamsfoundation.lams.tool.mc.McContent getMcContent() {
return this.mcContent;
}
- public void setMcContent(McContent mcContent) {
+ public void setMcContent(org.lamsfoundation.lams.tool.mc.McContent mcContent) {
this.mcContent = mcContent;
}
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml
===================================================================
diff -u
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml (revision 0)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml (revision 48c973dcec3754f35dce1f2468a5739067b47179)
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
+ @hibernate.class
+ table="tl_lamc11_usr_attempt"
+
+
+
+
+ @hibernate.id
+ generator-class="assigned"
+ type="java.lang.Long"
+ column="uid"
+
+
+
+
+
+
+
+
+ @hibernate.property
+ column="attempt_id"
+ length="20"
+ not-null="true"
+
+
+
+
+ @hibernate.property
+ column="attempt_time"
+ length="19"
+
+
+
+
+ @hibernate.property
+ column="time_zone"
+ length="255"
+
+
+
+
+
+
+
+
+ @hibernate.many-to-one
+ not-null="true"
+ @hibernate.column name="qa_que_content_id"
+
+
+
+
+
+
+ @hibernate.many-to-one
+ not-null="true"
+ @hibernate.column name="que_usr_id"
+
+
+
+
+
+
+ @hibernate.many-to-one
+ not-null="true"
+ @hibernate.column name="qa_que_option_id"
+
+
+
+
+
+
Fisheye: Tag 48c973dcec3754f35dce1f2468a5739067b47179 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/QaContent.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 48c973dcec3754f35dce1f2468a5739067b47179 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/QaContent.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 48c973dcec3754f35dce1f2468a5739067b47179 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/QaQueContent.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 48c973dcec3754f35dce1f2468a5739067b47179 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/QaQueContent.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 48c973dcec3754f35dce1f2468a5739067b47179 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/QaQueUsr.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 48c973dcec3754f35dce1f2468a5739067b47179 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/QaQueUsr.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 48c973dcec3754f35dce1f2468a5739067b47179 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/QaSession.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 48c973dcec3754f35dce1f2468a5739067b47179 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/QaSession.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 48c973dcec3754f35dce1f2468a5739067b47179 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/QaUploadedFile.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 48c973dcec3754f35dce1f2468a5739067b47179 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/QaUploadedFile.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 48c973dcec3754f35dce1f2468a5739067b47179 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/QaUsrResp.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 48c973dcec3754f35dce1f2468a5739067b47179 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/QaUsrResp.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 48c973dcec3754f35dce1f2468a5739067b47179 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/QaUtils.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 48c973dcec3754f35dce1f2468a5739067b47179 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/SubmissionDetails.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 48c973dcec3754f35dce1f2468a5739067b47179 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IQaContentDAO.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 48c973dcec3754f35dce1f2468a5739067b47179 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IQaQueContentDAO.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 48c973dcec3754f35dce1f2468a5739067b47179 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IQaQueUsrDAO.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 48c973dcec3754f35dce1f2468a5739067b47179 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IQaSessionDAO.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 48c973dcec3754f35dce1f2468a5739067b47179 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IQaUploadedFileDAO.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 48c973dcec3754f35dce1f2468a5739067b47179 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IQaUsrRespDAO.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 48c973dcec3754f35dce1f2468a5739067b47179 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/QaContentDAO.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 48c973dcec3754f35dce1f2468a5739067b47179 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/QaQueContentDAO.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 48c973dcec3754f35dce1f2468a5739067b47179 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/QaQueUsrDAO.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 48c973dcec3754f35dce1f2468a5739067b47179 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/QaSessionDAO.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 48c973dcec3754f35dce1f2468a5739067b47179 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/QaUploadedFileDAO.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 48c973dcec3754f35dce1f2468a5739067b47179 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/QaUsrRespDAO.java'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
===================================================================
diff -u
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml (revision 0)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml (revision 48c973dcec3754f35dce1f2468a5739067b47179)
@@ -0,0 +1,88 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ /WEB-INF/McContent.hbm.xml
+ /WEB-INF/McSession.hbm.xml
+ /WEB-INF/McQueContent.hbm.xml
+ /WEB-INF/McQueUsr.hbm.xml
+
+
+
+ /WEB-INF/McContent.hbm.xml
+ /WEB-INF/McSession.hbm.xml
+ /WEB-INF/McQueContent.hbm.xml
+ /WEB-INF/McQueUsr.hbm.xml
+
+
+