Index: lams_learning/.classpath =================================================================== diff -u -rbe86c0bc220914398d3ce8ec9ae9cab91b47353a -r7dfa802584b72c21927df5f28425ee7939fcc9c5 --- lams_learning/.classpath (.../.classpath) (revision be86c0bc220914398d3ce8ec9ae9cab91b47353a) +++ lams_learning/.classpath (.../.classpath) (revision 7dfa802584b72c21927df5f28425ee7939fcc9c5) @@ -21,6 +21,7 @@ + Fisheye: Tag 7dfa802584b72c21927df5f28425ee7939fcc9c5 refers to a dead (removed) revision in file `lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/command/Command.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 7dfa802584b72c21927df5f28425ee7939fcc9c5 refers to a dead (removed) revision in file `lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/Kumalive.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 7dfa802584b72c21927df5f28425ee7939fcc9c5 refers to a dead (removed) revision in file `lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/KumaliveLog.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 7dfa802584b72c21927df5f28425ee7939fcc9c5 refers to a dead (removed) revision in file `lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/KumalivePoll.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 7dfa802584b72c21927df5f28425ee7939fcc9c5 refers to a dead (removed) revision in file `lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/KumalivePollAnswer.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 7dfa802584b72c21927df5f28425ee7939fcc9c5 refers to a dead (removed) revision in file `lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/KumaliveRubric.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 7dfa802584b72c21927df5f28425ee7939fcc9c5 refers to a dead (removed) revision in file `lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/KumaliveScore.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 7dfa802584b72c21927df5f28425ee7939fcc9c5 refers to a dead (removed) revision in file `lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/presence/model/PresenceChatMessage.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 7dfa802584b72c21927df5f28425ee7939fcc9c5 refers to a dead (removed) revision in file `lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/presence/model/PresenceChatUser.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_learning/src/java/org/lamsfoundation/lams/learning/command/model/Command.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7dfa802584b72c21927df5f28425ee7939fcc9c5 --- lams_learning/src/java/org/lamsfoundation/lams/learning/command/model/Command.java (.../Command.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/command/model/Command.java (.../Command.java) (revision 7dfa802584b72c21927df5f28425ee7939fcc9c5) @@ -26,19 +26,36 @@ import java.io.Serializable; 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.Table; + /** * Stores a command to be sent to a learner via websocket. */ +@Entity +@Table(name = "lams_learning_command") public class Command implements Serializable { + private static final long serialVersionUID = 8662126292341034144L; + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + @Column(name = "lesson_id") private Long lessonId; + @Column(name = "user_name") private String userName; + @Column(name = "create_date") private Date createDate; + @Column(name = "command_text") private String commandText; public Command() { Index: lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/dao/hibernate/KumaliveDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7dfa802584b72c21927df5f28425ee7939fcc9c5 --- lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/dao/hibernate/KumaliveDAO.java (.../KumaliveDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/dao/hibernate/KumaliveDAO.java (.../KumaliveDAO.java) (revision 7dfa802584b72c21927df5f28425ee7939fcc9c5) @@ -25,7 +25,7 @@ import java.util.List; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.learning.kumalive.dao.IKumaliveDAO; import org.lamsfoundation.lams.learning.kumalive.model.Kumalive; @@ -83,10 +83,9 @@ return (List) doFind(query.toString(), organisationId); } - @SuppressWarnings("unchecked") @Override public List findKumalives(List kumaliveIds) { - Query query = getSession().createQuery(FIND_KUMALIVES_BY_IDS); + Query query = getSession().createQuery(FIND_KUMALIVES_BY_IDS, Kumalive.class); query.setParameterList("ids", kumaliveIds); return query.list(); } Index: lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/Kumalive.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7dfa802584b72c21927df5f28425ee7939fcc9c5 --- lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/Kumalive.java (.../Kumalive.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/Kumalive.java (.../Kumalive.java) (revision 7dfa802584b72c21927df5f28425ee7939fcc9c5) @@ -23,21 +23,53 @@ package org.lamsfoundation.lams.learning.kumalive.model; import java.io.Serializable; +import java.util.HashSet; 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.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.User; +@Entity +@Table(name = "lams_kumalive") public class Kumalive implements Serializable { - private static final long serialVersionUID = -7932572065216398930L; + @Id + @Column(name = "kumalive_id") + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long kumaliveId; + + @ManyToOne(optional=false) + @JoinColumn(name = "organisation_id") private Organisation organisation; + + @ManyToOne + @JoinColumn(name = "create_by") private User createdBy; + + @Column private String name; + + @Column private Boolean finished = false; - private Set rubrics; + + @OneToMany(fetch = FetchType.EAGER) + @JoinColumn(name = "kumalive_id") + @OrderBy("order_id ASC") + private Set rubrics = new HashSet<>(); public Kumalive() { } Index: lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumaliveLog.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7dfa802584b72c21927df5f28425ee7939fcc9c5 --- lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumaliveLog.java (.../KumaliveLog.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumaliveLog.java (.../KumaliveLog.java) (revision 7dfa802584b72c21927df5f28425ee7939fcc9c5) @@ -25,17 +25,36 @@ import java.io.Serializable; import java.util.Date; -public class KumaliveLog implements Serializable { +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; +@Entity +@Table(name = "lams_kumalive_log") +public class KumaliveLog implements Serializable { private static final long serialVersionUID = -2294366826356383997L; public static final short TYPE_HAND_UP = 1; public static final short TYPE_HAND_DOWN = 2; + @Id + @Column(name = "log_id") + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long logId; + + @Column(name = "kumalive_id") private Long kumaliveId; + + @Column(name = "user_id") private Integer userId; + + @Column(name = "log_date") private Date date; + + @Column(name = "log_type") private Short type; public KumaliveLog() { Index: lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePoll.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7dfa802584b72c21927df5f28425ee7939fcc9c5 --- lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePoll.java (.../KumalivePoll.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePoll.java (.../KumalivePoll.java) (revision 7dfa802584b72c21927df5f28425ee7939fcc9c5) @@ -27,17 +27,51 @@ import java.util.HashSet; import java.util.Set; -public class KumalivePoll implements Serializable { +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; +@Entity +@Table(name = "lams_kumalive_poll") +public class KumalivePoll implements Serializable { private static final long serialVersionUID = 5154401897739494150L; + @Id + @Column(name = "poll_id") + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long pollId; + + @ManyToOne(optional=false) + @JoinColumn(name = "kumalive_id") private Kumalive kumalive; + + @Column private String name; + + @Column(name = "votes_released") private Boolean votesReleased; + + @Column(name = "voters_released") private Boolean votersReleased; + + @Column(name = "start_date") private Date startDate; + + @Column(name = "finish_date") private Date finishDate; + + @OneToMany(fetch = FetchType.EAGER) + @JoinColumn(name = "poll_id") + @OrderBy("order_id ASC") private Set answers; public KumalivePoll() { Index: lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePollAnswer.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7dfa802584b72c21927df5f28425ee7939fcc9c5 --- lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePollAnswer.java (.../KumalivePollAnswer.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePollAnswer.java (.../KumalivePollAnswer.java) (revision 7dfa802584b72c21927df5f28425ee7939fcc9c5) @@ -25,16 +25,58 @@ import java.io.Serializable; import java.util.Date; import java.util.Map; +import java.util.TreeMap; -public class KumalivePollAnswer implements Serializable { +import javax.persistence.CollectionTable; +import javax.persistence.Column; +import javax.persistence.ElementCollection; +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.MapKeyColumn; +import javax.persistence.OrderBy; +import javax.persistence.Table; +@Entity +@Table(name = "lams_kumalive_poll_answer") +public class KumalivePollAnswer implements Serializable { private static final long serialVersionUID = -760184191959618734L; + @Id + @Column(name = "answer_id") + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long answerId; + + @ManyToOne(optional=false) + @JoinColumn(name = "poll_id") private KumalivePoll poll; + + @Column(name = "order_id") private Short orderId; + + @Column private String name; - private Map votes; + +// +// +// +// +// + +// @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER) +// @JoinColumn(name = "kumalive_id") +// @OrderBy("sequence_id ASC") + + @ElementCollection(fetch = FetchType.LAZY) + @OrderBy("vote_date ASC") + @MapKeyColumn(name="user_id") + @Column(name="vote_date") + @CollectionTable(name="lams_kumalive_poll_vote", joinColumns=@JoinColumn(name="answer_id")) + private Map votes = new TreeMap<>(); public KumalivePollAnswer() { } Index: lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumaliveRubric.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7dfa802584b72c21927df5f28425ee7939fcc9c5 --- lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumaliveRubric.java (.../KumaliveRubric.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumaliveRubric.java (.../KumaliveRubric.java) (revision 7dfa802584b72c21927df5f28425ee7939fcc9c5) @@ -24,16 +24,39 @@ 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.lamsfoundation.lams.usermanagement.Organisation; +@Entity +@Table(name = "lams_kumalive_rubric") public class KumaliveRubric implements Serializable { - private static final long serialVersionUID = 1425357203513480609L; + @Id + @Column(name = "rubric_id") + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long rubricId; + + @ManyToOne(optional=false) + @JoinColumn(name = "organisation_id") private Organisation organisation; + + @ManyToOne + @JoinColumn(name = "kumalive_id") private Kumalive kumalive; + + @Column(name = "order_id") private Short orderId; + + @Column private String name; public KumaliveRubric() { Index: lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumaliveScore.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7dfa802584b72c21927df5f28425ee7939fcc9c5 --- lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumaliveScore.java (.../KumaliveScore.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumaliveScore.java (.../KumaliveScore.java) (revision 7dfa802584b72c21927df5f28425ee7939fcc9c5) @@ -24,15 +24,39 @@ 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.lamsfoundation.lams.usermanagement.User; +@Entity +@Table(name = "lams_kumalive_score") public class KumaliveScore implements Serializable { private static final long serialVersionUID = -5191089091527630037L; + @Id + @Column(name = "score_id") + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long scoreId; + + @ManyToOne(optional=false) + @JoinColumn(name = "rubric_id") private KumaliveRubric rubric; + + @ManyToOne + @JoinColumn(name = "user_id") private User user; + + @Column private Long batch; + + @Column private Short score; public KumaliveScore() { Index: lams_learning/src/java/org/lamsfoundation/lams/learning/presence/model/PresenceChatMessage.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7dfa802584b72c21927df5f28425ee7939fcc9c5 --- lams_learning/src/java/org/lamsfoundation/lams/learning/presence/model/PresenceChatMessage.java (.../PresenceChatMessage.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/presence/model/PresenceChatMessage.java (.../PresenceChatMessage.java) (revision 7dfa802584b72c21927df5f28425ee7939fcc9c5) @@ -27,25 +27,39 @@ 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.Table; + +@Entity +@Table(name = "lams_presence_chat_msgs") public class PresenceChatMessage implements java.io.Serializable, Cloneable { + private static final long serialVersionUID = -8892809174427080723L; + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + @Column(name = "lesson_id") private Long lessonId; + @Column(name = "from_user") private String from; + @Column(name = "to_user") private String to; + @Column(name = "date_sent") private Date dateSent; + @Column private String message; public PresenceChatMessage() { - } public PresenceChatMessage(Long lessonId, String from, String to, Date dateSent, String message) { @@ -57,9 +71,6 @@ this.message = message; } - /** - * - */ public Long getUid() { return uid; } @@ -68,9 +79,6 @@ this.uid = uid; } - /** - * - */ public Long getLessonId() { return lessonId; } @@ -79,9 +87,6 @@ this.lessonId = lessonId; } - /** - * - */ public String getFrom() { return from; } @@ -90,9 +95,6 @@ this.from = from; } - /** - * - */ public String getTo() { return to; } @@ -101,9 +103,6 @@ this.to = to; } - /** - * - */ public Date getDateSent() { return dateSent; } @@ -112,9 +111,6 @@ this.dateSent = dateSent; } - /** - * - */ public String getMessage() { return message; } Index: lams_learning/src/java/org/lamsfoundation/lams/learning/presence/model/PresenceChatUser.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7dfa802584b72c21927df5f28425ee7939fcc9c5 --- lams_learning/src/java/org/lamsfoundation/lams/learning/presence/model/PresenceChatUser.java (.../PresenceChatUser.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/presence/model/PresenceChatUser.java (.../PresenceChatUser.java) (revision 7dfa802584b72c21927df5f28425ee7939fcc9c5) @@ -21,21 +21,28 @@ * **************************************************************** */ - - package org.lamsfoundation.lams.learning.presence.model; import java.util.Date; -/** - * - */ +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + +@Entity +@Table(name = "lams_presence_user") public class PresenceChatUser implements java.io.Serializable, Cloneable { + private static final long serialVersionUID = 583967496079297454L; + @Id + @Column private String nickname; + @Column(name = "lesson_id") private Long lessonId; + @Column(name = "last_presence") private Date lastPresence; public PresenceChatUser() { @@ -47,9 +54,6 @@ this.lastPresence = lastPresence; } - /** - * - */ public String getNickname() { return nickname; } @@ -58,9 +62,6 @@ this.nickname = nickname; } - /** - * - */ public Long getLessonId() { return lessonId; } @@ -69,9 +70,6 @@ this.lessonId = lessonId; } - /** - * - */ public Date getLastPresence() { return lastPresence; }