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.159 -r1.160
--- lams_common/db/sql/create_lams_11_tables.sql 2 Dec 2011 19:43:40 -0000 1.159
+++ lams_common/db/sql/create_lams_11_tables.sql 5 Dec 2011 16:04:24 -0000 1.160
@@ -227,6 +227,7 @@
, admin_browse_all_users TINYINT(1) NOT NULL DEFAULT 0
, admin_change_status TINYINT(1) NOT NULL DEFAULT 0
, admin_create_guest TINYINT(1) NOT NULL DEFAULT 0
+ , enable_course_notifications TINYINT(1) NOT NULL DEFAULT 0
, enable_monitor_gradebook TINYINT(1) NOT NULL DEFAULT 0
, enable_learner_gradebook TINYINT(1) NOT NULL DEFAULT 0
, locale_id INTEGER
@@ -650,6 +651,7 @@
, learner_presence_avail TINYINT(1) DEFAULT 0
, learner_im_avail TINYINT(1) DEFAULT 0
, live_edit_enabled TINYINT(1) DEFAULT 0
+ , enable_lesson_notifications TINYINT(1) DEFAULT 0
, locked_for_edit TINYINT DEFAULT 0
, marks_released TINYINT DEFAULT 0
, version INTEGER DEFAULT 1
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040006.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040006.sql,v
diff -u -r1.13 -r1.14
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040006.sql 2 Dec 2011 19:43:40 -0000 1.13
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040006.sql 5 Dec 2011 16:04:24 -0000 1.14
@@ -165,6 +165,10 @@
ALTER TABLE lams_lesson ADD COLUMN scheduled_number_days_to_lesson_finish INT(3) DEFAULT NULL;
ALTER TABLE lams_user_group ADD COLUMN scheduled_lesson_end_date DATETIME;
+-- WVI-15 Email Notifications
+ALTER TABLE lams_lesson ADD COLUMN enable_lesson_notifications TINYINT(1) DEFAULT 0;
+ALTER TABLE lams_organisation ADD COLUMN enable_course_notifications TINYINT(1) NOT NULL DEFAULT 0;
+
COMMIT;
SET AUTOCOMMIT = 1;
set FOREIGN_KEY_CHECKS = 1;
Index: lams_common/src/java/org/lamsfoundation/lams/index/IndexLessonBean.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/index/IndexLessonBean.java,v
diff -u -r1.1 -r1.2
--- lams_common/src/java/org/lamsfoundation/lams/index/IndexLessonBean.java 8 Jan 2008 07:02:33 -0000 1.1
+++ lams_common/src/java/org/lamsfoundation/lams/index/IndexLessonBean.java 5 Dec 2011 16:04:24 -0000 1.2
@@ -26,101 +26,129 @@
/**
* @version
- *
+ *
*
- * View Source
+ * View Source
*
- *
+ *
* @author Fei Yang
- *
+ *
* Created at 10:13:43 on 14/06/2006
*/
-public class IndexLessonBean implements Comparable{
- private Long id;
- private String name;
- private String description;
- private String url;
- private Integer state;
- private boolean completed;
- private List links;
+public class IndexLessonBean implements Comparable {
+ private Long id;
+ private String name;
+ private String description;
+ private String url;
+ private Integer state;
+ private boolean completed;
+ private boolean enableLessonNotifications;
+ private List links;
- public IndexLessonBean(String name, String url) {
- this.name = name;
- this.url = url;
- }
-
- public IndexLessonBean(Long id, String name, String description, Integer state, boolean completed) {
- this.id = id;
- this.name = name;
- this.description = description;
- this.state = state;
- this.completed = completed;
- }
-
- public IndexLessonBean(Long id, String name, String description, String url, Integer state, boolean completed, List links) {
- this.id = id;
- this.name = name;
- this.description = description;
- this.url = url;
- this.state = state;
- this.completed = completed;
- this.links = links;
- }
- /**
- * @return Returns the links.
- */
- public List getLinks() {
- return links;
- }
- /**
- * @param links The links to set.
- */
- public void setLinks(List links) {
- this.links = links;
- }
- public Long getId() {
- return id;
- }
- public void setId(Long id) {
- this.id = id;
- }
- /**
- * @return Returns the name.
- */
- public String getName() {
- return name;
- }
- /**
- * @param name The name to set.
- */
- public void setName(String name) {
- this.name = name;
- }
- public int compareTo(Object o) {
- return name.compareTo(((IndexLessonBean)o).getName());
- }
- public String getDescription() {
- return description;
- }
- public void setDescription(String description) {
- this.description = description;
- }
- public String getUrl() {
- return url;
- }
- public void setUrl(String url) {
- this.url = url;
- }
- public Integer getState() {
- return state;
- }
- public void setState(Integer state) {
- this.state = state;
- }
- public boolean getCompleted() {
- return completed;
- }
- public void setCompleted(boolean completed) {
- this.completed = completed;
- }
+ public IndexLessonBean(String name, String url) {
+ this.name = name;
+ this.url = url;
+ }
+
+ public IndexLessonBean(Long id, String name, String description, Integer state, boolean completed, boolean enableLessonNotifications) {
+ this.id = id;
+ this.name = name;
+ this.description = description;
+ this.state = state;
+ this.completed = completed;
+ this.enableLessonNotifications = enableLessonNotifications;
+ }
+
+ public IndexLessonBean(Long id, String name, String description, String url, Integer state, boolean completed,
+ List links) {
+ this.id = id;
+ this.name = name;
+ this.description = description;
+ this.url = url;
+ this.state = state;
+ this.completed = completed;
+ this.links = links;
+ }
+
+ /**
+ * @return Returns the links.
+ */
+ public List getLinks() {
+ return links;
+ }
+
+ /**
+ * @param links
+ * The links to set.
+ */
+ public void setLinks(List links) {
+ this.links = links;
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ /**
+ * @return Returns the name.
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @param name
+ * The name to set.
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public int compareTo(Object o) {
+ return name.compareTo(((IndexLessonBean) o).getName());
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public boolean getCompleted() {
+ return completed;
+ }
+
+ public void setCompleted(boolean completed) {
+ this.completed = completed;
+ }
+
+ public boolean isEnableLessonNotifications() {
+ return enableLessonNotifications;
+ }
+
+ public void setEnableLessonNotifications(boolean enableLessonNotifications) {
+ this.enableLessonNotifications = enableLessonNotifications;
+ }
}
Index: lams_common/src/java/org/lamsfoundation/lams/index/IndexLinkBean.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/index/IndexLinkBean.java,v
diff -u -r1.2 -r1.3
--- lams_common/src/java/org/lamsfoundation/lams/index/IndexLinkBean.java 10 Nov 2008 03:46:27 -0000 1.2
+++ lams_common/src/java/org/lamsfoundation/lams/index/IndexLinkBean.java 5 Dec 2011 16:04:24 -0000 1.3
@@ -34,63 +34,79 @@
* Created at 10:12:09 on 14/06/2006
*/
public class IndexLinkBean {
-
- private String name;
- private String url;
- private String style;
- private String tooltip;
-
- public IndexLinkBean(String name, String url, String style, String tooltip) {
- super();
- this.name = name;
- this.url = url;
- this.style = style;
- this.tooltip = tooltip;
- }
-
- public IndexLinkBean(String name, String url) {
- this.name = name;
- this.url = url;
- }
- /**
- * @return Returns the name.
- */
- public String getName() {
- return name;
- }
- /**
- * @param name The name to set.
- */
- public void setName(String name) {
- this.name = name;
- }
- /**
- * @return Returns the url.
- */
- public String getUrl() {
- return url;
- }
- /**
- * @param url The url to set.
- */
- public void setUrl(String url) {
- this.url = url;
- }
-
- public String getStyle() {
- return style;
- }
-
- public void setStyle(String style) {
- this.style = style;
- }
-
- public String getTooltip() {
- return tooltip;
- }
- public void setTooltip(String tooltip) {
- this.tooltip = tooltip;
- }
+ private String name;
+ private String url;
+ private String style;
+ private String spanStyle;
+ private String tooltip;
+ public IndexLinkBean(String name, String url, String style, String spanStyle, String tooltip) {
+ super();
+ this.name = name;
+ this.url = url;
+ this.style = style;
+ this.spanStyle = spanStyle;
+ this.tooltip = tooltip;
+ }
+
+ public IndexLinkBean(String name, String url) {
+ this.name = name;
+ this.url = url;
+ }
+
+ /**
+ * @return Returns the name.
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @param name
+ * The name to set.
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /**
+ * @return Returns the url.
+ */
+ public String getUrl() {
+ return url;
+ }
+
+ /**
+ * @param url
+ * The url to set.
+ */
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ public String getStyle() {
+ return style;
+ }
+
+ public void setStyle(String style) {
+ this.style = style;
+ }
+
+ public String getSpanStyle() {
+ return spanStyle;
+ }
+
+ public void setSpanStyle(String spanStyle) {
+ this.spanStyle = spanStyle;
+ }
+
+ public String getTooltip() {
+ return tooltip;
+ }
+
+ public void setTooltip(String tooltip) {
+ this.tooltip = tooltip;
+ }
+
}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IGroupUserDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IGroupUserDAO.java,v
diff -u -r1.2 -r1.3
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IGroupUserDAO.java 2 Dec 2011 19:43:40 -0000 1.2
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IGroupUserDAO.java 5 Dec 2011 16:04:24 -0000 1.3
@@ -23,18 +23,23 @@
/* $Id$ */
package org.lamsfoundation.lams.learningdesign.dao;
+import java.util.Date;
+import java.util.List;
+
import org.lamsfoundation.lams.dao.IBaseDAO;
-import org.lamsfoundation.lams.learningdesign.Group;
import org.lamsfoundation.lams.learningdesign.GroupUser;
import org.lamsfoundation.lams.lesson.Lesson;
+import org.lamsfoundation.lams.usermanagement.User;
/**
* @author Andrey Balan
*/
public interface IGroupUserDAO extends IBaseDAO {
- public GroupUser getGroupUser(Lesson lesson, Integer userId);
+ GroupUser getGroupUser(Lesson lesson, Integer userId);
+
+ List getUsersWithLessonEndingSoonerThan(Lesson lesson, Date timeToScheduledLessonEnd);
- public void saveGroupUser(GroupUser groupUser);
+ void saveGroupUser(GroupUser groupUser);
}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupUserDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupUserDAO.java,v
diff -u -r1.2 -r1.3
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupUserDAO.java 2 Dec 2011 19:43:40 -0000 1.2
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupUserDAO.java 5 Dec 2011 16:04:24 -0000 1.3
@@ -23,19 +23,25 @@
/* $Id$ */
package org.lamsfoundation.lams.learningdesign.dao.hibernate;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
import org.lamsfoundation.lams.learningdesign.GroupUser;
import org.lamsfoundation.lams.learningdesign.dao.IGroupUserDAO;
import org.lamsfoundation.lams.lesson.Lesson;
+import org.lamsfoundation.lams.usermanagement.User;
/**
* @author Andrey Balan
*/
public class GroupUserDAO extends BaseDAO implements IGroupUserDAO {
+ private static final String GET_USERS_BY_LESSON_AND_TIME = "SELECT DISTINCT gu.user FROM "
+ + GroupUser.class.getName()
+ + " AS gu WHERE gu.group.grouping.groupingId=? AND (gu.scheduledLessonEndDate IS NOT NULL) AND (NOW() < gu.scheduledLessonEndDate) AND (? > gu.scheduledLessonEndDate)";
+
public GroupUser getGroupUser(Lesson lesson, Integer userId) {
HashMap properties = new HashMap();
properties.put("group.grouping.groupingId", lesson.getLessonClass().getGroupingId());
@@ -46,9 +52,21 @@
} else {
return list.get(0);
}
-
+
}
+ /**
+ * Returns users with deadline sooner than specified date
+ *
+ * @param lesson
+ * @param timeToScheduledLessonEnd
+ * @return
+ */
+ public List getUsersWithLessonEndingSoonerThan(Lesson lesson, Date timeToScheduledLessonEnd) {
+ return getHibernateTemplate().find(GET_USERS_BY_LESSON_AND_TIME,
+ new Object[] { lesson.getLessonClass().getGroupingId(), timeToScheduledLessonEnd });
+ }
+
public void saveGroupUser(GroupUser groupUser) {
getHibernateTemplate().save(groupUser);
}
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java,v
diff -u -r1.37 -r1.38
--- lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java 2 Dec 2011 19:43:40 -0000 1.37
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java 5 Dec 2011 16:04:24 -0000 1.38
@@ -143,6 +143,9 @@
private Boolean liveEditEnabled;
/** Persistent field. Defaults to FALSE if not set to anything by a constructor parameter. */
+ private Boolean enableLessonNotifications;
+
+ /** Persistent field. Defaults to FALSE if not set to anything by a constructor parameter. */
private Boolean marksReleased;
private Date releaseDate;
@@ -160,11 +163,12 @@
*/
public Lesson(String name, String description, Date createDateTime, User user, Integer lessonStateId,
Integer previousLessonStateId, Boolean learnerExportAvailable, LearningDesign learningDesign,
- Set learnerProgresses, Boolean learnerPresenceAvailable, Boolean learnerImAvailable, Boolean liveEditEnabled, Integer scheduledNumberDaysTolessonFinish) {
+ Set learnerProgresses, Boolean learnerPresenceAvailable, Boolean learnerImAvailable,
+ Boolean liveEditEnabled, Boolean enableLessonNotifications, Integer scheduledNumberDaysTolessonFinish) {
this(null, name, description, createDateTime, null, null, user, lessonStateId, previousLessonStateId,
learnerExportAvailable, false, learningDesign, null, null, learnerProgresses, learnerPresenceAvailable,
- learnerImAvailable, liveEditEnabled, scheduledNumberDaysTolessonFinish);
- }
+ learnerImAvailable, liveEditEnabled, enableLessonNotifications, scheduledNumberDaysTolessonFinish);
+ }
/**
* Constructor that creates a new lesson with organization and class information. Chain construtor pattern
@@ -176,39 +180,40 @@
Boolean learnerPresenceAvailable, Boolean learnerImAvailable, Boolean liveEditEnabled) {
this(null, name, description, createDateTime, null, null, user, lessonStateId, previousLessonStateId,
learnerExportAvailable, false, learningDesign, lessonClass, organisation, learnerProgresses,
- learnerPresenceAvailable, learnerImAvailable, liveEditEnabled, null);
- }
+ learnerPresenceAvailable, learnerImAvailable, liveEditEnabled, false, null);
+ }
/** full constructor */
public Lesson(Long lessonId, String name, String description, Date createDateTime, Date startDateTime,
Date endDateTime, User user, Integer lessonStateId, Integer previousLessonStateId,
Boolean learnerExportAvailable, Boolean lockedForEdit, LearningDesign learningDesign,
LessonClass lessonClass, Organisation organisation, Set learnerProgresses,
Boolean learnerPresenceAvailable, Boolean learnerImAvailable, Boolean liveEditEnabled,
- Integer scheduledNumberDaysToLessonFinish) {
- this.lessonId = lessonId;
- this.lessonName = name;
- this.lessonDescription = description;
- this.createDateTime = createDateTime;
- this.startDateTime = startDateTime;
- this.endDateTime = endDateTime;
- this.user = user;
- this.lessonStateId = lessonStateId;
- this.previousLessonStateId = previousLessonStateId;
- this.learnerExportAvailable = learnerExportAvailable != null ? learnerExportAvailable : Boolean.FALSE;
- this.learnerPresenceAvailable = learnerPresenceAvailable != null ? learnerPresenceAvailable : Boolean.FALSE;
- this.learnerImAvailable = learnerImAvailable != null ? learnerImAvailable : Boolean.FALSE;
- this.lockedForEdit = false;
- this.learningDesign = learningDesign;
- this.lessonClass = lessonClass;
- this.organisation = organisation;
- this.learnerProgresses = learnerProgresses;
- this.liveEditEnabled = liveEditEnabled;
- this.gradebookUserLessons = new HashSet();
- this.marksReleased = false;
- this.scheduledNumberDaysToLessonFinish = scheduledNumberDaysToLessonFinish;
+ Boolean enableLessonNotifications, Integer scheduledNumberDaysToLessonFinish) {
+ this.lessonId = lessonId;
+ this.lessonName = name;
+ this.lessonDescription = description;
+ this.createDateTime = createDateTime;
+ this.startDateTime = startDateTime;
+ this.endDateTime = endDateTime;
+ this.user = user;
+ this.lessonStateId = lessonStateId;
+ this.previousLessonStateId = previousLessonStateId;
+ this.learnerExportAvailable = learnerExportAvailable != null ? learnerExportAvailable : Boolean.FALSE;
+ this.learnerPresenceAvailable = learnerPresenceAvailable != null ? learnerPresenceAvailable : Boolean.FALSE;
+ this.learnerImAvailable = learnerImAvailable != null ? learnerImAvailable : Boolean.FALSE;
+ this.lockedForEdit = false;
+ this.learningDesign = learningDesign;
+ this.lessonClass = lessonClass;
+ this.organisation = organisation;
+ this.learnerProgresses = learnerProgresses;
+ this.liveEditEnabled = liveEditEnabled;
+ this.enableLessonNotifications = enableLessonNotifications;
+ this.gradebookUserLessons = new HashSet();
+ this.marksReleased = false;
+ this.scheduledNumberDaysToLessonFinish = scheduledNumberDaysToLessonFinish;
}
-
+
/**
* Factory method that create a new lesson. It initialized all necessary data for a new lesson with organization and
* lesson class information. It is designed for monitor side to create a lesson by teacher.
@@ -270,6 +275,7 @@
Boolean learnerPresenceAvailable,
Boolean learnerImAvailable,
Boolean liveEditEnabled,
+ Boolean enableLessonNotifications,
Integer scheduledNumberDaysToLessonFinish)
{
return new Lesson(lessonName,
@@ -284,6 +290,7 @@
learnerPresenceAvailable,
learnerImAvailable,
liveEditEnabled,
+ enableLessonNotifications,
scheduledNumberDaysToLessonFinish);
}
//---------------------------------------------------------------------
@@ -526,6 +533,17 @@
this.liveEditEnabled = liveEditEnabled;
}
+ /**
+ * @hibernate.property type="java.lang.Boolean" column="enable_lesson_notifications" length="1"
+ */
+ public Boolean getEnableLessonNotifications() {
+ return enableLessonNotifications;
+ }
+
+ public void setEnableLessonNotifications(Boolean enableLessonNotifications) {
+ this.enableLessonNotifications = enableLessonNotifications;
+ }
+
/**
* @hibernate.property type="java.lang.Boolean" column="locked_for_edit"
* length="1"
@@ -676,15 +694,15 @@
this.marksReleased = marksReleased;
}
- /**
- * @hibernate.property type="java.util.Date" column="release_date"
+ /**
+ * @hibernate.property type="java.util.Date" column="release_date"
*
*/
public Date getReleaseDate() {
- return releaseDate;
- }
+ return releaseDate;
+ }
- public void setReleaseDate(Date releaseDate) {
- this.releaseDate = releaseDate;
- }
+ public void setReleaseDate(Date releaseDate) {
+ this.releaseDate = releaseDate;
+ }
}
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java,v
diff -u -r1.40 -r1.41
--- lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java 5 Nov 2010 00:19:09 -0000 1.40
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java 5 Dec 2011 16:04:24 -0000 1.41
@@ -774,8 +774,11 @@
String lessonDescription = (String) tuple[2];
Integer lessonState = (Integer) tuple[3];
Boolean lessonCompleted = (Boolean) tuple[4];
+ lessonCompleted = lessonCompleted == null ? false : lessonCompleted.booleanValue();
+ Boolean enableLessonNotifications = (Boolean) tuple[5];
+ enableLessonNotifications = enableLessonNotifications == null ? false : enableLessonNotifications.booleanValue();
IndexLessonBean bean = new IndexLessonBean(lessonId, lessonName, lessonDescription, lessonState,
- (lessonCompleted == null ? false : lessonCompleted.booleanValue()));
+ lessonCompleted, enableLessonNotifications);
map.put(new Long(lessonId), bean);
}
}
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java,v
diff -u -r1.19 -r1.20
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java 9 Apr 2009 00:08:36 -0000 1.19
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java 5 Dec 2011 16:04:24 -0000 1.20
@@ -32,21 +32,20 @@
import org.apache.commons.lang.builder.ToStringBuilder;
import org.lamsfoundation.lams.usermanagement.dto.OrganisationDTO;
-/**
- * @hibernate.class
- * table="lams_organisation"
- *
-*/
+/**
+ * @hibernate.class table="lams_organisation"
+ *
+ */
public class Organisation implements Serializable, Comparable {
- private static final long serialVersionUID = -6742443056151585129L;
+ private static final long serialVersionUID = -6742443056151585129L;
- /** identifier field */
+ /** identifier field */
private Integer organisationId;
/** nullable persistent field */
private String name;
-
+
/** nullable persistent field */
private String code;
@@ -73,460 +72,415 @@
/** persistent field */
private Set childOrganisations;
-
+
/** persistent field */
private Set lessons;
-
+
private OrganisationState organisationState;
- private SupportedLocale locale;
+ private SupportedLocale locale;
/** persistent field */
private Boolean courseAdminCanAddNewUsers;
/** persistent field */
private Boolean courseAdminCanBrowseAllUsers;
-
+
/** persistent field */
private Boolean courseAdminCanChangeStatusOfCourse;
/** persistent field */
private Boolean courseAdminCanCreateGuestAccounts;
-
+
/** persistent field */
+ private Boolean enableCourseNotifications;
+
+ /** persistent field */
private Boolean enableGradebookForMonitors;
-
+
/** persistent field */
private Boolean enableGradebookForLearners;
-
+
/** persistent field */
private Date archivedDate;
-
+
private String orderedLessonIds;
/** full constructor */
- public Organisation(String name, String description, Organisation parentOrganisation,
- Date createDate, User createdBy, Workspace workspace,
- OrganisationType organisationType, Set userOrganisations, Set childOrganisations, Set lessons,
- Boolean courseAdminCanAddNewUsers, Boolean courseAdminCanBrowseAllUsers, Boolean courseAdminCanChangeStatusOfCourse,
- Boolean courseAdminCanCreateGuestAccounts, String orderedLessonIds, Boolean enableGradebookForLearners, Boolean enableGradebookForMonitors) {
- this.name = name;
- this.description = description;
- this.parentOrganisation = parentOrganisation;
- this.createDate = createDate;
- this.createdBy = createdBy;
- this.workspace = workspace;
- this.organisationType = organisationType;
- this.userOrganisations = userOrganisations;
- this.childOrganisations = childOrganisations;
- this.lessons = lessons;
- this.courseAdminCanAddNewUsers = courseAdminCanAddNewUsers;
- this.courseAdminCanBrowseAllUsers = courseAdminCanBrowseAllUsers;
- this.courseAdminCanChangeStatusOfCourse = courseAdminCanChangeStatusOfCourse;
- this.courseAdminCanCreateGuestAccounts = courseAdminCanCreateGuestAccounts;
- this.orderedLessonIds = orderedLessonIds;
- this.enableGradebookForLearners = enableGradebookForLearners;
- this.enableGradebookForMonitors = enableGradebookForMonitors;
+ public Organisation(String name, String description, Organisation parentOrganisation, Date createDate,
+ User createdBy, Workspace workspace, OrganisationType organisationType, Set userOrganisations,
+ Set childOrganisations, Set lessons, Boolean courseAdminCanAddNewUsers,
+ Boolean courseAdminCanBrowseAllUsers, Boolean courseAdminCanChangeStatusOfCourse,
+ Boolean courseAdminCanCreateGuestAccounts, Boolean enableCourseNotifications, String orderedLessonIds,
+ Boolean enableGradebookForLearners, Boolean enableGradebookForMonitors) {
+ this.name = name;
+ this.description = description;
+ this.parentOrganisation = parentOrganisation;
+ this.createDate = createDate;
+ this.createdBy = createdBy;
+ this.workspace = workspace;
+ this.organisationType = organisationType;
+ this.userOrganisations = userOrganisations;
+ this.childOrganisations = childOrganisations;
+ this.lessons = lessons;
+ this.courseAdminCanAddNewUsers = courseAdminCanAddNewUsers;
+ this.courseAdminCanBrowseAllUsers = courseAdminCanBrowseAllUsers;
+ this.courseAdminCanChangeStatusOfCourse = courseAdminCanChangeStatusOfCourse;
+ this.courseAdminCanCreateGuestAccounts = courseAdminCanCreateGuestAccounts;
+ this.enableCourseNotifications = enableCourseNotifications;
+ this.orderedLessonIds = orderedLessonIds;
+ this.enableGradebookForLearners = enableGradebookForLearners;
+ this.enableGradebookForMonitors = enableGradebookForMonitors;
}
/** default constructor */
public Organisation() {
- this.courseAdminCanAddNewUsers = Boolean.FALSE;
- this.courseAdminCanBrowseAllUsers = Boolean.FALSE;
- this.courseAdminCanChangeStatusOfCourse = Boolean.FALSE;
- this.courseAdminCanCreateGuestAccounts = Boolean.FALSE;
- this.enableGradebookForLearners = Boolean.FALSE;
- this.enableGradebookForMonitors = Boolean.FALSE;
-
+ this.courseAdminCanAddNewUsers = Boolean.FALSE;
+ this.courseAdminCanBrowseAllUsers = Boolean.FALSE;
+ this.courseAdminCanChangeStatusOfCourse = Boolean.FALSE;
+ this.courseAdminCanCreateGuestAccounts = Boolean.FALSE;
+ this.enableCourseNotifications = Boolean.FALSE;
+ this.enableGradebookForLearners = Boolean.FALSE;
+ this.enableGradebookForMonitors = Boolean.FALSE;
}
/** minimal constructor */
- public Organisation(Date createDate, User createdBy, Workspace workspace, OrganisationType organisationType, Set userOrganisations, Set lessons) {
- this.createDate = createDate;
- this.createdBy = createdBy;
- this.workspace = workspace;
- this.organisationType = organisationType;
- this.userOrganisations = userOrganisations;
- this.lessons = lessons;
-
- // mandatory fields in the db
- this.courseAdminCanAddNewUsers = Boolean.FALSE;
- this.courseAdminCanBrowseAllUsers = Boolean.FALSE;
- this.courseAdminCanChangeStatusOfCourse = Boolean.FALSE;
- this.courseAdminCanCreateGuestAccounts = Boolean.FALSE;
- this.enableGradebookForLearners = Boolean.FALSE;
- this.enableGradebookForMonitors = Boolean.FALSE;
+ public Organisation(Date createDate, User createdBy, Workspace workspace, OrganisationType organisationType,
+ Set userOrganisations, Set lessons) {
+ this.createDate = createDate;
+ this.createdBy = createdBy;
+ this.workspace = workspace;
+ this.organisationType = organisationType;
+ this.userOrganisations = userOrganisations;
+ this.lessons = lessons;
+
+ // mandatory fields in the db
+ this.courseAdminCanAddNewUsers = Boolean.FALSE;
+ this.courseAdminCanBrowseAllUsers = Boolean.FALSE;
+ this.courseAdminCanChangeStatusOfCourse = Boolean.FALSE;
+ this.courseAdminCanCreateGuestAccounts = Boolean.FALSE;
+ this.enableCourseNotifications = Boolean.FALSE;
+ this.enableGradebookForLearners = Boolean.FALSE;
+ this.enableGradebookForMonitors = Boolean.FALSE;
}
- public Organisation(String name,
- String description,
- Date createDate,
- User createdBy,
- OrganisationType organisationType) {
- super();
- this.name = name;
- this.description = description;
- this.createDate = createDate;
- this.createdBy = createdBy;
- this.organisationType = organisationType;
- }
- /**
- * @hibernate.id
- * generator-class="native"
- * type="java.lang.Integer"
- * column="organisation_id"
- *
+ public Organisation(String name, String description, Date createDate, User createdBy,
+ OrganisationType organisationType) {
+ super();
+ this.name = name;
+ this.description = description;
+ this.createDate = createDate;
+ this.createdBy = createdBy;
+ this.organisationType = organisationType;
+ }
+
+ /**
+ * @hibernate.id generator-class="native" type="java.lang.Integer" column="organisation_id"
+ *
*/
public Integer getOrganisationId() {
- return this.organisationId;
+ return this.organisationId;
}
public void setOrganisationId(Integer organisationId) {
- this.organisationId = organisationId;
+ this.organisationId = organisationId;
}
- /**
- * @hibernate.property
- * column="name"
- * length="250"
- *
+ /**
+ * @hibernate.property column="name" length="250"
+ *
*/
public String getName() {
- return this.name;
+ return this.name;
}
public void setName(String name) {
- this.name = name;
+ this.name = name;
}
- /**
- * @hibernate.property
- * column="code"
- * length="20"
- *
+ /**
+ * @hibernate.property column="code" length="20"
+ *
*/
public String getCode() {
- return this.code;
+ return this.code;
}
public void setCode(String code) {
- this.code = code;
+ this.code = code;
}
-
- /**
- * @hibernate.property
- * column="description"
- * length="250"
- *
+
+ /**
+ * @hibernate.property column="description" length="250"
+ *
*/
public String getDescription() {
- return this.description;
+ return this.description;
}
public void setDescription(String description) {
- this.description = description;
+ this.description = description;
}
- /**
- * @hibernate.many-to-one
- * @hibernate.column name="parent_organisation_id"
- *
+ /**
+ * @hibernate.many-to-one
+ * @hibernate.column name="parent_organisation_id"
+ *
*/
public Organisation getParentOrganisation() {
- return this.parentOrganisation;
+ return this.parentOrganisation;
}
public void setParentOrganisation(Organisation parentOrganisation) {
- this.parentOrganisation = parentOrganisation;
+ this.parentOrganisation = parentOrganisation;
}
- /**
- * @hibernate.property
- * column="create_date"
- * length="19"
- * not-null="true"
- *
+ /**
+ * @hibernate.property column="create_date" length="19" not-null="true"
+ *
*/
public Date getCreateDate() {
- return this.createDate;
+ return this.createDate;
}
public void setCreateDate(Date createDate) {
- this.createDate = createDate;
+ this.createDate = createDate;
}
/**
- * @hibernate.many-to-one not-null="true"
- * @hibernate.column name="created_by"
- *
+ * @hibernate.many-to-one not-null="true"
+ * @hibernate.column name="created_by"
+ *
*/
public User getCreatedBy() {
- return this.createdBy;
+ return this.createdBy;
}
public void setCreatedBy(User createdBy) {
- this.createdBy = createdBy;
+ this.createdBy = createdBy;
}
-
- /**
- * @hibernate.many-to-one
- * cascade="all"
- * not-null="false"
- * @hibernate.column name="workspace_id"
- *
+ /**
+ * @hibernate.many-to-one cascade="all" not-null="false"
+ * @hibernate.column name="workspace_id"
+ *
*/
public Workspace getWorkspace() {
- return this.workspace;
+ return this.workspace;
}
public void setWorkspace(Workspace workspace) {
- this.workspace = workspace;
+ this.workspace = workspace;
}
- /**
- * @hibernate.many-to-one
- * not-null="true"
- *
+ /**
+ * @hibernate.many-to-one not-null="true"
+ *
*/
public OrganisationType getOrganisationType() {
- return this.organisationType;
+ return this.organisationType;
}
public void setOrganisationType(OrganisationType organisationType) {
- this.organisationType = organisationType;
+ this.organisationType = organisationType;
}
- /**
- * @hibernate.set
- * lazy="true"
- * inverse="true"
- * cascade="none"
- * @hibernate.collection-key
- * column="organisation_id"
- * @hibernate.collection-one-to-many
- * class="org.lamsfoundation.lams.usermanagement.UserOrganisation"
- *
+ /**
+ * @hibernate.set lazy="true" inverse="true" cascade="none"
+ * @hibernate.collection-key column="organisation_id"
+ * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.usermanagement.UserOrganisation"
+ *
*/
public Set getUserOrganisations() {
- return this.userOrganisations;
+ return this.userOrganisations;
}
public void setUserOrganisations(Set userOrganisations) {
- this.userOrganisations = userOrganisations;
+ this.userOrganisations = userOrganisations;
}
- /**
- * @hibernate.set
- * lazy="true"
- * inverse="true"
- * cascade="none"
- * @hibernate.collection-key
- * column="parent_organisation_id"
- * @hibernate.collection-one-to-many
- * class="org.lamsfoundation.lams.usermanagement.Organisation"
- *
+ /**
+ * @hibernate.set lazy="true" inverse="true" cascade="none"
+ * @hibernate.collection-key column="parent_organisation_id"
+ * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.usermanagement.Organisation"
+ *
*/
- public Set getChildOrganisations() {
- return childOrganisations;
- }
+ public Set getChildOrganisations() {
+ return childOrganisations;
+ }
- public void setChildOrganisations(Set childOrganisations) {
- this.childOrganisations = childOrganisations;
- }
-
- /**
- * @hibernate.set
- * lazy="true"
- * inverse="true"
- * cascade="none"
- * @hibernate.collection-key
- * column="organisation_id"
- * @hibernate.collection-one-to-many
- * class="org.lamsfoundation.lams.lesson.Lesson"
- *
+ public void setChildOrganisations(Set childOrganisations) {
+ this.childOrganisations = childOrganisations;
+ }
+
+ /**
+ * @hibernate.set lazy="true" inverse="true" cascade="none"
+ * @hibernate.collection-key column="organisation_id"
+ * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.lesson.Lesson"
+ *
*/
public Set getLessons() {
- return this.lessons;
+ return this.lessons;
}
public void setLessons(Set lessons) {
- this.lessons = lessons;
+ this.lessons = lessons;
}
- /**
- * @hibernate.many-to-one
- * not-null="true"
- * @hibernate.column name="organisation_state_id"
- *
+ /**
+ * @hibernate.many-to-one not-null="true"
+ * @hibernate.column name="organisation_state_id"
+ *
*/
public OrganisationState getOrganisationState() {
- return this.organisationState;
+ return this.organisationState;
}
public void setOrganisationState(OrganisationState organisationState) {
- this.organisationState = organisationState;
+ this.organisationState = organisationState;
}
- /**
- * @hibernate.property
- * column="admin_add_new_users"
- * length="1"
- * not-null="true"
- *
+ /**
+ * @hibernate.property column="admin_add_new_users" length="1" not-null="true"
+ *
*/
public Boolean getCourseAdminCanAddNewUsers() {
- return this.courseAdminCanAddNewUsers;
+ return this.courseAdminCanAddNewUsers;
}
public void setCourseAdminCanAddNewUsers(Boolean courseAdminCanAddNewUsers) {
- this.courseAdminCanAddNewUsers = courseAdminCanAddNewUsers;
+ this.courseAdminCanAddNewUsers = courseAdminCanAddNewUsers;
}
- /**
- * @hibernate.property
- * column="admin_browse_all_users"
- * length="1"
- * not-null="true"
- *
+ /**
+ * @hibernate.property column="admin_browse_all_users" length="1" not-null="true"
+ *
*/
public Boolean getCourseAdminCanBrowseAllUsers() {
- return this.courseAdminCanBrowseAllUsers;
+ return this.courseAdminCanBrowseAllUsers;
}
public void setCourseAdminCanBrowseAllUsers(Boolean courseAdminCanBrowseAllUsers) {
- this.courseAdminCanBrowseAllUsers = courseAdminCanBrowseAllUsers;
+ this.courseAdminCanBrowseAllUsers = courseAdminCanBrowseAllUsers;
}
- /**
- * @hibernate.property
- * column="admin_change_status"
- * length="1"
- * not-null="true"
- *
+ /**
+ * @hibernate.property column="admin_change_status" length="1" not-null="true"
+ *
*/
public Boolean getCourseAdminCanChangeStatusOfCourse() {
- return this.courseAdminCanChangeStatusOfCourse;
+ return this.courseAdminCanChangeStatusOfCourse;
}
public void setCourseAdminCanChangeStatusOfCourse(Boolean courseAdminCanChangeStatusOfCourse) {
- this.courseAdminCanChangeStatusOfCourse = courseAdminCanChangeStatusOfCourse;
+ this.courseAdminCanChangeStatusOfCourse = courseAdminCanChangeStatusOfCourse;
}
- /**
- * @hibernate.property
- * column="admin_create_guest"
- * length="1"
- * not-null="true"
- *
+ /**
+ * @hibernate.property column="admin_create_guest" length="1" not-null="true"
+ *
*/
public Boolean getCourseAdminCanCreateGuestAccounts() {
- return this.courseAdminCanCreateGuestAccounts;
+ return this.courseAdminCanCreateGuestAccounts;
}
public void setCourseAdminCanCreateGuestAccounts(Boolean courseAdminCanCreateGuestAccounts) {
- this.courseAdminCanCreateGuestAccounts = courseAdminCanCreateGuestAccounts;
+ this.courseAdminCanCreateGuestAccounts = courseAdminCanCreateGuestAccounts;
}
-
-
- public String toString() {
- return new ToStringBuilder(this)
- .append("organisationId", getOrganisationId())
- .toString();
+ /**
+ * @hibernate.property column="enable_course_notifications" length="1" not-null="true"
+ *
+ */
+ public Boolean getEnableCourseNotifications() {
+ return this.enableCourseNotifications;
}
+ public void setEnableCourseNotifications(Boolean enableCourseNotifications) {
+ this.enableCourseNotifications = enableCourseNotifications;
+ }
+
+ public String toString() {
+ return new ToStringBuilder(this).append("organisationId", getOrganisationId()).toString();
+ }
+
public boolean equals(Object other) {
- if ( !(other instanceof Organisation) ) return false;
- Organisation castOther = (Organisation) other;
- return new EqualsBuilder()
- .append(this.getOrganisationId(), castOther.getOrganisationId())
- .isEquals();
+ if (!(other instanceof Organisation))
+ return false;
+ Organisation castOther = (Organisation) other;
+ return new EqualsBuilder().append(this.getOrganisationId(), castOther.getOrganisationId()).isEquals();
}
public int hashCode() {
- return new HashCodeBuilder()
- .append(getOrganisationId())
- .toHashCode();
+ return new HashCodeBuilder().append(getOrganisationId()).toHashCode();
}
- public OrganisationDTO getOrganisationDTO(){
- return new OrganisationDTO(this);
+
+ public OrganisationDTO getOrganisationDTO() {
+ return new OrganisationDTO(this);
}
- /**
- * @hibernate.many-to-one
- * not-null="true"
- * lazy="false"
- * @hibernate.column name="locale_id"
- * @param localeCountry
- */
- public SupportedLocale getLocale() {
- return locale;
- }
- public void setLocale(SupportedLocale locale) {
- this.locale = locale;
- }
+ /**
+ * @hibernate.many-to-one not-null="true" lazy="false"
+ * @hibernate.column name="locale_id"
+ * @param localeCountry
+ */
+ public SupportedLocale getLocale() {
+ return locale;
+ }
- public int compareTo(Object o) {
- return name.compareToIgnoreCase(((Organisation)o).getName());
- }
-
- /**
- * @hibernate.property
- * column="archived_date"
- * length="19"
- * not-null="false"
- *
+ public void setLocale(SupportedLocale locale) {
+ this.locale = locale;
+ }
+
+ public int compareTo(Object o) {
+ return name.compareToIgnoreCase(((Organisation) o).getName());
+ }
+
+ /**
+ * @hibernate.property column="archived_date" length="19" not-null="false"
+ *
*/
public Date getArchivedDate() {
- return this.archivedDate;
+ return this.archivedDate;
}
public void setArchivedDate(Date archivedDate) {
- this.archivedDate = archivedDate;
+ this.archivedDate = archivedDate;
}
-
+
/**
- * @hibernate.property column="ordered_lesson_ids" length="65535"
+ * @hibernate.property column="ordered_lesson_ids" length="65535"
*/
- public String getOrderedLessonIds()
- {
- return orderedLessonIds;
+ public String getOrderedLessonIds() {
+ return orderedLessonIds;
}
- public void setOrderedLessonIds(String orderedLessonIds)
- {
- this.orderedLessonIds = orderedLessonIds;
+ public void setOrderedLessonIds(String orderedLessonIds) {
+ this.orderedLessonIds = orderedLessonIds;
}
- /**
- * @hibernate.property
- * column="enable_teacher_gradebook"
- * length="1"
- * not-null="true"
- *
+ /**
+ * @hibernate.property column="enable_teacher_gradebook" length="1" not-null="true"
+ *
*/
public Boolean getEnableGradebookForMonitors() {
- return enableGradebookForMonitors;
+ return enableGradebookForMonitors;
}
public void setEnableGradebookForMonitors(Boolean enableGradebookForMonitors) {
- this.enableGradebookForMonitors = enableGradebookForMonitors;
+ this.enableGradebookForMonitors = enableGradebookForMonitors;
}
- /**
- * @hibernate.property
- * column="enable_learner_gradebook"
- * length="1"
- * not-null="true"
- *
+ /**
+ * @hibernate.property column="enable_learner_gradebook" length="1" not-null="true"
+ *
*/
public Boolean getEnableGradebookForLearners() {
- return enableGradebookForLearners;
+ return enableGradebookForLearners;
}
public void setEnableGradebookForLearners(Boolean enableGradebookForLearners) {
- this.enableGradebookForLearners = enableGradebookForLearners;
+ this.enableGradebookForLearners = enableGradebookForLearners;
}
}
Index: lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestLessonDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/lesson/dao/Attic/TestLessonDAO.java,v
diff -u -r1.21 -r1.22
--- lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestLessonDAO.java 2 Dec 2011 19:43:40 -0000 1.21
+++ lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestLessonDAO.java 5 Dec 2011 16:04:24 -0000 1.22
@@ -124,6 +124,7 @@
false,
false,
false,
+ false,
null);
try
Index: lams_common/test/java/org/lamsfoundation/lams/lesson/service/TestLessonService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/lesson/service/Attic/TestLessonService.java,v
diff -u -r1.6 -r1.7
--- lams_common/test/java/org/lamsfoundation/lams/lesson/service/TestLessonService.java 2 Dec 2011 19:43:40 -0000 1.6
+++ lams_common/test/java/org/lamsfoundation/lams/lesson/service/TestLessonService.java 5 Dec 2011 16:04:24 -0000 1.7
@@ -79,7 +79,7 @@
User test1 = userManagementService.getUserByLogin(TEST1_USER_LOGIN);
// this lesson isn't valid as it doesn't have a learning design
- Lesson newLesson = Lesson.createNewLessonWithoutClass("test lesson", "test lesson", mmm, true, null, false, false, false, null);
+ Lesson newLesson = Lesson.createNewLessonWithoutClass("test lesson", "test lesson", mmm, true, null, false, false, false, false, null);
lessonDAO.saveLesson(newLesson);
Organisation organisation = (Organisation) baseDAO.find(Organisation.class, TEST_ORG_ID);
Index: lams_monitoring/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/build.xml,v
diff -u -r1.29 -r1.30
--- lams_monitoring/build.xml 2 Apr 2009 04:11:52 -0000 1.29
+++ lams_monitoring/build.xml 5 Dec 2011 16:03:31 -0000 1.30
@@ -136,6 +136,7 @@
+
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java,v
diff -u -r1.90 -r1.91
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java 2 Dec 2011 19:43:27 -0000 1.90
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java 5 Dec 2011 16:03:31 -0000 1.91
@@ -75,6 +75,8 @@
* the user who want to create this lesson.
* @param customCSV
* the custom comma separated values to be used by toolAdapters
+ * @param enableNotifications
+ * enable "email notifications" link for the current lesson
* @param numberDaysToLessonFinish
* number of days the lesson will be available to user since he starts it. (lesson finish scheduling
* feature)
@@ -83,7 +85,7 @@
public Lesson initializeLesson(String lessonName, String lessonDescription, Boolean learnerExportAvailable,
long learningDesignId, Integer organisationId, Integer userID, String customCSV,
Boolean learnerPresenceAvailable, Boolean learnerImAvailable, Boolean liveEditEnabled,
- Integer numberDaysToLessonFinish);
+ Boolean enableNotifications, Integer numberDaysToLessonFinish);
/**
* Initialize a new lesson so as to start the learning process for a normal
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java,v
diff -u -r1.158 -r1.159
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 2 Dec 2011 19:43:27 -0000 1.158
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 5 Dec 2011 16:03:30 -0000 1.159
@@ -29,6 +29,7 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
+import java.util.Collection;
import java.util.Comparator;
import java.util.Date;
import java.util.HashSet;
@@ -47,6 +48,7 @@
import javax.servlet.http.HttpSession;
+import org.apache.commons.collections.CollectionUtils;
import org.apache.log4j.Logger;
import org.lamsfoundation.lams.authoring.service.IAuthoringService;
import org.lamsfoundation.lams.dao.IBaseDAO;
@@ -66,6 +68,7 @@
import org.lamsfoundation.lams.learningdesign.ToolActivity;
import org.lamsfoundation.lams.learningdesign.dao.IActivityDAO;
import org.lamsfoundation.lams.learningdesign.dao.IGroupDAO;
+import org.lamsfoundation.lams.learningdesign.dao.IGroupUserDAO;
import org.lamsfoundation.lams.learningdesign.dao.IGroupingDAO;
import org.lamsfoundation.lams.learningdesign.dao.ILearningDesignDAO;
import org.lamsfoundation.lams.learningdesign.dao.ITransitionDAO;
@@ -168,6 +171,8 @@
private IGroupingDAO groupingDAO;
private IGroupDAO groupDAO;
+
+ private IGroupUserDAO groupUserDAO;
private ILearnerProgressDAO learnerProgressDAO;
@@ -308,6 +313,13 @@
}
/**
+ * @param groupDAO
+ */
+ public void setGroupUserDAO(IGroupUserDAO groupUserDAO) {
+ this.groupUserDAO = groupUserDAO;
+ }
+
+ /**
* @param groupingDAO
*/
public void setGroupingDAO(IGroupingDAO groupingDAO) {
@@ -403,7 +415,7 @@
public Lesson initializeLesson(String lessonName, String lessonDescription, Boolean learnerExportAvailable,
long learningDesignId, Integer organisationId, Integer userID, String customCSV,
Boolean learnerPresenceAvailable, Boolean learnerImAvailable, Boolean liveEditEnabled,
- Integer scheduledNumberDaysToLessonFinish) {
+ Boolean enableLessonNotifications, Integer scheduledNumberDaysToLessonFinish) {
LearningDesign originalLearningDesign = authoringService.getLearningDesign(new Long(learningDesignId));
if (originalLearningDesign == null) {
@@ -439,7 +451,7 @@
User user = userID != null ? (User) baseDAO.find(User.class, userID) : null;
Lesson initializedLesson = initializeLesson(lessonName, lessonDescription, learnerExportAvailable,
originalLearningDesign, user, runSeqFolder, LearningDesign.COPY_TYPE_LESSON, customCSV,
- learnerPresenceAvailable, learnerImAvailable, liveEditEnabled, scheduledNumberDaysToLessonFinish);
+ learnerPresenceAvailable, learnerImAvailable, liveEditEnabled, enableLessonNotifications, scheduledNumberDaysToLessonFinish);
Long initializedLearningDesignId = initializedLesson.getLearningDesign().getLearningDesignId();
logEventService.logEvent(LogEvent.TYPE_TEACHER_LESSON_CREATE, userID, initializedLearningDesignId, initializedLesson.getLessonId(), null);
@@ -453,7 +465,8 @@
* design is not assigned to any workspace folder.
*/
public Lesson initializeLessonForPreview(String lessonName, String lessonDescription, long learningDesignId,
- Integer userID, String customCSV, Boolean learnerPresenceAvailable, Boolean learnerImAvailable, Boolean liveEditEnabled) {
+ Integer userID, String customCSV, Boolean learnerPresenceAvailable, Boolean learnerImAvailable,
+ Boolean liveEditEnabled) {
LearningDesign originalLearningDesign = authoringService.getLearningDesign(new Long(learningDesignId));
if (originalLearningDesign == null) {
throw new MonitoringServiceException("Learning design for id=" + learningDesignId
@@ -463,13 +476,13 @@
return initializeLesson(lessonName, lessonDescription, Boolean.TRUE, originalLearningDesign, user, null,
LearningDesign.COPY_TYPE_PREVIEW, customCSV, learnerPresenceAvailable, learnerImAvailable,
- liveEditEnabled, null);
+ liveEditEnabled, null, null);
}
public Lesson initializeLesson(String lessonName, String lessonDescription, Boolean learnerExportAvailable,
LearningDesign originalLearningDesign, User user, WorkspaceFolder workspaceFolder, int copyType,
- String customCSV, Boolean learnerPresenceAvailable, Boolean learnerImAvailable, Boolean liveEditEnabled,
- Integer scheduledNumberDaysToLessonFinish) {
+ String customCSV, Boolean learnerPresenceAvailable, Boolean learnerImAvailable, Boolean liveEditEnabled,
+ Boolean enableLessonNotifications, Integer scheduledNumberDaysToLessonFinish) {
// copy the current learning design
LearningDesign copiedLearningDesign = authoringService.copyLearningDesign(originalLearningDesign, new Integer(
@@ -485,9 +498,10 @@
}
Lesson lesson = createNewLesson(title, lessonDescription, user, learnerExportAvailable, copiedLearningDesign,
- learnerPresenceAvailable, learnerImAvailable, liveEditEnabled, scheduledNumberDaysToLessonFinish);
- auditAction(MonitoringService.AUDIT_LESSON_CREATED_KEY,
- new Object[] { lessonName, copiedLearningDesign.getTitle(), learnerExportAvailable });
+ learnerPresenceAvailable, learnerImAvailable, liveEditEnabled, enableLessonNotifications,
+ scheduledNumberDaysToLessonFinish);
+ auditAction(MonitoringService.AUDIT_LESSON_CREATED_KEY, new Object[] { lessonName,
+ copiedLearningDesign.getTitle(), learnerExportAvailable });
return lesson;
}
@@ -515,6 +529,7 @@
.get("enablePresence"));
boolean learnerImAvailable = WDDXProcessor.convertToBoolean("enableIm", table.get("enableIm"));
boolean liveEditEnabled = WDDXProcessor.convertToBoolean("enableLiveEdit", table.get("enableLiveEdit"));
+ Boolean enableLessonNotifications = WDDXProcessor.convertToBoolean("enableLessonNotifications", table.get("enableLessonNotifications"));
String customCSV = WDDXProcessor.convertToString(WDDXTAGS.CUSTOM_CSV, table.get(WDDXTAGS.CUSTOM_CSV));
Integer scheduledNumberDaysToLessonFinish = WDDXProcessor.convertToInteger("scheduledNumberDaysToLessonFinish", table.get("scheduledNumberDaysToLessonFinish"));
@@ -527,7 +542,7 @@
learnerPresenceAvailable, learnerImAvailable, liveEditEnabled);
} else {
newLesson = initializeLesson(title, desc, learnerExportAvailable, ldId, organisationId, creatorUserId,
- customCSV, learnerPresenceAvailable, learnerImAvailable, liveEditEnabled,
+ customCSV, learnerPresenceAvailable, learnerImAvailable, liveEditEnabled, enableLessonNotifications,
scheduledNumberDaysToLessonFinish);
}
@@ -1573,6 +1588,7 @@
return flashMessage.serializeMessage();
}
+
/**
* (non-Javadoc)
*
@@ -2036,18 +2052,22 @@
* @param user
* user the user who want to create this lesson.
* @param learnerExportAvailable
- * should the export portfolio option be made available to the
- * learner?
+ * should the export portfolio option be made available to the learner?
* @param copiedLearningDesign
* the copied learning design
+ * @param enableLessonNotifications
+ * enable "email notifications" link for the current lesson
+ *
* @return the lesson object without class.
*
*/
private Lesson createNewLesson(String lessonName, String lessonDescription, User user,
Boolean learnerExportAvailable, LearningDesign copiedLearningDesign, Boolean learnerPresenceAvailable,
- Boolean learnerImAvailable, Boolean liveEditEnabled, Integer scheduledNumberDaysToLessonFinish) {
+ Boolean learnerImAvailable, Boolean liveEditEnabled, Boolean enableLessonNotifications,
+ Integer scheduledNumberDaysToLessonFinish) {
Lesson newLesson = Lesson.createNewLessonWithoutClass(lessonName, lessonDescription, user,
- learnerExportAvailable, copiedLearningDesign, learnerPresenceAvailable, learnerImAvailable, liveEditEnabled, scheduledNumberDaysToLessonFinish);
+ learnerExportAvailable, copiedLearningDesign, learnerPresenceAvailable, learnerImAvailable,
+ liveEditEnabled, enableLessonNotifications, scheduledNumberDaysToLessonFinish);
lessonDAO.saveLesson(newLesson);
return newLesson;
}
@@ -2801,17 +2821,18 @@
boolean learnerImAvailable = WDDXProcessor.convertToBoolean("enableIm", table.get("enableIm"));
String customCSV = WDDXProcessor.convertToString(WDDXTAGS.CUSTOM_CSV, table.get(WDDXTAGS.CUSTOM_CSV));
boolean liveEditEnabled = WDDXProcessor.convertToBoolean("enableLiveEdit", table.get("enableLiveEdit"));
+ Boolean enableLessonNotifications = WDDXProcessor.convertToBoolean("enableLessonNotifications", table.get("enableLessonNotifications"));
int numLessons = WDDXProcessor.convertToInt("numberLessonsSplit", table.get("numberLessonsSplit"));
Integer scheduledNumberDaysToLessonFinish = WDDXProcessor.convertToInteger("scheduledNumberDaysToLessonFinish", table.get("scheduledNumberDaysToLessonFinish"));
- // initialise multiple lessons
-
- if (numLessons > 0) {
- for (int i = 1; i <= numLessons; i++) {
- Lesson newLesson = initializeLesson(title + " " + i, desc, learnerExportAvailable, ldId,
- organisationId, creatorUserId, customCSV, learnerPresenceAvailable, learnerImAvailable, liveEditEnabled, scheduledNumberDaysToLessonFinish);
- lessonIds.add(newLesson.getLessonId());
- }
+ // initialize multiple lessons
+ if (numLessons > 0) {
+ for (int i = 1; i <= numLessons; i++) {
+ Lesson newLesson = initializeLesson(title + " " + i, desc, learnerExportAvailable, ldId,
+ organisationId, creatorUserId, customCSV, learnerPresenceAvailable, learnerImAvailable,
+ liveEditEnabled, enableLessonNotifications, scheduledNumberDaysToLessonFinish);
+ lessonIds.add(newLesson.getLessonId());
+ }
}
} catch (Exception e) {
@@ -2975,7 +2996,8 @@
.getLessonDescription(), lesson.getLearnerExportAvailable(), lesson
.getLearningDesign().getLearningDesignId(), group.getOrganisationId(), userDto
.getUserID(), null, lesson.getLearnerPresenceAvailable(), lesson
- .getLearnerImAvailable(), lesson.getLiveEditEnabled(), null);
+ .getLearnerImAvailable(), lesson.getLiveEditEnabled(), lesson
+ .getEnableLessonNotifications(), null);
// save LessonClasses
newLesson = this
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java,v
diff -u -r1.68 -r1.69
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 2 Dec 2011 19:43:27 -0000 1.68
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 5 Dec 2011 16:03:30 -0000 1.69
@@ -194,7 +194,7 @@
Boolean learnerPresenceAvailable = WebUtil.readBooleanParam(request, "learnerPresenceAvailable", false);
Boolean learnerImAvailable = WebUtil.readBooleanParam(request, "learnerImAvailable", false);
Boolean liveEditEnabled = WebUtil.readBooleanParam(request, "liveEditEnabled", false);
- Lesson newLesson = monitoringService.initializeLesson(title,desc,learnerExportAvailable,ldId,organisationId,getUserId(), null, learnerPresenceAvailable, learnerImAvailable, liveEditEnabled, null);
+ Lesson newLesson = monitoringService.initializeLesson(title,desc,learnerExportAvailable,ldId,organisationId,getUserId(), null, learnerPresenceAvailable, learnerImAvailable, liveEditEnabled, Boolean.FALSE, null);
flashMessage = new FlashMessage("initializeLesson",newLesson.getLessonId());
} catch (Exception e) {
@@ -730,6 +730,7 @@
languageCollection.add(new String("lesson.tab.heading.label"));
languageCollection.add(new String("add.now.button.label"));
languageCollection.add(new String("advanced.tab.form.advanced.options.label"));
+ languageCollection.add(new String("advanced.tab.enable.lesson.notifications"));
languageCollection.add(new String("advanced.tab.form.enable.im.label"));
languageCollection.add(new String("advanced.tab.form.time.limits.label"));
languageCollection.add(new String("advanced.tab.form.enter.number.days.label"));
Index: lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/Attic/TestMonitoringService.java,v
diff -u -r1.49 -r1.50
--- lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java 2 Dec 2011 19:43:27 -0000 1.49
+++ lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java 5 Dec 2011 16:03:31 -0000 1.50
@@ -157,7 +157,7 @@
long previousLDId = getMaxId(lamsLearningDesignTableName, idName);
Lesson testLesson = monitoringService.initializeLesson("Test_Lesson", "Test_Description", Boolean.TRUE,
- TEST_LEARNING_DESIGN_ID, null, testUser.getUserId(), null, false, false, false, null);
+ TEST_LEARNING_DESIGN_ID, null, testUser.getUserId(), null, false, false, false, false, null);
TestMonitoringService.TEST_LESSON_ID = testLesson.getLessonId();
Lesson createdLesson = lessonDao.getLesson(TestMonitoringService.TEST_LESSON_ID);
assertNotNull(createdLesson);
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_monitoring/web/emailnotifications/courseNotifications.jsp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_monitoring/web/emailnotifications/lessonNotifications.jsp'.
Fisheye: No comparison available. Pass `N' to diff?