Fisheye: Tag d7de6a4360d49e6436856f8de9fb5de7166dd3f8 refers to a dead (removed) revision in file `lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/Survey.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d7de6a4360d49e6436856f8de9fb5de7166dd3f8 refers to a dead (removed) revision in file `lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d7de6a4360d49e6436856f8de9fb5de7166dd3f8 refers to a dead (removed) revision in file `lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyCondition.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d7de6a4360d49e6436856f8de9fb5de7166dd3f8 refers to a dead (removed) revision in file `lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyOption.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d7de6a4360d49e6436856f8de9fb5de7166dd3f8 refers to a dead (removed) revision in file `lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d7de6a4360d49e6436856f8de9fb5de7166dd3f8 refers to a dead (removed) revision in file `lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveySession.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d7de6a4360d49e6436856f8de9fb5de7166dd3f8 refers to a dead (removed) revision in file `lams_tool_survey/conf/hibernate/mappings/org/lamsfoundation/lams/tool/survey/model/SurveyUser.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rd7de6a4360d49e6436856f8de9fb5de7166dd3f8 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.java (.../Survey.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.java (.../Survey.java) (revision d7de6a4360d49e6436856f8de9fb5de7166dd3f8) @@ -29,65 +29,97 @@ import java.util.Set; import java.util.TreeSet; +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.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.log4j.Logger; +import org.hibernate.annotations.Cascade; +import org.hibernate.annotations.SortComparator; import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator; /** - * Survey - * * @author Dapeng Ni - * - * - * */ + +@Entity +@Table(name = "tl_lasurv11_survey") public class Survey implements Cloneable { private static final Logger log = Logger.getLogger(Survey.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 = "show_questions_on_one_page") private boolean showOnePage; + + @Column(name = "show_other_users_answers") private boolean showOtherUsersAnswers; + + @Column(name = "lock_on_finished") private boolean lockWhenFinished; + @Column(name = "reflect_on_activity") private boolean reflectOnActivity; + + @Column(name = "reflect_instructions") private String reflectInstructions; + @Column(name = "define_later") private boolean defineLater; + + @Column(name = "content_in_use") private boolean contentInUse; + @Column(name = "answer_submit_notify") private boolean notifyTeachersOnAnswerSumbit; - // general infomation + @Column(name = "create_date") private Date created; + + @Column(name = "update_date") private Date updated; + + @Column(name = "submission_deadline") private Date submissionDeadline; + + @ManyToOne + @JoinColumn(name = "create_by") + @Cascade(org.hibernate.annotations.CascadeType.SAVE_UPDATE) private SurveyUser createdBy; - // survey Items - private Set questions; + @OneToMany(cascade = CascadeType.ALL) + @JoinColumn(name = "survey_uid") + @OrderBy("sequence_id") + private Set questions = new HashSet(); - // conditions + @OneToMany(cascade = CascadeType.ALL) + @JoinColumn(name = "content_uid") + @SortComparator(TextSearchConditionComparator.class) private Set conditions = new TreeSet(new TextSearchConditionComparator()); - /** - * Default contruction method. - * - */ - public Survey() { - questions = new HashSet(); - } - - // ********************************************************** - // Function method for Survey - // ********************************************************** public static Survey newInstance(Survey defaultContent, Long contentId) { Survey toContent = new Survey(); toContent = (Survey) defaultContent.clone(); @@ -112,10 +144,10 @@ survey = (Survey) super.clone(); survey.setUid(null); if (questions != null) { - Iterator iter = questions.iterator(); + Iterator iter = questions.iterator(); Set set = new HashSet(); while (iter.hasNext()) { - SurveyQuestion item = (SurveyQuestion) iter.next(); + SurveyQuestion item = iter.next(); SurveyQuestion newItem = (SurveyQuestion) item.clone(); set.add(newItem); } @@ -174,68 +206,48 @@ 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 surveys. - * - * - * */ public SurveyUser getCreatedBy() { return createdBy; } /** - * @param createdBy - * The userid of the user who created this Share surveys. + * The userid of the user who created this Share surveys. */ public void setCreatedBy(SurveyUser createdBy) { this.createdBy = createdBy; } - /** - * - */ public Long getUid() { return uid; } @@ -244,46 +256,27 @@ 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 lockWhenFinish. - * - * - * - */ public boolean getLockWhenFinished() { return lockWhenFinished; } /** - * @param lockWhenFinished - * Set to true to lock the survey for finished users. + * Set to true to lock the survey for finished users. */ public void setLockWhenFinished(boolean lockWhenFinished) { this.lockWhenFinished = lockWhenFinished; } /** * @return Returns the instructions set by the teacher. - * - * */ public String getInstructions() { return instructions; @@ -293,27 +286,14 @@ this.instructions = instructions; } - /** - * - * - * - * - * - * - * @return - */ public Set getQuestions() { return questions; } - public void setQuestions(Set questions) { + public void setQuestions(Set questions) { this.questions = questions; } - /** - * - * @return - */ public boolean isContentInUse() { return contentInUse; } @@ -322,10 +302,6 @@ this.contentInUse = contentInUse; } - /** - * - * @return - */ public boolean isDefineLater() { return defineLater; } @@ -334,10 +310,6 @@ this.defineLater = defineLater; } - /** - * - * @return - */ public Long getContentId() { return contentId; } @@ -346,10 +318,6 @@ this.contentId = contentId; } - /** - * - * @return - */ public String getReflectInstructions() { return reflectInstructions; } @@ -358,10 +326,6 @@ this.reflectInstructions = reflectInstructions; } - /** - * - * @return - */ public boolean isReflectOnActivity() { return reflectOnActivity; } @@ -370,10 +334,6 @@ this.reflectOnActivity = reflectOnActivity; } - /** - * - * @return - */ public boolean isShowOnePage() { return showOnePage; } @@ -382,10 +342,6 @@ this.showOnePage = showOnePage; } - /** - * - * @return - */ public boolean isShowOtherUsersAnswers() { return showOtherUsersAnswers; } @@ -394,10 +350,6 @@ this.showOtherUsersAnswers = showOtherUsersAnswers; } - /** - * - * @return - */ public boolean isNotifyTeachersOnAnswerSumbit() { return notifyTeachersOnAnswerSumbit; } @@ -406,13 +358,6 @@ this.notifyTeachersOnAnswerSumbit = notifyTeachersOnAnswerSumbit; } - /** - * - * sort="org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator" - * - * - * - */ public Set getConditions() { return conditions; } @@ -421,15 +366,11 @@ this.conditions = conditions; } - /** - * - * @return date submissionDeadline - */ public Date getSubmissionDeadline() { return submissionDeadline; } public void setSubmissionDeadline(Date submissionDeadline) { this.submissionDeadline = submissionDeadline; } -} +} \ No newline at end of file Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rd7de6a4360d49e6436856f8de9fb5de7166dd3f8 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.java (.../SurveyAnswer.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.java (.../SurveyAnswer.java) (revision d7de6a4360d49e6436856f8de9fb5de7166dd3f8) @@ -21,41 +21,55 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.survey.model; 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 javax.persistence.Transient; + /** - * Survey - * * @author Dapeng Ni - * - * - * */ + +@Entity +@Table(name = "tl_lasurv11_answer") public class SurveyAnswer { + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + @ManyToOne + @JoinColumn(name = "user_uid") private SurveyUser user; + @ManyToOne + @JoinColumn(name = "question_uid") private SurveyQuestion surveyQuestion; + // options choice string: option UIDs are conjunctioned by &. Such as 2&5&3 + @Column(name = "answer_choices") private String answerChoices; + + @Column(name = "answer_text") private String answerText; + + @Column(name = "udpate_date") private Date updateDate; - // ************************************************ - // DTO fields - // ************************************************ // it is list of optional UIDs. Uid is long type, but here just save them by String format + @Transient private String[] choices; - /** - * - * @return - */ public SurveyQuestion getSurveyQuestion() { return surveyQuestion; } @@ -64,10 +78,6 @@ this.surveyQuestion = item; } - /** - * - * @return Returns the log Uid. - */ public Long getUid() { return uid; } @@ -76,10 +86,6 @@ this.uid = uid; } - /** - * - * @return - */ public SurveyUser getUser() { return user; } @@ -88,10 +94,6 @@ this.user = user; } - /** - * - * @return - */ public String getAnswerChoices() { return answerChoices; } @@ -100,10 +102,6 @@ this.answerChoices = answers; } - /** - * - * @return - */ public Date getUpdateDate() { return updateDate; } @@ -112,10 +110,6 @@ this.updateDate = updateDate; } - /** - * - * @return - */ public String getAnswerText() { return answerText; } @@ -131,5 +125,4 @@ public void setChoices(String[] choices) { this.choices = choices; } - -} +} \ No newline at end of file Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyCondition.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rd7de6a4360d49e6436856f8de9fb5de7166dd3f8 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyCondition.java (.../SurveyCondition.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyCondition.java (.../SurveyCondition.java) (revision d7de6a4360d49e6436856f8de9fb5de7166dd3f8) @@ -20,13 +20,19 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.survey.model; import java.util.Set; import java.util.TreeSet; -import org.apache.log4j.Logger; +import javax.persistence.CascadeType; +import javax.persistence.Entity; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; +import javax.persistence.ManyToMany; +import javax.persistence.OrderBy; +import javax.persistence.Table; + import org.lamsfoundation.lams.learningdesign.BranchCondition; import org.lamsfoundation.lams.learningdesign.LearningDesign; import org.lamsfoundation.lams.learningdesign.TextSearchCondition; @@ -40,17 +46,19 @@ /** * A text search condition with a set of questions on answers to which the search should be performed. * - * * @author Marcin Cieslak - * */ +@Entity +@Table(name = "tl_lasurv11_conditions") public class SurveyCondition extends TextSearchCondition { /** * Questions linked to this condition. Answers to them will be scanned for the words that make the condition's * parameters. */ + @ManyToMany(cascade = CascadeType.ALL) + @JoinTable(name = "tl_lasurv11_condition_questions", joinColumns = @JoinColumn(name = "condition_id"), inverseJoinColumns = @JoinColumn(name = "question_uid")) + @OrderBy("question_uid") private Set questions = new TreeSet(new QuestionsComparator()); - private static Logger log = Logger.getLogger(SurveyCondition.class); public SurveyCondition() { Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyOption.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rd7de6a4360d49e6436856f8de9fb5de7166dd3f8 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyOption.java (.../SurveyOption.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyOption.java (.../SurveyOption.java) (revision d7de6a4360d49e6436856f8de9fb5de7166dd3f8) @@ -23,25 +23,46 @@ package org.lamsfoundation.lams.tool.survey.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 javax.persistence.Transient; + import org.apache.log4j.Logger; /** * * @author Steve.Ni - * - * @version $Revision$ */ + +@Entity +@Table(name = "tl_lasurv11_option") public class SurveyOption implements Cloneable { private static final Logger log = Logger.getLogger(SurveyOption.class); + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + + @Column(name = "sequence_id") private int sequenceId; + + @Column private String description; //**************************************************** // DTO fields: percentage of response for this option. For monitoring summary usage. + @Transient private double response; + + @Transient private String responseFormatStr; + + @Transient private int responseCount; @Override @@ -57,29 +78,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 userID) { this.uid = userID; } - /** - * - * @return - */ public String getDescription() { return description; } @@ -88,10 +94,6 @@ this.description = description; } - /** - * - * @return - */ public int getSequenceId() { return sequenceId; } @@ -123,5 +125,4 @@ public void setResponseFormatStr(String reponseFormatStr) { this.responseFormatStr = reponseFormatStr; } - -} +} \ No newline at end of file Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rd7de6a4360d49e6436856f8de9fb5de7166dd3f8 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.java (.../SurveyQuestion.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.java (.../SurveyQuestion.java) (revision d7de6a4360d49e6436856f8de9fb5de7166dd3f8) @@ -28,42 +28,69 @@ import java.util.Iterator; 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 javax.persistence.Transient; + import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.lamsfoundation.lams.tool.survey.util.SurveyWebUtils; /** - * Survey - * * @author Dapeng Ni - * - * - * */ +@Entity +@Table(name = "tl_lasurv11_question") public class SurveyQuestion implements Cloneable { private static final Logger log = Logger.getLogger(SurveyQuestion.class); private static final int SHORT_TITLE_LENGTH = 60; + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; // Survey Type:1=Single Choice,2=Multiple Choice,3=Text Entry + @Column(name = "question_type") private short type; + @Column private String description; + + @Column(name = "sequence_id") private int sequenceId; - // option of Question + @Column(name = "append_text") private boolean appendText; + + @Column private boolean optional; + + @Column(name = "allow_multiple_answer") private boolean allowMultipleAnswer; - private Set options; + @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true) + @JoinColumn(name = "question_uid") + @OrderBy("sequence_id") + private Set options = new HashSet(); + @Column(name = "create_date") private Date createDate; + + @ManyToOne + @JoinColumn(name = "create_by") private SurveyUser createBy; - // *********************************************** - // DTO fields: + @Transient private String shortTitle; @Override @@ -73,10 +100,10 @@ obj = (SurveyQuestion) super.clone(); // clone options if (options != null) { - Iterator iter = options.iterator(); - Set set = new HashSet(); + Iterator iter = options.iterator(); + Set set = new HashSet(); while (iter.hasNext()) { - SurveyOption instruct = (SurveyOption) iter.next(); + SurveyOption instruct = iter.next(); SurveyOption newInsruct = (SurveyOption) instruct.clone(); set.add(newInsruct); } @@ -95,29 +122,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 userID) { this.uid = userID; } - /** - * - * @return - */ public String getDescription() { return description; } @@ -126,12 +138,6 @@ this.description = description; } - /** - * - * - * - * @return - */ public Set getOptions() { return options; } @@ -140,11 +146,6 @@ this.options = itemInstructions; } - /** - * - * - * @return - */ public SurveyUser getCreateBy() { return createBy; } @@ -153,10 +154,6 @@ this.createBy = createBy; } - /** - * - * @return - */ public Date getCreateDate() { return createDate; } @@ -165,10 +162,6 @@ this.createDate = createDate; } - /** - * - * @return - */ public short getType() { return type; } @@ -177,10 +170,6 @@ this.type = type; } - /** - * - * @return - */ public boolean isAppendText() { return appendText; } @@ -189,10 +178,6 @@ this.appendText = appendText; } - /** - * - * @return - */ public boolean isOptional() { return optional; } @@ -201,10 +186,6 @@ this.optional = compulsory; } - /** - * - * @return - */ public boolean isAllowMultipleAnswer() { return allowMultipleAnswer; } @@ -213,10 +194,6 @@ this.allowMultipleAnswer = allowMultipleAnswer; } - /** - * - * @return - */ public int getSequenceId() { return sequenceId; } @@ -240,4 +217,4 @@ String newInput = SurveyWebUtils.removeHTMLTags(this.description); this.shortTitle = StringUtils.abbreviate(newInput, SHORT_TITLE_LENGTH); } -} +} \ No newline at end of file Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveySession.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rd7de6a4360d49e6436856f8de9fb5de7166dd3f8 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveySession.java (.../SurveySession.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveySession.java (.../SurveySession.java) (revision d7de6a4360d49e6436856f8de9fb5de7166dd3f8) @@ -25,30 +25,44 @@ 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; + /** - * Survey - * * @author Dapeng Ni - * - * - * */ + +@Entity +@Table(name = "tl_lasurv11_session") public class SurveySession { + @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 = "survey_uid") private Survey survey; + + @Column(name = "session_start_date") private Date sessionStartDate; + + @Column(name = "session_end_date") private Date sessionEndDate; -// ********************************************************** - // Get/Set methods -// ********************************************************** - /** - * - * @return Returns the learnerID. - */ public Long getUid() { return uid; } @@ -57,10 +71,6 @@ this.uid = uuid; } - /** - * - * @return - */ public Date getSessionEndDate() { return sessionEndDate; } @@ -69,11 +79,6 @@ this.sessionEndDate = sessionEndDate; } - /** - * - * - * @return - */ public Date getSessionStartDate() { return sessionStartDate; } @@ -82,11 +87,6 @@ this.sessionStartDate = sessionStartDate; } - /** - * - * - * @return - */ public Survey getSurvey() { return survey; } @@ -95,10 +95,6 @@ this.survey = survey; } - /** - * - * @return - */ public Long getSessionId() { return sessionId; } @@ -107,21 +103,11 @@ 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; } - -} +} \ No newline at end of file Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyUser.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rd7de6a4360d49e6436856f8de9fb5de7166dd3f8 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyUser.java (.../SurveyUser.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyUser.java (.../SurveyUser.java) (revision d7de6a4360d49e6436856f8de9fb5de7166dd3f8) @@ -23,38 +23,65 @@ package org.lamsfoundation.lams.tool.survey.model; +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; import org.apache.log4j.Logger; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; /** - * Survey - * * @author Dapeng Ni - * - * */ + +@Entity +@Table(name = "tl_lasurv11_user") public class SurveyUser implements Cloneable { - private static final long serialVersionUID = -7043502180037866257L; private static Logger log = Logger.getLogger(SurveyUser.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; + + @Column(name = "response_finalized") private boolean responseFinalized; + @ManyToOne + @JoinColumn(name = "session_uid") private SurveySession session; + + @ManyToOne + @JoinColumn(name = "survey_uid") private Survey survey; public SurveyUser() { } public SurveyUser(UserDTO user, SurveySession session) { - this.userId = new Long(user.getUserID().intValue()); + this.userId = user.getUserID().longValue(); this.firstName = user.getFirstName(); this.lastName = user.getLastName(); this.loginName = user.getLogin(); @@ -65,7 +92,7 @@ } public SurveyUser(UserDTO user, Survey content) { - this.userId = new Long(user.getUserID().intValue()); + this.userId = user.getUserID().longValue(); this.firstName = user.getFirstName(); this.lastName = user.getLastName(); this.loginName = user.getLogin(); @@ -103,45 +130,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) { this.uid = userID; } - /** - * - * @return Returns the userId. - */ public Long getUserId() { return userId; } - /** - * @param userId - * The userId to set. - */ public void setUserId(Long userID) { this.userId = userID; } - /** - * - * @return - */ public String getLastName() { return lastName; } @@ -150,10 +154,6 @@ this.lastName = lastName; } - /** - * - * @return - */ public String getFirstName() { return firstName; } @@ -162,10 +162,6 @@ this.firstName = firstName; } - /** - * - * @return - */ public String getLoginName() { return loginName; } @@ -174,10 +170,6 @@ this.loginName = loginName; } - /** - * - * @return - */ public SurveySession getSession() { return session; } @@ -186,10 +178,6 @@ this.session = session; } - /** - * - * @return - */ public Survey getSurvey() { return survey; } @@ -210,18 +198,10 @@ this.sessionFinished = sessionFinished; } - /** - * - * @return Returns the responseFinalized. - */ public boolean isResponseFinalized() { return responseFinalized; } - /** - * @param responseFinalized - * The responseFinalized to set. - */ public void setResponseFinalized(boolean responseFinalized) { this.responseFinalized = responseFinalized; } @@ -246,5 +226,4 @@ public int hashCode() { return new HashCodeBuilder().append(uid).append(firstName).append(lastName).append(loginName).toHashCode(); } - -} +} \ No newline at end of file Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringConditionController.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rd7de6a4360d49e6436856f8de9fb5de7166dd3f8 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringConditionController.java (.../AuthoringConditionController.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringConditionController.java (.../AuthoringConditionController.java) (revision d7de6a4360d49e6436856f8de9fb5de7166dd3f8) @@ -52,7 +52,6 @@ import org.springframework.util.MultiValueMap; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; /** * Auxiliary action in author mode. It contains operations with SurveyCondition. The rest of operations are located in @@ -134,7 +133,7 @@ * @return * @throws ServletException */ - @RequestMapping(value = "/saveOrUpdateCondition", method = RequestMethod.POST) + @RequestMapping(value = "/saveOrUpdateCondition") public String saveOrUpdateCondition(@ModelAttribute("surveyConditionForm") SurveyConditionForm surveyConditionForm, HttpServletRequest request) {