Fisheye: Tag 862a8e07b6ea55951a9047221ed0a86486b93b71 refers to a dead (removed) revision in file `lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/Daco.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 862a8e07b6ea55951a9047221ed0a86486b93b71 refers to a dead (removed) revision in file `lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoAnswer.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 862a8e07b6ea55951a9047221ed0a86486b93b71 refers to a dead (removed) revision in file `lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoAnswerOption.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 862a8e07b6ea55951a9047221ed0a86486b93b71 refers to a dead (removed) revision in file `lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoQuestion.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 862a8e07b6ea55951a9047221ed0a86486b93b71 refers to a dead (removed) revision in file `lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoSession.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 862a8e07b6ea55951a9047221ed0a86486b93b71 refers to a dead (removed) revision in file `lams_tool_daco/conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoUser.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoUserDAOHibernate.java =================================================================== diff -u -r8846e87b362ce07b580e3750128c5826e667f7e5 -r862a8e07b6ea55951a9047221ed0a86486b93b71 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoUserDAOHibernate.java (.../DacoUserDAOHibernate.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoUserDAOHibernate.java (.../DacoUserDAOHibernate.java) (revision 862a8e07b6ea55951a9047221ed0a86486b93b71) @@ -188,7 +188,7 @@ " JOIN tl_ladaco10_sessions sess on user.session_uid = sess.uid and sess.session_id = :sessionId"); buildNameSearch(queryText, searchString); - List list = getSession().createSQLQuery(queryText.toString()).setLong("sessionId", sessionId.longValue()) + List list = getSession().createNativeQuery(queryText.toString()).setLong("sessionId", sessionId.longValue()) .list(); if (list == null || list.size() == 0) { return 0; Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/Daco.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r862a8e07b6ea55951a9047221ed0a86486b93b71 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/Daco.java (.../Daco.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/Daco.java (.../Daco.java) (revision 862a8e07b6ea55951a9047221ed0a86486b93b71) @@ -27,6 +27,19 @@ import java.util.LinkedHashSet; import java.util.Set; +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.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.OrderBy; +import javax.persistence.Table; + import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.log4j.Logger; @@ -39,48 +52,65 @@ * * */ +@Entity +@Table(name = "tl_ladaco10_contents") public class Daco implements Cloneable { private static final Logger log = Logger.getLogger(Daco.class); - // key + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - // tool contentID + @Column(name = "content_id") private Long contentId; + @Column private String title; + @Column private String instructions; - // advance - + @Column(name = "lock_on_finished") private boolean lockOnFinished; + @Column(name = "define_later") private boolean defineLater; + @Column(name = "content_in_use") private boolean contentInUse; + @Column(name = "min_records") private Short minRecords; + @Column(name = "max_records") private Short maxRecords; - // general infomation + @Column(name = "create_date") private Date created; + @Column(name = "update_date") private Date updated; + @ManyToOne(cascade = CascadeType.ALL) + @JoinColumn(name = "create_by") private DacoUser createdBy; - // daco Questions - private Set dacoQuestions = new LinkedHashSet(); + @OneToMany(fetch = FetchType.EAGER, mappedBy = "daco", cascade = CascadeType.ALL) + @OrderBy("uid ASC") + private Set dacoQuestions = new LinkedHashSet(); + @Column(name = "reflect_on_activity") private boolean reflectOnActivity; + @Column(name = "reflect_instructions") private String reflectInstructions; + @Column(name = "learner_entry_notify") private boolean notifyTeachersOnLearnerEntry; + @Column(name = "record_submit_notify") private boolean notifyTeachersOnRecordSumbit; // ********************************************************** @@ -160,67 +190,30 @@ this.setUpdated(new Date(now)); } - // ********************************************************** - // get/set methods - // ********************************************************** - /** - * Returns the object's creation date - * - * @return date - * - */ public Date getCreated() { return created; } - /** - * Sets the object's creation date - * - * @param created - */ public void setCreated(Date created) { this.created = created; } - /** - * Returns the object's date of last update - * - * @return date updated - * - */ public Date getUpdated() { return updated; } - /** - * Sets the object's date of last update - * - * @param updated - */ public void setUpdated(Date updated) { this.updated = updated; } - /** - * - * @return Returns the userid of the user who created the Share daco. - * - */ public DacoUser getCreatedBy() { return createdBy; } - /** - * @param createdBy - * The userid of the user who created this Share daco. - */ public void setCreatedBy(DacoUser createdBy) { this.createdBy = createdBy; } - /** - * - */ public Long getUid() { return uid; } @@ -229,47 +222,22 @@ this.uid = uid; } - /** - * @return Returns the title. - * - * - * - */ public String getTitle() { return title; } - /** - * @param title - * The title to set. - */ public void setTitle(String title) { this.title = title; } - /** - * @return Returns the lockOnFinish. - * - * - * - */ public boolean getLockOnFinished() { return lockOnFinished; } - /** - * @param lockOnFinished - * Set to true to lock the daco for finished users. - */ public void setLockOnFinished(boolean lockOnFinished) { this.lockOnFinished = lockOnFinished; } - /** - * @return Returns the instructions set by the teacher. - * - * - */ public String getInstructions() { return instructions; } @@ -278,15 +246,6 @@ this.instructions = instructions; } - /** - * - * - * - * - * - * - * @return - */ public Set getDacoQuestions() { return dacoQuestions; } @@ -295,10 +254,6 @@ this.dacoQuestions = dacoQuestions; } - /** - * - * @return - */ public boolean isContentInUse() { return contentInUse; } @@ -307,10 +262,6 @@ this.contentInUse = contentInUse; } - /** - * - * @return - */ public boolean isDefineLater() { return defineLater; } @@ -319,10 +270,6 @@ this.defineLater = defineLater; } - /** - * - * @return - */ public Long getContentId() { return contentId; } @@ -331,10 +278,6 @@ this.contentId = contentId; } - /** - * - * @return - */ public String getReflectInstructions() { return reflectInstructions; } @@ -343,10 +286,6 @@ this.reflectInstructions = reflectInstructions; } - /** - * - * @return - */ public boolean isReflectOnActivity() { return reflectOnActivity; } @@ -355,11 +294,6 @@ this.reflectOnActivity = reflectOnActivity; } - /** - * @return Returns the instructions set by the teacher. - * - * - */ public Short getMinRecords() { return minRecords; } @@ -368,11 +302,6 @@ this.minRecords = minRecords; } - /** - * @return Returns the instructions set by the teacher. - * - * - */ public Short getMaxRecords() { return maxRecords; } @@ -381,10 +310,6 @@ this.maxRecords = maxRecords; } - /** - * - * @return - */ public boolean isNotifyTeachersOnLearnerEntry() { return notifyTeachersOnLearnerEntry; } @@ -393,10 +318,6 @@ this.notifyTeachersOnLearnerEntry = notifyTeachersOnLearnerEntry; } - /** - * - * @return - */ public boolean isNotifyTeachersOnRecordSumbit() { return notifyTeachersOnRecordSumbit; } Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoAnswer.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r862a8e07b6ea55951a9047221ed0a86486b93b71 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoAnswer.java (.../DacoAnswer.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoAnswer.java (.../DacoAnswer.java) (revision 862a8e07b6ea55951a9047221ed0a86486b93b71) @@ -24,6 +24,15 @@ import java.util.Date; +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.log4j.Logger; /** @@ -33,27 +42,43 @@ * * */ +@Entity +@Table(name = "tl_ladaco10_answers") public class DacoAnswer implements Cloneable { private static final Logger log = Logger.getLogger(DacoQuestion.class); + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + @ManyToOne + @JoinColumn(name = "user_uid") private DacoUser user; + @Column(name = "record_id") private Integer recordId; + @Column private String answer; - private DacoQuestion question; + @ManyToOne + @JoinColumn(name = "question_uid") + private DacoQuestion question; + @Column(name = "file_uuid") private Long fileUuid; + @Column(name = "file_version_id") private Long fileVersionId; + @Column(name = "file_name") private String fileName; + @Column(name = "file_type") private String fileType; + @Column(name = "create_date") private Date createDate; @Override @@ -69,14 +94,6 @@ return cloned; } - // ********************************************************** - // Get/Set methods - // ********************************************************** - - /** - * - * @return Returns the answer ID. - */ public Long getUid() { return uid; } @@ -85,10 +102,6 @@ uid = uuid; } - /** - * - * @return - */ public DacoUser getUser() { return user; } @@ -97,10 +110,6 @@ this.user = user; } - /** - * - * @return Returns the record ID. - */ public Integer getRecordId() { return recordId; } @@ -109,10 +118,6 @@ this.recordId = recordId; } - /** - * - * @return Returns the answer. - */ public String getAnswer() { return answer; } @@ -121,10 +126,6 @@ this.answer = answer; } - /** - * - * @return - */ public DacoQuestion getQuestion() { return question; } @@ -133,11 +134,6 @@ this.question = question; } - /** - * - * - * @return - */ public Long getFileUuid() { return fileUuid; } @@ -146,10 +142,6 @@ fileUuid = crUuid; } - /** - * - * @return - */ public Long getFileVersionId() { return fileVersionId; } @@ -158,9 +150,6 @@ fileVersionId = crVersionId; } - /** - * - */ public String getFileType() { return fileType; } @@ -169,9 +158,6 @@ fileType = type; } - /** - * - */ public String getFileName() { return fileName; } @@ -180,9 +166,6 @@ fileName = name; } - /** - * - */ public Date getCreateDate() { return createDate; } Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoAnswerOption.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r862a8e07b6ea55951a9047221ed0a86486b93b71 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoAnswerOption.java (.../DacoAnswerOption.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoAnswerOption.java (.../DacoAnswerOption.java) (revision 862a8e07b6ea55951a9047221ed0a86486b93b71) @@ -22,6 +22,13 @@ */ package org.lamsfoundation.lams.tool.daco.model; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + import org.apache.log4j.Logger; /** @@ -32,23 +39,22 @@ * * */ +@Entity +@Table(name = "tl_ladaco10_answer_options") public class DacoAnswerOption implements Cloneable { private static final Logger log = Logger.getLogger(DacoQuestion.class); + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + @Column(name = "sequence_num") private Integer sequenceNumber; + @Column(name = "answer_option") private String answerOption; - // ********************************************************** - // Get/Set methods - // ********************************************************** - - /** - * - * @return Returns the answer ID. - */ public Long getUid() { return uid; } @@ -57,10 +63,6 @@ uid = uuid; } - /** - * - * @return Returns the sequence number. - */ public Integer getSequenceNumber() { return sequenceNumber; } @@ -69,10 +71,6 @@ this.sequenceNumber = sequenceNumber; } - /** - * - * @return Returns the possible answer. - */ public String getAnswerOption() { return answerOption; } Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoQuestion.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r862a8e07b6ea55951a9047221ed0a86486b93b71 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoQuestion.java (.../DacoQuestion.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoQuestion.java (.../DacoQuestion.java) (revision 862a8e07b6ea55951a9047221ed0a86486b93b71) @@ -27,6 +27,19 @@ import java.util.LinkedHashSet; import java.util.Set; +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.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.OrderBy; +import javax.persistence.Table; + import org.apache.log4j.Logger; /** @@ -37,32 +50,52 @@ * * */ +@Entity +@Table(name = "tl_ladaco10_questions") public class DacoQuestion implements Cloneable { private static final Logger log = Logger.getLogger(DacoQuestion.class); + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + @Column(name = "question_type") private short type; + @Column(name = "min_constraint") private Float min; + @Column(name = "max_constraint") private Float max; + @Column(name = "digits_decimal") private Short digitsDecimal; + @Column private Short summary; + @Column private String description; - private String initialQuestion; - + @OneToMany(fetch = FetchType.EAGER, + cascade = CascadeType.ALL) + @JoinColumn(name = "question_uid") + @OrderBy("sequenceNumber ASC") private Set answerOptions = new LinkedHashSet(); + @Column(name = "is_required") private boolean isRequired; + @Column(name = "create_date") private Date createDate; + + @ManyToOne + @JoinColumn(name = "create_by") private DacoUser createBy; + @ManyToOne + @JoinColumn(name = "content_uid") private Daco daco; @Override @@ -88,29 +121,14 @@ return obj; } - // ********************************************************** - // Get/Set methods - // ********************************************************** - /** - * - * @return Returns the uid. - */ public Long getUid() { return uid; } - /** - * @param uid - * The uid to set. - */ public void setUid(Long uid) { this.uid = uid; } - /** - * - * @return - */ public String getDescription() { return description; } @@ -119,11 +137,6 @@ this.description = description; } - /** - * - * - * @return - */ public DacoUser getCreateBy() { return createBy; } @@ -132,10 +145,6 @@ this.createBy = createBy; } - /** - * - * @return - */ public Date getCreateDate() { return createDate; } @@ -144,10 +153,6 @@ this.createDate = createDate; } - /** - * - * @return - */ public boolean isRequired() { return isRequired; } @@ -156,10 +161,6 @@ this.isRequired = isRequired; } - /** - * - * @return - */ public short getType() { return type; } @@ -168,10 +169,6 @@ this.type = type; } - /** - * - * @return - */ public Float getMin() { return min; } @@ -180,10 +177,6 @@ this.min = min; } - /** - * - * @return - */ public Float getMax() { return max; } @@ -192,10 +185,6 @@ this.max = max; } - /** - * - * @return - */ public Short getDigitsDecimal() { return digitsDecimal; } @@ -204,10 +193,6 @@ this.digitsDecimal = digitsDecimal; } - /** - * - * @return - */ public Short getSummary() { return summary; } @@ -216,12 +201,6 @@ this.summary = summary; } - /** - * - * - * - * @return - */ public Set getAnswerOptions() { return answerOptions; } @@ -230,20 +209,6 @@ answerOptions = options; } - /* - * public Long getContentUid() { - * return contentUid; - * } - * - * public void setContentUid(Long contentUid) { - * this.contentUid = contentUid; - * } - */ - - /** - * - * @return - */ public Daco getDaco() { return daco; } Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoSession.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r862a8e07b6ea55951a9047221ed0a86486b93b71 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoSession.java (.../DacoSession.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoSession.java (.../DacoSession.java) (revision 862a8e07b6ea55951a9047221ed0a86486b93b71) @@ -26,6 +26,18 @@ import java.util.Date; import java.util.Set; +import javax.persistence.CascadeType; +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.OneToMany; +import javax.persistence.OrderBy; +import javax.persistence.Table; + import org.apache.log4j.Logger; /** @@ -36,40 +48,50 @@ * * */ +@Entity +@Table(name = "tl_ladaco10_sessions") public class DacoSession { private static Logger log = Logger.getLogger(DacoSession.class); + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + + @Column(name = "session_id") private Long sessionId; + + @Column(name = "session_name") private String sessionName; + + @ManyToOne + @JoinColumn(name = "content_uid") private Daco daco; + + @Column(name = "session_start_date") private Date sessionStartDate; + + @Column(name = "session_end_date") private Date sessionEndDate; + // finish or not + @Column private int status; - // daco Questions + + @OneToMany(cascade = CascadeType.ALL) + @JoinColumn(name = "session_uid") + @OrderBy("createDate") private Set dacoQuestions; - // ********************************************************** - // Get/Set methods - // ********************************************************** - /** - * - * @return Returns the learnerID. - */ - public Long getUid() { + public Long getUid() { return uid; } private void setUid(Long uuid) { uid = uuid; } - /** - * - * @return - */ public Date getSessionEndDate() { return sessionEndDate; } @@ -78,11 +100,6 @@ this.sessionEndDate = sessionEndDate; } - /** - * - * - * @return - */ public Date getSessionStartDate() { return sessionStartDate; } @@ -91,10 +108,6 @@ this.sessionStartDate = sessionStartDate; } - /** - * - * @return - */ public int getStatus() { return status; } @@ -103,10 +116,6 @@ this.status = status; } - /** - * - * @return - */ public Daco getDaco() { return daco; } @@ -115,10 +124,6 @@ this.daco = daco; } - /** - * - * @return - */ public Long getSessionId() { return sessionId; } @@ -127,32 +132,14 @@ this.sessionId = sessionId; } - /** - * - * @return Returns the session name - */ public String getSessionName() { return sessionName; } - /** - * - * @param sessionName - * The session name to set. - */ public void setSessionName(String sessionName) { this.sessionName = sessionName; } - /** - * - * - * - * - * - * - * @return - */ public Set getDacoQuestions() { return dacoQuestions; } Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoUser.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r862a8e07b6ea55951a9047221ed0a86486b93b71 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoUser.java (.../DacoUser.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoUser.java (.../DacoUser.java) (revision 862a8e07b6ea55951a9047221ed0a86486b93b71) @@ -27,6 +27,19 @@ import java.util.LinkedHashSet; import java.util.Set; +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.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.OrderBy; +import javax.persistence.Table; +import javax.persistence.Transient; + import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.log4j.Logger; @@ -40,24 +53,49 @@ * * */ +@Entity +@Table(name = "tl_ladaco10_users") public class DacoUser implements Cloneable { private static final long serialVersionUID = -7043502180037866257L; private static Logger log = Logger.getLogger(DacoUser.class); + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + + @Column(name = "user_id") private Long userId; + + @Column(name = "first_name") private String firstName; + + @Column(name = "last_name") private String lastName; + + @Column(name = "login_name") private String loginName; + + @Column(name = "session_finished") private boolean sessionFinished; + @ManyToOne + @JoinColumn(name = "session_uid") private DacoSession session; + + @ManyToOne + @JoinColumn(name = "content_uid") private Daco daco; - // =============== NON Persisit value: for display use =========== - // the user access some reousrce question date time. Use in monitoring summary page - private Date accessDate; + + @OneToMany(fetch = FetchType.EAGER, + mappedBy = "user") + @OrderBy("recordId ASC, uid ASC") private Set answers = new LinkedHashSet(); + // the user access some resource question date time. Use in monitoring summary page + @Transient + private Date accessDate; + public DacoUser() { } @@ -104,45 +142,22 @@ return user; } - // ********************************************************** - // Get/Set methods - // ********************************************************** - /** - * - * @return Returns the uid. - */ public Long getUid() { return uid; } - /** - * @param uid - * The uid to set. - */ public void setUid(Long userID) { uid = userID; } - /** - * - * @return Returns the userId. - */ public Long getUserId() { return userId; } - /** - * @param userId - * The userId to set. - */ public void setUserId(Long userID) { userId = userID; } - /** - * - * @return - */ public String getLastName() { return lastName; } @@ -151,10 +166,6 @@ this.lastName = lastName; } - /** - * - * @return - */ public String getFirstName() { return firstName; } @@ -163,10 +174,6 @@ this.firstName = firstName; } - /** - * - * @return - */ public String getLoginName() { return loginName; } @@ -175,10 +182,6 @@ this.loginName = loginName; } - /** - * - * @return - */ public DacoSession getSession() { return session; } @@ -187,10 +190,6 @@ this.session = session; } - /** - * - * @return - */ public Daco getDaco() { return daco; } @@ -199,10 +198,6 @@ daco = content; } - /** - * - * @return - */ public boolean isSessionFinished() { return sessionFinished; } @@ -240,12 +235,6 @@ this.accessDate = accessDate; } - /** - * - * - * - */ - public Set getAnswers() { return answers; } Fisheye: Tag 862a8e07b6ea55951a9047221ed0a86486b93b71 refers to a dead (removed) revision in file `lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceProxy.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java =================================================================== diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -r862a8e07b6ea55951a9047221ed0a86486b93b71 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java (.../LearningController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java (.../LearningController.java) (revision 862a8e07b6ea55951a9047221ed0a86486b93b71) @@ -424,7 +424,7 @@ case DacoConstants.QUESTION_TYPE_FILE: case DacoConstants.QUESTION_TYPE_IMAGE: { MultipartFile file = recordForm.getFile(fileNumber); - if (file != null) { + if (file != null && !file.isEmpty()) { try { dacoService.uploadDacoAnswerFile(answer, file); } catch (UploadDacoFileException e) { Index: lams_tool_daco/web/pages/authoring/basic.jsp =================================================================== diff -u -r13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d -r862a8e07b6ea55951a9047221ed0a86486b93b71 --- lams_tool_daco/web/pages/authoring/basic.jsp (.../basic.jsp) (revision 13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d) +++ lams_tool_daco/web/pages/authoring/basic.jsp (.../basic.jsp) (revision 862a8e07b6ea55951a9047221ed0a86486b93b71) @@ -80,6 +80,7 @@
+
Index: lams_tool_daco/web/pages/learning/questionSummaries.jsp =================================================================== diff -u -r8846e87b362ce07b580e3750128c5826e667f7e5 -r862a8e07b6ea55951a9047221ed0a86486b93b71 --- lams_tool_daco/web/pages/learning/questionSummaries.jsp (.../questionSummaries.jsp) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) +++ lams_tool_daco/web/pages/learning/questionSummaries.jsp (.../questionSummaries.jsp) (revision 862a8e07b6ea55951a9047221ed0a86486b93b71) @@ -53,7 +53,7 @@ - + @@ -138,13 +138,13 @@ - - + + : - - ${singleAnswer.answer} + + ${singleAnswer.answer}: @@ -159,8 +159,8 @@ -
- ${singleAnswer.answer} + + ${singleAnswer.answer}: ${singleAnswer.count}