Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.100.2.6 -r1.100.2.7
--- lams_admin/conf/language/lams/ApplicationResources.properties 8 Jul 2015 16:55:19 -0000 1.100.2.6
+++ lams_admin/conf/language/lams/ApplicationResources.properties 24 Feb 2016 12:35:38 -0000 1.100.2.7
@@ -520,7 +520,5 @@
tool.groups.group.name.error =A group name can not be blank
tool.groups.save.error =Error while saving groups
config.live.edit =Enable live edit
-config.export.portfolio =Enable export portfolio
-
#======= End labels: Exported 515 labels for en AU =====
Index: lams_admin/conf/xdoclet/struts-forms.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/xdoclet/struts-forms.xml,v
diff -u -r1.43.2.6 -r1.43.2.7
--- lams_admin/conf/xdoclet/struts-forms.xml 9 Feb 2016 11:28:41 -0000 1.43.2.6
+++ lams_admin/conf/xdoclet/struts-forms.xml 24 Feb 2016 12:35:38 -0000 1.43.2.7
@@ -16,7 +16,6 @@
-
Index: lams_admin/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.3.2.1 -r1.3.2.2
--- lams_admin/web/WEB-INF/tlds/lams/lams.tld 4 Aug 2014 14:00:24 -0000 1.3.2.1
+++ lams_admin/web/WEB-INF/tlds/lams/lams.tld 24 Feb 2016 12:35:38 -0000 1.3.2.2
@@ -181,14 +181,6 @@
Output stylesheet based on the user preferences.
- localLinkPath
- false
-
- true
-
-
-
- Output stylesheet based on the user preferences.stylefalse
Index: lams_admin/web/organisation/createOrEdit.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/organisation/createOrEdit.jsp,v
diff -u -r1.5.2.2 -r1.5.2.3
--- lams_admin/web/organisation/createOrEdit.jsp 20 Jan 2015 08:53:13 -0000 1.5.2.2
+++ lams_admin/web/organisation/createOrEdit.jsp 24 Feb 2016 12:35:38 -0000 1.5.2.3
@@ -152,16 +152,6 @@
-
-
-
-
-
-
-
-
Index: lams_build/lib/lams/lams-monitoring.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams-monitoring.jar,v
diff -u -r1.63.2.4 -r1.63.2.5
Binary files differ
Index: lams_build/lib/lams/lams.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v
diff -u -r1.420.2.61 -r1.420.2.62
Binary files differ
Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.138.2.17 -r1.138.2.18
--- lams_central/conf/language/lams/ApplicationResources.properties 12 Jan 2016 13:14:21 -0000 1.138.2.17
+++ lams_central/conf/language/lams/ApplicationResources.properties 24 Feb 2016 12:35:44 -0000 1.138.2.18
@@ -125,7 +125,6 @@
title.edit.profile.window =LAMS :: Edit My Profile
title.profile.edit.screen =Edit My Profile
title.archived.groups =Archived Groups
-label.export.portfolio =Export Portfolio
label.name =Name
label.title =Title
label.first_name =First Name
@@ -388,7 +387,6 @@
label.tab.advanced.field.monitor =Start in Monitor
label.tab.advanced.field.liveedit =Enable Live Edit
label.tab.advanced.field.notification =Enable lesson notification
-label.tab.advanced.field.export =Enable export portfolio for learners
label.tab.advanced.field.presence =Allow learners to see who is online
label.tab.advanced.field.im =Enable Instant Messaging
label.tab.advanced.field.split =Split learners into separate copies of this lesson
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/EditOnFlyProcessor.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/service/EditOnFlyProcessor.java,v
diff -u -r1.4.2.3 -r1.4.2.4
--- lams_central/src/java/org/lamsfoundation/lams/authoring/service/EditOnFlyProcessor.java 24 Nov 2015 14:05:07 -0000 1.4.2.3
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/EditOnFlyProcessor.java 24 Feb 2016 12:35:44 -0000 1.4.2.4
@@ -62,7 +62,6 @@
// everything done by endSimpleActivity
}
- /** Creates an ActivityPortfolio. */
@Override
public void endSimpleActivity(SimpleActivity activity) throws LearningDesignProcessorException {
if (!activity.isFloating()) {
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java,v
diff -u -r1.53.2.6 -r1.53.2.7
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java 4 Sep 2015 14:50:50 -0000 1.53.2.6
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java 24 Feb 2016 12:35:44 -0000 1.53.2.7
@@ -203,9 +203,8 @@
}
public ActionForward getToolOutputDefinitionsJSON(ActionMapping mapping, ActionForm form,
- HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException,
- JSONException {
- String wddxPacket;
+ HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException, JSONException {
IAuthoringService authoringService = getAuthoringService();
Long toolContentID = WebUtil.readLongParam(request, "toolContentID");
Integer definitionType = ToolOutputDefinition.DATA_OUTPUT_DEFINITION_TYPE_CONDITION;
@@ -366,8 +365,8 @@
flashMessage = new FlashMessage("getAvailableLicenses", licenses);
} catch (Exception e) {
AuthoringAction.log.error("getAvailableLicenses: License details unavailable due to system error.", e);
- flashMessage = new FlashMessage("getAvailableLicenses", "License details unavailable due to system error :"
- + e.getMessage(), FlashMessage.ERROR);
+ flashMessage = new FlashMessage("getAvailableLicenses",
+ "License details unavailable due to system error :" + e.getMessage(), FlashMessage.ERROR);
getAuditService().log(AuthoringAction.class.getName(), e.toString());
}
@@ -468,8 +467,8 @@
// get title from tool content
IToolVO tool = getToolService().getToolByID(toolID);
- WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
- .getServletContext());
+ WebApplicationContext wac = WebApplicationContextUtils
+ .getRequiredWebApplicationContext(getServlet().getServletContext());
ToolContentManager toolManager = (ToolContentManager) wac.getBean(tool.getServiceName());
String title = toolManager.getToolContentTitle(toolContentID);
// create the LD and put it in Run Sequences folder in the given organisation
@@ -478,7 +477,7 @@
if (learningDesignID != null) {
User user = (User) getUserManagementService().findById(User.class, userID);
Lesson lesson = getMonitoringService().initializeLessonWithoutLDcopy(title, "", learningDesignID, user,
- null, false, false, true, false, false, true, true, false, null, null);
+ null, false, false, false, false, true, true, false, null, null);
Organisation organisation = getMonitoringService().getOrganisation(organisationID);
List staffList = new LinkedList();
@@ -526,7 +525,7 @@
*/
public ActionForward saveLearningDesign(ActionMapping mapping, ActionForm form, HttpServletRequest request,
HttpServletResponse response) throws JSONException, UserException, WorkspaceFolderException, IOException,
- ObjectExtractorException, ParseException {
+ ObjectExtractorException, ParseException {
JSONObject ldJSON = new JSONObject(request.getParameter("ld"));
LearningDesign learningDesign = getAuthoringService().saveLearningDesignDetails(ldJSON);
@@ -536,8 +535,8 @@
Long learningDesignID = learningDesign.getLearningDesignId();
if (learningDesignID != null) {
Gson gson = new GsonBuilder().create();
- Vector validationDTOs = getAuthoringService().validateLearningDesign(
- learningDesignID);
+ Vector validationDTOs = getAuthoringService()
+ .validateLearningDesign(learningDesignID);
String validationJSON = gson.toJson(validationDTOs);
responseJSON.put("validation", new JSONArray(validationJSON));
@@ -626,8 +625,8 @@
writer.close();
}
} catch (IOException e) {
- AuthoringAction.log.error("Error while writing " + extension.toUpperCase() + " thumbnail of LD "
- + learningDesignID + ".", e);
+ AuthoringAction.log.error(
+ "Error while writing " + extension.toUpperCase() + " thumbnail of LD " + learningDesignID + ".", e);
} finally {
if (fos != null) {
try {
@@ -647,26 +646,26 @@
*/
private IAuditService getAuditService() {
if (AuthoringAction.auditService == null) {
- WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
- .getServletContext());
+ WebApplicationContext ctx = WebApplicationContextUtils
+ .getRequiredWebApplicationContext(getServlet().getServletContext());
AuthoringAction.auditService = (IAuditService) ctx.getBean("auditService");
}
return AuthoringAction.auditService;
}
private IMonitoringService getMonitoringService() {
if (AuthoringAction.monitoringService == null) {
- WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
- .getServletContext());
+ WebApplicationContext ctx = WebApplicationContextUtils
+ .getRequiredWebApplicationContext(getServlet().getServletContext());
AuthoringAction.monitoringService = (IMonitoringService) ctx.getBean("monitoringService");
}
return AuthoringAction.monitoringService;
}
private IUserManagementService getUserManagementService() {
if (AuthoringAction.userManagementService == null) {
- WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
- .getServletContext());
+ WebApplicationContext wac = WebApplicationContextUtils
+ .getRequiredWebApplicationContext(getServlet().getServletContext());
AuthoringAction.userManagementService = (IUserManagementService) wac
.getBean(CentralConstants.USER_MANAGEMENT_SERVICE_BEAN_NAME);
}
@@ -675,8 +674,8 @@
public IAuthoringService getAuthoringService() {
if (AuthoringAction.authoringService == null) {
- WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
- .getServletContext());
+ WebApplicationContext wac = WebApplicationContextUtils
+ .getRequiredWebApplicationContext(getServlet().getServletContext());
AuthoringAction.authoringService = (IAuthoringService) wac
.getBean(AuthoringConstants.AUTHORING_SERVICE_BEAN_NAME);
}
@@ -685,26 +684,26 @@
public ILamsToolService getToolService() {
if (AuthoringAction.toolService == null) {
- WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
- .getServletContext());
+ WebApplicationContext wac = WebApplicationContextUtils
+ .getRequiredWebApplicationContext(getServlet().getServletContext());
AuthoringAction.toolService = (ILamsToolService) wac.getBean(AuthoringConstants.TOOL_SERVICE_BEAN_NAME);
}
return AuthoringAction.toolService;
}
private ILearningDesignService getLearningDesignService() {
if (AuthoringAction.learningDesignService == null) {
- WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
- .getServletContext());
+ WebApplicationContext ctx = WebApplicationContextUtils
+ .getRequiredWebApplicationContext(getServlet().getServletContext());
AuthoringAction.learningDesignService = (ILearningDesignService) ctx.getBean("learningDesignService");
}
return AuthoringAction.learningDesignService;
}
private ISecurityService getSecurityService() {
if (AuthoringAction.securityService == null) {
- WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
- .getServletContext());
+ WebApplicationContext ctx = WebApplicationContextUtils
+ .getRequiredWebApplicationContext(getServlet().getServletContext());
AuthoringAction.securityService = (ISecurityService) ctx.getBean("securityService");
}
return AuthoringAction.securityService;
Index: lams_central/src/java/org/lamsfoundation/lams/util/CentralConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/util/CentralConstants.java,v
diff -u -r1.37.2.1 -r1.37.2.2
--- lams_central/src/java/org/lamsfoundation/lams/util/CentralConstants.java 13 Feb 2015 23:43:00 -0000 1.37.2.1
+++ lams_central/src/java/org/lamsfoundation/lams/util/CentralConstants.java 24 Feb 2016 12:35:44 -0000 1.37.2.2
@@ -185,8 +185,6 @@
public static final String HEADER_CONTENT_ATTACHMENT = "attachment;filename=";
- public static final String PARAM_LEARNER_EXPORT_PORTFOLIO_ENABLE = "learnerEnableExport";
-
public static final String PARAM_LEARNER_PRESENCE_ENABLE = "learnerSeeOnline";
public static final String PARAM_LEARNER_IM_ENABLE = "learnerInstantMessaging";
Index: lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java,v
diff -u -r1.45.2.4 -r1.45.2.5
--- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java 10 Sep 2015 22:16:23 -0000 1.45.2.4
+++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java 24 Feb 2016 12:35:44 -0000 1.45.2.5
@@ -37,7 +37,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -68,7 +67,6 @@
* @struts.action-forward name="group" path="/group.jsp"
*/
public class DisplayGroupAction extends Action {
- private static Logger log = Logger.getLogger(DisplayGroupAction.class);
private static IUserManagementService service;
private static LessonService lessonService;
private static ILearningDesignService learningDesignService;
@@ -127,16 +125,16 @@
private IndexOrgBean createOrgBean(Organisation org, List roles, String username, boolean isSysAdmin)
throws SQLException, NamingException {
- IndexOrgBean orgBean = new IndexOrgBean(org.getOrganisationId(), org.getName(), org.getOrganisationType()
- .getOrganisationTypeId());
+ IndexOrgBean orgBean = new IndexOrgBean(org.getOrganisationId(), org.getName(),
+ org.getOrganisationType().getOrganisationTypeId());
// First, populate header part
List links = new ArrayList();
List moreLinks = new ArrayList();
if (isSysAdmin && stateId.equals(OrganisationState.ACTIVE)) {
if (orgBean.getType().equals(OrganisationType.COURSE_TYPE)) {
- moreLinks.add(new IndexLinkBean("index.classman", "javascript:openOrgManagement("
- + org.getOrganisationId() + ")", "manage-group-button", null));
+ moreLinks.add(new IndexLinkBean("index.classman",
+ "javascript:openOrgManagement(" + org.getOrganisationId() + ")", "manage-group-button", null));
}
}
@@ -145,34 +143,37 @@
links.add(new IndexLinkBean("index.coursegradebook.learner", link, "my-grades-button", null));
}
- if ((roles.contains(Role.ROLE_GROUP_ADMIN) || roles.contains(Role.ROLE_GROUP_MANAGER) || roles
- .contains(Role.ROLE_MONITOR)) && stateId.equals(OrganisationState.ACTIVE)) {
+ if ((roles.contains(Role.ROLE_GROUP_ADMIN) || roles.contains(Role.ROLE_GROUP_MANAGER)
+ || roles.contains(Role.ROLE_MONITOR)) && stateId.equals(OrganisationState.ACTIVE)) {
if (orgBean.getType().equals(OrganisationType.COURSE_TYPE)) {
- if ((!isSysAdmin) && (roles.contains(Role.ROLE_GROUP_ADMIN) || roles.contains(Role.ROLE_GROUP_MANAGER))) {
- moreLinks.add(new IndexLinkBean("index.classman", "javascript:openOrgManagement("
- + org.getOrganisationId() + ")", "manage-group-button", null));
+ if ((!isSysAdmin)
+ && (roles.contains(Role.ROLE_GROUP_ADMIN) || roles.contains(Role.ROLE_GROUP_MANAGER))) {
+ moreLinks.add(new IndexLinkBean("index.classman",
+ "javascript:openOrgManagement(" + org.getOrganisationId() + ")", "manage-group-button",
+ null));
}
if ((roles.contains(Role.ROLE_GROUP_ADMIN) || roles.contains(Role.ROLE_GROUP_MANAGER)
|| roles.contains(Role.ROLE_AUTHOR) || roles.contains(Role.ROLE_MONITOR))) {
- moreLinks.add(new IndexLinkBean("index.orggroup", "javascript:showOrgGroupDialog("
- + org.getOrganisationId() + ")", "manage-group-button", null));
+ moreLinks.add(new IndexLinkBean("index.orggroup",
+ "javascript:showOrgGroupDialog(" + org.getOrganisationId() + ")", "manage-group-button",
+ null));
}
if (roles.contains(Role.ROLE_GROUP_MANAGER) || roles.contains(Role.ROLE_MONITOR)) {
String name = org.getEnableSingleActivityLessons() ? "index.addlesson.single" : "index.addlesson";
- links.add(new IndexLinkBean(name,
- "javascript:showAddLessonDialog(" + org.getOrganisationId() + ")", "add-lesson-button",
- null));
+ links.add(new IndexLinkBean(name, "javascript:showAddLessonDialog(" + org.getOrganisationId() + ")",
+ "add-lesson-button", null));
}
- moreLinks.add(new IndexLinkBean("index.searchlesson", "javascript:showSearchLessonDialog("
- + org.getOrganisationId() + ")", "search-lesson", "index.searchlesson.tooltip"));
+ moreLinks.add(new IndexLinkBean("index.searchlesson",
+ "javascript:showSearchLessonDialog(" + org.getOrganisationId() + ")", "search-lesson",
+ "index.searchlesson.tooltip"));
// Adding course notifications links if enabled
if (org.getEnableCourseNotifications()
&& (roles.contains(Role.ROLE_GROUP_MANAGER) || roles.contains(Role.ROLE_MONITOR))) {
- moreLinks.add(new IndexLinkBean("index.emailnotifications", "javascript:showNotificationsDialog("
- + org.getOrganisationId() + ",null)", "course-notifications",
- "index.emailnotifications.tooltip"));
+ moreLinks.add(new IndexLinkBean("index.emailnotifications",
+ "javascript:showNotificationsDialog(" + org.getOrganisationId() + ",null)",
+ "course-notifications", "index.emailnotifications.tooltip"));
}
// Adding gradebook course monitor links if enabled
@@ -185,11 +186,10 @@
} else {// CLASS_TYPE
if (roles.contains(Role.ROLE_GROUP_MANAGER) || roles.contains(Role.ROLE_MONITOR)) {
- String name = org.getParentOrganisation().getEnableSingleActivityLessons() ? "index.addlesson.single"
- : "index.addlesson";
- links.add(new IndexLinkBean(name,
- "javascript:showAddLessonDialog(" + org.getOrganisationId() + ")", "add-lesson-button",
- null));
+ String name = org.getParentOrganisation().getEnableSingleActivityLessons()
+ ? "index.addlesson.single" : "index.addlesson";
+ links.add(new IndexLinkBean(name, "javascript:showAddLessonDialog(" + org.getOrganisationId() + ")",
+ "add-lesson-button", null));
}
// Adding gradebook course monitor links if enabled
@@ -236,8 +236,8 @@
for (Organisation organisation : children) {
if (organisation.getOrganisationState().getOrganisationStateId().equals(stateId)) {
List classRoles = new ArrayList();
- List userOrganisationRoles = getService().getUserOrganisationRoles(
- organisation.getOrganisationId(), username);
+ List userOrganisationRoles = getService()
+ .getUserOrganisationRoles(organisation.getOrganisationId(), username);
// don't list the subgroup if user is not a member, and not a group admin/manager
if (((userOrganisationRoles == null) || userOrganisationRoles.isEmpty()) && !isSysAdmin
&& !roles.contains(Role.ROLE_GROUP_ADMIN) && !roles.contains(Role.ROLE_GROUP_MANAGER)) {
@@ -284,20 +284,11 @@
LinkedList lessonLinks = new LinkedList();
String url = null;
Integer lessonStateId = bean.getState();
- if (stateId.equals(OrganisationState.ACTIVE)) {
- if (roles.contains(Role.ROLE_LEARNER)) {
- if (lessonStateId.equals(Lesson.STARTED_STATE) || lessonStateId.equals(Lesson.FINISHED_STATE)) {
- url = "javascript:openLearner(" + bean.getId() + ")";
- }
- }
- } else if (stateId.equals(OrganisationState.ARCHIVED)) {
- if (roles.contains(Role.ROLE_LEARNER)) {
- if (lessonStateId.equals(Lesson.STARTED_STATE) || lessonStateId.equals(Lesson.FINISHED_STATE)) {
- lessonLinks.addFirst(new IndexLinkBean("label.export.portfolio",
- "javascript:openExportPortfolio(" + bean.getId() + ")"));
- }
- }
+ if (stateId.equals(OrganisationState.ACTIVE) && roles.contains(Role.ROLE_LEARNER)
+ && (lessonStateId.equals(Lesson.STARTED_STATE) || lessonStateId.equals(Lesson.FINISHED_STATE))) {
+ url = "javascript:openLearner(" + bean.getId() + ")";
}
+
if ((lessonLinks.size() > 0) || (url != null)) {
bean.setUrl(url);
bean.setLinks(lessonLinks);
@@ -327,8 +318,8 @@
if ((isGroupManagerOrMonitor && stateId.equals(OrganisationState.ACTIVE))
|| (stateId.equals(OrganisationState.ARCHIVED) && roles.contains(Role.ROLE_GROUP_MANAGER))) {
- lessonLinks.addFirst(new IndexLinkBean("index.monitor", "javascript:showMonitorLessonDialog("
- + bean.getId() + ")", "mycourses-monitor-img", null));
+ lessonLinks.addFirst(new IndexLinkBean("index.monitor",
+ "javascript:showMonitorLessonDialog(" + bean.getId() + ")", "mycourses-monitor-img", null));
}
// Adding lesson notifications links if enabled
@@ -339,9 +330,8 @@
}
// Adding gradebook course monitor links if enabled
- if (isGroupManagerOrMonitor
- && (org.getEnableGradebookForMonitors() || ((parent != null) && parent
- .getEnableGradebookForMonitors()))) {
+ if (isGroupManagerOrMonitor && (org.getEnableGradebookForMonitors()
+ || ((parent != null) && parent.getEnableGradebookForMonitors()))) {
String link = "javascript:showGradebookLessonDialog(" + bean.getId() + ")";
lessonLinks
.addFirst(new IndexLinkBean("index.coursegradebookmonitor", link, "mycourses-mark-img", null));
@@ -373,40 +363,40 @@
private User getUser(String login) {
return (User) getService().findByProperty(User.class, "login", login).get(0);
}
-
+
private IUserManagementService getService() {
if (DisplayGroupAction.service == null) {
- WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
- .getServletContext());
+ WebApplicationContext ctx = WebApplicationContextUtils
+ .getRequiredWebApplicationContext(getServlet().getServletContext());
DisplayGroupAction.service = (IUserManagementService) ctx.getBean("userManagementService");
}
return DisplayGroupAction.service;
}
private LessonService getLessonService() {
if (DisplayGroupAction.lessonService == null) {
- WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
- .getServletContext());
+ WebApplicationContext ctx = WebApplicationContextUtils
+ .getRequiredWebApplicationContext(getServlet().getServletContext());
DisplayGroupAction.lessonService = (LessonService) ctx.getBean("lessonService");
}
return DisplayGroupAction.lessonService;
}
private ILearningDesignService getLearningDesignService() {
if (DisplayGroupAction.learningDesignService == null) {
- WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
- .getServletContext());
+ WebApplicationContext ctx = WebApplicationContextUtils
+ .getRequiredWebApplicationContext(getServlet().getServletContext());
DisplayGroupAction.learningDesignService = (ILearningDesignService) ctx.getBean("learningDesignService");
}
return DisplayGroupAction.learningDesignService;
}
-
+
private ISecurityService getSecurityService() {
- if (securityService == null) {
- WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
- .getServletContext());
- securityService = (ISecurityService) ctx.getBean("securityService");
+ if (DisplayGroupAction.securityService == null) {
+ WebApplicationContext ctx = WebApplicationContextUtils
+ .getRequiredWebApplicationContext(getServlet().getServletContext());
+ DisplayGroupAction.securityService = (ISecurityService) ctx.getBean("securityService");
}
- return securityService;
+ return DisplayGroupAction.securityService;
}
}
\ No newline at end of file
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.60.2.15 -r1.60.2.16
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java 10 Sep 2015 11:03:43 -0000 1.60.2.15
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java 24 Feb 2016 12:35:44 -0000 1.60.2.16
@@ -205,16 +205,7 @@
req.setAttribute(AttributeNames.PARAM_MODE, mode);
}
- Boolean isPortfolioEnabled = lesson.getLearnerExportAvailable() != null ? lesson.getLearnerExportAvailable()
- : Boolean.TRUE;
- Organisation organisation = lesson.getOrganisation();
- // in case of preview lesson (organisation is null) don't check organisation's settings
- if (organisation != null) {
- isPortfolioEnabled &= organisation.getEnableExportPortfolio();
- }
-
req.setAttribute(AttributeNames.PARAM_LESSON_ID, String.valueOf(lessonId));
- 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_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java,v
diff -u -r1.21.4.1 -r1.21.4.2
--- lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java 10 Feb 2016 10:01:39 -0000 1.21.4.1
+++ lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java 24 Feb 2016 12:35:44 -0000 1.21.4.2
@@ -50,9 +50,9 @@
* @author Fiona Malikoff
*/
public class CssTag extends TagSupport {
+ private static final long serialVersionUID = -3143529984657965761L;
private static final Logger log = Logger.getLogger(CssTag.class);
- private String localLinkPath = null;
private String style = null;
private static final String LEARNER_STYLE = "learner"; // expandable
@@ -79,11 +79,7 @@
for (String theme : themeList) {
if (theme != null) {
theme = appendStyle(theme, rtl);
- if (localLinkPath != null) {
- customStylesheetLink = generateLocalLink(theme);
- } else {
- customStylesheetLink = generateLink(theme, serverURL);
- }
+ customStylesheetLink = generateLink(theme, serverURL);
}
if (customStylesheetLink != null) {
@@ -104,16 +100,6 @@
return Tag.SKIP_BODY;
}
- private String generateLocalLink(String stylesheetName) {
- if (localLinkPath.endsWith("/")) {
- return "";
- } else {
- return "";
- }
- }
-
private String appendStyle(String stylesheetName, boolean rtl) {
String ssName = stylesheetName;
if (ssName != null) {
@@ -142,21 +128,6 @@
}
/**
- * @jsp.attribute required="false" rtexprvalue="true" description="Should the css link be a local file link? If so,
- * what is the path back to the 'root'. For tools' export portfolio pages, this should be set to
- * \"../\""
- *
- * @return Returns the property.
- */
- public String getLocalLinkPath() {
- return localLinkPath;
- }
-
- public void setLocalLinkPath(String localLinkPath) {
- this.localLinkPath = localLinkPath;
- }
-
- /**
* @jsp.attribute required="false" rtexprvalue="true" description="Learner pages use learner, fancy pages such as
* index page use core"
*
Index: lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonJoinServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonJoinServlet.java,v
diff -u -r1.12 -r1.12.2.1
--- lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonJoinServlet.java 29 Jan 2014 21:26:09 -0000 1.12
+++ lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonJoinServlet.java 24 Feb 2016 12:35:44 -0000 1.12.2.1
@@ -84,8 +84,8 @@
@Override
public void init() throws ServletException {
- LessonJoinServlet.lessonService = (ILessonService) WebApplicationContextUtils.getRequiredWebApplicationContext(
- getServletContext()).getBean("lessonService");
+ LessonJoinServlet.lessonService = (ILessonService) WebApplicationContextUtils
+ .getRequiredWebApplicationContext(getServletContext()).getBean("lessonService");
LessonJoinServlet.userService = (IUserManagementService) WebApplicationContextUtils
.getRequiredWebApplicationContext(getServletContext()).getBean("userManagementService");
@@ -98,8 +98,8 @@
}
@Override
- public synchronized void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException,
- IOException {
+ public synchronized void doGet(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
PrintWriter out = response.getWriter();
response.setContentType("text/xml");
@@ -129,23 +129,23 @@
if (StringUtils.isBlank(username)) {
LessonJoinServlet.log.debug("Missing parameter: " + CentralConstants.PARAM_USERNAME);
element.setAttribute(CentralConstants.ATTR_RESULT_CODE, "0");
- element.setAttribute(CentralConstants.ATTR_RESULT_TEXT, "Missing parameter: "
- + CentralConstants.PARAM_USERNAME);
+ element.setAttribute(CentralConstants.ATTR_RESULT_TEXT,
+ "Missing parameter: " + CentralConstants.PARAM_USERNAME);
} else if (StringUtils.isBlank(orgId)) {
LessonJoinServlet.log.debug("Missing parameter: " + CentralConstants.PARAM_COURSE_ID);
element.setAttribute(CentralConstants.ATTR_RESULT_CODE, "0");
- element.setAttribute(CentralConstants.ATTR_RESULT_TEXT, "Missing parameter: "
- + CentralConstants.PARAM_COURSE_ID);
+ element.setAttribute(CentralConstants.ATTR_RESULT_TEXT,
+ "Missing parameter: " + CentralConstants.PARAM_COURSE_ID);
} else if (StringUtils.isBlank(ldId)) {
LessonJoinServlet.log.debug("Missing parameter: " + CentralConstants.PARAM_LEARNING_DESIGN_ID);
element.setAttribute(CentralConstants.ATTR_RESULT_CODE, "0");
- element.setAttribute(CentralConstants.ATTR_RESULT_TEXT, "Missing parameter: "
- + CentralConstants.PARAM_LEARNING_DESIGN_ID);
+ element.setAttribute(CentralConstants.ATTR_RESULT_TEXT,
+ "Missing parameter: " + CentralConstants.PARAM_LEARNING_DESIGN_ID);
} else if (StringUtils.isBlank(learnerSize)) {
LessonJoinServlet.log.debug("Missing parameter: " + CentralConstants.PARAM_LEARNER_SIZE);
element.setAttribute(CentralConstants.ATTR_RESULT_CODE, "0");
- element.setAttribute(CentralConstants.ATTR_RESULT_TEXT, "Missing parameter: "
- + CentralConstants.PARAM_LEARNER_SIZE);
+ element.setAttribute(CentralConstants.ATTR_RESULT_TEXT,
+ "Missing parameter: " + CentralConstants.PARAM_LEARNER_SIZE);
}
// authenticate integrated server
@@ -163,7 +163,8 @@
if ((lessons != null) && (lessons.size() > 0)) {
// add to first lesson where lesson size < learnerSize
- if (addUserToLesson(lessons, Integer.valueOf(learnerSize).intValue(), Integer.valueOf(orgId), user)) {
+ if (addUserToLesson(lessons, Integer.valueOf(learnerSize).intValue(), Integer.valueOf(orgId),
+ user)) {
// success result code
element.setAttribute(CentralConstants.ATTR_RESULT_CODE, "1");
}
@@ -258,7 +259,6 @@
String lessonDescription;
Boolean enableLessonIntro;
Boolean displayDesignImage;
- Boolean learnerExportAvailable;
Boolean learnerPresenceAvailable;
Boolean learnerImAvailable;
Boolean liveEditEnabled;
@@ -279,7 +279,6 @@
lessonDescription = l.getLessonDescription();
enableLessonIntro = l.isEnableLessonIntro();
displayDesignImage = l.isDisplayDesignImage();
- learnerExportAvailable = l.getLearnerExportAvailable();
learnerPresenceAvailable = l.getLearnerPresenceAvailable();
learnerImAvailable = l.getLearnerImAvailable();
liveEditEnabled = l.getLiveEditEnabled();
@@ -296,7 +295,6 @@
lessonDescription = ld.getDescription();
enableLessonIntro = false;
displayDesignImage = false;
- learnerExportAvailable = true;
learnerPresenceAvailable = false;
learnerImAvailable = false;
liveEditEnabled = false;
@@ -309,10 +307,9 @@
false);
staffList = getUsersFromDTOs(userDTOs);
}
- Lesson lesson = LessonJoinServlet.monitoringService.initializeLesson(lessonName, lessonDescription, ldId,
- orgId, ownerUserId, null, enableLessonIntro, displayDesignImage, learnerExportAvailable,
- learnerPresenceAvailable, learnerImAvailable, liveEditEnabled, enableNotifications, learnerRestart,
- null, null);
+ Lesson lesson = LessonJoinServlet.monitoringService.initializeLesson(lessonName, lessonDescription, ldId, orgId,
+ ownerUserId, null, enableLessonIntro, displayDesignImage, learnerPresenceAvailable, learnerImAvailable,
+ liveEditEnabled, enableNotifications, learnerRestart, null, null);
LessonJoinServlet.monitoringService.createLessonClassForLesson(lesson.getLessonId().longValue(), org,
learnerGroupName, learnerList, staffGroupName, staffList, ownerUserId);
LessonJoinServlet.monitoringService.startLesson(lesson.getLessonId().longValue(), ownerUserId);
Index: lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java,v
diff -u -r1.48.2.9 -r1.48.2.10
--- lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java 22 Oct 2015 08:51:59 -0000 1.48.2.9
+++ lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java 24 Feb 2016 12:35:44 -0000 1.48.2.10
@@ -85,7 +85,7 @@
private static IExportToolContentService exportService = null;
private static ILamsCoreToolService toolService = null;
-
+
private static IGradebookService gradebookService = null;
private static IUserManagementService userManagementService = null;
@@ -136,9 +136,6 @@
String lastNames = request.getParameter("lastNames");
String emails = request.getParameter("emails");
- // optional parameters for lesson initialisation
- boolean exportPortfolioEnable = WebUtil.readBooleanParam(request,
- CentralConstants.PARAM_LEARNER_EXPORT_PORTFOLIO_ENABLE, false);
boolean presenceEnable = WebUtil.readBooleanParam(request, CentralConstants.PARAM_LEARNER_PRESENCE_ENABLE,
false);
boolean imEnable = WebUtil.readBooleanParam(request, CentralConstants.PARAM_LEARNER_IM_ENABLE, false);
@@ -162,7 +159,7 @@
if (method.equals(CentralConstants.METHOD_START)) {
ldId = new Long(ldIdStr);
Long lessonId = startLesson(serverId, datetime, hashValue, username, ldId, courseId, title, desc,
- country, lang, customCSV, exportPortfolioEnable, presenceEnable, imEnable);
+ country, lang, customCSV, presenceEnable, imEnable);
element = document.createElement(CentralConstants.ELEM_LESSON);
element.setAttribute(CentralConstants.ATTR_LESSON_ID, lessonId.toString());
@@ -178,7 +175,7 @@
} else if (method.equals(CentralConstants.METHOD_SCHEDULE)) {
ldId = new Long(ldIdStr);
Long lessonId = scheduleLesson(serverId, datetime, hashValue, username, ldId, courseId, title, desc,
- startDate, country, lang, customCSV, exportPortfolioEnable, presenceEnable, imEnable);
+ startDate, country, lang, customCSV, presenceEnable, imEnable);
element = document.createElement(CentralConstants.ELEM_LESSON);
element.setAttribute(CentralConstants.ATTR_LESSON_ID, lessonId.toString());
@@ -199,7 +196,7 @@
String firstName = request.getParameter(LoginRequestDispatcher.PARAM_FIRST_NAME);
String lastName = request.getParameter(LoginRequestDispatcher.PARAM_LAST_NAME);
String email = request.getParameter(LoginRequestDispatcher.PARAM_EMAIL);
-
+
lsId = new Long(lsIdStr);
element = getSingleStudentProgress(document, serverId, datetime, hashValue, username, firstName,
lastName, lang, country, email, lsId, courseId);
@@ -219,21 +216,22 @@
element = document.createElement(CentralConstants.ELEM_LESSON);
element.setAttribute(CentralConstants.ATTR_LESSON_ID, lsIdStr);
-
+
} else if (method.equals("gradebookMarksUser")) {
lsId = new Long(lsIdStr);
element = getGradebookMarks(document, serverId, datetime, hashValue, username, lsId, null, outputsUser);
-
+
} else if (method.equals("gradebookMarksLesson")) {
lsId = new Long(lsIdStr);
element = getGradebookMarks(document, serverId, datetime, hashValue, username, lsId, null, null);
-
+
} else if (method.equals("gradebookMarksCourse")) {
element = getGradebookMarks(document, serverId, datetime, hashValue, username, null, courseId, null);
} else if (method.equals("toolOutputsAllUsers")) {
lsId = new Long(lsIdStr);
- element = getToolOutputs(document, serverId, datetime, hashValue, username, lsId, courseId, false, null);
+ element = getToolOutputs(document, serverId, datetime, hashValue, username, lsId, courseId, false,
+ null);
} else if (method.equals("authoredToolOutputsAllUsers")) {
lsId = new Long(lsIdStr);
@@ -293,7 +291,7 @@
} catch (Exception e) {
LessonManagerServlet.log.error("Problem loading learning manager servlet request", e);
response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
-
+
} finally {
if (outputStream != null) {
outputStream.flush();
@@ -325,7 +323,7 @@
public Long startLesson(String serverId, String datetime, String hashValue, String username, long ldId,
String courseId, String title, String desc, String countryIsoCode, String langIsoCode, String customCSV,
- boolean exportPortfolioEnable, boolean presenceEnable, boolean imEnable) throws RemoteException {
+ boolean presenceEnable, boolean imEnable) throws RemoteException {
try {
ExtServerOrgMap serverMap = LessonManagerServlet.integrationService.getExtServerOrgMap(serverId);
Authenticator.authenticate(serverMap, datetime, username, hashValue);
@@ -337,8 +335,8 @@
// 1. init lesson
Lesson lesson = LessonManagerServlet.monitoringService.initializeLesson(title, desc, ldId,
- organisation.getOrganisationId(), user.getUserId(), customCSV, false, false, exportPortfolioEnable,
- presenceEnable, imEnable, true, false, false, null, null);
+ organisation.getOrganisationId(), user.getUserId(), customCSV, false, false, presenceEnable,
+ imEnable, true, false, false, null, null);
// 2. create lessonClass for lesson
createLessonClass(lesson, organisation, user);
// 3. start lesson
@@ -354,24 +352,23 @@
public Long scheduleLesson(String serverId, String datetime, String hashValue, String username, long ldId,
String courseId, String title, String desc, String startDate, String countryIsoCode, String langIsoCode,
- String customCSV, boolean exportPortfolioEnable, boolean presenceEnable, boolean imEnable)
- throws RemoteException {
+ String customCSV, boolean presenceEnable, boolean imEnable) throws RemoteException {
try {
ExtServerOrgMap serverMap = LessonManagerServlet.integrationService.getExtServerOrgMap(serverId);
Authenticator.authenticate(serverMap, datetime, username, hashValue);
ExtUserUseridMap userMap = LessonManagerServlet.integrationService.getExtUserUseridMap(serverMap, username);
ExtCourseClassMap orgMap = LessonManagerServlet.integrationService.getExtCourseClassMap(serverMap, userMap,
courseId, countryIsoCode, langIsoCode, null, LoginRequestDispatcher.METHOD_MONITOR);
// 1. init lesson
- Lesson lesson = LessonManagerServlet.monitoringService.initializeLesson(title, desc, ldId, orgMap
- .getOrganisation().getOrganisationId(), userMap.getUser().getUserId(), customCSV, false, false,
- exportPortfolioEnable, presenceEnable, imEnable, true, false, false, null, null);
+ Lesson lesson = LessonManagerServlet.monitoringService.initializeLesson(title, desc, ldId,
+ orgMap.getOrganisation().getOrganisationId(), userMap.getUser().getUserId(), customCSV, false,
+ false, presenceEnable, imEnable, true, false, false, null, null);
// 2. create lessonClass for lesson
createLessonClass(lesson, orgMap.getOrganisation(), userMap.getUser());
// 3. schedule lesson
Date date = DateUtil.convertFromLAMSFlashFormat(startDate);
- LessonManagerServlet.monitoringService.startLessonOnSchedule(lesson.getLessonId(), date, userMap.getUser()
- .getUserId());
+ LessonManagerServlet.monitoringService.startLessonOnSchedule(lesson.getLessonId(), date,
+ userMap.getUser().getUserId());
return lesson.getLessonId();
} catch (Exception e) {
throw new RemoteException(e.getMessage(), e);
@@ -400,8 +397,8 @@
// get the username with the integration prefix removed
String userNoPrefixName = learnerProgress.getUserName().substring(prefix.length() + 1);
- ExtUserUseridMap learnerMap = LessonManagerServlet.integrationService.getExtUserUseridMap(
- serverMap, userNoPrefixName);
+ ExtUserUseridMap learnerMap = LessonManagerServlet.integrationService.getExtUserUseridMap(serverMap,
+ userNoPrefixName);
Element learnerProgElem = document.createElement(CentralConstants.ELEM_LEARNER_PROGRESS);
@@ -412,10 +409,10 @@
learnerProgElem.setAttribute(CentralConstants.ATTR_LESSON_COMPLETE,
"" + learnerProgress.getLessonComplete());
learnerProgElem.setAttribute(CentralConstants.ATTR_ACTIVITY_COUNT, "" + activitiesTotal);
- learnerProgElem.setAttribute(CentralConstants.ATTR_ACTIVITIES_COMPLETED, ""
- + completedActivities);
- learnerProgElem.setAttribute(CentralConstants.ATTR_ACTIVITIES_ATTEMPTED, ""
- + attemptedActivities);
+ learnerProgElem.setAttribute(CentralConstants.ATTR_ACTIVITIES_COMPLETED,
+ "" + completedActivities);
+ learnerProgElem.setAttribute(CentralConstants.ATTR_ACTIVITIES_ATTEMPTED,
+ "" + attemptedActivities);
// learnerProgElem.setAttribute(CentralConstants.ATTR_CURRENT_ACTIVITY , currActivity);
learnerProgElem.setAttribute(CentralConstants.ATTR_STUDENT_ID, "" + learnerMap.getSid());
learnerProgElem.setAttribute(CentralConstants.ATTR_COURSE_ID, courseID);
@@ -458,8 +455,8 @@
serverMap, username, firstName, lastName, language, country, email, usePrefix,
isUpdateUserDetails);
- LearnerProgress learnProg = LessonManagerServlet.lessonService.getUserProgressForLesson(userMap
- .getUser().getUserId(), lsId);
+ LearnerProgress learnProg = LessonManagerServlet.lessonService
+ .getUserProgressForLesson(userMap.getUser().getUserId(), lsId);
Element learnerProgElem = document.createElement(CentralConstants.ELEM_LEARNER_PROGRESS);
@@ -474,10 +471,10 @@
learnerProgElem.setAttribute(CentralConstants.ATTR_LESSON_COMPLETE,
"" + learnerProgress.getLessonComplete());
learnerProgElem.setAttribute(CentralConstants.ATTR_ACTIVITY_COUNT, "" + activitiesTotal);
- learnerProgElem.setAttribute(CentralConstants.ATTR_ACTIVITIES_COMPLETED, ""
- + completedActivities);
- learnerProgElem.setAttribute(CentralConstants.ATTR_ACTIVITIES_ATTEMPTED, ""
- + attemptedActivities);
+ learnerProgElem.setAttribute(CentralConstants.ATTR_ACTIVITIES_COMPLETED,
+ "" + completedActivities);
+ learnerProgElem.setAttribute(CentralConstants.ATTR_ACTIVITIES_ATTEMPTED,
+ "" + attemptedActivities);
// learnerProgElem.setAttribute(CentralConstants.ATTR_CURRENT_ACTIVITY , currActivity);
learnerProgElem.setAttribute(CentralConstants.ATTR_STUDENT_ID, "" + userMap.getSid());
learnerProgElem.setAttribute(CentralConstants.ATTR_COURSE_ID, courseID);
@@ -537,8 +534,8 @@
Integer userId = userMap.getUser().getUserId();
// 1. init lesson
- Lesson lesson = LessonManagerServlet.monitoringService.initializeLessonForPreview(title, desc, ldId,
- userId, customCSV, presenceEnable, imEnable, false);
+ Lesson lesson = LessonManagerServlet.monitoringService.initializeLessonForPreview(title, desc, ldId, userId,
+ customCSV, presenceEnable, imEnable, false);
// 2. create lessonClass for lesson
LessonManagerServlet.monitoringService.createPreviewClassForLesson(userId, lesson.getLessonId());
@@ -603,8 +600,8 @@
List staffList = new LinkedList();
staffList.add(creator);
List learnerList = new LinkedList();
- Vector learnerVector = LessonManagerServlet.userManagementService.getUsersFromOrganisationByRole(
- organisation.getOrganisationId(), Role.LEARNER, false, true);
+ Vector learnerVector = LessonManagerServlet.userManagementService
+ .getUsersFromOrganisationByRole(organisation.getOrganisationId(), Role.LEARNER, false, true);
learnerList.addAll(learnerVector);
LessonManagerServlet.monitoringService.createLessonClassForLesson(lesson.getLessonId(), organisation,
organisation.getName() + "Learners", learnerList, organisation.getName() + "Staff", staffList,
@@ -635,7 +632,7 @@
LessonManagerServlet.toolService = (ILamsCoreToolService) WebApplicationContextUtils
.getRequiredWebApplicationContext(getServletContext()).getBean("lamsCoreToolService");
-
+
LessonManagerServlet.gradebookService = (IGradebookService) WebApplicationContextUtils
.getRequiredWebApplicationContext(getServletContext()).getBean("gradebookService");
@@ -716,9 +713,9 @@
// in case there is firstNames available - check all arrays have the same length, as otherwise it's
// prone to ArrayOutOfBounds exceptions
- if ((firstNames != null)
- && ((firstNameArray.length != lastNameArray.length)
- || (firstNameArray.length != emailArray.length) || (firstNameArray.length != (learnerIdArray.length + monitorIdArray.length)))) {
+ if ((firstNames != null) && ((firstNameArray.length != lastNameArray.length)
+ || (firstNameArray.length != emailArray.length)
+ || (firstNameArray.length != (learnerIdArray.length + monitorIdArray.length)))) {
LessonManagerServlet.log.error("Invalid parameters sent: wrong array length.");
return false;
}
@@ -776,8 +773,8 @@
String countryIsoCode, String langIsoCode) throws UserInfoFetchException, UserInfoValidationException {
if (LessonManagerServlet.log.isDebugEnabled()) {
- LessonManagerServlet.log.debug("Adding user '" + username + "' as " + method + " to lesson with id '"
- + lsIdStr + "'.");
+ LessonManagerServlet.log
+ .debug("Adding user '" + username + "' as " + method + " to lesson with id '" + lsIdStr + "'.");
}
ExtUserUseridMap userMap = null;
@@ -798,8 +795,8 @@
if (LessonManagerServlet.lessonService == null) {
LessonManagerServlet.lessonService = (ILessonService) WebApplicationContextUtils
- .getRequiredWebApplicationContext(request.getSession().getServletContext()).getBean(
- "lessonService");
+ .getRequiredWebApplicationContext(request.getSession().getServletContext())
+ .getBean("lessonService");
}
User user = userMap.getUser();
@@ -817,7 +814,7 @@
}
}
-
+
/**
* This method gets the tool outputs for a lesson or a specific user and returns them in XML format.
*
@@ -835,36 +832,36 @@
*/
@SuppressWarnings("unchecked")
public Element getGradebookMarks(Document document, String serverId, String datetime, String hashValue,
- String username, Long lessonIdParam, String courseId, String outputsUser)
- throws Exception {
+ String username, Long lessonIdParam, String courseId, String outputsUser) throws Exception {
ExtServerOrgMap serverMap = LessonManagerServlet.integrationService.getExtServerOrgMap(serverId);
Authenticator.authenticate(serverMap, datetime, username, hashValue);
-
+
List lessons = new LinkedList();
if (courseId != null) {
-
+
ExtCourseClassMap orgMap = LessonManagerServlet.integrationService.getExtCourseClassMap(serverMap.getSid(),
courseId);
if (orgMap == null) {
- LessonManagerServlet.log.debug("No course exists for: " + courseId
- + ". Cannot get tool outputs report.");
+ LessonManagerServlet.log
+ .debug("No course exists for: " + courseId + ". Cannot get tool outputs report.");
throw new Exception("Course with courseId: " + courseId + " could not be found");
- }
+ }
Integer organisationId = orgMap.getOrganisation().getOrganisationId();
-
- lessons.addAll(lessonService.getLessonsByGroup(organisationId));
-
+
+ lessons.addAll(LessonManagerServlet.lessonService.getLessonsByGroup(organisationId));
+
} else {
Lesson lesson = LessonManagerServlet.lessonService.getLesson(lessonIdParam);
if (lesson == null) {
- LessonManagerServlet.log.debug("No lesson exists for: " + lessonIdParam
- + ". Cannot get tool outputs report.");
- throw new Exception("Lesson with lessonID: " + lessonIdParam + " could not be found for learner progresses");
+ LessonManagerServlet.log
+ .debug("No lesson exists for: " + lessonIdParam + ". Cannot get tool outputs report.");
+ throw new Exception(
+ "Lesson with lessonID: " + lessonIdParam + " could not be found for learner progresses");
}
lessons.add(lesson);
}
-
+
// Create the root node of the xml document
Element gradebookMarksElement = document.createElement("GradebookMarks");
@@ -890,31 +887,33 @@
// if outputsUser is null we build results for the whole lesson, otherwise - for the specified learner
if (outputsUser != null) {
- ExtUserUseridMap userMap = LessonManagerServlet.integrationService.getExistingExtUserUseridMap(
- serverMap, outputsUser);
+ ExtUserUseridMap userMap = LessonManagerServlet.integrationService
+ .getExistingExtUserUseridMap(serverMap, outputsUser);
if (userMap == null) {
throw new Exception("No user exists for: " + outputsUser + ". Cannot get tool outputs report.");
}
User user = userMap.getUser();
Integer userId = user.getUserId();
-
- GradebookUserLesson gradebookUserLesson = gradebookService.getGradebookUserLesson(lessonId, userId);
+
+ GradebookUserLesson gradebookUserLesson = LessonManagerServlet.gradebookService
+ .getGradebookUserLesson(lessonId, userId);
if (gradebookUserLesson == null) {
gradebookUserLesson = new GradebookUserLesson(lesson, user);
}
gradebookUserLessons.add(gradebookUserLesson);
} else {
- gradebookUserLessons.addAll(gradebookService.getGradebookUserLesson(lessonId));
+ gradebookUserLessons.addAll(LessonManagerServlet.gradebookService.getGradebookUserLesson(lessonId));
LessonManagerServlet.log.debug("Getting tool ouputs report for: " + lessonId
+ ". With learning design: " + lesson.getLearningDesign().getLearningDesignId());
}
-
- List allUsers = integrationService.getExtUserUseridMapByServerMap(serverMap);
+ List allUsers = LessonManagerServlet.integrationService
+ .getExtUserUseridMapByServerMap(serverMap);
+
for (GradebookUserLesson gradebookUserLesson : gradebookUserLessons) {
Integer userId = gradebookUserLesson.getLearner().getUserId();
-
+
//find user
ExtUserUseridMap extUser = null;
for (ExtUserUseridMap extUserIter : allUsers) {
@@ -923,20 +922,21 @@
break;
}
}
-
+
if (extUser == null) {
- throw new Exception("User with userId: " + userId + " doesn't belong to extServer: "
- + serverMap.getSid());
+ throw new Exception(
+ "User with userId: " + userId + " doesn't belong to extServer: " + serverMap.getSid());
}
Element learnerElement = document.createElement("Learner");
learnerElement.setAttribute("extUsername", extUser.getExtUsername());
- String userTotalMark = gradebookUserLesson.getMark() == null ? "" : gradebookUserLesson.getMark().toString();
+ String userTotalMark = gradebookUserLesson.getMark() == null ? ""
+ : gradebookUserLesson.getMark().toString();
learnerElement.setAttribute("userTotalMark", userTotalMark);
lessonElement.appendChild(learnerElement);
}
-
+
gradebookMarksElement.appendChild(lessonElement);
}
@@ -962,7 +962,7 @@
@SuppressWarnings("unchecked")
public Element getToolOutputs(Document document, String serverId, String datetime, String hashValue,
String username, Long lessonId, String courseID, boolean isAuthoredToolOutputs, String outputsUser)
- throws Exception {
+ throws Exception {
ExtServerOrgMap serverMap = LessonManagerServlet.integrationService.getExtServerOrgMap(serverId);
Authenticator.authenticate(serverMap, datetime, username, hashValue);
@@ -984,8 +984,8 @@
outputsUser);
if (userMap == null) {
// TODO: handle this error instead of throwing an exception
- LessonManagerServlet.log.debug("No user exists for: " + outputsUser
- + ". Cannot get tool outputs report.");
+ LessonManagerServlet.log
+ .debug("No user exists for: " + outputsUser + ". Cannot get tool outputs report.");
throw new Exception("No user exists for: " + outputsUser + ". Cannot get tool outputs report.");
}
learners.add(userMap.getUser());
@@ -1002,8 +1002,8 @@
toolOutputsElement.setAttribute(CentralConstants.ATTR_LESSON_ID, "" + lessonId);
toolOutputsElement.setAttribute("name", lesson.getLessonName());
- List learnerProgresses = LessonManagerServlet.lessonService.getUserProgressForLesson(lesson
- .getLessonId());
+ List learnerProgresses = LessonManagerServlet.lessonService
+ .getUserProgressForLesson(lesson.getLessonId());
List toolSessions = LessonManagerServlet.toolService.getToolSessionsByLesson(lesson);
// map contains pairs toolContentId -> toolOutputDefinitions
@@ -1049,8 +1049,8 @@
toolSession = dbToolSession;
}
}
- Map toolOutputDefinitions = toolOutputDefinitionsMap.get(activity
- .getToolContentId());
+ Map toolOutputDefinitions = toolOutputDefinitionsMap
+ .get(activity.getToolContentId());
learnerElement.appendChild(getActivityOutputsElement(document, activity, learner, learnerProgress,
toolSession, toolOutputDefinitions, isAuthoredToolOutputs));
@@ -1079,8 +1079,8 @@
* THIS IS A HACK to retrieve the first tool activity manually so it can be cast as a ToolActivity - if it is
* one
*/
- Activity firstActivity = LessonManagerServlet.monitoringService.getActivityById(lesson.getLearningDesign()
- .getFirstActivity().getActivityId());
+ Activity firstActivity = LessonManagerServlet.monitoringService
+ .getActivityById(lesson.getLearningDesign().getFirstActivity().getActivityId());
activities.add(firstActivity);
activities.addAll(lesson.getLearningDesign().getActivities());
@@ -1160,8 +1160,8 @@
if (activityEvaluations != null) {
for (ActivityEvaluation evaluation : activityEvaluations) {
if (outputName.equals(evaluation.getToolOutputDefinition())) {
- ToolOutput toolOutput = LessonManagerServlet.toolService.getOutputFromTool(
- outputName, toolSession, learner.getUserId());
+ ToolOutput toolOutput = LessonManagerServlet.toolService
+ .getOutputFromTool(outputName, toolSession, learner.getUserId());
activityElement.appendChild(getOutputElement(document, toolOutput, definition));
}
}
Index: lams_central/web/addLesson.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/addLesson.jsp,v
diff -u -r1.16.2.6 -r1.16.2.7
--- lams_central/web/addLesson.jsp 9 Feb 2016 18:52:57 -0000 1.16.2.6
+++ lams_central/web/addLesson.jsp 24 Feb 2016 12:35:44 -0000 1.16.2.7
@@ -193,7 +193,6 @@
-
Index: lams_central/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.3.2.2 -r1.3.2.3
--- lams_central/web/WEB-INF/tlds/lams/lams.tld 12 Jan 2016 12:20:30 -0000 1.3.2.2
+++ lams_central/web/WEB-INF/tlds/lams/lams.tld 24 Feb 2016 12:35:44 -0000 1.3.2.3
@@ -178,17 +178,9 @@
cssorg.lamsfoundation.lams.web.tag.CssTagempty
-
+
Output stylesheet based on the user preferences.
- localLinkPath
- false
-
- true
-
-
-
- Output stylesheet based on the user preferences.stylefalse
Index: lams_central/web/comments/comments.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/comments/comments.jsp,v
diff -u -r1.6.2.5 -r1.6.2.6
--- lams_central/web/comments/comments.jsp 23 Feb 2016 14:23:03 -0000 1.6.2.5
+++ lams_central/web/comments/comments.jsp 24 Feb 2016 12:35:44 -0000 1.6.2.6
@@ -1,4 +1,5 @@
+
<%@ taglib uri="tags-lams" prefix="lams"%>
<%@ taglib uri="tags-core" prefix="c"%>
<%@ taglib uri="tags-html" prefix="html"%>
@@ -17,23 +18,15 @@
-
-
-
-
-
-
-
-
+
-
-
+
+
- <%-- if localFiles == true then wanted for export portfolio and must run offline --%>
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: lams_learning/web/layout/layout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/layout/layout.jsp,v
diff -u -r1.18 -r1.18.12.1
--- lams_learning/web/layout/layout.jsp 2 May 2008 00:45:55 -0000 1.18
+++ lams_learning/web/layout/layout.jsp 24 Feb 2016 12:35:27 -0000 1.18.12.1
@@ -37,22 +37,14 @@
<fmt:message key="${pageTitleKey}" />
- <%-- if localFiles == true then wanted for export portfolio and must run offline --%>
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
Index: lams_learning/web/layout/mobileLayout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/layout/mobileLayout.jsp,v
diff -u -r1.2.2.1 -r1.2.2.2
--- lams_learning/web/layout/mobileLayout.jsp 9 Feb 2016 18:53:04 -0000 1.2.2.1
+++ lams_learning/web/layout/mobileLayout.jsp 24 Feb 2016 12:35:27 -0000 1.2.2.2
@@ -36,24 +36,17 @@
<fmt:message key="${pageTitleKey}" />
- <%-- if localFiles == true then wanted for export portfolio and must run offline --%>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
Index: lams_learning/web/mobile/main.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/mobile/main.jsp,v
diff -u -r1.1.2.4 -r1.1.2.5
--- lams_learning/web/mobile/main.jsp 9 Feb 2016 18:53:04 -0000 1.1.2.4
+++ lams_learning/web/mobile/main.jsp 24 Feb 2016 12:35:27 -0000 1.1.2.5
@@ -41,7 +41,6 @@
learner.do?method=displayProgress&lessonID=&keepThis=true&TB_iframe=true&height=300&width=400" title=" - " class="thickbox">'"/>
- exportWaitingPage.jsp?mode=learner&lessonID=&hideClose=true&keepThis=true&TB_iframe=true&height=300&width=400" title="" class="thickbox">notebook.do?method=viewAll&lessonID=')">
Index: lams_monitoring/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.66.2.9 -r1.66.2.10
--- lams_monitoring/conf/language/lams/ApplicationResources.properties 11 Nov 2015 17:16:47 -0000 1.66.2.9
+++ lams_monitoring/conf/language/lams/ApplicationResources.properties 24 Feb 2016 12:35:15 -0000 1.66.2.10
@@ -52,11 +52,7 @@
force.complete.stop.message.completed.to.activity =Move to activity successful.
force.complete.stop.message.completed.to.end =Move to activity successful to end of the lesson.
force.complete.stop.message.stopped.unexpectedly =Move to activity has finished processing. Please check the learner's progress bar for their current activity.
-export.portfolio.window.title =Export Portfolio
-export.portfolio.generating.message =Generating portfolio - please wait.
-export.portfolio.generation.complete.message =Your portfolio might take a while to generate. Once it's ready, your browser will begin downloading the file.
-audit.lesson.created =Lesson "{0}" created with learning design "{1}", export portfolio for learner set to {2}.
-audit.learner.portfolio.set =Lesson "{0}" has the export portfolio for learner set to {1}.
+audit.lesson.created =Lesson "{0}" created with learning design "{1}".
label.branching.general.instructions =Place the lesson participants in their branches. Initially you can add and remove learners, but once a participant starts one of the branches then you will not be able to remove learners from any branches. If you try to remove someone from a branch and they will not remove then check their progress - if they start using the branch while you are on this screen you will not get any errors but you will not be able to remove them from the branch. You will still be able to add learners to branches.
label.branching.branch.heading =Branch
label.branching.non.allocated.users.heading =Learners without a Branch
@@ -118,7 +114,6 @@
al.validation.msg2 =Title is a required field.
summery.desc.lbl =Description:
summery.learners.lbl =Learners:
-wizard.learner.expp.cb.lbl =Enable export portfolio for learner
al.validation.msg1 =A valid sequence must be selected.
finish.btn =Start in Monitor
al.validation.schtime =Please select a future date and time for scheduling.
@@ -223,7 +218,6 @@
button.schedule.tooltip =Schedule lesson to start in a future time
button.start.now =Start Now
button.start.now.tooltip =Start the lesson immediately
-lesson.enable.portfolio =Enable export portfolio for learner
lesson.enable.presence =Allow learners to see who is online
lesson.enable.presence.alert =Now learners can see who is online
lesson.disable.presence.alert =Now learners can not see who is online
@@ -257,7 +251,6 @@
label.learner.progress.activity.attempted.tooltip =The learner has attempted but not yet finished this activity
label.learner.progress.activity.tostart.tooltip =The learner has to complete the activities before this activity to access it
label.learner.progress.activity.support.tooltip =Double click to open this support activity
-button.export.learner.tooltip =Export this learner portfolio and save it on your computer for future reference
button.timechart =View Time Chart
button.timechart.tooltip =View a chart of the selected learner progress against time for each activity
learners.page =Page
@@ -291,8 +284,6 @@
button.help.tooltip =Open help page
button.refresh =Refresh
button.refresh.tooltip =Reload the latest progress data
-button.export =Export Portfolio
-button.export.tooltip =Export the class portfolio and save it on your computer for future reference
lesson.presence =online learners
sequence.help.info =Double click on an activity for more details
lesson.learner.url =Learner URL:
Index: lams_monitoring/conf/xdoclet/struts-forms.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/conf/xdoclet/struts-forms.xml,v
diff -u -r1.7 -r1.7.2.1
--- lams_monitoring/conf/xdoclet/struts-forms.xml 8 Apr 2014 11:33:20 -0000 1.7
+++ lams_monitoring/conf/xdoclet/struts-forms.xml 24 Feb 2016 12:35:15 -0000 1.7.2.1
@@ -6,8 +6,6 @@
-
-
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml,v
diff -u -r1.36.2.9 -r1.36.2.10
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml 10 Aug 2015 15:24:11 -0000 1.36.2.9
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml 24 Feb 2016 12:35:15 -0000 1.36.2.10
@@ -73,7 +73,6 @@
PROPAGATION_REQUIREDPROPAGATION_REQUIREDPROPAGATION_REQUIRED
- PROPAGATION_REQUIREDPROPAGATION_REQUIREDPROPAGATION_REQUIRED,readOnly
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.110.2.9 -r1.110.2.10
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java 12 Jan 2016 09:36:10 -0000 1.110.2.9
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java 24 Feb 2016 12:35:15 -0000 1.110.2.10
@@ -60,10 +60,9 @@
* Intialise lesson without creating Learning Design copy, i.e. the original LD will be used.
*/
Lesson initializeLessonWithoutLDcopy(String lessonName, String lessonDescription, long learningDesignID, User user,
- String customCSV, Boolean enableLessonIntro, Boolean displayDesignImage, Boolean learnerExportAvailable,
- Boolean learnerPresenceAvailable, Boolean learnerImAvailable, Boolean liveEditEnabled,
- Boolean enableLessonNotifications, Boolean learnerRestart, Integer scheduledNumberDaysToLessonFinish,
- Lesson precedingLesson);
+ String customCSV, Boolean enableLessonIntro, Boolean displayDesignImage, Boolean learnerPresenceAvailable,
+ Boolean learnerImAvailable, Boolean liveEditEnabled, Boolean enableLessonNotifications,
+ Boolean learnerRestart, Integer scheduledNumberDaysToLessonFinish, Lesson precedingLesson);
/**
*
@@ -99,8 +98,6 @@
* display an intro page to the lesson
* @param displayDesignImage
* display the design image or not
- * @param learnerExportAvailable
- * should the export portfolio option be made available to the learner?
* @param enableNotifications
* enable "email notifications" link for the current lesson
* @param numberDaysToLessonFinish
@@ -110,9 +107,9 @@
*/
Lesson initializeLesson(String lessonName, String lessonDescription, long learningDesignId, Integer organisationId,
Integer userID, String customCSV, Boolean enableLessonIntro, Boolean displayDesignImage,
- Boolean learnerExportAvailable, Boolean learnerPresenceAvailable, Boolean learnerImAvailable,
- Boolean liveEditEnabled, Boolean enableNotifications, Boolean learnerRestart,
- Integer numberDaysToLessonFinish, Long precedingLessonId);
+ Boolean learnerPresenceAvailable, Boolean learnerImAvailable, Boolean liveEditEnabled,
+ Boolean enableNotifications, Boolean learnerRestart, Integer numberDaysToLessonFinish,
+ Long precedingLessonId);
/**
* Initialize a new lesson so as to start the learning process for a normal or preview learning session. It needs to
@@ -231,8 +228,8 @@
/**
* Finish a lesson.A Finished lesson can be viewed on the monitoring interface. It should be an "inactive" lesson. A
- * Finished lesson is listed on the learner interface but all the learner can do is view the progress bar and do an
- * export portfolio - they cannot access any of the tool screens.
+ * Finished lesson is listed on the learner interface but all the learner can do is view the progress - they cannot
+ * access any of the tool screens.
*
* @param lessonId
* @param userId
@@ -243,32 +240,20 @@
void finishLesson(long lessonId, Integer userId) throws UserAccessDeniedException;
/**
- * Set whether or not the export portfolio button is available in learner. Sets it to FALSE if
- * learnerExportAvailable is null. Checks that the user is a staff member of this lesson before updating.
+ * Set whether or not the learner presence button is available in monitor. Checks that the user is a staff member of
+ * this lesson before updating.
*
* @param lessonId
* @param userId
- * @param learnerExportAvailable
- * @return new value for learnerExportAvailable. Normally will be same as input parameter, will only be different if
- * the value cannot be updated for some reason.
- */
- Boolean setLearnerPortfolioAvailable(long lessonId, Integer userId, Boolean learnerExportAvailable);
-
- /**
- * Set whether or not the learner presence button is available in monitor. Sets it to FALSE if
- * learnerExportAvailable is null. Checks that the user is a staff member of this lesson before updating.
- *
- * @param lessonId
- * @param userId
* @param learnerPresenceAvailable
* @return new value for learnerPresenceAvailable. Normally will be same as input parameter, will only be different
* if the value cannot be updated for some reason.
*/
Boolean setPresenceAvailable(long lessonId, Integer userId, Boolean learnerPresenceAvailable);
/**
- * Set whether or not the learner IM button is available in monitor. Sets it to FALSE if learnerExportAvailable is
- * null. Checks that the user is a staff member of this lesson before updating.
+ * Set whether or not the learner IM button is available in monitor. Checks that the user is a staff member of this
+ * lesson before updating.
*
* @param lessonId
* @param userId
@@ -279,8 +264,8 @@
Boolean setPresenceImAvailable(long lessonId, Integer userId, Boolean learnerPresenceImAvailable);
/**
- * Set whether or not the live edit is available in monitor. Sets it to FALSE if learnerExportAvailable is null.
- * Checks that the user is a staff member of this lesson before updating.
+ * Set whether or not the live edit is available in monitor. Checks that the user is a staff member of this lesson
+ * before updating.
*
* @param lessonId
* @param userId
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.195.2.21 -r1.195.2.22
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 12 Jan 2016 09:36:10 -0000 1.195.2.21
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 24 Feb 2016 12:35:15 -0000 1.195.2.22
@@ -122,9 +122,6 @@
import org.quartz.Trigger;
import org.quartz.TriggerBuilder;
import org.quartz.TriggerKey;
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
/**
*
View only screen for Group Based and Tool Based branching
-*
Class export portfolio page for all branching types
-*
-*
-* Due to how XDoclet works, we have to have a separate subclass of BranchingAction
-* for each branching type, and include the XDoclet tags in the subclasses.
-*
-* @author Fiona Malikoff
-*/
+ * The action servlet that provides the support for the
+ *
+ *
+ *
View only screen for Group Based and Tool Based branching
+ *
+ *
+ * Due to how XDoclet works, we have to have a separate subclass of BranchingAction for each branching type, and include
+ * the XDoclet tags in the subclasses.
+ *
+ * @author Fiona Malikoff
+ */
public class BranchingAction extends LamsDispatchAction {
//---------------------------------------------------------------------
- protected static final String VIEW_BRANCHES_SCREEN = "viewBranches";
- protected static final String CHOSEN_SELECTION_SCREEN = "chosenSelection";
- public static final String PARAM_BRANCHING_DTO = "branching";
- public static final String PARAM_SHOW_GROUP_NAME = "showGroupName";
- /** If localFiles = true will be written to a local file for export portfolio */
- public static final String PARAM_LOCAL_FILES= "localFiles";
- public static final String PARAM_MAY_DELETE = "mayDelete";
- public static final String PARAM_MODULE_LANGUAGE_XML = "languageXML";
- protected static final String PARAM_VIEW_MODE = "viewMode";
-
- /**
- * Export Portfolio Page
- */
- public ActionForward exportPortfolio(ActionMapping mapping,
- ActionForm form,
- HttpServletRequest request,
- HttpServletResponse response) throws IOException,
- ServletException
- {
- long lessonId = WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID);
- long activityId = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID);
+ protected static final String VIEW_BRANCHES_SCREEN = "viewBranches";
+ protected static final String CHOSEN_SELECTION_SCREEN = "chosenSelection";
+ public static final String PARAM_BRANCHING_DTO = "branching";
+ public static final String PARAM_SHOW_GROUP_NAME = "showGroupName";
+ public static final String PARAM_LOCAL_FILES = "localFiles";
+ public static final String PARAM_MAY_DELETE = "mayDelete";
+ public static final String PARAM_MODULE_LANGUAGE_XML = "languageXML";
+ protected static final String PARAM_VIEW_MODE = "viewMode";
- IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext());
- BranchingActivity activity = (BranchingActivity) monitoringService.getActivityById(activityId, BranchingActivity.class);
- return viewBranching(activity, lessonId, true, mapping, request, monitoringService);
- }
-
/**
* Display the view screen, irrespective of the branching type.
*/
- public ActionForward viewBranching(ActionMapping mapping,
- ActionForm form,
- HttpServletRequest request,
- HttpServletResponse response) throws IOException,
- ServletException
- {
- long lessonId = WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID);
- long activityId = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID);
+ public ActionForward viewBranching(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws IOException, ServletException {
+ long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
+ long activityId = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID);
- IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext());
- BranchingActivity activity = (BranchingActivity) monitoringService.getActivityById(activityId, BranchingActivity.class);
- return viewBranching(activity, lessonId, false, mapping, request, monitoringService);
+ IMonitoringService monitoringService = MonitoringServiceProxy
+ .getMonitoringService(getServlet().getServletContext());
+ BranchingActivity activity = (BranchingActivity) monitoringService.getActivityById(activityId,
+ BranchingActivity.class);
+ return viewBranching(activity, lessonId, false, mapping, request, monitoringService);
}
- protected ActionForward viewBranching(BranchingActivity activity, Long lessonId, boolean useLocalFiles,
- ActionMapping mapping, HttpServletRequest request, IMonitoringService monitoringService) throws IOException, ServletException {
+ protected ActionForward viewBranching(BranchingActivity activity, Long lessonId, boolean useLocalFiles,
+ ActionMapping mapping, HttpServletRequest request, IMonitoringService monitoringService)
+ throws IOException, ServletException {
- // in general the progress engine expects the activity and lesson id to be in the request,
- // so follow that standard.
- request.setAttribute(AttributeNames.PARAM_ACTIVITY_ID, activity.getActivityId());
- request.setAttribute(AttributeNames.PARAM_LESSON_ID, lessonId);
- request.setAttribute(AttributeNames.PARAM_TITLE, activity.getTitle());
- request.setAttribute(PARAM_LOCAL_FILES, useLocalFiles);
- request.setAttribute(PARAM_MODULE_LANGUAGE_XML, getLanguageXML());
- request.setAttribute(PARAM_MAY_DELETE, Boolean.FALSE);
- request.setAttribute(PARAM_VIEW_MODE, Boolean.TRUE);
-
- // only show the group names if this is a group based branching activity - the names
- // are meaningless for chosen and tool based branching
- BranchingDTO dto = getBranchingDTO(activity, monitoringService);
- request.setAttribute(PARAM_BRANCHING_DTO, dto);
- request.setAttribute(PARAM_SHOW_GROUP_NAME, activity.isGroupBranchingActivity());
- if ( log.isDebugEnabled() ) {
- log.debug("viewBranching: Branching activity "+dto);
- }
- return mapping.findForward(CHOSEN_SELECTION_SCREEN);
+ // in general the progress engine expects the activity and lesson id to be in the request,
+ // so follow that standard.
+ request.setAttribute(AttributeNames.PARAM_ACTIVITY_ID, activity.getActivityId());
+ request.setAttribute(AttributeNames.PARAM_LESSON_ID, lessonId);
+ request.setAttribute(AttributeNames.PARAM_TITLE, activity.getTitle());
+ request.setAttribute(PARAM_LOCAL_FILES, useLocalFiles);
+ request.setAttribute(PARAM_MODULE_LANGUAGE_XML, getLanguageXML());
+ request.setAttribute(PARAM_MAY_DELETE, Boolean.FALSE);
+ request.setAttribute(PARAM_VIEW_MODE, Boolean.TRUE);
+
+ // only show the group names if this is a group based branching activity - the names
+ // are meaningless for chosen and tool based branching
+ BranchingDTO dto = getBranchingDTO(activity, monitoringService);
+ request.setAttribute(PARAM_BRANCHING_DTO, dto);
+ request.setAttribute(PARAM_SHOW_GROUP_NAME, activity.isGroupBranchingActivity());
+ if (log.isDebugEnabled()) {
+ log.debug("viewBranching: Branching activity " + dto);
}
-
- // Can't do this in BranchingDTO (although that's where it should be) as we have
- // to get the SequenceActivities via the getActivityById to get around Hibernate
- // not allowing us to cast the cglib classes.
- private BranchingDTO getBranchingDTO(BranchingActivity activity, IMonitoringService monitoringService) {
- BranchingDTO dto = new BranchingDTO();
-
- dto.setBranchActivityId(activity.getActivityId());
- dto.setBranchActivityName(activity.getTitle());
-
- TreeSet branches = new TreeSet();
- Iterator iter = activity.getActivities().iterator();
- while (iter.hasNext()) {
- Activity childActivity = iter.next();
- SequenceActivity branch = (SequenceActivity) monitoringService.getActivityById(childActivity.getActivityId(), SequenceActivity.class);
- Set mappingEntries = branch.getBranchEntries();
-
- // If it is a grouped based or teacher chosen branching, the users will be in groups.
- // If not get the user based on the progress engine and create a dummy group.
- // Can't use tool session as sequence activities don't have a tool session!
- SortedSet groups = new TreeSet();
- if ( activity.isChosenBranchingActivity() || activity.isGroupBranchingActivity() ) {
- for ( BranchActivityEntry entry : mappingEntries ) {
- Group group = entry.getGroup();
- groups.add(group);
- }
- } else {
- Group group = new Group();
- if ( group.getUsers() == null ) {
- group.setUsers(new HashSet());
- }
- List learners = monitoringService.getLearnersAttemptedOrCompletedActivity(branch);
- group.getUsers().addAll(learners);
- groups.add(group);
- }
- branches.add(new BranchDTO(branch, groups));
+ return mapping.findForward(CHOSEN_SELECTION_SCREEN);
+ }
+
+ // Can't do this in BranchingDTO (although that's where it should be) as we have
+ // to get the SequenceActivities via the getActivityById to get around Hibernate
+ // not allowing us to cast the cglib classes.
+ private BranchingDTO getBranchingDTO(BranchingActivity activity, IMonitoringService monitoringService) {
+ BranchingDTO dto = new BranchingDTO();
+
+ dto.setBranchActivityId(activity.getActivityId());
+ dto.setBranchActivityName(activity.getTitle());
+
+ TreeSet branches = new TreeSet();
+ Iterator iter = activity.getActivities().iterator();
+ while (iter.hasNext()) {
+ Activity childActivity = iter.next();
+ SequenceActivity branch = (SequenceActivity) monitoringService
+ .getActivityById(childActivity.getActivityId(), SequenceActivity.class);
+ Set mappingEntries = branch.getBranchEntries();
+
+ // If it is a grouped based or teacher chosen branching, the users will be in groups.
+ // If not get the user based on the progress engine and create a dummy group.
+ // Can't use tool session as sequence activities don't have a tool session!
+ SortedSet groups = new TreeSet();
+ if (activity.isChosenBranchingActivity() || activity.isGroupBranchingActivity()) {
+ for (BranchActivityEntry entry : mappingEntries) {
+ Group group = entry.getGroup();
+ groups.add(group);
}
- dto.setBranches(branches);
- return dto;
- }
-
- /**
- * @return String of xml with all needed language elements
- */
- protected String getLanguageXML(){
- IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext());
- MessageService messageService = monitoringService.getMessageService();
- ArrayList languageCollection = new ArrayList();
- languageCollection.add(new String("button.finished"));
- languageCollection.add(new String("label.branching.non.allocated.users.heading"));
- languageCollection.add(new String("label.grouping.status"));
- languageCollection.add(new String("label.grouping.learners"));
- languageCollection.add(new String("error.title"));
- languageCollection.add(new String("label.branching.popup.drag.selection.message"));
-
- String languageOutput = "";
-
- for(int i = 0; i < languageCollection.size(); i++){
- languageOutput += "" + messageService.getMessage(languageCollection.get(i)) + "";
+ } else {
+ Group group = new Group();
+ if (group.getUsers() == null) {
+ group.setUsers(new HashSet());
}
-
- languageOutput += "";
-
- return languageOutput;
+ List learners = monitoringService.getLearnersAttemptedOrCompletedActivity(branch);
+ group.getUsers().addAll(learners);
+ groups.add(group);
+ }
+ branches.add(new BranchDTO(branch, groups));
}
+ dto.setBranches(branches);
+ return dto;
+ }
- }
+ /**
+ * @return String of xml with all needed language elements
+ */
+ protected String getLanguageXML() {
+ IMonitoringService monitoringService = MonitoringServiceProxy
+ .getMonitoringService(getServlet().getServletContext());
+ MessageService messageService = monitoringService.getMessageService();
+ ArrayList languageCollection = new ArrayList();
+ languageCollection.add(new String("button.finished"));
+ languageCollection.add(new String("label.branching.non.allocated.users.heading"));
+ languageCollection.add(new String("label.grouping.status"));
+ languageCollection.add(new String("label.grouping.learners"));
+ languageCollection.add(new String("error.title"));
+ languageCollection.add(new String("label.branching.popup.drag.selection.message"));
+
+ String languageOutput = "";
+
+ for (int i = 0; i < languageCollection.size(); i++) {
+ languageOutput += ""
+ + messageService.getMessage(languageCollection.get(i)) + "";
+ }
+
+ languageOutput += "";
+
+ return languageOutput;
+ }
+}
\ No newline at end of file
Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/BranchingExportPortfolioServlet.java'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java,v
diff -u -r1.24.2.1 -r1.24.2.2
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java 23 Nov 2015 11:49:32 -0000 1.24.2.1
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java 24 Feb 2016 12:35:15 -0000 1.24.2.2
@@ -81,9 +81,7 @@
* @struts:action-forward name="viewSynchGate" path=".viewSynchGate"
* @struts:action-forward name="viewPermissionGate" path=".viewPermissionGate"
* @struts:action-forward name="viewScheduleGate" path=".viewScheduleGate"
- * @struts:action-forward name="viewConditionGate" path=".viewConditionGate" ----------------XDoclet
- * Tags--------------------
- *
+ * @struts:action-forward name="viewConditionGate" path=".viewConditionGate"
*/
public class GateAction extends LamsDispatchAction {
// ---------------------------------------------------------------------
@@ -105,8 +103,6 @@
// Gate Form fields
private static final String ACTIVITY_FORM_FIELD = "activityId";
private static final String TOTAL_LEARNERS_FORM_FIELD = "totalLearners";
- public static final String READ_ONLY = "readOnly";
- public static final String LOCAL_FILES = "localFiles";
private static final String USER_ID = "userId";
// ---------------------------------------------------------------------
@@ -164,7 +160,6 @@
}
gateForm.set(GateAction.ACTIVITY_FORM_FIELD, gateIdLong);
- gateForm.set(GateAction.LOCAL_FILES, Boolean.FALSE);
return findViewByGateType(mapping, gateForm, gate);
}
@@ -226,18 +221,6 @@
return findViewByGateType(mapping, gateForm, gate);
}
- /**
- * Export Portfolio Page
- */
- public ActionForward exportPortfolio(ActionMapping mapping, ActionForm form, HttpServletRequest request,
- HttpServletResponse response) throws IOException, ServletException {
- DynaActionForm gateForm = (DynaActionForm) form;
- ActionForward forward = viewGate(mapping, form, request, response);
- gateForm.set(GateAction.READ_ONLY, Boolean.TRUE);
- gateForm.set(GateAction.LOCAL_FILES, Boolean.TRUE);
- return forward;
- }
-
// ---------------------------------------------------------------------
// Helper Methods
// ---------------------------------------------------------------------
@@ -258,7 +241,6 @@
lessonService = MonitoringServiceProxy.getLessonService(getServlet().getServletContext());
// reset all the other fields, so that the following code only has to set up its own values (LDEV-1237)
- gateForm.set(GateAction.READ_ONLY, Boolean.FALSE);
gateForm.set("gate", null);
gateForm.set("waitingLearnerList", null);
gateForm.set("allowedToPassLearnerList", null);
Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateExportPortfolioServlet.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.118.2.31 -r1.118.2.32
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 12 Jan 2016 09:36:10 -0000 1.118.2.31
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 24 Feb 2016 12:35:15 -0000 1.118.2.32
@@ -176,15 +176,6 @@
}
}
- private FlashMessage handleCriticalError(String methodKey, String messageKey) {
- String message = getMonitoringService().getMessageService().getMessage(messageKey);
- LamsDispatchAction.log.error("Error occured " + methodKey + " error ");
- MonitoringAction.auditService = getAuditService();
- MonitoringAction.auditService.log(MonitoringAction.class.getName() + ":" + methodKey, message);
-
- return new FlashMessage(methodKey, message, FlashMessage.CRITICAL_ERROR);
- }
-
private ActionForward redirectToURL(ActionMapping mapping, HttpServletResponse response, String url)
throws IOException {
if (url != null) {
@@ -217,7 +208,6 @@
long ldId = WebUtil.readLongParam(request, AttributeNames.PARAM_LEARNINGDESIGN_ID);
Integer copyType = WebUtil.readIntParam(request, "copyType", true);
String customCSV = request.getParameter("customCSV");
- Boolean learnerExportAvailable = WebUtil.readBooleanParam(request, "learnerExportPortfolio", false);
Boolean learnerPresenceAvailable = WebUtil.readBooleanParam(request, "learnerPresenceAvailable", false);
Boolean learnerImAvailable = WebUtil.readBooleanParam(request, "learnerImAvailable", false);
Boolean liveEditEnabled = WebUtil.readBooleanParam(request, "liveEditEnabled", false);
@@ -230,8 +220,8 @@
} else {
try {
newLesson = getMonitoringService().initializeLesson(title, desc, ldId, organisationId, getUserId(),
- customCSV, false, false, learnerExportAvailable, learnerPresenceAvailable, learnerImAvailable,
- liveEditEnabled, false, learnerRestart, null, null);
+ customCSV, false, false, learnerPresenceAvailable, learnerImAvailable, liveEditEnabled, false,
+ learnerRestart, null, null);
} catch (SecurityException e) {
response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a monitor in the organisation");
return null;
@@ -321,7 +311,6 @@
boolean startMonitor = WebUtil.readBooleanParam(request, "startMonitor", false);
boolean enableLiveEdit = WebUtil.readBooleanParam(request, "liveEditEnable", false);
boolean notificationsEnable = WebUtil.readBooleanParam(request, "notificationsEnable", false);
- boolean portfolioEnable = WebUtil.readBooleanParam(request, "portfolioEnable", false);
boolean presenceEnable = WebUtil.readBooleanParam(request, "presenceEnable", false);
boolean imEnable = WebUtil.readBooleanParam(request, "imEnable", false);
Integer splitNumberLessons = WebUtil.readIntParam(request, "splitNumberLessons", true);
@@ -389,9 +378,8 @@
Lesson lesson = null;
try {
lesson = getMonitoringService().initializeLesson(lessonInstanceName, introDescription, ldId,
- organisationId, userId, null, introEnable, introImage, portfolioEnable, presenceEnable,
- imEnable, enableLiveEdit, notificationsEnable, learnerRestart, timeLimitIndividual,
- precedingLessonId);
+ organisationId, userId, null, introEnable, introImage, presenceEnable, imEnable, enableLiveEdit,
+ notificationsEnable, learnerRestart, timeLimitIndividual, precedingLessonId);
getMonitoringService().createLessonClassForLesson(lesson.getLessonId(), organisation,
learnerGroupInstanceName, lessonInstanceLearners, staffGroupInstanceName, staff, userId);
@@ -1042,7 +1030,6 @@
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");
@@ -1536,20 +1523,6 @@
return MonitoringAction.auditService;
}
- /**
- * Get TimezoneService bean.
- *
- * @return
- */
- private ITimezoneService getTimezoneService() {
- if (MonitoringAction.timezoneService == null) {
- WebApplicationContext ctx = WebApplicationContextUtils
- .getRequiredWebApplicationContext(getServlet().getServletContext());
- MonitoringAction.timezoneService = (ITimezoneService) ctx.getBean("timezoneService");
- }
- return MonitoringAction.timezoneService;
- }
-
private ILessonService getLessonService() {
if (MonitoringAction.lessonService == null) {
WebApplicationContext ctx = WebApplicationContextUtils
@@ -1587,23 +1560,6 @@
}
/**
- * Set whether or not the export portfolio button is available in learner. Expects parameters lessonID and
- * learnerExportPortfolio.
- */
- public ActionForward learnerExportPortfolioAvailable(ActionMapping mapping, ActionForm form,
- HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
- Long lessonID = new Long(WebUtil.readLongParam(request, "lessonID"));
- Integer userID = getUserId();
- Boolean learnerExportPortfolioAvailable = WebUtil.readBooleanParam(request, "learnerExportPortfolio", false);
- try {
- getMonitoringService().setLearnerPortfolioAvailable(lessonID, userID, learnerExportPortfolioAvailable);
- } catch (SecurityException e) {
- response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a monitor in the lesson");
- }
- return null;
- }
-
- /**
* Set whether or not the presence available button is available in learner. Expects parameters lessonID and
* presenceAvailable.
*/
@@ -1674,8 +1630,6 @@
* Creates a list of users out of string with comma-delimited user IDs.
*/
private List parseUserList(HttpServletRequest request, String paramName, Collection users) {
- IUserManagementService userManagementService = MonitoringServiceProxy
- .getUserManagementService(getServlet().getServletContext());
String userIdList = request.getParameter(paramName);
String[] userIdArray = userIdList.split(",");
List result = new ArrayList(userIdArray.length);
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/SequenceAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/SequenceAction.java,v
diff -u -r1.2.12.1 -r1.2.12.2
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/SequenceAction.java 23 Nov 2015 11:49:32 -0000 1.2.12.1
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/SequenceAction.java 24 Feb 2016 12:35:15 -0000 1.2.12.2
@@ -34,7 +34,6 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.lamsfoundation.lams.learningdesign.BranchingActivity;
import org.lamsfoundation.lams.learningdesign.SequenceActivity;
import org.lamsfoundation.lams.monitoring.service.IMonitoringService;
import org.lamsfoundation.lams.monitoring.service.MonitoringServiceProxy;
@@ -44,72 +43,51 @@
import org.lamsfoundation.lams.web.util.AttributeNames;
/**
-* The action servlet that provides the support for the Sequence activities. At present, this is
-* only a basic view screen that lists the user's in the sequence.
-*
-* @struts:action path="/sequence"
-* parameter="method"
-* validate="false"
-* @struts.action-forward name = "viewSequence" path = ".viewSequence"
-*
-* @author Fiona Malikoff
-*/
+ * The action servlet that provides the support for the Sequence activities. At present, this is only a basic view
+ * screen that lists the user's in the sequence.
+ *
+ * @struts:action path="/sequence" parameter="method" validate="false"
+ * @struts.action-forward name = "viewSequence" path = ".viewSequence"
+ *
+ * @author Fiona Malikoff
+ */
public class SequenceAction extends LamsDispatchAction {
- public static final String VIEW_SEQUENCE = "viewSequence";
- public static final String PARAM_LEARNERS = "learners";
- /** If localFiles = true will be written to a local file for export portfolio */
- public static final String PARAM_LOCAL_FILES= "localFiles";
-
- /**
- * Export Portfolio Page
- */
- public ActionForward exportPortfolio(ActionMapping mapping,
- ActionForm form,
- HttpServletRequest request,
- HttpServletResponse response) throws IOException,
- ServletException
- {
- long lessonId = WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID);
- long activityId = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID);
+ public static final String VIEW_SEQUENCE = "viewSequence";
+ public static final String PARAM_LEARNERS = "learners";
+ public static final String PARAM_LOCAL_FILES = "localFiles";
- IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext());
- SequenceActivity activity = (SequenceActivity) monitoringService.getActivityById(activityId, SequenceActivity.class);
- return viewSequence(activity, lessonId, true, mapping, request, monitoringService);
- }
-
/**
- * Display the view screen - to be used if we ever want direct access to the screen rather than export portfolio version.
+ * Display the view screen.
*/
- public ActionForward viewSequence(ActionMapping mapping,
- ActionForm form,
- HttpServletRequest request,
- HttpServletResponse response) throws IOException,
- ServletException
- {
- long lessonId = WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID);
- long activityId = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID);
+ public ActionForward viewSequence(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws IOException, ServletException {
+ long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
+ long activityId = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID);
- IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext());
- SequenceActivity activity = (SequenceActivity) monitoringService.getActivityById(activityId, SequenceActivity.class);
- return viewSequence(activity, lessonId, false, mapping, request, monitoringService);
+ IMonitoringService monitoringService = MonitoringServiceProxy
+ .getMonitoringService(getServlet().getServletContext());
+ SequenceActivity activity = (SequenceActivity) monitoringService.getActivityById(activityId,
+ SequenceActivity.class);
+ return viewSequence(activity, lessonId, false, mapping, request, monitoringService);
}
- protected ActionForward viewSequence(SequenceActivity activity, Long lessonId, boolean useLocalFiles,
- ActionMapping mapping, HttpServletRequest request, IMonitoringService monitoringService) throws IOException, ServletException {
+ protected ActionForward viewSequence(SequenceActivity activity, Long lessonId, boolean useLocalFiles,
+ ActionMapping mapping, HttpServletRequest request, IMonitoringService monitoringService)
+ throws IOException, ServletException {
- // in general the progress engine expects the activity and lesson id to be in the request,
- // so follow that standard.
- request.setAttribute(AttributeNames.PARAM_ACTIVITY_ID, activity.getActivityId());
- request.setAttribute(AttributeNames.PARAM_LESSON_ID, lessonId);
- request.setAttribute(AttributeNames.PARAM_TITLE, activity.getTitle());
- request.setAttribute(PARAM_LOCAL_FILES, useLocalFiles);
-
- // only show the group names if this is a group based branching activity - the names
- // are meaningless for chosen and tool based branching
- List learners = monitoringService.getLearnersAttemptedOrCompletedActivity(activity);
- request.setAttribute(PARAM_LEARNERS, learners);
- return mapping.findForward(VIEW_SEQUENCE);
- }
+ // in general the progress engine expects the activity and lesson id to be in the request,
+ // so follow that standard.
+ request.setAttribute(AttributeNames.PARAM_ACTIVITY_ID, activity.getActivityId());
+ request.setAttribute(AttributeNames.PARAM_LESSON_ID, lessonId);
+ request.setAttribute(AttributeNames.PARAM_TITLE, activity.getTitle());
+ request.setAttribute(SequenceAction.PARAM_LOCAL_FILES, useLocalFiles);
- }
+ // only show the group names if this is a group based branching activity - the names
+ // are meaningless for chosen and tool based branching
+ List learners = monitoringService.getLearnersAttemptedOrCompletedActivity(activity);
+ request.setAttribute(SequenceAction.PARAM_LEARNERS, learners);
+ return mapping.findForward(SequenceAction.VIEW_SEQUENCE);
+ }
+
+}
Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/SequenceExportPortfolioServlet.java'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_monitoring/web/monitor.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/monitor.jsp,v
diff -u -r1.27.2.20 -r1.27.2.21
--- lams_monitoring/web/monitor.jsp 9 Feb 2016 18:53:13 -0000 1.27.2.20
+++ lams_monitoring/web/monitor.jsp 24 Feb 2016 12:35:15 -0000 1.27.2.21
@@ -40,7 +40,6 @@
hasContentFrame = false,
presenceEnabled = false,
hasDialog = false,
- enableExportPortfolio = ${enableExportPortfolio},
sequenceTabShowInfo = ${sequenceTabShowInfo eq true},
LAMS_URL = '',
@@ -137,10 +136,6 @@
SUPPORT_ACTIVITY : '',
PROGRESS_NOT_STARTED : '',
-
- EXPORT_PORTFOLIO : '',
-
- EXPORT_PORTFOLIO_LEARNER_TOOLTIP : '',
TIME_CHART : '',
@@ -340,16 +335,6 @@