Index: lams_common/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/build.xml,v
diff -u -r1.69 -r1.69.6.1
--- lams_common/build.xml 9 Apr 2009 05:05:51 -0000 1.69
+++ lams_common/build.xml 26 Feb 2010 21:16:35 -0000 1.69.6.1
@@ -435,6 +435,7 @@
+
Index: lams_common/conf/hibernate/mappings/hibernate.cfg.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/hibernate.cfg.xml,v
diff -u -r1.1 -r1.1.6.1
--- lams_common/conf/hibernate/mappings/hibernate.cfg.xml 6 Apr 2009 17:08:08 -0000 1.1
+++ lams_common/conf/hibernate/mappings/hibernate.cfg.xml 26 Feb 2010 21:16:34 -0000 1.1.6.1
@@ -46,5 +46,6 @@
+
\ No newline at end of file
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/planner/PedagogicalPlannerNodeRole.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_common/db/sql/create_lams_11_tables.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/create_lams_11_tables.sql,v
diff -u -r1.138.2.6.2.1 -r1.138.2.6.2.2
--- lams_common/db/sql/create_lams_11_tables.sql 25 Feb 2010 18:34:38 -0000 1.138.2.6.2.1
+++ lams_common/db/sql/create_lams_11_tables.sql 26 Feb 2010 21:16:34 -0000 1.138.2.6.2.2
@@ -1146,4 +1146,17 @@
, PRIMARY KEY (user_id,learning_design_id)
)TYPE=InnoDB;
+CREATE TABLE lams_planner_node_role (
+ uid BIGINT(20) NOT NULL AUTO_INCREMENT
+ , node_uid BIGINT(20) NOT NULL
+ , user_id BIGINT(20) NOT NULL
+ , role_id INT(6) NOT NULL
+ , PRIMARY KEY (uid)
+ , UNIQUE KEY (node_uid, user_id, role_id)
+ , CONSTRAINT FK_planner_node_role_user FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE NO ACTION
+ , CONSTRAINT FK_planner_node_role_node FOREIGN KEY (node_uid) REFERENCES lams_planner_nodes (uid) ON DELETE CASCADE ON UPDATE NO ACTION
+ , CONSTRAINT FK_planner_node_role_role FOREIGN KEY (role_id) REFERENCES lams_role (role_id) ON DELETE CASCADE ON UPDATE NO ACTION
+)TYPE=InnoDB;
+
+
Index: lams_common/db/sql/drop_lams_11_tables.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/drop_lams_11_tables.sql,v
diff -u -r1.29 -r1.29.8.1
--- lams_common/db/sql/drop_lams_11_tables.sql 13 Feb 2009 17:45:21 -0000 1.29
+++ lams_common/db/sql/drop_lams_11_tables.sql 26 Feb 2010 21:16:34 -0000 1.29.8.1
@@ -56,6 +56,8 @@
DROP TABLE IF EXISTS lams_workspace_folder_type;
DROP TABLE IF EXISTS lams_workspace_folder_content_type;
DROP TABLE IF EXISTS lams_workspace_folder_content;
+DROP TABLE IF EXISTS lams_planner_recent_learning_designs;
+DROP TABLE IF EXISTS lams_planner_node_role;
-- Drop Quartz Tables
DROP TABLE IF EXISTS lams_quartz_JOB_LISTENERS;
Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/commonContext.xml,v
diff -u -r1.79.2.3 -r1.79.2.3.2.1
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml 3 Jun 2009 06:36:29 -0000 1.79.2.3
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml 26 Feb 2010 21:16:34 -0000 1.79.2.3.2.1
@@ -89,6 +89,7 @@
classpath:org/lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.hbm.xml
+ classpath:org/lamsfoundation/lams/planner/PedagogicalPlannerNodeRole.hbm.xml
classpath:org/lamsfoundation/lams/gradebook/GradebookUserActivity.hbm.xml
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/planner/PedagogicalPlannerNodeRole.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/planner/PedagogicalPlannerNodeRole.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/planner/PedagogicalPlannerNodeRole.java,v
diff -u -r1.1.2.3 -r1.1.2.4
--- lams_common/src/java/org/lamsfoundation/lams/planner/PedagogicalPlannerNodeRole.java 25 Feb 2010 19:13:23 -0000 1.1.2.3
+++ lams_common/src/java/org/lamsfoundation/lams/planner/PedagogicalPlannerNodeRole.java 26 Feb 2010 21:16:34 -0000 1.1.2.4
@@ -25,7 +25,11 @@
import org.lamsfoundation.lams.usermanagement.Role;
import org.lamsfoundation.lams.usermanagement.User;
-
+
+/**
+ * @hibernate.class table="lams_planner_node_role"
+ *
+ */
public class PedagogicalPlannerNodeRole {
Long uid;
@@ -44,34 +48,45 @@
this.role = role;
}
+ /**
+ * @hibernate.id column="uid" generator-class="native" type="java.lang.Long"
+ */
public Long getUid() {
return uid;
}
-
public void setUid(Long uid) {
this.uid = uid;
}
+ /**
+ * @hibernate.many-to-one column="node_uid" cascade="delete"
+ * @return
+ */
public PedagogicalPlannerSequenceNode getNode() {
return node;
}
-
public void setNode(PedagogicalPlannerSequenceNode node) {
this.node = node;
}
+ /**
+ * @hibernate.many-to-one column="user_id" cascade="delete" not-null="true"
+ * @return
+ */
public User getUser() {
return user;
}
-
public void setUser(User user) {
this.user = user;
}
+ /**
+ * @hibernate.many-to-one column="role_id" cascade="delete" not-null="true"
+ * @return
+ */
public Role getRole() {
return role;
}
-
public void setRole(Role role) {
this.role = role;
}
Index: lams_common/src/java/org/lamsfoundation/lams/planner/dao/hibernate/PedagogicalPlannerDAOHibernate.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/planner/dao/hibernate/PedagogicalPlannerDAOHibernate.java,v
diff -u -r1.4.8.1 -r1.4.8.2
--- lams_common/src/java/org/lamsfoundation/lams/planner/dao/hibernate/PedagogicalPlannerDAOHibernate.java 25 Feb 2010 19:13:23 -0000 1.4.8.1
+++ lams_common/src/java/org/lamsfoundation/lams/planner/dao/hibernate/PedagogicalPlannerDAOHibernate.java 26 Feb 2010 21:16:34 -0000 1.4.8.2
@@ -54,7 +54,7 @@
private static final String FIND_NEIGHBOUR_NODE_DESC = "FROM " + PedagogicalPlannerSequenceNode.class.getName()
+ " AS n WHERE ((? IS NULL AND n.parent=NULL) OR n.parent.uid=?) AND n.order<=? ORDER BY n.order DESC";
private static final String GET_PLANNER_NODE_ROLE = "FROM " + PedagogicalPlannerNodeRole.class.getName()
- + " WHERE user.userId=? AND node.uid=? AND role.roleId=?";
+ + " AS r WHERE r.user.userId=? AND r.node.uid=? AND r.role.roleId=?";
// TODO include inherited users
private static final String GET_PLANNER_NODE_ROLE_USERS = "SELECT p.user FROM "
+ PedagogicalPlannerNodeRole.class.getName() + " AS p WHERE p.node.uid=? AND p.role.roleId=?";