Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java,v
diff -u -r1.64 -r1.65
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java 3 Nov 2014 13:39:58 -0000 1.64
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java 13 Jan 2015 22:11:29 -0000 1.65
@@ -207,9 +207,13 @@
req.setAttribute(AttributeNames.PARAM_MODE, mode);
}
+ Boolean isPortfolioEnabled = lesson.getLearnerExportAvailable() != null ? lesson
+ .getLearnerExportAvailable() : Boolean.TRUE;
+ Organisation organisation = lesson.getOrganisation();
+ isPortfolioEnabled &= organisation.getEnableExportPortfolio();
+
req.setAttribute(AttributeNames.PARAM_LESSON_ID, String.valueOf(lessonId));
- req.setAttribute(AttributeNames.PARAM_EXPORT_PORTFOLIO_ENABLED, String.valueOf(lesson
- .getLearnerExportAvailable() != null ? lesson.getLearnerExportAvailable() : Boolean.TRUE));
+ req.setAttribute(AttributeNames.PARAM_EXPORT_PORTFOLIO_ENABLED, String.valueOf(isPortfolioEnabled));
req.setAttribute(AttributeNames.PARAM_PRESENCE_ENABLED,
String.valueOf(lesson.getLearnerPresenceAvailable()));
req.setAttribute(AttributeNames.PARAM_PRESENCE_IM_ENABLED, String.valueOf(lesson.getLearnerImAvailable()));
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml,v
diff -u -r1.23 -r1.24
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml 27 Aug 2014 12:26:32 -0000 1.23
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml 13 Jan 2015 22:11:33 -0000 1.24
@@ -132,6 +132,24 @@
+
+
+ @hibernate.property column="enable_live_edit"
+ length="1" not-null="true"
+
+
+
+
+
+ @hibernate.property column="enable_export_portfolio"
+ length="1" not-null="true"
+
+
+
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040039.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040039.sql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040039.sql 13 Jan 2015 22:11:33 -0000 1.1
@@ -0,0 +1,15 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+
+-- LDEV-3410 Add feature allowing disable export portfolio and live edit
+ALTER TABLE lams_organisation ADD COLUMN enable_live_edit TINYINT(1) NOT NULL DEFAULT 1
+ AFTER enable_single_activity_lessons;
+ALTER TABLE lams_organisation ADD COLUMN enable_export_portfolio TINYINT(1) NOT NULL DEFAULT 1
+ AFTER enable_live_edit;
+
+-- If there were no errors, commit and restore autocommit to on
+SET FOREIGN_KEY_CHECKS=0;
+COMMIT;
+SET AUTOCOMMIT = 1;
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.24 -r1.25
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java 9 Apr 2014 15:54:12 -0000 1.24
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java 13 Jan 2015 22:11:33 -0000 1.25
@@ -99,6 +99,12 @@
/** persistent field */
private Boolean enableSingleActivityLessons;
+
+ /** persistent field */
+ private Boolean enableLiveEdit;
+
+ /** persistent field */
+ private Boolean enableExportPortfolio;
/** persistent field */
private Date archivedDate;
@@ -115,6 +121,8 @@
this.enableGradebookForLearners = Boolean.FALSE;
this.enableGradebookForMonitors = Boolean.FALSE;
this.enableSingleActivityLessons = Boolean.FALSE;
+ this.enableLiveEdit = Boolean.FALSE;
+ this.enableExportPortfolio = Boolean.FALSE;
}
public Integer getOrganisationId() {
@@ -331,4 +339,20 @@
public void setEnableSingleActivityLessons(Boolean enableSingleActivityLessons) {
this.enableSingleActivityLessons = enableSingleActivityLessons;
}
+
+ public Boolean getEnableLiveEdit() {
+ return enableLiveEdit;
+ }
+
+ public void setEnableLiveEdit(Boolean enableLiveEdit) {
+ this.enableLiveEdit = enableLiveEdit;
+ }
+
+ public Boolean getEnableExportPortfolio() {
+ return enableExportPortfolio;
+ }
+
+ public void setEnableExportPortfolio(Boolean enableExportPortfolio) {
+ this.enableExportPortfolio = enableExportPortfolio;
+ }
}
\ No newline at end of file
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.131 -r1.132
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 22 Dec 2014 10:18:21 -0000 1.131
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 13 Jan 2015 22:11:31 -0000 1.132
@@ -926,6 +926,8 @@
Organisation organisation = (Organisation) userManagementService.findById(Organisation.class,
lessonDTO.getOrganisationID());
request.setAttribute("notificationsAvailable", organisation.getEnableCourseNotifications());
+ request.setAttribute("enableLiveEdit", organisation.getEnableLiveEdit());
+ request.setAttribute("enableExportPortfolio", organisation.getEnableExportPortfolio());
request.setAttribute("lesson", lessonDTO);
return mapping.findForward("monitorLesson");
Index: lams_monitoring/web/monitor.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/monitor.jsp,v
diff -u -r1.30 -r1.31
--- lams_monitoring/web/monitor.jsp 14 Dec 2014 03:00:38 -0000 1.30
+++ lams_monitoring/web/monitor.jsp 13 Jan 2015 22:11:31 -0000 1.31
@@ -40,6 +40,7 @@
hasContentFrame = false,
presenceEnabled = false,
hasDialog = false,
+ enableExportPortfolio = ${enableExportPortfolio},
LAMS_URL = '',
@@ -339,25 +340,32 @@
Index: lams_monitoring/web/includes/javascript/monitorLesson.js
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/includes/javascript/monitorLesson.js,v
diff -u -r1.47 -r1.48
--- lams_monitoring/web/includes/javascript/monitorLesson.js 30 Sep 2014 12:09:28 -0000 1.47
+++ lams_monitoring/web/includes/javascript/monitorLesson.js 13 Jan 2015 22:11:31 -0000 1.48
@@ -1527,22 +1527,28 @@
if (!learnerProgressCellsTemplate) {
// fill the placeholder, after all required variables were initialised
learnerProgressCellsTemplate =
- ' ;11; '
- + ''
- + LABELS.EXPORT_PORTFOLIO
- + ''
- /* + '
- + LABELS.TIME_CHART
- + ''*/
- + ''
- + LABELS.EMAIL_BUTTON
- + ' | | ';
+ ' ;11; ';
+
+ if (enableExportPortfolio) {
+ learnerProgressCellsTemplate +=
+ ''
+ + LABELS.EXPORT_PORTFOLIO
+ + '';
+ }
+
+ learnerProgressCellsTemplate +=
+ /* + '
+ + LABELS.TIME_CHART
+ + ''*/
+ ''
+ + LABELS.EMAIL_BUTTON
+ + ' | | ';
}
// remove existing progress bars
|