Fisheye: Tag 85ef8aca5722a36582117db1e8b988e2c16b6369 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/ConfigAction.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 85ef8aca5722a36582117db1e8b988e2c16b6369 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/DisabledUserManageAction.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 85ef8aca5722a36582117db1e8b988e2c16b6369 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/ImportExcelAction.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 85ef8aca5722a36582117db1e8b988e2c16b6369 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/ImportExcelForm.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 85ef8aca5722a36582117db1e8b988e2c16b6369 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/ImportExcelSaveAction.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 85ef8aca5722a36582117db1e8b988e2c16b6369 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/LoginMaintainAction.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 85ef8aca5722a36582117db1e8b988e2c16b6369 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/LoginSaveAction.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 85ef8aca5722a36582117db1e8b988e2c16b6369 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 85ef8aca5722a36582117db1e8b988e2c16b6369 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageBean.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 85ef8aca5722a36582117db1e8b988e2c16b6369 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgSaveAction.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 85ef8aca5722a36582117db1e8b988e2c16b6369 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 85ef8aca5722a36582117db1e8b988e2c16b6369 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/ScheduledJobDTO.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 85ef8aca5722a36582117db1e8b988e2c16b6369 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/ScheduledJobListAction.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 85ef8aca5722a36582117db1e8b988e2c16b6369 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerListAction.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 85ef8aca5722a36582117db1e8b988e2c16b6369 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerMaintainAction.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 85ef8aca5722a36582117db1e8b988e2c16b6369 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerSaveAction.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 85ef8aca5722a36582117db1e8b988e2c16b6369 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/ToolContentListAction.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 85ef8aca5722a36582117db1e8b988e2c16b6369 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 85ef8aca5722a36582117db1e8b988e2c16b6369 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserBean.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 85ef8aca5722a36582117db1e8b988e2c16b6369 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserListDTO.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 85ef8aca5722a36582117db1e8b988e2c16b6369 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 85ef8aca5722a36582117db1e8b988e2c16b6369 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgAction.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 85ef8aca5722a36582117db1e8b988e2c16b6369 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgRoleAction.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 85ef8aca5722a36582117db1e8b988e2c16b6369 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgRoleForm.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 85ef8aca5722a36582117db1e8b988e2c16b6369 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgRoleSaveAction.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 85ef8aca5722a36582117db1e8b988e2c16b6369 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgSaveAction.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 85ef8aca5722a36582117db1e8b988e2c16b6369 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserRolesAction.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 85ef8aca5722a36582117db1e8b988e2c16b6369 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserRolesSaveAction.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 85ef8aca5722a36582117db1e8b988e2c16b6369 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 85ef8aca5722a36582117db1e8b988e2c16b6369 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSearchAction.java'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ConfigAction.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ConfigAction.java (revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ConfigAction.java (revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
@@ -0,0 +1,141 @@
+/****************************************************************
+ * Copyright (C) 2006 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+package org.lamsfoundation.lams.admin.web.action;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.DynaActionForm;
+import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
+import org.lamsfoundation.lams.config.ConfigurationItem;
+import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.web.action.LamsDispatchAction;
+
+/**
+ * ConfigAction
+ *
+ * @author Mitchell Seaton
+ */
+/**
+ * struts doclets
+ *
+ *
+ *
+ *
+ *
+ */
+public class ConfigAction extends LamsDispatchAction {
+
+ private static Configuration configurationService;
+ private static MessageService messageService;
+
+ private Configuration getConfiguration() {
+ if (configurationService == null) {
+ configurationService = AdminServiceProxy.getConfiguration(getServlet().getServletContext());
+ }
+ return configurationService;
+ }
+
+ private MessageService getMessageService() {
+ if (messageService == null) {
+ messageService = AdminServiceProxy.getMessageService(getServlet().getServletContext());
+ }
+ return messageService;
+ }
+
+ @Override
+ public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+
+ request.setAttribute("config", getConfiguration().arrangeItems(Configuration.ITEMS_NON_LDAP));
+
+ return mapping.findForward("config");
+ }
+
+ public ActionForward save(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+
+ if (isCancelled(request)) {
+ return mapping.findForward("sysadmin");
+ }
+
+ DynaActionForm configForm = (DynaActionForm) form;
+ String[] keys = (String[]) configForm.get("key");
+ String[] values = (String[]) configForm.get("value");
+
+ String errorForward = "config";
+
+ for (int i = 0; i < keys.length; i++) {
+ ConfigurationItem item = getConfiguration().getConfigItemByKey(keys[i]);
+
+ if (item != null) {
+ // return to ldap page if that's where we came from
+ if (StringUtils.contains(item.getHeaderName(), "config.header.ldap")) {
+ errorForward = "ldap";
+ }
+
+ if (item.getRequired()) {
+ if (!(values[i] != null && values[i].length() > 0)) {
+ request.setAttribute("error", getRequiredError(item.getDescriptionKey()));
+ request.setAttribute("config", getConfiguration().arrangeItems(Configuration.ITEMS_NON_LDAP));
+ return mapping.findForward(errorForward);
+ }
+ }
+ String format = item.getFormat();
+ if (format != null && format.equals(ConfigurationItem.LONG_FORMAT)) {
+ try {
+ Long.parseLong(values[i]);
+ } catch (NumberFormatException e) {
+ request.setAttribute("error", getNumericError(item.getDescriptionKey()));
+ request.setAttribute("config", getConfiguration().arrangeItems(Configuration.ITEMS_NON_LDAP));
+ return mapping.findForward(errorForward);
+ }
+ }
+ Configuration.updateItem(keys[i], values[i]);
+ }
+ }
+ getConfiguration().persistUpdate();
+
+ Configuration.refreshCache();
+
+ return mapping.findForward("sysadmin");
+ }
+
+ private String getRequiredError(String arg) {
+ String[] args = new String[1];
+ args[0] = getMessageService().getMessage(arg);
+ return getMessageService().getMessage("error.required", args);
+ }
+
+ private String getNumericError(String arg) {
+ String[] args = new String[1];
+ args[0] = getMessageService().getMessage(arg);
+ return getMessageService().getMessage("error.numeric", args);
+ }
+
+}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/DisabledUserManageAction.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/DisabledUserManageAction.java (revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/DisabledUserManageAction.java (revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
@@ -0,0 +1,73 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+
+package org.lamsfoundation.lams.admin.web.action;
+
+import java.util.List;
+
+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;
+import org.apache.struts.action.ActionMapping;
+import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
+import org.lamsfoundation.lams.usermanagement.Role;
+import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+
+/**
+ * @author jliew
+ *
+ *
+ *
+ *
+ */
+public class DisabledUserManageAction extends Action {
+
+ private static final Logger log = Logger.getLogger(DisabledUserManageAction.class);
+
+ @Override
+ public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+
+ IUserManagementService service = AdminServiceProxy.getService(getServlet().getServletContext());
+
+ if (!(request.isUserInRole(Role.SYSADMIN) || service.isUserGlobalGroupAdmin())) {
+ request.setAttribute("errorName", "DisabledUserManageAction");
+ request.setAttribute("errorMessage", AdminServiceProxy.getMessageService(getServlet().getServletContext())
+ .getMessage("error.need.sysadmin"));
+ return mapping.findForward("error");
+ }
+
+ List users = service.findByProperty(User.class, "disabledFlag", true);
+ log.debug("got " + users.size() + " disabled users");
+ request.setAttribute("users", users);
+
+ return mapping.findForward("disabledlist");
+ }
+
+}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ImportExcelAction.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ImportExcelAction.java (revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ImportExcelAction.java (revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
@@ -0,0 +1,61 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+
+package org.lamsfoundation.lams.admin.web.action;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.Action;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.lamsfoundation.lams.admin.web.form.ImportExcelForm;
+import org.lamsfoundation.lams.util.WebUtil;
+
+/**
+ * @author jliew
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ */
+public class ImportExcelAction extends Action {
+
+ @Override
+ public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+
+ Integer orgId = WebUtil.readIntParam(request, "orgId", true);
+ //if (orgId==null) orgId = (Integer)request.getAttribute("orgId");
+
+ ImportExcelForm importExcelForm = (ImportExcelForm) form;
+ importExcelForm.setOrgId(orgId);
+
+ return mapping.findForward("importexcel");
+ }
+
+}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ImportExcelSaveAction.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ImportExcelSaveAction.java (revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ImportExcelSaveAction.java (revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
@@ -0,0 +1,109 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+
+package org.lamsfoundation.lams.admin.web.action;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.Action;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.upload.FormFile;
+import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
+import org.lamsfoundation.lams.admin.service.IImportService;
+import org.lamsfoundation.lams.admin.web.form.ImportExcelForm;
+import org.lamsfoundation.lams.web.session.SessionManager;
+
+/**
+ * @author jliew
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ */
+public class ImportExcelSaveAction extends Action {
+
+ @Override
+ public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+
+ if (isCancelled(request)) {
+ return mapping.findForward("sysadmin");
+ }
+
+ IImportService importService = AdminServiceProxy.getImportService(getServlet().getServletContext());
+ ImportExcelForm importExcelForm = (ImportExcelForm) form;
+ FormFile file = importExcelForm.getFile();
+
+ // validation
+ if (file == null || file.getFileSize() <= 0) {
+ return mapping.findForward("import");
+ }
+
+ String sessionId = SessionManager.getSession().getId();
+ SessionManager.getSession().setAttribute(IImportService.IMPORT_FILE, file);
+ // use a new thread only if number of users is > threshold
+ if (importService.getNumRows(file) < IImportService.THRESHOLD) {
+ List results = importService.parseSpreadsheet(file, sessionId);
+ SessionManager.getSession(sessionId).setAttribute(IImportService.IMPORT_RESULTS, results);
+ return mapping.findForward("results");
+ } else {
+ Thread t = new Thread(new ImportExcelThread(sessionId));
+ t.start();
+ return mapping.findForward("status");
+ }
+ }
+
+ private class ImportExcelThread implements Runnable {
+ private String sessionId;
+
+ public ImportExcelThread(String sessionId) {
+ this.sessionId = sessionId;
+ }
+
+ @Override
+ public void run() {
+ IImportService importService = AdminServiceProxy.getImportService(getServlet().getServletContext());
+ try {
+ FormFile file = (FormFile) SessionManager.getSession(sessionId)
+ .getAttribute(IImportService.IMPORT_FILE);
+ List results = importService.parseSpreadsheet(file, sessionId);
+ SessionManager.getSession(sessionId).setAttribute(IImportService.IMPORT_RESULTS, results);
+ } catch (Exception e) {
+ }
+ }
+ }
+
+}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ImportGroupsAction.java
===================================================================
diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -r85ef8aca5722a36582117db1e8b988e2c16b6369
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ImportGroupsAction.java (.../ImportGroupsAction.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ImportGroupsAction.java (.../ImportGroupsAction.java) (revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
@@ -35,7 +35,7 @@
import org.apache.struts.upload.FormFile;
import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
import org.lamsfoundation.lams.admin.service.IImportService;
-import org.lamsfoundation.lams.admin.web.ImportExcelForm;
+import org.lamsfoundation.lams.admin.web.form.ImportExcelForm;
/**
* @author jliew
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/LoginMaintainAction.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/LoginMaintainAction.java (revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/LoginMaintainAction.java (revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
@@ -0,0 +1,95 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+package org.lamsfoundation.lams.admin.web.action;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.Action;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.DynaActionForm;
+import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
+
+/**
+ *
+ * View Source
+ *
+ *
+ * @author Fei Yang
+ */
+
+/**
+ * struts doclets
+ *
+ *
+ *
+ *
+ *
+ *
+ */
+public class LoginMaintainAction extends Action {
+
+ private static final String NEWS_PAGE_PATH_SUFFIX = File.separatorChar + "lams-www.war" + File.separatorChar
+ + "news.html";
+
+ @Override
+ public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+
+ DynaActionForm loginMaintainForm = (DynaActionForm) form;
+ loginMaintainForm.set("news", loadNews());
+ return mapping.findForward("loginmaintain");
+ }
+
+ private String loadNews() throws IOException {
+ BufferedReader bReader = null;
+ try {
+ InputStreamReader ir = new InputStreamReader(
+ new FileInputStream(Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) + NEWS_PAGE_PATH_SUFFIX),
+ Charset.forName("UTF-8"));
+ bReader = new BufferedReader(ir);
+ StringBuilder news = new StringBuilder();
+ String line = bReader.readLine();
+ while (line != null) {
+ news.append(line).append('\n');
+ line = bReader.readLine();
+ }
+ return news.toString();
+ } finally {
+ if (bReader != null) {
+ bReader.close();
+ }
+ }
+ }
+
+}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/LoginSaveAction.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/LoginSaveAction.java (revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/LoginSaveAction.java (revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
@@ -0,0 +1,78 @@
+/****************************************************************
+ * Copyright (C) 2006 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+package org.lamsfoundation.lams.admin.web.action;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.OutputStreamWriter;
+import java.nio.charset.Charset;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.DynaActionForm;
+import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
+import org.lamsfoundation.lams.web.action.LamsDispatchAction;
+
+/**
+ * Use DispatchAction for future extension convenience, e.g. add preview feature
+ *
+ * @author Fei Yang
+ */
+public class LoginSaveAction extends LamsDispatchAction {
+
+ private static final String NEWS_PAGE_PATH_SUFFIX = File.separatorChar + "lams-www.war" + File.separatorChar
+ + "news.html";
+
+ public ActionForward save(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+
+ if (isCancelled(request)) {
+ return mapping.findForward("sysadmin");
+ }
+
+ DynaActionForm loginMaintainForm = (DynaActionForm) form;
+ BufferedWriter bWriter = null;
+ try {
+ OutputStreamWriter ow = new OutputStreamWriter(new FileOutputStream(
+ Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) + NEWS_PAGE_PATH_SUFFIX),
+ Charset.forName("UTF-8"));
+ bWriter = new BufferedWriter(ow);
+ bWriter.write(loginMaintainForm.getString("news"));
+ bWriter.flush();
+ } finally {
+ if (bWriter != null) {
+ bWriter.close();
+ }
+ }
+
+ return mapping.findForward("sysadmin");
+ }
+
+}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgManageAction.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgManageAction.java (revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgManageAction.java (revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
@@ -0,0 +1,232 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+package org.lamsfoundation.lams.admin.web.action;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.tomcat.util.json.JSONArray;
+import org.apache.tomcat.util.json.JSONException;
+import org.apache.tomcat.util.json.JSONObject;
+import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
+import org.lamsfoundation.lams.admin.web.form.OrgManageForm;
+import org.lamsfoundation.lams.security.ISecurityService;
+import org.lamsfoundation.lams.usermanagement.Organisation;
+import org.lamsfoundation.lams.usermanagement.OrganisationState;
+import org.lamsfoundation.lams.usermanagement.OrganisationType;
+import org.lamsfoundation.lams.usermanagement.Role;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.usermanagement.service.UserManagementService;
+import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.action.LamsDispatchAction;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+/**
+ *
+ * View Source
+ *
+ *
+ * @author Fei Yang
+ */
+public class OrgManageAction extends LamsDispatchAction {
+
+ private static IUserManagementService userManagementService;
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+ initServices();
+
+ // Get organisation whose child organisations we will populate the OrgManageForm with
+ Integer orgId = WebUtil.readIntParam(request, "org", true);
+ if (orgId == null) {
+ orgId = (Integer) request.getAttribute("org");
+ }
+ if ((orgId == null) || (orgId == 0)) {
+ response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Missing organisation ID");
+ return null;
+ }
+
+ // get logged in user's id
+ Integer userId = ((UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER)).getUserID();
+ ISecurityService securityService = AdminServiceProxy.getSecurityService(getServlet().getServletContext());
+
+ Organisation org = null;
+ boolean isRootOrganisation = false;
+ Organisation rootOrganisation = userManagementService.getRootOrganisation();
+ if (orgId.equals(rootOrganisation.getOrganisationId())) {
+ org = rootOrganisation;
+ isRootOrganisation = true;
+ } else {
+ org = (Organisation) userManagementService.findById(Organisation.class, orgId);
+ }
+
+ // check if user is allowed to view and edit groups
+ if (!request.isUserInRole(Role.SYSADMIN) && !(isRootOrganisation
+ ? request.isUserInRole(Role.GROUP_ADMIN) || request.isUserInRole(Role.GROUP_MANAGER)
+ : securityService.hasOrgRole(orgId, userId, new String[] { Role.GROUP_ADMIN, Role.GROUP_MANAGER },
+ "manage courses", false))) {
+ response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a manager or admin in the organisation");
+ return null;
+ }
+
+ // get number of users figure
+ // TODO use hql that does a count instead of getting whole objects
+ int numUsers = org == rootOrganisation ? userManagementService.getCountUsers()
+ : userManagementService.getUsersFromOrganisation(orgId).size();
+ String key = org == rootOrganisation ? "label.users.in.system" : "label.users.in.group";
+ MessageService messageService = AdminServiceProxy.getMessageService(getServlet().getServletContext());
+ request.setAttribute("numUsers", messageService.getMessage(key, new String[] { String.valueOf(numUsers) }));
+
+ // Set OrgManageForm
+ OrgManageForm orgManageForm = (OrgManageForm) form;
+ if (orgManageForm == null) {
+ orgManageForm = new OrgManageForm();
+ orgManageForm.setStateId(OrganisationState.ACTIVE);
+ } else if (orgManageForm.getStateId() == null) {
+ orgManageForm.setStateId(OrganisationState.ACTIVE);
+ }
+ orgManageForm.setParentId(orgId);
+ orgManageForm.setParentName(org.getName());
+ orgManageForm.setType(org.getOrganisationType().getOrganisationTypeId());
+
+ // Get list of child organisations depending on requestor's role and the organisation's type
+ if (orgManageForm.getType().equals(OrganisationType.CLASS_TYPE)) {
+ // display class info, with parent group's 'courseAdminCan...' permissions.
+ // note the org is not saved, properties set only for passing to view component.
+ Organisation pOrg = org.getParentOrganisation();
+ org.setCourseAdminCanAddNewUsers(pOrg.getCourseAdminCanAddNewUsers());
+ org.setCourseAdminCanBrowseAllUsers(pOrg.getCourseAdminCanBrowseAllUsers());
+ org.setCourseAdminCanChangeStatusOfCourse(pOrg.getCourseAdminCanChangeStatusOfCourse());
+ request.setAttribute("org", org);
+
+ // display parent org breadcrumb link
+ request.setAttribute("parentGroupName", pOrg.getName());
+ request.setAttribute("parentGroupId", pOrg.getOrganisationId());
+ } else {
+ request.setAttribute("OrgManageForm", orgManageForm);
+
+ // display org info
+ request.setAttribute("org", org);
+ }
+
+ // let the jsp know whether to display links
+ request.setAttribute("createGroup",
+ request.isUserInRole(Role.SYSADMIN) || userManagementService.isUserGlobalGroupAdmin());
+ request.setAttribute("editGroup", true);
+ request.setAttribute("manageGlobalRoles", request.isUserInRole(Role.SYSADMIN));
+ return mapping.findForward("orglist");
+ }
+
+ /**
+ * Returns list of organisations for .
+ */
+ public ActionForward getOrgs(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse res) throws IOException, ServletException, JSONException {
+ initServices();
+
+ Integer parentOrgId = WebUtil.readIntParam(request, "parentOrgId");
+ Integer stateId = WebUtil.readIntParam(request, "stateId");
+ Integer typeIdParam = WebUtil.readIntParam(request, "type");
+ // the organisation type of the children
+ Integer typeId = (typeIdParam.equals(OrganisationType.ROOT_TYPE) ? OrganisationType.COURSE_TYPE
+ : OrganisationType.CLASS_TYPE);
+ String searchString = WebUtil.readStrParam(request, "fcol[1]", true);
+
+ // paging parameters of tablesorter
+ int size = WebUtil.readIntParam(request, "size");
+ int page = WebUtil.readIntParam(request, "page");
+ Integer isSort1 = WebUtil.readIntParam(request, "column[0]", true);
+ Integer isSort2 = WebUtil.readIntParam(request, "column[1]", true);
+ Integer isSort3 = WebUtil.readIntParam(request, "column[2]", true);
+ Integer isSort4 = WebUtil.readIntParam(request, "column[3]", true);
+
+ String sortBy = "";
+ String sortOrder = "";
+ if (isSort1 != null) {
+ sortBy = "id";
+ sortOrder = isSort1.equals(0) ? "ASC" : "DESC";
+
+ } else if (isSort2 != null) {
+ sortBy = "name";
+ sortOrder = isSort2.equals(0) ? "ASC" : "DESC";
+
+ } else if (isSort3 != null) {
+ sortBy = "code";
+ sortOrder = isSort3.equals(0) ? "ASC" : "DESC";
+
+ } else if (isSort4 != null) {
+ sortBy = "description";
+ sortOrder = isSort4.equals(0) ? "ASC" : "DESC";
+
+ }
+
+ List organisations = userManagementService.getPagedCourses(parentOrgId, typeId, stateId, page,
+ size, sortBy, sortOrder, searchString);
+
+ JSONObject responcedata = new JSONObject();
+ responcedata.put("total_rows", userManagementService.getCountCoursesByParentCourseAndTypeAndState(parentOrgId,
+ typeId, stateId, searchString));
+
+ JSONArray rows = new JSONArray();
+ for (Organisation organisation : organisations) {
+
+ JSONObject responseRow = new JSONObject();
+ responseRow.put("id", organisation.getOrganisationId());
+ String orgName = organisation.getName() == null ? "" : organisation.getName();
+ responseRow.put("name", StringEscapeUtils.escapeHtml(orgName));
+ String orgCode = organisation.getCode() == null ? "" : organisation.getCode();
+ responseRow.put("code", StringEscapeUtils.escapeHtml(orgCode));
+ String orgDescription = organisation.getDescription() == null ? "" : organisation.getDescription();
+ responseRow.put("description", StringEscapeUtils.escapeHtml(orgDescription));
+
+ rows.put(responseRow);
+ }
+ responcedata.put("rows", rows);
+ res.setContentType("application/json;charset=utf-8");
+ res.getWriter().print(new String(responcedata.toString()));
+ return null;
+ }
+
+ private void initServices() {
+ if (userManagementService == null) {
+ WebApplicationContext ctx = WebApplicationContextUtils
+ .getWebApplicationContext(getServlet().getServletContext());
+ userManagementService = (UserManagementService) ctx.getBean("userManagementService");
+ }
+ }
+}
\ No newline at end of file
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgSaveAction.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgSaveAction.java (revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgSaveAction.java (revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
@@ -0,0 +1,265 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+package org.lamsfoundation.lams.admin.web.action;
+
+import java.util.Date;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.apache.struts.action.Action;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
+import org.apache.struts.action.DynaActionForm;
+import org.lamsfoundation.lams.admin.AdminConstants;
+import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
+import org.lamsfoundation.lams.usermanagement.Organisation;
+import org.lamsfoundation.lams.usermanagement.OrganisationState;
+import org.lamsfoundation.lams.usermanagement.OrganisationType;
+import org.lamsfoundation.lams.usermanagement.SupportedLocale;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.util.ValidationUtil;
+import org.lamsfoundation.lams.util.audit.IAuditService;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+/**
+ * @version
+ *
+ *
+ * View Source
+ *
+ *
+ * @author Fei Yang
+ *
+ * Created at 16:42:53 on 2006-6-7
+ */
+
+/**
+ * struts doclets
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ */
+
+public class OrgSaveAction extends Action {
+
+ private static Logger log = Logger.getLogger(OrgSaveAction.class);
+ private static IUserManagementService service;
+ private MessageService messageService;
+
+ @Override
+ public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+
+ if (service == null) {
+ service = AdminServiceProxy.getService(getServlet().getServletContext());
+ }
+ if (messageService == null) {
+ messageService = AdminServiceProxy.getMessageService(getServlet().getServletContext());
+ }
+ DynaActionForm orgForm = (DynaActionForm) form;
+ Integer orgId = (Integer) orgForm.get("orgId");
+ Organisation org;
+
+ if (isCancelled(request)) {
+ if (orgId != 0) {
+ request.setAttribute("org", orgId);
+ org = (Organisation) service.findById(Organisation.class, orgId);
+ if (org.getOrganisationType().getOrganisationTypeId().equals(OrganisationType.CLASS_TYPE)) {
+ return mapping.findForward("userlist");
+ }
+ } else {
+ request.setAttribute("org", orgForm.get("parentId"));
+ }
+ return mapping.findForward("orglist");
+ }
+
+ ActionMessages errors = new ActionMessages();
+
+ //organisation name validation
+ String orgName = (orgForm.get("name") == null) ? null : (String) orgForm.get("name");
+ if (StringUtils.isBlank(orgName)) {
+ errors.add("name", new ActionMessage("error.name.required"));
+ } else if (!ValidationUtil.isOrgNameValid(orgName)) {
+ errors.add("name", new ActionMessage("error.name.invalid.characters"));
+ }
+
+ if (errors.isEmpty()) {
+ HttpSession ss = SessionManager.getSession();
+ UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+ SupportedLocale locale = (SupportedLocale) service.findById(SupportedLocale.class,
+ (Integer) orgForm.get("localeId"));
+ OrganisationState state = (OrganisationState) service.findById(OrganisationState.class,
+ (Integer) orgForm.get("stateId"));
+
+ if (orgId != 0) {
+ if (service.canEditGroup(user.getUserID(), orgId)) {
+ org = (Organisation) service.findById(Organisation.class, orgId);
+ // set archived date only when it first changes to become archived
+ if (state.getOrganisationStateId().equals(OrganisationState.ARCHIVED) && !org.getOrganisationState()
+ .getOrganisationStateId().equals(OrganisationState.ARCHIVED)) {
+ org.setArchivedDate(new Date());
+ }
+ writeAuditLog(org, orgForm, state, locale);
+ BeanUtils.copyProperties(org, orgForm);
+ } else {
+ request.setAttribute("errorName", "UserAction");
+ request.setAttribute("errorMessage", messageService.getMessage("error.authorisation"));
+ return mapping.findForward("error");
+ }
+ } else {
+ org = new Organisation();
+ BeanUtils.copyProperties(org, orgForm);
+ org.setParentOrganisation(
+ (Organisation) service.findById(Organisation.class, (Integer) orgForm.get("parentId")));
+ org.setOrganisationType(
+ (OrganisationType) service.findById(OrganisationType.class, (Integer) orgForm.get("typeId")));
+ writeAuditLog(org, orgForm, org.getOrganisationState(), org.getLocale());
+ }
+ org.setLocale(locale);
+ org.setOrganisationState(state);
+ if (log.isDebugEnabled()) {
+ log.debug("orgId: " + org.getOrganisationId() + " create date: " + org.getCreateDate());
+ }
+ org = service.saveOrganisation(org, user.getUserID());
+
+ request.setAttribute("org", orgForm.get("parentId"));
+ return mapping.findForward("orglist");
+ } else {
+ saveErrors(request, errors);
+ return mapping.findForward("organisation");
+ }
+ }
+
+ private void writeAuditLog(Organisation org, DynaActionForm orgForm, OrganisationState newState,
+ SupportedLocale newLocale) {
+
+ WebApplicationContext ctx = WebApplicationContextUtils
+ .getRequiredWebApplicationContext(getServlet().getServletContext());
+ IAuditService auditService = (IAuditService) ctx.getBean("auditService");
+ MessageService messageService = (MessageService) ctx.getBean("adminMessageService");
+
+ String message;
+
+ // audit log entries for organisation attribute changes
+ if ((Integer) orgForm.get("orgId") != 0) {
+ final String key = "audit.organisation.change";
+ String[] args = new String[4];
+ args[1] = org.getName() + "(" + org.getOrganisationId() + ")";
+ if (!org.getOrganisationState().getOrganisationStateId().equals(orgForm.get("stateId"))) {
+ args[0] = "state";
+ args[2] = org.getOrganisationState().getDescription();
+ args[3] = newState.getDescription();
+ message = messageService.getMessage(key, args);
+ auditService.log(AdminConstants.MODULE_NAME, message);
+ }
+ if (!StringUtils.equals(org.getName(), (String) orgForm.get("name"))) {
+ args[0] = "name";
+ args[2] = org.getName();
+ args[3] = (String) orgForm.get("name");
+ message = messageService.getMessage(key, args);
+ auditService.log(AdminConstants.MODULE_NAME, message);
+ }
+ if (!StringUtils.equals(org.getCode(), (String) orgForm.get("code"))) {
+ args[0] = "code";
+ args[2] = org.getCode();
+ args[3] = (String) orgForm.get("code");
+ message = messageService.getMessage(key, args);
+ auditService.log(AdminConstants.MODULE_NAME, message);
+ }
+ if (!StringUtils.equals(org.getDescription(), orgForm.getString("description"))) {
+ args[0] = "description";
+ args[2] = org.getDescription();
+ args[3] = (String) orgForm.get("description");
+ message = messageService.getMessage(key, args);
+ auditService.log(AdminConstants.MODULE_NAME, message);
+ }
+ if (!org.getCourseAdminCanAddNewUsers().equals(orgForm.get("courseAdminCanAddNewUsers"))) {
+ args[0] = "courseAdminCanAddNewUsers";
+ args[2] = org.getCourseAdminCanAddNewUsers() ? "true" : "false";
+ args[3] = (Boolean) orgForm.get("courseAdminCanAddNewUsers") ? "true" : "false";
+ message = messageService.getMessage(key, args);
+ auditService.log(AdminConstants.MODULE_NAME, message);
+ }
+ if (!org.getCourseAdminCanBrowseAllUsers().equals(orgForm.get("courseAdminCanBrowseAllUsers"))) {
+ args[0] = "courseAdminCanBrowseAllUsers";
+ args[2] = org.getCourseAdminCanBrowseAllUsers() ? "true" : "false";
+ args[3] = (Boolean) orgForm.get("courseAdminCanBrowseAllUsers") ? "true" : "false";
+ message = messageService.getMessage(key, args);
+ auditService.log(AdminConstants.MODULE_NAME, message);
+ }
+ if (!org.getCourseAdminCanChangeStatusOfCourse()
+ .equals(orgForm.get("courseAdminCanChangeStatusOfCourse"))) {
+ args[0] = "courseAdminCanChangeStatusOfCourse";
+ args[2] = org.getCourseAdminCanChangeStatusOfCourse() ? "true" : "false";
+ args[3] = (Boolean) orgForm.get("courseAdminCanChangeStatusOfCourse") ? "true" : "false";
+ message = messageService.getMessage(key, args);
+ auditService.log(AdminConstants.MODULE_NAME, message);
+ }
+ /*
+ * this field not set yet
+ * if(!org.getCourseAdminCanCreateGuestAccounts().equals((Boolean)orgForm.get(
+ * "courseAdminCanCreateGuestAccounts"))) {
+ * args[0] = "courseAdminCanCreateGuestAccounts";
+ * args[2] = org.getCourseAdminCanCreateGuestAccounts() ? "true" : "false";
+ * args[3] = (Boolean)orgForm.get("courseAdminCanCreateGuestAccounts") ? "true" : "false";
+ * message = messageService.getMessage(key, args);
+ * auditService.log(AdminConstants.MODULE_NAME, message);
+ * }
+ */
+ if (!org.getLocale().getLocaleId().equals(orgForm.get("localeId"))) {
+ args[0] = "locale";
+ args[2] = org.getLocale().getDescription();
+ args[3] = newLocale.getDescription();
+ message = messageService.getMessage(key, args);
+ auditService.log(AdminConstants.MODULE_NAME, message);
+ }
+ } else {
+ String[] args = new String[2];
+ args[0] = org.getName() + "(" + org.getOrganisationId() + ")";
+ args[1] = org.getOrganisationType().getName();
+ message = messageService.getMessage("audit.organisation.create", args);
+ auditService.log(AdminConstants.MODULE_NAME, message);
+ }
+ }
+
+}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrganisationAction.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrganisationAction.java (revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrganisationAction.java (revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
@@ -0,0 +1,179 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+package org.lamsfoundation.lams.admin.web.action;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.DynaActionForm;
+import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
+import org.lamsfoundation.lams.usermanagement.Organisation;
+import org.lamsfoundation.lams.usermanagement.OrganisationState;
+import org.lamsfoundation.lams.usermanagement.OrganisationType;
+import org.lamsfoundation.lams.usermanagement.Role;
+import org.lamsfoundation.lams.usermanagement.SupportedLocale;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.action.LamsDispatchAction;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+
+/**
+ * @author Fei Yang
+ *
+ *
+ *
+ *
+ *
+ *
+ */
+public class OrganisationAction extends LamsDispatchAction {
+
+ private static IUserManagementService service;
+ private static MessageService messageService;
+ private static List locales;
+ private static List status;
+
+ public ActionForward edit(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+ OrganisationAction.service = AdminServiceProxy.getService(getServlet().getServletContext());
+ initLocalesAndStatus();
+ DynaActionForm orgForm = (DynaActionForm) form;
+ Integer orgId = WebUtil.readIntParam(request, "orgId", true);
+
+ HttpSession session = SessionManager.getSession();
+ if (session != null) {
+ UserDTO userDto = (UserDTO) session.getAttribute(AttributeNames.USER);
+ if (userDto != null) {
+ Integer userId = userDto.getUserID();
+ // sysadmin, global group admin, group manager, group admin can edit group
+ if (OrganisationAction.service.canEditGroup(userId, orgId)) {
+ // edit existing organisation
+ if (orgId != null) {
+ Organisation org = (Organisation) OrganisationAction.service.findById(Organisation.class,
+ orgId);
+ BeanUtils.copyProperties(orgForm, org);
+ orgForm.set("parentId", org.getParentOrganisation().getOrganisationId());
+ orgForm.set("parentName", org.getParentOrganisation().getName());
+ orgForm.set("typeId", org.getOrganisationType().getOrganisationTypeId());
+ orgForm.set("stateId", org.getOrganisationState().getOrganisationStateId());
+ SupportedLocale locale = org.getLocale();
+ orgForm.set("localeId", locale != null ? locale.getLocaleId() : null);
+ }
+ request.getSession().setAttribute("locales", OrganisationAction.locales);
+ request.getSession().setAttribute("status", OrganisationAction.status);
+ if (OrganisationAction.service.isUserSysAdmin()
+ || OrganisationAction.service.isUserGlobalGroupAdmin()) {
+ return mapping.findForward("organisation");
+ } else {
+ return mapping.findForward("organisationCourseAdmin");
+ }
+ }
+ }
+ }
+
+ return error(mapping, request);
+ }
+
+ public ActionForward create(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+ OrganisationAction.service = AdminServiceProxy.getService(getServlet().getServletContext());
+ initLocalesAndStatus();
+ DynaActionForm orgForm = (DynaActionForm) form;
+
+ if (!(request.isUserInRole(Role.SYSADMIN) || OrganisationAction.service.isUserGlobalGroupAdmin())) {
+ // only sysadmins and global group admins can create groups
+ if (((orgForm.get("typeId") != null) && orgForm.get("typeId").equals(OrganisationType.COURSE_TYPE))
+ || (orgForm.get("typeId") == null)) {
+ return error(mapping, request);
+ }
+ }
+
+ // creating new organisation
+ orgForm.set("orgId", null);
+ Integer parentId = WebUtil.readIntParam(request, "parentId", true);
+ if (parentId != null) {
+ Organisation parentOrg = (Organisation) OrganisationAction.service.findById(Organisation.class, parentId);
+ orgForm.set("parentName", parentOrg.getName());
+ }
+ request.getSession().setAttribute("locales", OrganisationAction.locales);
+ request.getSession().setAttribute("status", OrganisationAction.status);
+ return mapping.findForward("organisation");
+ }
+
+ /**
+ * Looks up course ID by its name. Used mainly by TestHarness.
+ */
+ @SuppressWarnings("unchecked")
+ public ActionForward getOrganisationIdByName(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws IOException {
+ String organisationName = WebUtil.readStrParam(request, "name");
+ OrganisationAction.service = AdminServiceProxy.getService(getServlet().getServletContext());
+ List organisations = service.findByProperty(Organisation.class, "name", organisationName);
+ if (!organisations.isEmpty()) {
+ response.setContentType("text/plain;charset=utf-8");
+ response.getWriter().print(organisations.get(0).getOrganisationId());
+ }
+ return null;
+ }
+
+ private ActionForward error(ActionMapping mapping, HttpServletRequest request) {
+ OrganisationAction.messageService = AdminServiceProxy.getMessageService(getServlet().getServletContext());
+ request.setAttribute("errorName", "OrganisationAction");
+ request.setAttribute("errorMessage", OrganisationAction.messageService.getMessage("error.authorisation"));
+ return mapping.findForward("error");
+ }
+
+ /*
+ * public ActionForward remove(ActionMapping mapping, ActionForm form,HttpServletRequest request,
+ * HttpServletResponse response){
+ * Integer orgId = WebUtil.readIntParam(request,"orgId");
+ * getService().deleteById(Organisation.class,orgId);
+ * Integer parentId = WebUtil.readIntParam(request,"parentId");
+ * request.setAttribute("org",parentId);
+ * return mapping.findForward("orglist");
+ * }
+ */
+
+ @SuppressWarnings("unchecked")
+ private void initLocalesAndStatus() {
+ if ((OrganisationAction.locales == null)
+ || ((OrganisationAction.status == null) && (OrganisationAction.service != null))) {
+ OrganisationAction.locales = OrganisationAction.service.findAll(SupportedLocale.class);
+ OrganisationAction.status = OrganisationAction.service.findAll(OrganisationState.class);
+ Collections.sort(OrganisationAction.locales);
+ }
+ }
+}
\ No newline at end of file
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ScheduledJobListAction.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ScheduledJobListAction.java (revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ScheduledJobListAction.java (revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
@@ -0,0 +1,112 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+package org.lamsfoundation.lams.admin.web.action;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import javax.servlet.ServletException;
+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;
+import org.apache.struts.action.ActionMapping;
+import org.lamsfoundation.lams.admin.web.dto.ScheduledJobDTO;
+import org.quartz.JobDetail;
+import org.quartz.JobKey;
+import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
+import org.quartz.Trigger;
+import org.quartz.impl.matchers.GroupMatcher;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+/**
+ *
+ * @author Steve.Ni
+ * @version $Revision$
+ *
+ *
+ *
+ *
+ */
+public class ScheduledJobListAction extends Action {
+
+ private static final Logger log = Logger.getLogger(ScheduledJobListAction.class);
+
+ /**
+ * Get all waitting queue jobs scheduled in Quartz table and display job name, job start time and description. The
+ * description will be in format "Lesson Name":"the lesson creator", or "The gate name":"The relatived lesson name".
+ *
+ * @param mapping
+ * The ActionMapping used to select this instance
+ * @param actionForm
+ * The optional ActionForm bean for this request (if any)
+ * @param request
+ * The HTTP request we are processing
+ * @param response
+ * The HTTP response we are creating
+ *
+ * @exception IOException
+ * if an input/output error occurs
+ * @exception ServletException
+ * if a servlet exception occurs
+ *
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+
+ WebApplicationContext ctx = WebApplicationContextUtils
+ .getWebApplicationContext(this.getServlet().getServletContext());
+ Scheduler scheduler = (Scheduler) ctx.getBean("scheduler");
+ ArrayList jobList = new ArrayList();
+ try {
+ Set jobKeys = scheduler.getJobKeys(GroupMatcher.jobGroupEquals(Scheduler.DEFAULT_GROUP));
+ for (JobKey jobKey : jobKeys) {
+ ScheduledJobDTO jobDto = new ScheduledJobDTO();
+ JobDetail detail = scheduler.getJobDetail(jobKey);
+ jobDto.setName(jobKey.getName());
+ jobDto.setDescription(detail.getDescription());
+ List triggers = (List) scheduler.getTriggersOfJob(jobKey);
+ for (Trigger trigger : triggers) {
+ jobDto.setStartDate(trigger.getStartTime());
+ jobList.add(jobDto);
+ }
+ }
+ } catch (SchedulerException e) {
+ ScheduledJobListAction.log.equals("Failed get job names:" + e.getMessage());
+ }
+
+ request.setAttribute("jobList", jobList);
+ return mapping.findForward("list");
+ }
+
+}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ServerListAction.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ServerListAction.java (revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ServerListAction.java (revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
@@ -0,0 +1,55 @@
+/****************************************************************
+ * Copyright (C) 2006 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+package org.lamsfoundation.lams.admin.web.action;
+
+import java.util.Collections;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.Action;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
+import org.lamsfoundation.lams.integration.ExtServer;
+
+/**
+ *
+ * @author Fei Yang
+ */
+public class ServerListAction extends Action {
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+ List extServers = AdminServiceProxy.getIntegrationService(getServlet().getServletContext())
+ .getAllExtServers();
+ Collections.sort(extServers);
+ request.setAttribute("servers", extServers);
+ return mapping.findForward("serverlist");
+ }
+
+}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ServerMaintainAction.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ServerMaintainAction.java (revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ServerMaintainAction.java (revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
@@ -0,0 +1,88 @@
+/****************************************************************
+ * Copyright (C) 2006 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+package org.lamsfoundation.lams.admin.web.action;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.DynaActionForm;
+import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
+import org.lamsfoundation.lams.integration.ExtServer;
+import org.lamsfoundation.lams.integration.service.IIntegrationService;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.action.LamsDispatchAction;
+
+/**
+ *
+ * View Source
+ *
+ *
+ * @author Fei Yang
+ */
+public class ServerMaintainAction extends LamsDispatchAction {
+
+ @SuppressWarnings("unchecked")
+ public ActionForward edit(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+ DynaActionForm extServerForm = (DynaActionForm) form;
+ Integer sid = WebUtil.readIntParam(request, "sid", true);
+ if (sid != null) {
+ ExtServer map = AdminServiceProxy.getIntegrationService(getServlet().getServletContext())
+ .getExtServer(sid);
+ BeanUtils.copyProperties(extServerForm, map);
+ }
+ return mapping.findForward("servermaintain");
+ }
+
+ public ActionForward disable(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+ IIntegrationService service = AdminServiceProxy.getIntegrationService(getServlet().getServletContext());
+ Integer sid = WebUtil.readIntParam(request, "sid", false);
+ ExtServer map = service.getExtServer(sid);
+ map.setDisabled(true);
+ service.saveExtServer(map);
+ return mapping.findForward("serverlist");
+ }
+
+ public ActionForward enable(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+ IIntegrationService service = AdminServiceProxy.getIntegrationService(getServlet().getServletContext());
+ Integer sid = WebUtil.readIntParam(request, "sid", false);
+ ExtServer map = service.getExtServer(sid);
+ map.setDisabled(false);
+ service.saveExtServer(map);
+ return mapping.findForward("serverlist");
+ }
+
+ public ActionForward delete(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+ Integer sid = WebUtil.readIntParam(request, "sid", false);
+ AdminServiceProxy.getService(getServlet().getServletContext()).deleteById(ExtServer.class, sid);
+ return mapping.findForward("serverlist");
+ }
+
+}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ServerSaveAction.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ServerSaveAction.java (revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ServerSaveAction.java (revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
@@ -0,0 +1,120 @@
+/****************************************************************
+ * Copyright (C) 2006 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+package org.lamsfoundation.lams.admin.web.action;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.struts.action.Action;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
+import org.apache.struts.action.DynaActionForm;
+import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
+import org.lamsfoundation.lams.integration.ExtServer;
+import org.lamsfoundation.lams.integration.service.IIntegrationService;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.MessageService;
+
+/**
+ *
+ * View Source
+ *
+ *
+ * @author Fei Yang
+ */
+public class ServerSaveAction extends Action {
+
+ private static IIntegrationService service;
+ private static IUserManagementService userService;
+ private static MessageService messageService;
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+
+ if (isCancelled(request)) {
+ return mapping.findForward("success");
+ }
+
+ service = AdminServiceProxy.getIntegrationService(getServlet().getServletContext());
+ userService = AdminServiceProxy.getService(getServlet().getServletContext());
+ messageService = AdminServiceProxy.getMessageService(getServlet().getServletContext());
+
+ DynaActionForm extServerForm = (DynaActionForm) form;
+ ActionMessages errors = new ActionMessages();
+ String[] requiredFields = { "serverid", "serverkey", "servername", "prefix", "userinfoUrl" };
+ for (String requiredField : requiredFields) {
+ if (StringUtils.trimToNull(extServerForm.getString(requiredField)) == null) {
+ errors.add(requiredField,
+ new ActionMessage("error.required", messageService.getMessage("sysadmin." + requiredField)));
+ }
+ }
+
+ Integer sid = (Integer) extServerForm.get("sid");
+ if (errors.isEmpty()) {//check duplication
+ String[] uniqueFields = { "serverid", "prefix" };
+ for (String uniqueField : uniqueFields) {
+ List list = userService.findByProperty(ExtServer.class, uniqueField,
+ extServerForm.get(uniqueField));
+ if (list != null && list.size() > 0) {
+ if (sid.equals(-1)) {//new map
+ errors.add(uniqueField, new ActionMessage("error.not.unique",
+ messageService.getMessage("sysadmin." + uniqueField)));
+ } else {
+ ExtServer map = (ExtServer) list.get(0);
+ if (!map.getSid().equals(sid)) {
+ errors.add(uniqueField, new ActionMessage("error.not.unique",
+ messageService.getMessage("sysadmin." + uniqueField)));
+ }
+ }
+
+ }
+ }
+ }
+ if (errors.isEmpty()) {
+ ExtServer map = null;
+ if (sid.equals(-1)) {
+ map = new ExtServer();
+ BeanUtils.copyProperties(map, extServerForm);
+ map.setSid(null);
+ map.setServerTypeId(ExtServer.INTEGRATION_SERVER_TYPE);
+ } else {
+ map = service.getExtServer(sid);
+ BeanUtils.copyProperties(map, extServerForm);
+ }
+ service.saveExtServer(map);
+ return mapping.findForward("success");
+ } else {
+ saveErrors(request, errors);
+ return mapping.getInputForward();
+ }
+ }
+}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ToolContentListAction.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ToolContentListAction.java (revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ToolContentListAction.java (revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
@@ -0,0 +1,327 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+
+package org.lamsfoundation.lams.admin.web.action;
+
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import javax.sql.DataSource;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.struts.action.Action;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.tomcat.util.json.JSONArray;
+import org.apache.tomcat.util.json.JSONException;
+import org.apache.tomcat.util.json.JSONObject;
+import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
+import org.lamsfoundation.lams.learningdesign.LearningLibrary;
+import org.lamsfoundation.lams.learningdesign.LearningLibraryGroup;
+import org.lamsfoundation.lams.learningdesign.dto.LearningLibraryDTO;
+import org.lamsfoundation.lams.learningdesign.dto.LibraryActivityDTO;
+import org.lamsfoundation.lams.learningdesign.service.ILearningDesignService;
+import org.lamsfoundation.lams.tool.Tool;
+import org.lamsfoundation.lams.usermanagement.Role;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+/**
+ * @author jliew
+ *
+ *
+ *
+ *
+ *
+ *
+ */
+public class ToolContentListAction extends Action {
+
+ private static final String PARAM_ACTION = "action";
+ private static final String PARAM_LIBRARY_ID = "libraryID";
+
+ private static final String ATTRIBUTE_ERROR_NAME = "errorName";
+ private static final String ATTRIBUTE_ERROR_MESSAGE = "errorMessage";
+ private static final String ATTRIBUTE_LIBRARY = "toolLibrary";
+ private static final String ATTRIBUTE_VALIDITY = "learningLibraryValidity";
+ private static final String ATTRIBUTE_TOOL_VERSIONS = "toolVersions";
+ private static final String ATTRIBUTE_DATABASE_VERSIONS = "dbVersions";
+
+ private static final String FORWARD_SUCCESS = "toolcontentlist";
+ private static final String FORWARD_GROUPS = "groups";
+ private static final String FORWARD_ERROR = "error";
+
+ private static final String ACTION_ENABLE = "enable";
+ private static final String ACTION_DISABLE = "disable";
+ private static final String ACTION_OPEN_GROUPS = "openLearningLibraryGroups";
+ private static final String ACTION_SAVE_GROUPS = "saveLearningLibraryGroups";
+
+ private static final String QUERY_DATABASE_VERSIONS = "select system_name, patch_level from patches";
+
+ private static ILearningDesignService learningDesignService;
+ private static IUserManagementService userManagementService;
+ private static DataSource dataSource;
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+ // check permission
+ if (!(request.isUserInRole(Role.SYSADMIN))) {
+ request.setAttribute(ToolContentListAction.ATTRIBUTE_ERROR_NAME, "ToolContentListAction");
+ request.setAttribute(ToolContentListAction.ATTRIBUTE_ERROR_MESSAGE, AdminServiceProxy
+ .getMessageService(getServlet().getServletContext()).getMessage("error.authorisation"));
+ return mapping.findForward(ToolContentListAction.FORWARD_ERROR);
+ }
+
+ // not just display, but enable/disable a learning library
+ String param = request.getParameter(ToolContentListAction.PARAM_ACTION);
+ if (StringUtils.equals(param, ToolContentListAction.ACTION_ENABLE)) {
+ if (checkPriviledge(request)) {
+ enableLibrary(mapping, form, request, response);
+ } else {
+ return mapping.findForward(ToolContentListAction.FORWARD_ERROR);
+ }
+ } else if (StringUtils.equals(param, ToolContentListAction.ACTION_DISABLE)) {
+ if (checkPriviledge(request)) {
+ disableLibrary(mapping, form, request, response);
+ } else {
+ return mapping.findForward(ToolContentListAction.FORWARD_ERROR);
+ }
+ } else if (StringUtils.equals(param, ToolContentListAction.ACTION_OPEN_GROUPS)) {
+ return openLearningLibraryGroups(mapping, form, request, response);
+ } else if (StringUtils.equals(param, ToolContentListAction.ACTION_SAVE_GROUPS)) {
+ saveLearningLibraryGroups(mapping, form, request, response);
+ return null;
+ }
+
+ // get learning library dtos and their validity
+ List learningLibraryDTOs = getLearningDesignService().getAllLearningLibraryDetails(false,
+ getUserLanguage());
+ // this is filled when executing following method, for efficiency purposes
+ HashMap learningLibraryValidity = new HashMap(learningLibraryDTOs.size());
+ ArrayList toolLibrary = filterMultipleToolEntries(learningLibraryDTOs,
+ learningLibraryValidity);
+ request.setAttribute(ToolContentListAction.ATTRIBUTE_LIBRARY, toolLibrary);
+ request.setAttribute(ToolContentListAction.ATTRIBUTE_VALIDITY, learningLibraryValidity);
+
+ // get tool versions
+ HashMap toolVersions = new HashMap();
+ List tools = getUserManagementService().findAll(Tool.class);
+ for (Tool tool : tools) {
+ toolVersions.put(tool.getToolId(), tool.getToolVersion());
+ }
+ request.setAttribute(ToolContentListAction.ATTRIBUTE_TOOL_VERSIONS, toolVersions);
+
+ // get tool database versions
+ HashMap dbVersions = new HashMap();
+ Connection conn = getDataSource().getConnection();
+ PreparedStatement query = conn.prepareStatement(ToolContentListAction.QUERY_DATABASE_VERSIONS);
+ ResultSet results = query.executeQuery();
+ while (results.next()) {
+ dbVersions.put(results.getString("system_name"), results.getInt("patch_level"));
+ }
+ request.setAttribute(ToolContentListAction.ATTRIBUTE_DATABASE_VERSIONS, dbVersions);
+
+ return mapping.findForward(ToolContentListAction.FORWARD_SUCCESS);
+ }
+
+ // returns full list of learning libraries, valid or not
+ @SuppressWarnings("unchecked")
+ private ArrayList filterMultipleToolEntries(List learningLibraryDTOs,
+ HashMap learningLibraryValidity) {
+ ArrayList activeTools = new ArrayList();
+ ArrayList activeCombinedTools = new ArrayList();
+ for (LearningLibraryDTO learningLibraryDTO : learningLibraryDTOs) {
+ // populate information about learning libary validity
+ learningLibraryValidity.put(learningLibraryDTO.getLearningLibraryID(), learningLibraryDTO.getValidFlag());
+ for (LibraryActivityDTO template : (List) learningLibraryDTO.getTemplateActivities()) {
+ // no learning library ID = a part of combined learning library, we already have it in the list
+ if (template.getLearningLibraryID() != null) {
+ // combined libraries do not have tool content ID set
+ if (template.getToolContentID() == null) {
+ if (!toolExists(template, activeCombinedTools)) {
+ activeCombinedTools.add(template);
+ }
+ } else {
+ if (!toolExists(template, activeTools)) {
+ activeTools.add(template);
+ }
+ }
+ }
+ }
+ }
+ // put combined libraries at the end, purely for easy of use
+ activeTools.addAll(activeCombinedTools);
+ return activeTools;
+ }
+
+ private boolean toolExists(LibraryActivityDTO newItem, ArrayList list) {
+ for (LibraryActivityDTO libraryActivityDTO : list) {
+ if (newItem.getLearningLibraryID().equals(libraryActivityDTO.getLearningLibraryID())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private String getUserLanguage() {
+ HttpSession ss = SessionManager.getSession();
+ UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+ return user == null ? "" : user.getLocaleLanguage();
+ }
+
+ private boolean checkPriviledge(HttpServletRequest request) {
+ if (!getUserManagementService().isUserSysAdmin()) {
+ request.setAttribute(ToolContentListAction.ATTRIBUTE_ERROR_NAME, "ToolContentListAction");
+ request.setAttribute(ToolContentListAction.ATTRIBUTE_ERROR_MESSAGE, AdminServiceProxy
+ .getMessageService(getServlet().getServletContext()).getMessage("error.no.sysadmin.priviledge"));
+ return false;
+ }
+ return true;
+ }
+
+ private void disableLibrary(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) {
+ Long learningLibraryId = WebUtil.readLongParam(request, ToolContentListAction.PARAM_LIBRARY_ID, false);
+ ILearningDesignService ldService = getLearningDesignService();
+ ldService.setValid(learningLibraryId, false);
+ }
+
+ private void enableLibrary(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) {
+ Long learningLibraryId = WebUtil.readLongParam(request, ToolContentListAction.PARAM_LIBRARY_ID, false);
+ ILearningDesignService ldService = getLearningDesignService();
+ ldService.setValid(learningLibraryId, true);
+
+ }
+
+ /**
+ * Loads groups and libraries and displays the management dialog.
+ */
+ private ActionForward openLearningLibraryGroups(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws JSONException, IOException {
+ // build full list of available learning libraries
+ List learningLibraries = getLearningDesignService()
+ .getAllLearningLibraryDetails(getUserLanguage());
+ JSONArray learningLibrariesJSON = new JSONArray();
+ for (LearningLibraryDTO learningLibrary : learningLibraries) {
+ JSONObject learningLibraryJSON = new JSONObject();
+ learningLibraryJSON.put("learningLibraryId", learningLibrary.getLearningLibraryID());
+ learningLibraryJSON.put("title", learningLibrary.getTitle());
+ learningLibrariesJSON.put(learningLibraryJSON);
+ }
+ request.setAttribute("learningLibraries", learningLibrariesJSON.toString());
+
+ // build list of existing groups
+ List groups = getLearningDesignService().getLearningLibraryGroups();
+ JSONArray groupsJSON = new JSONArray();
+ for (LearningLibraryGroup group : groups) {
+ JSONObject groupJSON = new JSONObject();
+ groupJSON.put("groupId", group.getGroupId());
+ groupJSON.put("name", group.getName());
+ for (LearningLibrary learningLibrary : group.getLearningLibraries()) {
+ JSONObject learningLibraryJSON = new JSONObject();
+ learningLibraryJSON.put("learningLibraryId", learningLibrary.getLearningLibraryId());
+ learningLibraryJSON.put("title", learningLibrary.getTitle());
+ groupJSON.append("learningLibraries", learningLibraryJSON);
+ }
+ groupsJSON.put(groupJSON);
+ }
+ request.setAttribute("groups", groupsJSON.toString());
+
+ return mapping.findForward(ToolContentListAction.FORWARD_GROUPS);
+ }
+
+ private void saveLearningLibraryGroups(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws JSONException, IOException {
+ // extract groups from JSON and persist them
+ JSONArray groupsJSON = new JSONArray(request.getParameter("groups"));
+ List groups = new ArrayList(groupsJSON.length());
+
+ for (int groupIndex = 0; groupIndex < groupsJSON.length(); groupIndex++) {
+ LearningLibraryGroup group = new LearningLibraryGroup();
+ groups.add(group);
+
+ JSONObject groupJSON = groupsJSON.getJSONObject(groupIndex);
+ long groupId = groupJSON.optLong("groupId");
+ if (groupId > 0) {
+ group.setGroupId(groupId);
+ }
+ group.setName(groupJSON.getString("name"));
+
+ group.setLearningLibraries(new HashSet());
+ JSONArray learningLibrariesJSON = groupJSON.getJSONArray("learningLibraries");
+ for (int learningLibraryIndex = 0; learningLibraryIndex < learningLibrariesJSON
+ .length(); learningLibraryIndex++) {
+ long learningLibraryId = learningLibrariesJSON.getLong(learningLibraryIndex);
+ LearningLibrary learningLibrary = getLearningDesignService().getLearningLibrary(learningLibraryId);
+ group.getLearningLibraries().add(learningLibrary);
+ }
+ }
+
+ getLearningDesignService().saveLearningLibraryGroups(groups);
+ }
+
+ private ILearningDesignService getLearningDesignService() {
+ if (ToolContentListAction.learningDesignService == null) {
+ WebApplicationContext ctx = WebApplicationContextUtils
+ .getRequiredWebApplicationContext(getServlet().getServletContext());
+ ToolContentListAction.learningDesignService = (ILearningDesignService) ctx.getBean("learningDesignService");
+ }
+ return ToolContentListAction.learningDesignService;
+ }
+
+ private IUserManagementService getUserManagementService() {
+ if (ToolContentListAction.userManagementService == null) {
+ WebApplicationContext ctx = WebApplicationContextUtils
+ .getRequiredWebApplicationContext(getServlet().getServletContext());
+ ToolContentListAction.userManagementService = (IUserManagementService) ctx.getBean("userManagementService");
+ }
+ return ToolContentListAction.userManagementService;
+ }
+
+ private DataSource getDataSource() {
+ if (ToolContentListAction.dataSource == null) {
+ WebApplicationContext ctx = WebApplicationContextUtils
+ .getRequiredWebApplicationContext(getServlet().getServletContext());
+ ToolContentListAction.dataSource = (DataSource) ctx.getBean("dataSource");
+ }
+ return ToolContentListAction.dataSource;
+ }
+}
\ No newline at end of file
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserAction.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserAction.java (revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserAction.java (revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
@@ -0,0 +1,388 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+
+package org.lamsfoundation.lams.admin.web.action;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.TimeZone;
+import java.util.TreeSet;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.log4j.Logger;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.DynaActionForm;
+import org.lamsfoundation.lams.admin.AdminConstants;
+import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
+import org.lamsfoundation.lams.admin.web.dto.UserOrgRoleDTO;
+import org.lamsfoundation.lams.themes.Theme;
+import org.lamsfoundation.lams.themes.service.IThemeService;
+import org.lamsfoundation.lams.timezone.Timezone;
+import org.lamsfoundation.lams.timezone.dto.TimezoneDTO;
+import org.lamsfoundation.lams.timezone.service.ITimezoneService;
+import org.lamsfoundation.lams.timezone.util.TimezoneDTOComparator;
+import org.lamsfoundation.lams.usermanagement.AuthenticationMethod;
+import org.lamsfoundation.lams.usermanagement.Organisation;
+import org.lamsfoundation.lams.usermanagement.OrganisationState;
+import org.lamsfoundation.lams.usermanagement.OrganisationType;
+import org.lamsfoundation.lams.usermanagement.Role;
+import org.lamsfoundation.lams.usermanagement.SupportedLocale;
+import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.UserOrganisation;
+import org.lamsfoundation.lams.usermanagement.UserOrganisationRole;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.LanguageUtil;
+import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.action.LamsDispatchAction;
+
+/**
+ * @author Jun-Dir Liew
+ */
+public class UserAction extends LamsDispatchAction {
+
+ private static Logger log = Logger.getLogger(UserAction.class);
+ private IUserManagementService service;
+ private MessageService messageService;
+ private static IThemeService themeService;
+ private static ITimezoneService timezoneService;
+ private static List locales;
+ private static List authenticationMethods;
+
+ private void initServices() {
+ if (service == null) {
+ service = AdminServiceProxy.getService(getServlet().getServletContext());
+ }
+ if (messageService == null) {
+ messageService = AdminServiceProxy.getMessageService(getServlet().getServletContext());
+ }
+ if (UserAction.themeService == null) {
+ UserAction.themeService = AdminServiceProxy.getThemeService(getServlet().getServletContext());
+ }
+ if (UserAction.timezoneService == null) {
+ UserAction.timezoneService = AdminServiceProxy.getTimezoneService(getServlet().getServletContext());
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ public ActionForward edit(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+
+ initServices();
+ if (UserAction.locales == null) {
+ UserAction.locales = service.findAll(SupportedLocale.class);
+ Collections.sort(UserAction.locales);
+ }
+ if (UserAction.authenticationMethods == null) {
+ UserAction.authenticationMethods = service.findAll(AuthenticationMethod.class);
+ }
+
+ DynaActionForm userForm = (DynaActionForm) form;
+ Integer orgId = WebUtil.readIntParam(request, "orgId", true);
+ Integer userId = WebUtil.readIntParam(request, "userId", true);
+
+ // Get all the css themess
+ List themes = UserAction.themeService.getAllThemes();
+ request.setAttribute("themes", themes);
+
+ // Select the default themes by default
+ Theme defaultTheme = UserAction.themeService.getDefaultTheme();
+ for (Theme theme : themes) {
+ if (theme.getThemeId().equals(defaultTheme.getThemeId())) {
+ userForm.set("userTheme", theme.getThemeId());
+ break;
+ }
+ }
+
+ // test requestor's permission
+ Organisation org = null;
+ Boolean canEdit = service.isUserGlobalGroupAdmin();
+ if (orgId != null) {
+ org = (Organisation) service.findById(Organisation.class, orgId);
+ if (!canEdit) {
+ OrganisationType orgType = org.getOrganisationType();
+ Integer orgIdOfCourse = orgType.getOrganisationTypeId().equals(OrganisationType.CLASS_TYPE)
+ ? org.getParentOrganisation().getOrganisationId() : orgId;
+ User requestor = service.getUserByLogin(request.getRemoteUser());
+ if (service.isUserInRole(requestor.getUserId(), orgIdOfCourse, Role.GROUP_ADMIN)
+ || service.isUserInRole(requestor.getUserId(), orgIdOfCourse, Role.GROUP_MANAGER)) {
+ Organisation course = (Organisation) service.findById(Organisation.class, orgIdOfCourse);
+ canEdit = course.getCourseAdminCanAddNewUsers();
+ }
+ }
+ }
+
+ if (!(canEdit || request.isUserInRole(Role.SYSADMIN))) {
+ request.setAttribute("errorName", "UserAction");
+ request.setAttribute("errorMessage", messageService.getMessage("error.authorisation"));
+ return mapping.findForward("error");
+ }
+
+ // editing a user
+ if ((userId != null) && (userId != 0)) {
+ User user = (User) service.findById(User.class, userId);
+ UserAction.log.debug("got userid to edit: " + userId);
+ BeanUtils.copyProperties(userForm, user);
+ userForm.set("password", null);
+ SupportedLocale locale = user.getLocale();
+ userForm.set("localeId", locale.getLocaleId());
+
+ AuthenticationMethod authenticationMethod = user.getAuthenticationMethod();
+ userForm.set("authenticationMethodId", authenticationMethod.getAuthenticationMethodId());
+ // set user's organisations to display
+ request.setAttribute("userOrgRoles", getUserOrgRoles(user));
+ request.setAttribute("globalRoles", getGlobalRoles(user));
+
+ // Check the user css theme is still installed
+ Long userSelectedTheme = null;
+ if (user.getTheme() != null) {
+ for (Theme theme : themes) {
+ if (theme.getThemeId() == user.getTheme().getThemeId()) {
+ userSelectedTheme = theme.getThemeId();
+ break;
+ }
+ }
+ }
+ // if still null, use the default
+ if (userSelectedTheme == null) {
+ userSelectedTheme = UserAction.themeService.getDefaultTheme().getThemeId();
+ }
+ userForm.set("userTheme", userSelectedTheme);
+
+ //property available for modification only to sysadmins
+ userForm.set("twoFactorAuthenticationEnabled", user.isTwoFactorAuthenticationEnabled());
+ } else { // create a user
+ try {
+ SupportedLocale locale = LanguageUtil.getDefaultLocale();
+ userForm.set("localeId", locale.getLocaleId());
+ } catch (Exception e) {
+ UserAction.log.debug(e);
+ }
+ }
+ userForm.set("orgId", (org == null ? null : org.getOrganisationId()));
+
+ // sysadmins can mark users as required to use two-factor authentication
+ if (request.isUserInRole(Role.SYSADMIN)) {
+ request.setAttribute("isSysadmin", true);
+ }
+
+ // Get all available time zones
+ List availableTimeZones = UserAction.timezoneService.getDefaultTimezones();
+ TreeSet timezoneDtos = new TreeSet(new TimezoneDTOComparator());
+ for (Timezone availableTimeZone : availableTimeZones) {
+ String timezoneId = availableTimeZone.getTimezoneId();
+ TimezoneDTO timezoneDto = new TimezoneDTO();
+ timezoneDto.setTimeZoneId(timezoneId);
+ timezoneDto.setDisplayName(TimeZone.getTimeZone(timezoneId).getDisplayName());
+ timezoneDtos.add(timezoneDto);
+ }
+ request.setAttribute("timezoneDtos", timezoneDtos);
+
+ // for breadcrumb links
+ if (org != null) {
+ request.setAttribute("orgName", org.getName());
+ Organisation parentOrg = org.getParentOrganisation();
+ if ((parentOrg != null) && !parentOrg.equals(service.getRootOrganisation())) {
+ request.setAttribute("pOrgId", parentOrg.getOrganisationId());
+ request.setAttribute("parentName", parentOrg.getName());
+ }
+ }
+
+ request.setAttribute("locales", UserAction.locales);
+ request.setAttribute("authenticationMethods", UserAction.authenticationMethods);
+
+ return mapping.findForward("user");
+ }
+
+ // display user's global roles, if any
+ private UserOrgRoleDTO getGlobalRoles(User user) {
+ initServices();
+ UserOrganisation uo = service.getUserOrganisation(user.getUserId(),
+ service.getRootOrganisation().getOrganisationId());
+ if (uo == null) {
+ return null;
+ }
+ UserOrgRoleDTO uorDTO = new UserOrgRoleDTO();
+ List roles = new ArrayList();
+ for (Object uor : uo.getUserOrganisationRoles()) {
+ roles.add(((UserOrganisationRole) uor).getRole().getName());
+ }
+ Collections.sort(roles);
+ uorDTO.setOrgName(uo.getOrganisation().getName());
+ uorDTO.setRoles(roles);
+ return uorDTO;
+ }
+
+ // display user's organisations and roles in them
+ @SuppressWarnings("unchecked")
+ private List getUserOrgRoles(User user) {
+
+ initServices();
+ List uorDTOs = new ArrayList();
+ List uos = service.getUserOrganisationsForUserByTypeAndStatus(user.getLogin(),
+ OrganisationType.COURSE_TYPE, OrganisationState.ACTIVE);
+ for (UserOrganisation uo : uos) {
+ UserOrgRoleDTO uorDTO = new UserOrgRoleDTO();
+ List roles = new ArrayList();
+ for (Object uor : uo.getUserOrganisationRoles()) {
+ roles.add(((UserOrganisationRole) uor).getRole().getName());
+ }
+ Collections.sort(roles);
+ uorDTO.setOrgName(uo.getOrganisation().getName());
+ uorDTO.setRoles(roles);
+ List childDTOs = new ArrayList();
+ List childuos = service.getUserOrganisationsForUserByTypeAndStatusAndParent(
+ user.getLogin(), OrganisationType.CLASS_TYPE, OrganisationState.ACTIVE,
+ uo.getOrganisation().getOrganisationId());
+ for (UserOrganisation childuo : childuos) {
+ UserOrgRoleDTO childDTO = new UserOrgRoleDTO();
+ List childroles = new ArrayList();
+ for (Object uor : childuo.getUserOrganisationRoles()) {
+ childroles.add(((UserOrganisationRole) uor).getRole().getName());
+ }
+ Collections.sort(childroles);
+ childDTO.setOrgName(childuo.getOrganisation().getName());
+ childDTO.setRoles(childroles);
+ childDTOs.add(childDTO);
+ }
+ uorDTO.setChildDTOs(childDTOs);
+ uorDTOs.add(uorDTO);
+ }
+
+ return uorDTOs;
+ }
+
+ // determine whether to disable or delete user based on their lams data
+ public ActionForward remove(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+
+ initServices();
+
+ if (!(request.isUserInRole(Role.SYSADMIN) || service.isUserGlobalGroupAdmin())) {
+ request.setAttribute("errorName", "UserAction");
+ request.setAttribute("errorMessage", messageService.getMessage("error.authorisation"));
+ return mapping.findForward("error");
+ }
+
+ Integer orgId = WebUtil.readIntParam(request, "orgId", true);
+ Integer userId = WebUtil.readIntParam(request, "userId");
+ User user = (User) service.findById(User.class, userId);
+
+ Boolean hasData = service.userHasData(user);
+
+ request.setAttribute("method", (hasData ? "disable" : "delete"));
+ request.setAttribute("orgId", orgId);
+ request.setAttribute("userId", userId);
+ return mapping.findForward("remove");
+ }
+
+ public ActionForward disable(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+
+ initServices();
+
+ if (!(request.isUserInRole(Role.SYSADMIN) || service.isUserGlobalGroupAdmin())) {
+ request.setAttribute("errorName", "UserAction");
+ request.setAttribute("errorMessage", messageService.getMessage("error.authorisation"));
+ return mapping.findForward("error");
+ }
+
+ Integer orgId = WebUtil.readIntParam(request, "orgId", true);
+ Integer userId = WebUtil.readIntParam(request, "userId");
+ service.disableUser(userId);
+ String[] args = new String[1];
+ args[0] = userId.toString();
+ String message = messageService.getMessage("audit.user.disable", args);
+ AdminServiceProxy.getAuditService(getServlet().getServletContext()).log(AdminConstants.MODULE_NAME, message);
+
+ if ((orgId == null) || (orgId == 0)) {
+ return mapping.findForward("usersearch");
+ } else {
+ request.setAttribute("org", orgId);
+ return mapping.findForward("userlist");
+ }
+ }
+
+ public ActionForward delete(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+
+ initServices();
+
+ if (!(request.isUserInRole(Role.SYSADMIN) || service.isUserGlobalGroupAdmin())) {
+ request.setAttribute("errorName", "UserAction");
+ request.setAttribute("errorMessage", messageService.getMessage("error.authorisation"));
+ return mapping.findForward("error");
+ }
+
+ Integer orgId = WebUtil.readIntParam(request, "orgId", true);
+ Integer userId = WebUtil.readIntParam(request, "userId");
+ try {
+ service.removeUser(userId);
+ } catch (Exception e) {
+ request.setAttribute("errorName", "UserAction");
+ request.setAttribute("errorMessage", e.getMessage());
+ return mapping.findForward("error");
+ }
+ String[] args = new String[1];
+ args[0] = userId.toString();
+ String message = messageService.getMessage("audit.user.delete", args);
+ AdminServiceProxy.getAuditService(getServlet().getServletContext()).log(AdminConstants.MODULE_NAME, message);
+
+ if ((orgId == null) || (orgId == 0)) {
+ return mapping.findForward("usersearch");
+ } else {
+ request.setAttribute("org", orgId);
+ return mapping.findForward("userlist");
+ }
+ }
+
+ // called from disabled users screen
+ public ActionForward enable(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+
+ initServices();
+
+ if (!(request.isUserInRole(Role.SYSADMIN) || service.isUserGlobalGroupAdmin())) {
+ request.setAttribute("errorName", "UserAction");
+ request.setAttribute("errorMessage", messageService.getMessage("error.authorisation"));
+ return mapping.findForward("error");
+ }
+
+ Integer userId = WebUtil.readIntParam(request, "userId", true);
+ User user = (User) service.findById(User.class, userId);
+
+ UserAction.log.debug("enabling user: " + userId);
+ user.setDisabledFlag(false);
+ service.saveUser(user);
+
+ return mapping.findForward("disabledlist");
+ }
+
+}
\ No newline at end of file
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserManageAction.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserManageAction.java (revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserManageAction.java (revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
@@ -0,0 +1,169 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+
+package org.lamsfoundation.lams.admin.web.action;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+
+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;
+import org.apache.struts.action.ActionMapping;
+import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
+import org.lamsfoundation.lams.admin.web.dto.UserListDTO;
+import org.lamsfoundation.lams.usermanagement.Organisation;
+import org.lamsfoundation.lams.usermanagement.OrganisationType;
+import org.lamsfoundation.lams.usermanagement.Role;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.usermanagement.dto.UserManageBean;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+
+/**
+ * @author Jun-Dir Liew
+ *
+ * Created at 13:51:51 on 9/06/2006
+ */
+
+/**
+ * struts doclets
+ *
+ *
+ *
+ *
+ */
+public class UserManageAction extends Action {
+
+ private static final Logger log = Logger.getLogger(UserManageAction.class);
+ private static IUserManagementService service;
+ private static MessageService messageService;
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+
+ service = AdminServiceProxy.getService(getServlet().getServletContext());
+ messageService = AdminServiceProxy.getMessageService(getServlet().getServletContext());
+
+ // get id of org to list users for
+ Integer orgId = WebUtil.readIntParam(request, "org", true);
+ if (orgId == null) {
+ orgId = (Integer) request.getAttribute("org");
+ }
+ if ((orgId == null) || (orgId <= 0)) {
+ return forwardError(mapping, request, "error.org.invalid");
+ }
+ log.debug("orgId: " + orgId);
+
+ // get org name
+ Organisation organisation = (Organisation) service.findById(Organisation.class, orgId);
+ if (organisation == null) {
+ return forwardError(mapping, request, "error.org.invalid");
+ }
+ String orgName = organisation.getName();
+ log.debug("orgName: " + orgName);
+
+ Organisation pOrg = organisation.getParentOrganisation();
+ if (pOrg != null) {
+ request.setAttribute("pOrgId", pOrg.getOrganisationId());
+ request.setAttribute("pOrgName", pOrg.getName());
+ }
+ OrganisationType orgType = organisation.getOrganisationType();
+ request.setAttribute("orgType", orgType.getOrganisationTypeId());
+
+ // create form object
+ UserListDTO userManageForm = new UserListDTO();
+
+ Integer userId = ((UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER)).getUserID();
+ Organisation orgOfCourseAdmin = (orgType.getOrganisationTypeId().equals(OrganisationType.CLASS_TYPE)) ? pOrg
+ : organisation;
+ // check permission
+ Integer rootOrgId = service.getRootOrganisation().getOrganisationId();
+ if (request.isUserInRole(Role.SYSADMIN) || (service.isUserGlobalGroupAdmin() && !orgId.equals(rootOrgId))) {
+ userManageForm.setCourseAdminCanAddNewUsers(true);
+ userManageForm.setCourseAdminCanBrowseAllUsers(true);
+ request.setAttribute("canDeleteUser", true);
+ } else if ((service.isUserInRole(userId, orgOfCourseAdmin.getOrganisationId(), Role.GROUP_ADMIN)
+ || service.isUserInRole(userId, orgOfCourseAdmin.getOrganisationId(), Role.GROUP_MANAGER))
+ && !orgId.equals(rootOrgId)) {
+ userManageForm.setCourseAdminCanAddNewUsers(orgOfCourseAdmin.getCourseAdminCanAddNewUsers());
+ userManageForm.setCourseAdminCanBrowseAllUsers(orgOfCourseAdmin.getCourseAdminCanBrowseAllUsers());
+ } else {
+ return forwardError(mapping, request, "error.authorisation");
+ }
+
+ userManageForm.setOrgId(orgId);
+ userManageForm.setOrgName(orgName);
+ List userManageBeans = service.getUserManageBeans(orgId);
+ Collections.sort(userManageBeans);
+ userManageForm.setUserManageBeans(userManageBeans);
+ request.setAttribute("UserManageForm", userManageForm);
+
+ // heading
+ String[] args = { orgName };
+ request.setAttribute("heading", messageService.getMessage("heading.manage.group.users", args));
+
+ // count roles in the org
+ HashMap roleCount = new HashMap();
+ if (orgId.equals(rootOrgId)) {
+ roleCount.put(Role.SYSADMIN, Role.ROLE_SYSADMIN);
+ roleCount.put(Role.GROUP_ADMIN, Role.ROLE_GROUP_ADMIN);
+ } else {
+ roleCount.put(Role.LEARNER, Role.ROLE_LEARNER);
+ roleCount.put(Role.MONITOR, Role.ROLE_MONITOR);
+ roleCount.put(Role.AUTHOR, Role.ROLE_AUTHOR);
+ roleCount.put(Role.GROUP_MANAGER, Role.ROLE_GROUP_MANAGER);
+ roleCount.put(Role.GROUP_ADMIN, Role.ROLE_GROUP_ADMIN);
+ }
+ for (String role : roleCount.keySet()) {
+ Integer count = service.getCountRoleForOrg(orgId, roleCount.get(role), null);
+ request.setAttribute(role.replace(' ', '_'), count);
+ }
+
+ // count users in the org
+ // TODO use hql that does a count instead of getting whole objects
+ Integer numUsers = Integer.valueOf(service.getUsersFromOrganisation(orgId).size());
+ args[0] = numUsers.toString();
+ request.setAttribute("numUsers", messageService.getMessage("label.users.in.group", args));
+
+ return mapping.findForward("userlist");
+ }
+
+ private ActionForward forwardError(ActionMapping mapping, HttpServletRequest request, String key) {
+ request.setAttribute("errorName", "UserManageAction");
+ request.setAttribute("errorMessage", messageService.getMessage(key));
+ return mapping.findForward("error");
+ }
+
+}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserOrgAction.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserOrgAction.java (revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserOrgAction.java (revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
@@ -0,0 +1,104 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+
+package org.lamsfoundation.lams.admin.web.action;
+
+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;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.DynaActionForm;
+import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
+import org.lamsfoundation.lams.usermanagement.Organisation;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.util.WebUtil;
+
+/**
+ * @author Jun-Dir Liew
+ *
+ */
+
+/**
+ * struts doclets
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ */
+public class UserOrgAction extends Action {
+
+ private static final Logger log = Logger.getLogger(UserOrgAction.class);
+ private static IUserManagementService service;
+ private static MessageService messageService;
+
+ @Override
+ public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+
+ service = AdminServiceProxy.getService(getServlet().getServletContext());
+ messageService = AdminServiceProxy.getMessageService(getServlet().getServletContext());
+
+ //ActionMessages errors = new ActionMessages();
+ Integer orgId = WebUtil.readIntParam(request, "orgId", true);
+ log.debug("orgId: " + orgId);
+ // get org name
+ Organisation organisation = (Organisation) service.findById(Organisation.class, orgId);
+
+ if ((orgId == null) || (orgId <= 0) || organisation == null) {
+ request.setAttribute("errorName", "UserOrgAction");
+ request.setAttribute("errorMessage", messageService.getMessage("error.org.invalid"));
+ return mapping.findForward("error");
+ }
+
+ String orgName = organisation.getName();
+ log.debug("orgName: " + orgName);
+ Organisation parentOrg = organisation.getParentOrganisation();
+ if (parentOrg != null && !parentOrg.equals(service.getRootOrganisation())) {
+ request.setAttribute("pOrgId", parentOrg.getOrganisationId());
+ request.setAttribute("pOrgName", parentOrg.getName());
+ }
+ Integer orgType = organisation.getOrganisationType().getOrganisationTypeId();
+ request.setAttribute("orgType", orgType);
+
+ // create form object
+ DynaActionForm userOrgForm = (DynaActionForm) form;
+ userOrgForm.set("orgId", orgId);
+ userOrgForm.set("orgName", orgName);
+
+ String[] args = { "0" };
+ request.setAttribute("numExistUsers", messageService.getMessage("label.number.of.users", args));
+ request.setAttribute("numPotentialUsers", messageService.getMessage("label.number.of.potential.users", args));
+
+ return mapping.findForward("userorg");
+ }
+}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserOrgRoleAction.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserOrgRoleAction.java (revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserOrgRoleAction.java (revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
@@ -0,0 +1,123 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+
+package org.lamsfoundation.lams.admin.web.action;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.log4j.Logger;
+import org.apache.struts.action.Action;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
+import org.lamsfoundation.lams.admin.web.dto.UserBean;
+import org.lamsfoundation.lams.admin.web.form.UserOrgRoleForm;
+import org.lamsfoundation.lams.usermanagement.Organisation;
+import org.lamsfoundation.lams.usermanagement.OrganisationType;
+import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.UserOrganisation;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+
+/**
+ * @author jliew
+ *
+ * Called when a user has added users to an organisation.
+ *
+ */
+
+/**
+ * struts doclets
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ */
+public class UserOrgRoleAction extends Action {
+
+ private static Logger log = Logger.getLogger(UserOrgRoleAction.class);
+ private static IUserManagementService service;
+
+ @Override
+ public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+
+ service = AdminServiceProxy.getService(getServlet().getServletContext());
+ UserOrgRoleForm userOrgRoleForm = (UserOrgRoleForm) form;
+ // make sure we don't have left overs from any previous attempt
+ userOrgRoleForm.setUserBeans(new ArrayList());
+
+ // set list of roles appropriate for the organisation type
+ List roles = (List) request.getAttribute("roles");
+ request.setAttribute("numroles", roles.size());
+ Collections.sort(roles);
+ request.setAttribute("roles", roles);
+
+ Organisation organisation = (Organisation) service.findById(Organisation.class,
+ (Integer) request.getAttribute("orgId"));
+ userOrgRoleForm.setOrgId(organisation.getOrganisationId());
+
+ // display breadcrumb links
+ request.setAttribute("orgName", organisation.getName());
+ Organisation parentOrg = organisation.getParentOrganisation();
+ if (parentOrg != null && !parentOrg.equals(service.getRootOrganisation())) {
+ request.setAttribute("pOrgId", parentOrg.getOrganisationId());
+ request.setAttribute("pOrgName", parentOrg.getName());
+ }
+ request.setAttribute("orgType", organisation.getOrganisationType().getOrganisationTypeId());
+
+ // populate form with users
+ ArrayList userOrgs = (ArrayList) request.getAttribute("newUserOrganisations");
+ for (int i = 0; i < userOrgs.size(); i++) {
+ UserBean userBean = new UserBean();
+ User user = ((UserOrganisation) userOrgs.get(i)).getUser();
+ BeanUtils.copyProperties(userBean, user);
+ // flag users that will be added to parent group if necessary
+ userBean.setMemberOfParent(true);
+ if (organisation.getOrganisationType().getOrganisationTypeId().equals(OrganisationType.CLASS_TYPE)) {
+ if (service.getUserOrganisation(user.getUserId(),
+ organisation.getParentOrganisation().getOrganisationId()) == null) {
+ userBean.setMemberOfParent(false);
+ }
+ }
+ userOrgRoleForm.addUserBean(userBean);
+ log.debug("ready to assign role for user=" + userBean.getUserId());
+ }
+ log.debug("ready to assign roles for " + userOrgRoleForm.getUserBeans().size() + " new users in organisation "
+ + organisation.getName());
+
+ return mapping.findForward("userorgrole");
+ }
+
+}
\ No newline at end of file
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserOrgRoleSaveAction.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserOrgRoleSaveAction.java (revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserOrgRoleSaveAction.java (revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
@@ -0,0 +1,118 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+
+package org.lamsfoundation.lams.admin.web.action;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+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;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
+import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
+import org.lamsfoundation.lams.admin.web.dto.UserBean;
+import org.lamsfoundation.lams.admin.web.form.UserOrgRoleForm;
+import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+
+/**
+ * @author jliew
+ *
+ * Saves roles for users that were just added.
+ * Uses session scope because using request scope doesn't copy the form data
+ * into UserOrgRoleForm's userBeans ArrayList (the list becomes empty).
+ *
+ */
+
+/**
+ * struts doclets
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ */
+public class UserOrgRoleSaveAction extends Action {
+
+ private static Logger log = Logger.getLogger(UserOrgRoleSaveAction.class);
+ private static IUserManagementService service;
+
+ @Override
+ public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+
+ service = AdminServiceProxy.getService(getServlet().getServletContext());
+ UserOrgRoleForm userOrgRoleForm = (UserOrgRoleForm) form;
+
+ ArrayList userBeans = userOrgRoleForm.getUserBeans();
+ log.debug("userBeans is null? " + userBeans == null);
+ Integer orgId = userOrgRoleForm.getOrgId();
+ log.debug("orgId: " + orgId);
+
+ request.setAttribute("org", orgId);
+ request.getSession().removeAttribute("UserOrgRoleForm");
+
+ if (isCancelled(request)) {
+ return mapping.findForward("userlist");
+ }
+
+ // save UserOrganisation memberships, and the associated roles;
+ // for subgroups, if user is not a member of the parent group then add to that as well.
+ for (int i = 0; i < userBeans.size(); i++) {
+ UserBean bean = (UserBean) userBeans.get(i);
+ User user = (User) service.findById(User.class, bean.getUserId());
+ log.debug("userId: " + bean.getUserId());
+ String[] roleIds = bean.getRoleIds();
+ if (roleIds.length == 0) {
+ // TODO forward to userorgrole.do, not userorg.do
+ ActionMessages errors = new ActionMessages();
+ errors.add("roles", new ActionMessage("error.roles.empty"));
+ saveErrors(request, errors);
+ request.setAttribute("orgId", orgId);
+ return mapping.findForward("userorg");
+ }
+ service.setRolesForUserOrganisation(user, orgId, Arrays.asList(roleIds));
+ // FMALIKOFF 5/7/7 Commented out the following code that set the roles in the course if the current org is a class, as the logic
+ // is done in service.setRolesForUserOrganisation()
+ //if (organisation.getOrganisationType().getOrganisationTypeId().equals(OrganisationType.CLASS_TYPE)) {
+ // if (service.getUserOrganisation(bean.getUserId(), organisation.getParentOrganisation().getOrganisationId())==null) {
+ // service.setRolesForUserOrganisation(user, organisation.getParentOrganisation(), (List)Arrays.asList(roleIds));
+ // }
+ //}
+ }
+ return mapping.findForward("userlist");
+ }
+
+}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserOrgSaveAction.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserOrgSaveAction.java (revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserOrgSaveAction.java (revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
@@ -0,0 +1,147 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+
+package org.lamsfoundation.lams.admin.web.action;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+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;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.DynaActionForm;
+import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
+import org.lamsfoundation.lams.usermanagement.Organisation;
+import org.lamsfoundation.lams.usermanagement.Role;
+import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.UserOrganisation;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+
+/**
+ * @author Jun-Dir Liew
+ *
+ * Created at 17:22:21 on 20/06/2006
+ */
+
+/**
+ * struts doclets
+ *
+ *
+ *
+ *
+ *
+ */
+public class UserOrgSaveAction extends Action {
+
+ private static Logger log = Logger.getLogger(UserOrgSaveAction.class);
+ private static IUserManagementService service;
+ private List rolelist;
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+
+ DynaActionForm userOrgForm = (DynaActionForm) form;
+
+ Integer orgId = (Integer) userOrgForm.get("orgId");
+ request.setAttribute("org", orgId);
+
+ if (isCancelled(request)) {
+ return mapping.findForward("userlist");
+ }
+
+ service = AdminServiceProxy.getService(getServlet().getServletContext());
+ if (rolelist == null) {
+ rolelist = service.findAll(Role.class);
+ }
+
+ Organisation organisation = (Organisation) service.findById(Organisation.class, orgId);
+ Set uos = organisation.getUserOrganisations();
+
+ String[] userIds = (String[]) userOrgForm.get("userIds");
+ List userIdList = Arrays.asList(userIds);
+ log.debug("new user membership of orgId=" + orgId + " will be: " + userIdList);
+
+ // remove UserOrganisations that aren't in form data
+ Iterator iter = uos.iterator();
+ while (iter.hasNext()) {
+ UserOrganisation uo = (UserOrganisation) iter.next();
+ Integer userId = uo.getUser().getUserId();
+ if (userIdList.indexOf(userId.toString()) < 0) {
+ User user = (User) service.findById(User.class, userId);
+ Set userUos = user.getUserOrganisations();
+ userUos.remove(uo);
+ user.setUserOrganisations(userUos);
+ iter.remove();
+ log.debug("removed userId=" + userId + " from orgId=" + orgId);
+ // remove from subgroups
+ service.deleteChildUserOrganisations(uo.getUser(), uo.getOrganisation());
+ }
+ }
+ // add UserOrganisations that are in form data
+ List newUserOrganisations = new ArrayList();
+ for (int i = 0; i < userIdList.size(); i++) {
+ Integer userId = new Integer(userIdList.get(i));
+ Iterator iter2 = uos.iterator();
+ Boolean alreadyInOrg = false;
+ while (iter2.hasNext()) {
+ UserOrganisation uo = (UserOrganisation) iter2.next();
+ if (uo.getUser().getUserId().equals(userId)) {
+ alreadyInOrg = true;
+ break;
+ }
+ }
+ if (!alreadyInOrg) {
+ User user = (User) service.findById(User.class, userId);
+ UserOrganisation uo = new UserOrganisation(user, organisation);
+ newUserOrganisations.add(uo);
+ }
+ }
+
+ organisation.setUserOrganisations(uos);
+ service.save(organisation);
+
+ // if no new users, then finish; otherwise forward to where roles can be assigned for new users.
+ if (newUserOrganisations.isEmpty()) {
+ log.debug("no new users to add to orgId=" + orgId);
+ return mapping.findForward("userlist");
+ } else {
+ request.setAttribute("roles", service.filterRoles(rolelist, request.isUserInRole(Role.SYSADMIN),
+ organisation.getOrganisationType()));
+ request.setAttribute("newUserOrganisations", newUserOrganisations);
+ request.setAttribute("orgId", orgId);
+ return mapping.findForward("userorgrole");
+ }
+ }
+
+}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserRolesAction.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserRolesAction.java (revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserRolesAction.java (revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
@@ -0,0 +1,163 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+
+package org.lamsfoundation.lams.admin.web.action;
+
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+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;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
+import org.apache.struts.action.DynaActionForm;
+import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
+import org.lamsfoundation.lams.usermanagement.Organisation;
+import org.lamsfoundation.lams.usermanagement.OrganisationType;
+import org.lamsfoundation.lams.usermanagement.Role;
+import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.UserOrganisation;
+import org.lamsfoundation.lams.usermanagement.UserOrganisationRole;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.util.WebUtil;
+
+/**
+ * @author jliew
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ */
+public class UserRolesAction extends Action {
+
+ private static Logger log = Logger.getLogger(UserRolesAction.class);
+ private static IUserManagementService service;
+ private static MessageService messageService;
+ private static List rolelist;
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+
+ service = AdminServiceProxy.getService(getServlet().getServletContext());
+ messageService = AdminServiceProxy.getMessageService(getServlet().getServletContext());
+ if (rolelist == null) {
+ rolelist = service.findAll(Role.class);
+ Collections.sort(rolelist);
+ }
+
+ ActionMessages errors = new ActionMessages();
+ DynaActionForm userRolesForm = (DynaActionForm) form;
+ Integer orgId = WebUtil.readIntParam(request, "orgId", true);
+ Integer userId = WebUtil.readIntParam(request, "userId", true);
+
+ // user and org ids passed as attributes by UserSaveAction
+ if (orgId == null) {
+ orgId = (Integer) request.getAttribute("orgId");
+ }
+ if (orgId == null) {
+ errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.org.invalid"));
+ saveErrors(request, errors);
+ return mapping.findForward("userrole");
+ }
+ if (userId == null || userId == 0) {
+ userId = (Integer) request.getAttribute("userId");
+ }
+ if (userId == null) {
+ errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.userid.invalid"));
+ saveErrors(request, errors);
+ return mapping.findForward("userrole");
+ }
+ log.debug("editing roles for userId: " + userId + " and orgId: " + orgId);
+
+ // test requestor's permission
+ Organisation org = (Organisation) service.findById(Organisation.class, orgId);
+ User user = (User) service.findById(User.class, userId);
+ OrganisationType orgType = org.getOrganisationType();
+ Integer orgIdOfCourse = (orgType.getOrganisationTypeId().equals(OrganisationType.CLASS_TYPE))
+ ? org.getParentOrganisation().getOrganisationId() : orgId;
+ Boolean isSysadmin = request.isUserInRole(Role.SYSADMIN);
+ User requestor = service.getUserByLogin(request.getRemoteUser());
+ Integer rootOrgId = service.getRootOrganisation().getOrganisationId();
+ Boolean requestorHasRole = service.isUserInRole(requestor.getUserId(), orgIdOfCourse, Role.GROUP_MANAGER)
+ || (service.isUserInRole(requestor.getUserId(), orgIdOfCourse, Role.GROUP_ADMIN)
+ && !rootOrgId.equals(orgId))
+ || (service.isUserGlobalGroupAdmin() && !rootOrgId.equals(orgId));
+
+ if (!(requestorHasRole || isSysadmin)) {
+ request.setAttribute("errorName", "UserRolesAction");
+ request.setAttribute("errorMessage", messageService.getMessage("error.authorisation"));
+ return mapping.findForward("error");
+ }
+
+ userRolesForm.set("userId", userId);
+ userRolesForm.set("orgId", org.getOrganisationId());
+ // screen display vars
+ request.setAttribute("rolelist", service.filterRoles(rolelist, isSysadmin, orgType));
+ request.setAttribute("login", user.getLogin());
+ request.setAttribute("fullName", user.getFullName());
+ request.setAttribute("orgName", org.getName());
+ Organisation parentOrg = org.getParentOrganisation();
+ if (parentOrg != null && !parentOrg.equals(service.getRootOrganisation())) {
+ request.setAttribute("pOrgId", parentOrg.getOrganisationId());
+ request.setAttribute("parentName", parentOrg.getName());
+ }
+
+ String[] roles = null;
+ UserOrganisation uo = service.getUserOrganisation(userId, orgId);
+ if (uo != null) {
+ Iterator iter2 = uo.getUserOrganisationRoles().iterator();
+ roles = new String[uo.getUserOrganisationRoles().size()];
+ int i = 0;
+ while (iter2.hasNext()) {
+ UserOrganisationRole uor = (UserOrganisationRole) iter2.next();
+ roles[i] = uor.getRole().getRoleId().toString();
+ log.debug("got roleid: " + roles[i]);
+ i++;
+ }
+ } else {
+ ActionMessages messages = new ActionMessages();
+ messages.add("roles", new ActionMessage("msg.add.to.org", org.getName()));
+ saveMessages(request, messages);
+ }
+ userRolesForm.set("roles", roles);
+
+ return mapping.findForward("userrole");
+ }
+
+}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserRolesSaveAction.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserRolesSaveAction.java (revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserRolesSaveAction.java (revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
@@ -0,0 +1,109 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+
+package org.lamsfoundation.lams.admin.web.action;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+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;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
+import org.apache.struts.action.DynaActionForm;
+import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
+import org.lamsfoundation.lams.usermanagement.Organisation;
+import org.lamsfoundation.lams.usermanagement.Role;
+import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+
+/**
+ * @author jliew
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ */
+public class UserRolesSaveAction extends Action {
+
+ private static Logger log = Logger.getLogger(UserRolesSaveAction.class);
+ private static IUserManagementService service;
+ private static List rolelist;
+
+ @Override
+ public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+
+ service = AdminServiceProxy.getService(getServlet().getServletContext());
+ if (rolelist == null) {
+ rolelist = service.findAll(Role.class);
+ Collections.sort(rolelist);
+ }
+
+ ActionMessages errors = new ActionMessages();
+ DynaActionForm userRolesForm = (DynaActionForm) form;
+ Integer orgId = (Integer) userRolesForm.get("orgId");
+ Integer userId = (Integer) userRolesForm.get("userId");
+ String[] roles = (String[]) userRolesForm.get("roles");
+
+ request.setAttribute("org", orgId);
+
+ if (isCancelled(request)) {
+ return mapping.findForward("userlist");
+ }
+
+ log.debug("userId: " + userId + ", orgId: " + orgId + " will have " + roles.length + " roles");
+ Organisation org = (Organisation) service.findById(Organisation.class, orgId);
+ User user = (User) service.findById(User.class, userId);
+
+ // user must have at least 1 role
+ if (roles.length < 1) {
+ errors.add("roles", new ActionMessage("error.roles.empty"));
+ saveErrors(request, errors);
+ request.setAttribute("rolelist",
+ service.filterRoles(rolelist, request.isUserInRole(Role.SYSADMIN), org.getOrganisationType()));
+ request.setAttribute("login", user.getLogin());
+ request.setAttribute("fullName", user.getFullName());
+ return mapping.findForward("userroles");
+ }
+
+ service.setRolesForUserOrganisation(user, orgId, Arrays.asList(roles));
+
+ return mapping.findForward("userlist");
+ }
+
+}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSaveAction.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSaveAction.java (revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSaveAction.java (revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
@@ -0,0 +1,287 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+package org.lamsfoundation.lams.admin.web.action;
+
+import java.util.Date;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
+import org.apache.struts.action.DynaActionForm;
+import org.lamsfoundation.lams.admin.AdminConstants;
+import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
+import org.lamsfoundation.lams.security.ISecurityService;
+import org.lamsfoundation.lams.themes.Theme;
+import org.lamsfoundation.lams.usermanagement.AuthenticationMethod;
+import org.lamsfoundation.lams.usermanagement.SupportedLocale;
+import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.HashUtil;
+import org.lamsfoundation.lams.util.ValidationUtil;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.action.LamsDispatchAction;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+
+/**
+ * @author Jun-Dir Liew
+ *
+ * Created at 12:35:38 on 14/06/2006
+ */
+
+/**
+ * struts doclets
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ */
+
+public class UserSaveAction extends LamsDispatchAction {
+
+ private static Logger log = Logger.getLogger(UserSaveAction.class);
+ private static IUserManagementService service;
+
+ public ActionForward saveUserDetails(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+
+ UserSaveAction.service = AdminServiceProxy.getService(getServlet().getServletContext());
+ // action input
+ ActionMessages errors = new ActionMessages();
+ DynaActionForm userForm = (DynaActionForm) form;
+ Integer orgId = (Integer) userForm.get("orgId");
+ Integer userId = (Integer) userForm.get("userId");
+ ISecurityService securityService = AdminServiceProxy.getSecurityService(getServlet().getServletContext());
+ Integer loggeduserId = ((UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER)).getUserID();
+
+ // check if logged in User is Sysadmin
+ if (!securityService.isSysadmin(loggeduserId, "Edit User Details " + userId, true)) {
+ response.sendError(HttpServletResponse.SC_FORBIDDEN, "Only Sysadmin has edit permisions");
+ return null;
+ }
+
+ UserSaveAction.log.debug("orgId: " + orgId);
+ Boolean edit = false;
+ SupportedLocale locale = (SupportedLocale) UserSaveAction.service.findById(SupportedLocale.class,
+ (Integer) userForm.get("localeId"));
+ AuthenticationMethod authenticationMethod = (AuthenticationMethod) UserSaveAction.service
+ .findById(AuthenticationMethod.class, (Integer) userForm.get("authenticationMethodId"));
+ UserSaveAction.log.debug("locale: " + locale);
+ UserSaveAction.log.debug("authenticationMethod:" + authenticationMethod);
+
+ if (isCancelled(request)) {
+ if ((orgId == null) || (orgId == 0)) {
+ return mapping.findForward("usersearch");
+ }
+ request.setAttribute("org", orgId);
+ return mapping.findForward("userlist");
+ }
+
+ User user = null;
+ if (userId != 0) {
+ edit = true;
+ user = (User) UserSaveAction.service.findById(User.class, userId);
+ }
+
+ // login validation
+ String login = (userForm.get("login") == null) ? null : userForm.getString("login").trim();
+ if (StringUtils.isBlank(login)) {
+ errors.add("login", new ActionMessage("error.login.required"));
+ } else if (!ValidationUtil.isUserNameValid(login)) {
+ errors.add("login", new ActionMessage("error.username.invalid.characters"));
+ } else {
+ userForm.set("login", login);
+ User existingUser = UserSaveAction.service.getUserByLogin(login);
+ if (existingUser != null) {
+ if ((user != null) && StringUtils.equals(user.getLogin(), login)) {
+ // login exists - it's the user's current login
+ } else {
+ errors.add("login", new ActionMessage("error.login.unique",
+ "(" + login + ", ID: " + existingUser.getUserId() + ")"));
+ }
+ }
+ }
+
+ //first name validation
+ String firstName = (userForm.get("firstName") == null) ? null : (String) userForm.get("firstName");
+ if (StringUtils.isBlank(firstName)) {
+ errors.add("firstName", new ActionMessage("error.firstname.required"));
+ } else if (!ValidationUtil.isFirstLastNameValid(firstName)) {
+ errors.add("firstName", new ActionMessage("error.firstname.invalid.characters"));
+ }
+
+ //last name validation
+ String lastName = (userForm.get("lastName") == null) ? null : (String) userForm.get("lastName");
+ if (StringUtils.isBlank(lastName)) {
+ errors.add("lastName", new ActionMessage("error.lastname.required"));
+ } else if (!ValidationUtil.isFirstLastNameValid(lastName)) {
+ errors.add("lastName", new ActionMessage("error.lastname.invalid.characters"));
+ }
+
+ //user email validation
+ String userEmail = (userForm.get("email") == null) ? null : (String) userForm.get("email");
+ if (StringUtils.isBlank(userEmail)) {
+ errors.add("email", new ActionMessage("error.email.required"));
+ } else if (!ValidationUtil.isEmailValid(userEmail)) {
+ errors.add("email", new ActionMessage("error.valid.email.required"));
+ }
+
+ if (errors.isEmpty()) {
+ if (edit) { // edit user
+ UserSaveAction.log.debug("editing userId: " + userId);
+ // hash the new password if necessary, and audit the fact
+ userForm.set("password", user.getPassword());
+ BeanUtils.copyProperties(user, userForm);
+ user.setLocale(locale);
+ user.setAuthenticationMethod(authenticationMethod);
+
+ Theme cssTheme = (Theme) UserSaveAction.service.findById(Theme.class, (Long) userForm.get("userTheme"));
+ user.setTheme(cssTheme);
+
+ UserSaveAction.service.saveUser(user);
+ } else { // create user
+
+ //password validation
+ String password2 = userForm.getString("password2");
+ String password = (userForm.get("password") == null) ? null : (String) userForm.get("password");
+ if (StringUtils.isBlank(password)) {
+ errors.add("password", new ActionMessage("error.password.required"));
+ }
+ if (!StringUtils.equals(password, ((String) userForm.get("password2")))) {
+ errors.add("password", new ActionMessage("error.newpassword.mismatch"));
+ }
+ if (!ValidationUtil.isPasswordValueValid(password, password2)) {
+ errors.add("password", new ActionMessage("error.newpassword.mismatch"));
+ }
+
+ if (errors.isEmpty()) {
+ user = new User();
+ String salt = HashUtil.salt();
+ String passwordHash = HashUtil.sha256((String) userForm.get("password"), salt);
+ BeanUtils.copyProperties(user, userForm);
+ user.setSalt(salt);
+ user.setPassword(passwordHash);
+ UserSaveAction.log.debug("creating user... new login: " + user.getLogin());
+ if (errors.isEmpty()) {
+ // TODO set theme according to user input
+ // instead of server default.
+ user.setTheme(UserSaveAction.service.getDefaultTheme());
+ user.setDisabledFlag(false);
+ user.setCreateDate(new Date());
+ user.setAuthenticationMethod((AuthenticationMethod) UserSaveAction.service
+ .findByProperty(AuthenticationMethod.class, "authenticationMethodName", "LAMS-Database")
+ .get(0));
+ user.setUserId(null);
+ user.setLocale(locale);
+
+ Theme theme = (Theme) UserSaveAction.service.findById(Theme.class,
+ (Long) userForm.get("userTheme"));
+ user.setTheme(theme);
+
+ UserSaveAction.service.saveUser(user);
+
+ // make 'create user' audit log entry
+ UserSaveAction.service.auditUserCreated(user, AdminConstants.MODULE_NAME);
+
+ UserSaveAction.log.debug("user: " + user.toString());
+ }
+ }
+ }
+ }
+
+ if (errors.isEmpty()) {
+ if ((orgId == null) || (orgId == 0)) {
+ return mapping.findForward("usersearch");
+ }
+ if (edit) {
+ request.setAttribute("org", orgId);
+ return mapping.findForward("userlist");
+ } else {
+ request.setAttribute("orgId", orgId);
+ request.setAttribute("userId", user.getUserId());
+ return mapping.findForward("userroles");
+ }
+ } else {
+ saveErrors(request, errors);
+ request.setAttribute("orgId", orgId);
+ return mapping.findForward("user");
+ }
+ }
+
+ public ActionForward changePass(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+ UserSaveAction.service = AdminServiceProxy.getService(getServlet().getServletContext());
+ ActionMessages errors = new ActionMessages();
+ Integer userId = WebUtil.readIntParam(request, "userId", true);
+ ISecurityService securityService = AdminServiceProxy.getSecurityService(getServlet().getServletContext());
+ Integer loggeduserId = ((UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER)).getUserID();
+
+ // check if logged in User is Sysadmin
+ if (!securityService.isSysadmin(loggeduserId, "Change Password of User " + userId, true)) {
+ response.sendError(HttpServletResponse.SC_FORBIDDEN, "Only Sysadmin has edit permisions");
+ return null;
+ }
+
+ String password = WebUtil.readStrParam(request, "password");
+ String password2 = WebUtil.readStrParam(request, "password2");
+
+ //password validation
+ if (StringUtils.isBlank(password)) {
+ errors.add("password", new ActionMessage("error.password.required"));
+ }
+
+ if (!StringUtils.equals(password, password2)) {
+ errors.add("password", new ActionMessage("error.newpassword.mismatch"));
+ }
+ if (!ValidationUtil.isPasswordValueValid(password, password2)) {
+ errors.add("password", new ActionMessage("label.password.restrictions"));
+ }
+
+ if (errors.isEmpty()) {
+ User user = (User) UserSaveAction.service.findById(User.class, userId);
+ String salt = HashUtil.salt();
+ String passwordHash = HashUtil.sha256(password, salt);
+ user.setSalt(salt);
+ user.setPassword(passwordHash);
+ UserSaveAction.service.saveUser(user);
+ return mapping.findForward("userChangePass");
+ }
+ saveErrors(request, errors);
+ return mapping.findForward("errorPass");
+
+ }
+
+}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSearchAction.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSearchAction.java (revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSearchAction.java (revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
@@ -0,0 +1,156 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+
+package org.lamsfoundation.lams.admin.web.action;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.log4j.Logger;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.tomcat.util.json.JSONArray;
+import org.apache.tomcat.util.json.JSONException;
+import org.apache.tomcat.util.json.JSONObject;
+import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
+import org.lamsfoundation.lams.usermanagement.Role;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.action.LamsDispatchAction;
+
+/**
+ * @author jliew
+ *
+ *
+ *
+ *
+ */
+public class UserSearchAction extends LamsDispatchAction {
+
+ private static Logger log = Logger.getLogger(UserSearchAction.class);
+ private static IUserManagementService service;
+ private static MessageService messageService;
+
+ @Override
+ public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
+ initServices();
+
+ if (!(request.isUserInRole(Role.SYSADMIN) || service.isUserGlobalGroupAdmin())) {
+ log.debug("user not sysadmin or global group admin");
+
+ request.setAttribute("errorName", "UserSearchAction authorisation");
+ request.setAttribute("errorMessage", messageService.getMessage("error.authorisation"));
+ return mapping.findForward("error");
+ }
+
+ return mapping.findForward("usersearchlist");
+ }
+
+ /**
+ * Returns list of paged users.
+ */
+ public ActionForward getPagedUsers(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse res) throws IOException, ServletException, JSONException {
+ initServices();
+
+ // the organisation type of the children
+ String searchString = WebUtil.readStrParam(request, "fcol[1]", true);
+
+ // paging parameters of tablesorter
+ int size = WebUtil.readIntParam(request, "size");
+ int page = WebUtil.readIntParam(request, "page");
+ Integer isSort1 = WebUtil.readIntParam(request, "column[0]", true);
+ Integer isSort2 = WebUtil.readIntParam(request, "column[1]", true);
+ Integer isSort3 = WebUtil.readIntParam(request, "column[2]", true);
+ Integer isSort4 = WebUtil.readIntParam(request, "column[3]", true);
+ Integer isSort5 = WebUtil.readIntParam(request, "column[4]", true);
+
+ String sortBy = "userId";
+ String sortOrder = "DESC";
+ if (isSort1 != null) {
+ sortBy = "userId";
+ sortOrder = isSort1.equals(0) ? "ASC" : "DESC";
+
+ } else if (isSort2 != null) {
+ sortBy = "login";
+ sortOrder = isSort2.equals(0) ? "ASC" : "DESC";
+
+ } else if (isSort3 != null) {
+ sortBy = "firstName";
+ sortOrder = isSort3.equals(0) ? "ASC" : "DESC";
+
+ } else if (isSort4 != null) {
+ sortBy = "lastName";
+ sortOrder = isSort4.equals(0) ? "ASC" : "DESC";
+
+ } else if (isSort5 != null) {
+ sortBy = "email";
+ sortOrder = isSort5.equals(0) ? "ASC" : "DESC";
+ }
+
+ List userDtos = service.getAllUsersPaged(page, size, sortBy, sortOrder, searchString);
+
+ JSONObject responcedata = new JSONObject();
+ responcedata.put("total_rows", service.getCountUsers(searchString));
+
+ JSONArray rows = new JSONArray();
+ for (UserDTO userDto : userDtos) {
+
+ JSONObject responseRow = new JSONObject();
+ responseRow.put("userId", userDto.getUserID());
+ responseRow.put("login", StringEscapeUtils.escapeHtml(userDto.getLogin()));
+ String firstName = userDto.getFirstName() == null ? "" : userDto.getFirstName();
+ responseRow.put("firstName", StringEscapeUtils.escapeHtml(firstName));
+ String lastName = userDto.getLastName() == null ? "" : userDto.getLastName();
+ responseRow.put("lastName", StringEscapeUtils.escapeHtml(lastName));
+ String email = userDto.getEmail() == null ? "" : userDto.getEmail();
+ responseRow.put("email", StringEscapeUtils.escapeHtml(email));
+
+ rows.put(responseRow);
+ }
+ responcedata.put("rows", rows);
+ res.setContentType("application/json;charset=utf-8");
+ res.getWriter().print(new String(responcedata.toString()));
+ return null;
+ }
+
+ private void initServices() {
+ if (service == null) {
+ service = AdminServiceProxy.getService(getServlet().getServletContext());
+ }
+ if (messageService == null) {
+ messageService = AdminServiceProxy.getMessageService(getServlet().getServletContext());
+ }
+ }
+
+}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/dto/OrgManageBean.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/dto/OrgManageBean.java (revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/dto/OrgManageBean.java (revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
@@ -0,0 +1,130 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+package org.lamsfoundation.lams.admin.web.dto;
+
+import java.util.Date;
+
+import org.lamsfoundation.lams.usermanagement.SupportedLocale;
+
+/**
+ * @version
+ *
+ *
+ * View Source
+ *
+ *
+ * @author Fei Yang
+ *
+ * Created at 22:55:01 on 2006-6-6
+ */
+public class OrgManageBean implements Comparable {
+
+ /**
+ * OrgManageBean Constructor
+ *
+ * @param
+ */
+ public OrgManageBean() {
+ super();
+
+ }
+
+ private Integer organisationId;
+ private String name;
+ private String code;
+ private String description;
+ private Date createDate;
+ private boolean editable;
+ private String status;
+ private SupportedLocale locale;
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public Date getCreateDate() {
+ return createDate;
+ }
+
+ public void setCreateDate(Date createDate) {
+ this.createDate = createDate;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public SupportedLocale getLocale() {
+ return locale;
+ }
+
+ public void setLocale(SupportedLocale locale) {
+ this.locale = locale;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Integer getOrganisationId() {
+ return organisationId;
+ }
+
+ public void setOrganisationId(Integer organisationId) {
+ this.organisationId = organisationId;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public boolean isEditable() {
+ return editable;
+ }
+
+ public void setEditable(boolean editable) {
+ this.editable = editable;
+ }
+
+ @Override
+ public int compareTo(Object o) {
+ return name.compareToIgnoreCase(((OrgManageBean) o).getName());
+ }
+
+}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/dto/ScheduledJobDTO.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/dto/ScheduledJobDTO.java (revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/dto/ScheduledJobDTO.java (revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
@@ -0,0 +1,62 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+package org.lamsfoundation.lams.admin.web.dto;
+
+import java.util.Date;
+
+/**
+ * DTO class of quartz job object for displaying on screen.
+ *
+ * @author Steve.Ni
+ */
+public class ScheduledJobDTO {
+
+ private String name;
+ private Date startDate;
+ private String description;
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Date getStartDate() {
+ return startDate;
+ }
+
+ public void setStartDate(Date startDate) {
+ this.startDate = startDate;
+ }
+}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/dto/UserBean.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/dto/UserBean.java (revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/dto/UserBean.java (revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
@@ -0,0 +1,72 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+
+package org.lamsfoundation.lams.admin.web.dto;
+
+/**
+ * @author jliew
+ *
+ * Bean used as member of UserOrgRoleForm, representing a user's roles.
+ *
+ */
+public class UserBean {
+
+ private Integer userId;
+ private String login;
+ private String[] roleIds = {};
+ private Boolean memberOfParent;
+
+ public Integer getUserId() {
+ return this.userId;
+ }
+
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+
+ public String getLogin() {
+ return this.login;
+ }
+
+ public void setLogin(String login) {
+ this.login = login;
+ }
+
+ public String[] getRoleIds() {
+ return this.roleIds;
+ }
+
+ public void setRoleIds(String[] roleIds) {
+ this.roleIds = roleIds;
+ }
+
+ public Boolean getMemberOfParent() {
+ return this.memberOfParent;
+ }
+
+ public void setMemberOfParent(Boolean memberOfParent) {
+ this.memberOfParent = memberOfParent;
+ }
+
+}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/dto/UserListDTO.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/dto/UserListDTO.java (revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/dto/UserListDTO.java (revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
@@ -0,0 +1,83 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+
+package org.lamsfoundation.lams.admin.web.dto;
+
+import java.util.List;
+
+import org.lamsfoundation.lams.usermanagement.dto.UserManageBean;
+
+/**
+ * @author Jun-Dir Liew
+ *
+ * Created at 13:47:02 on 9/06/2006
+ */
+public class UserListDTO {
+
+ private List userManageBeans;
+ private Integer orgId;
+ private String orgName;
+ private Boolean courseAdminCanAddNewUsers;
+ private Boolean courseAdminCanBrowseAllUsers;
+
+ public List getUserManageBeans() {
+ return userManageBeans;
+ }
+
+ public void setUserManageBeans(List userManageBeans) {
+ this.userManageBeans = userManageBeans;
+ }
+
+ public Integer getOrgId() {
+ return orgId;
+ }
+
+ public void setOrgId(Integer orgId) {
+ this.orgId = orgId;
+ }
+
+ public String getOrgName() {
+ return orgName;
+ }
+
+ public void setOrgName(String orgName) {
+ this.orgName = orgName;
+ }
+
+ public Boolean getCourseAdminCanAddNewUsers() {
+ return courseAdminCanAddNewUsers;
+ }
+
+ public void setCourseAdminCanAddNewUsers(Boolean courseAdminCanAddNewUsers) {
+ this.courseAdminCanAddNewUsers = courseAdminCanAddNewUsers;
+ }
+
+ public Boolean getCourseAdminCanBrowseAllUsers() {
+ return courseAdminCanBrowseAllUsers;
+ }
+
+ public void setCourseAdminCanBrowseAllUsers(Boolean courseAdminCanBrowseAllUsers) {
+ this.courseAdminCanBrowseAllUsers = courseAdminCanBrowseAllUsers;
+ }
+}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ImportExcelForm.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ImportExcelForm.java (revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ImportExcelForm.java (revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
@@ -0,0 +1,55 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+
+package org.lamsfoundation.lams.admin.web.form;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.upload.FormFile;
+
+/**
+ * @author jliew
+ *
+ *
+ */
+public class ImportExcelForm extends ActionForm {
+
+ private Integer orgId;
+ private FormFile file;
+
+ public Integer getOrgId() {
+ return orgId;
+ }
+
+ public void setOrgId(Integer orgId) {
+ this.orgId = orgId;
+ }
+
+ public FormFile getFile() {
+ return file;
+ }
+
+ public void setFile(FormFile file) {
+ this.file = file;
+ }
+
+}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/OrgManageForm.java
===================================================================
diff -u -rc92ea51a973dc03ece970c057dd9369eda6a8c24 -r85ef8aca5722a36582117db1e8b988e2c16b6369
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/OrgManageForm.java (.../OrgManageForm.java) (revision c92ea51a973dc03ece970c057dd9369eda6a8c24)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/OrgManageForm.java (.../OrgManageForm.java) (revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
@@ -25,7 +25,7 @@
import java.util.List;
import org.apache.struts.action.ActionForm;
-import org.lamsfoundation.lams.admin.web.OrgManageBean;
+import org.lamsfoundation.lams.admin.web.dto.OrgManageBean;
/**
* @version
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/UserOrgRoleForm.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/UserOrgRoleForm.java (revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/UserOrgRoleForm.java (revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
@@ -0,0 +1,71 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+
+package org.lamsfoundation.lams.admin.web.form;
+
+import java.util.ArrayList;
+
+import org.apache.struts.action.ActionForm;
+import org.lamsfoundation.lams.admin.web.dto.UserBean;
+
+/**
+ * @author jliew
+ *
+ * This is the Action Form that is used when a user has added users
+ * to an organisation via UserOrgForm. Used to record roles for each
+ * of the added users.
+ *
+ */
+
+/**
+ * struts doclet
+ *
+ *
+ */
+public class UserOrgRoleForm extends ActionForm {
+
+ private ArrayList userBeans = new ArrayList();
+ private Integer orgId;
+
+ public ArrayList getUserBeans() {
+ return userBeans;
+ }
+
+ public void setUserBeans(ArrayList userBeans) {
+ this.userBeans = userBeans;
+ }
+
+ public Integer getOrgId() {
+ return orgId;
+ }
+
+ public void setOrgId(Integer orgId) {
+ this.orgId = orgId;
+ }
+
+ public void addUserBean(UserBean userBean) {
+ userBeans.add(userBean);
+ }
+
+}
Index: lams_admin/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r953f62a7fc515e2dc5c4ad983df233070cf7a82c -r85ef8aca5722a36582117db1e8b988e2c16b6369
--- lams_admin/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 953f62a7fc515e2dc5c4ad983df233070cf7a82c)
+++ lams_admin/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
@@ -23,11 +23,11 @@
/>
@@ -141,7 +141,7 @@
@@ -178,7 +178,7 @@
@@ -271,7 +271,7 @@
@@ -283,7 +283,7 @@
@@ -588,7 +588,7 @@
@@ -881,7 +881,7 @@
@@ -893,7 +893,7 @@
-
+
";
+
+ HttpSession ss = SessionManager.getSession();
+ UserDTO userDto = (UserDTO) ss.getAttribute(AttributeNames.USER);
+ Long userId = new Long(userDto.getUserID().longValue());
+ QaQueUsr user = getUserByIdAndSession(userId, new Long(sessionId));
+ String fullName = user.getFullname();
+
+ // add question-answer pairs to email message
+ List responses = qaUsrRespDAO.getResponsesByUserUid(user.getUid());
+ Date attemptTime = new Date();
+ String message = new String();
+ for (QaUsrResp response : responses) {
+ String question = response.getQaQuestion().getQuestion();
+ String answer = response.getAnswer();
+
+ message += NEW_LINE_CHARACTER + NEW_LINE_CHARACTER + question + " " + answer;
+ attemptTime = response.getAttemptTime();
+ }
+
+ message = NEW_LINE_CHARACTER + NEW_LINE_CHARACTER
+ + messageService.getMessage("label.user.has.answered.questions", new Object[] { fullName, attemptTime })
+ + message + NEW_LINE_CHARACTER + NEW_LINE_CHARACTER;
+
+ eventNotificationService.notifyLessonMonitors(sessionId, message, true);
+ }
+
+ @Override
+ public void exportToolContent(Long toolContentID, String rootPath) {
+ QaContent toolContentObj = qaDAO.getQaByContentId(toolContentID);
+ if (toolContentObj == null) {
+ long defaultToolContentId = toolService.getToolDefaultContentIdBySignature(QaAppConstants.MY_SIGNATURE);
+ toolContentObj = getQaContent(defaultToolContentId);
+ }
+ if (toolContentObj == null) {
+ throw new DataMissingException("Unable to find default content for the question and answer tool");
+ }
+
+ try {
+ // set ToolContentHandler as null to avoid copy file node in
+ // repository again.
+ toolContentObj = QaContent.newInstance(toolContentObj, toolContentID);
+
+ // don't export following fields value
+ toolContentObj.setQaSessions(null);
+ Set questions = toolContentObj.getQaQueContents();
+ for (QaQueContent question : questions) {
+ question.setQaContent(null);
+ }
+ for (LearnerItemRatingCriteria criteria : toolContentObj.getRatingCriterias()) {
+ criteria.setToolContentId(null);
+ }
+
+ exportContentService.exportToolContent(toolContentID, toolContentObj, qaToolContentHandler, rootPath);
+ } catch (ExportToolContentException e) {
+ throw new ToolException(e);
+ }
+ }
+
+ @Override
+ public void importToolContent(Long toolContentID, Integer newUserUid, String toolContentPath, String fromVersion,
+ String toVersion) throws ToolException {
+ try {
+ // register version filter class
+ exportContentService.registerImportVersionFilterClass(QaImportContentVersionFilter.class);
+
+ Object toolPOJO = exportContentService.importToolContent(toolContentPath, qaToolContentHandler, fromVersion,
+ toVersion);
+ if (!(toolPOJO instanceof QaContent)) {
+ throw new ImportToolContentException(
+ "Import QA tool content failed. Deserialized object is " + toolPOJO);
+ }
+ QaContent toolContentObj = (QaContent) toolPOJO;
+
+ // reset it to new toolContentID
+ toolContentObj.setQaContentId(toolContentID);
+ toolContentObj.setCreatedBy(newUserUid);
+ Set criterias = toolContentObj.getRatingCriterias();
+ if (criterias != null) {
+ for (LearnerItemRatingCriteria criteria : toolContentObj.getRatingCriterias()) {
+ criteria.setToolContentId(toolContentID);
+ if (criteria.getMaxRating() == null || criteria.getRatingStyle() == null) {
+ if (criteria.getOrderId() == 0) {
+ criteria.setMaxRating(0);
+ criteria.setRatingStyle(RatingCriteria.RATING_STYLE_COMMENT);
+ } else {
+ criteria.setMaxRating(RatingCriteria.RATING_STYLE_STAR_DEFAULT_MAX);
+ criteria.setRatingStyle(RatingCriteria.RATING_STYLE_STAR);
+ }
+ }
+ }
+ }
+
+ // set back the tool content
+ Set questions = toolContentObj.getQaQueContents();
+ for (QaQueContent question : questions) {
+ question.setQaContent(toolContentObj);
+ }
+ qaDAO.saveOrUpdateQa(toolContentObj);
+ } catch (ImportToolContentException e) {
+ throw new ToolException(e);
+ }
+ }
+
+ @Override
+ public SortedMap getToolOutputDefinitions(Long toolContentId, int definitionType)
+ throws ToolException {
+ QaContent qaContent = qaDAO.getQaByContentId(toolContentId);
+ if (qaContent == null) {
+ long defaultToolContentId = toolService.getToolDefaultContentIdBySignature(QaAppConstants.MY_SIGNATURE);
+ qaContent = getQaContent(defaultToolContentId);
+ }
+ return getQaOutputFactory().getToolOutputDefinitions(qaContent, definitionType);
+ }
+
+ @Override
+ public String getToolContentTitle(Long toolContentId) {
+ return qaDAO.getQaByContentId(toolContentId).getTitle();
+ }
+
+ @Override
+ public boolean isContentEdited(Long toolContentId) {
+ return qaDAO.getQaByContentId(toolContentId).isDefineLater();
+ }
+
+ @Override
+ public boolean isReadOnly(Long toolContentId) {
+ QaContent content = qaDAO.getQaByContentId(toolContentId);
+ for (QaSession session : (Set) content.getQaSessions()) {
+ if (!session.getQaQueUsers().isEmpty()) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ @Override
+ public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentID) throws ToolException {
+
+ if (toolSessionId == null) {
+ logger.error("toolSessionId is null");
+ throw new ToolException("toolSessionId is missing");
+ }
+
+ QaContent qaContent = qaDAO.getQaByContentId(toolContentID.longValue());
+
+ /*
+ * create a new a new tool session if it does not already exist in the tool session table
+ */
+ QaSession qaSession = getSessionById(toolSessionId);
+ if (qaSession == null) {
+ try {
+ qaSession = new QaSession(toolSessionId, new Date(System.currentTimeMillis()), QaSession.INCOMPLETE,
+ toolSessionName, qaContent, new TreeSet());
+ qaSessionDAO.createSession(qaSession);
+ } catch (Exception e) {
+ logger.error("Error creating new toolsession in the db");
+ throw new ToolException("Error creating new toolsession in the db: " + e);
+ }
+ }
+ }
+
+ @Override
+ public void removeToolSession(Long toolSessionId) throws DataMissingException, ToolException {
+ if (toolSessionId == null) {
+ logger.error("toolSessionId is null");
+ throw new DataMissingException("toolSessionId is missing");
+ }
+
+ QaSession qaSession = null;
+ try {
+ qaSession = getSessionById(toolSessionId.longValue());
+ } catch (QaApplicationException e) {
+ throw new DataMissingException("error retrieving qaSession: " + e);
+ } catch (Exception e) {
+ throw new ToolException("error retrieving qaSession: " + e);
+ }
+
+ if (qaSession == null) {
+ logger.error("qaSession is null");
+ throw new DataMissingException("qaSession is missing");
+ }
+
+ try {
+ qaSessionDAO.deleteQaSession(qaSession);
+ } catch (QaApplicationException e) {
+ throw new ToolException("error deleting qaSession:" + e);
+ }
+ }
+
+ @Override
+ public String leaveToolSession(Long toolSessionId, Long learnerId) throws DataMissingException, ToolException {
+
+ if (toolSessionId == null) {
+ logger.error("toolSessionId is null");
+ throw new DataMissingException("toolSessionId is missing");
+ }
+
+ if (learnerId == null) {
+ logger.error("learnerId is null");
+ throw new DataMissingException("learnerId is missing");
+ }
+
+ QaSession qaSession = getSessionById(toolSessionId.longValue());
+ qaSession.setSession_end_date(new Date(System.currentTimeMillis()));
+ qaSession.setSession_status(QaAppConstants.COMPLETED);
+ updateSession(qaSession);
+
+ try {
+ String nextUrl = learnerService.completeToolSession(toolSessionId, learnerId);
+ return nextUrl;
+ } catch (DataAccessException e) {
+ throw new ToolException("Exception occured when user is leaving tool session: " + e);
+ }
+
+ }
+
+ @Override
+ public List getRatingCriterias(Long toolContentId) {
+ return ratingService.getCriteriasByToolContentId(toolContentId);
+ }
+
+ @Override
+ public void saveRatingCriterias(HttpServletRequest request, Collection oldCriterias,
+ Long toolContentId) {
+ ratingService.saveRatingCriterias(request, oldCriterias, toolContentId);
+ }
+
+ @Override
+ public boolean isCommentsEnabled(Long toolContentId) {
+ return ratingService.isCommentsEnabled(toolContentId);
+ }
+
+ @Override
+ public boolean isRatingsEnabled(QaContent qaContent) {
+ //check if allow rate answers is ON and also that there is at least one non-comments rating criteria available
+ boolean allowRateAnswers = false;
+ if (qaContent.isAllowRateAnswers()) {
+ List ratingCriterias = getRatingCriterias(qaContent.getQaContentId());
+ for (RatingCriteria ratingCriteria : ratingCriterias) {
+ if (!ratingCriteria.isCommentsEnabled()) {
+ allowRateAnswers = true;
+ break;
+ }
+ }
+ }
+ return allowRateAnswers;
+ }
+
+ @Override
+ public List getRatingCriteriaDtos(Long contentId, Long toolSessionId, Collection itemIds,
+ boolean isCommentsByOtherUsersRequired, Long userId) {
+ return ratingService.getRatingCriteriaDtos(contentId, toolSessionId, itemIds, isCommentsByOtherUsersRequired, userId);
+ }
+
+ @Override
+ public int getCountItemsRatedByUser(Long toolContentId, Integer userId) {
+ return ratingService.getCountItemsRatedByUser(toolContentId, userId);
+ }
+
+ /**
+ * ToolSessionManager CONTRACT
+ */
+ @Override
+ public ToolSessionExportOutputData exportToolSession(Long toolSessionId)
+ throws DataMissingException, ToolException {
+ throw new ToolException("not yet implemented");
+ }
+
+ /**
+ * ToolSessionManager CONTRACT
+ */
+ @Override
+ public ToolSessionExportOutputData exportToolSession(List toolSessionIds)
+ throws DataMissingException, ToolException {
+ throw new ToolException("not yet implemented");
+ }
+
+ @Override
+ public SortedMap getToolOutput(List names, Long toolSessionId, Long learnerId) {
+ return getQaOutputFactory().getToolOutput(names, this, toolSessionId, learnerId);
+ }
+
+ @Override
+ public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) {
+ return getQaOutputFactory().getToolOutput(name, this, toolSessionId, learnerId);
+ }
+
+ @Override
+ public List getToolOutputs(String name, Long toolContentId) {
+ return new ArrayList();
+ }
+
+ @Override
+ public void forceCompleteUser(Long toolSessionId, User user) {
+ Long userId = user.getUserId().longValue();
+
+ QaSession session = getSessionById(toolSessionId);
+ if ((session == null) || (session.getQaContent() == null)) {
+ return;
+ }
+ QaContent content = session.getQaContent();
+
+ // copy answers only in case leader aware feature is ON
+ if (content.isUseSelectLeaderToolOuput()) {
+
+ QaQueUsr qaUser = getUserByIdAndSession(userId, toolSessionId);
+ // create user if he hasn't accessed this activity yet
+ if (qaUser == null) {
+
+ String userName = user.getLogin();
+ String fullName = user.getFirstName() + " " + user.getLastName();
+ qaUser = new QaQueUsr(userId, userName, fullName, session, new TreeSet());
+ qaQueUsrDAO.createUsr(qaUser);
+ }
+
+ QaQueUsr groupLeader = session.getGroupLeader();
+
+ // check if leader has submitted answers
+ if ((groupLeader != null) && groupLeader.isResponseFinalized()) {
+
+ // we need to make sure specified user has the same scratches as a leader
+ copyAnswersFromLeader(qaUser, groupLeader);
+ }
+
+ }
+
+ }
+
+ @Override
+ public IToolVO getToolBySignature(String toolSignature) {
+ IToolVO tool = toolService.getToolBySignature(toolSignature);
+ return tool;
+ }
+
+ @Override
+ public long getToolDefaultContentIdBySignature(String toolSignature) {
+ long contentId = 0;
+ contentId = toolService.getToolDefaultContentIdBySignature(toolSignature);
+ return contentId;
+ }
+
+ @Override
+ public Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry) {
+ return coreNotebookService.createNotebookEntry(id, idType, signature, userID, "", entry);
+ }
+
+ @Override
+ public NotebookEntry getEntry(Long id, Integer idType, String signature, Integer userID) {
+
+ List list = coreNotebookService.getEntry(id, idType, signature, userID);
+ if ((list == null) || list.isEmpty()) {
+ return null;
+ } else {
+ return list.get(0);
+ }
+ }
+
+ @Override
+ public boolean isGroupedActivity(long toolContentID) {
+ return toolService.isGroupedActivity(toolContentID);
+ }
+
+ @Override
+ public void auditLogStartEditingActivityInMonitor(long toolContentID) {
+ toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+ }
+
+ @Override
+ public String getLearnerContentFolder(Long toolSessionId, Long userId) {
+ return toolService.getLearnerContentFolder(toolSessionId, userId);
+ }
+
+ /**
+ * @return Returns the userManagementService.
+ */
+ public IUserManagementService getUserManagementService() {
+ return userManagementService;
+ }
+
+ public void setLearnerService(ILearnerService learnerService) {
+ this.learnerService = learnerService;
+ }
+
+ public void setQaDAO(IQaContentDAO qaDAO) {
+ this.qaDAO = qaDAO;
+ }
+
+ public void setQaQuestionDAO(IQaQuestionDAO qaQuestionDAO) {
+ this.qaQuestionDAO = qaQuestionDAO;
+ }
+
+ public void setQaSessionDAO(IQaSessionDAO qaSessionDAO) {
+ this.qaSessionDAO = qaSessionDAO;
+ }
+
+ public void setQaQueUsrDAO(IQaQueUsrDAO qaQueUsrDAO) {
+ this.qaQueUsrDAO = qaQueUsrDAO;
+ }
+
+ public void setQaUsrRespDAO(IQaUsrRespDAO qaUsrRespDAO) {
+ this.qaUsrRespDAO = qaUsrRespDAO;
+ }
+
+ /**
+ * @return Returns the qaDAO.
+ */
+ public IQaContentDAO getQaDAO() {
+ return qaDAO;
+ }
+
+ public void setUserManagementService(IUserManagementService userManagementService) {
+ this.userManagementService = userManagementService;
+ }
+
+ public void setToolService(ILamsToolService toolService) {
+ this.toolService = toolService;
+ }
+
+ /**
+ * @param qaToolContentHandler
+ * The qaToolContentHandler to set.
+ */
+ public void setQaToolContentHandler(IToolContentHandler qaToolContentHandler) {
+ this.qaToolContentHandler = qaToolContentHandler;
+ }
+
+ @Override
+ public IAuditService getAuditService() {
+ return auditService;
+ }
+
+ public void setAuditService(IAuditService auditService) {
+ this.auditService = auditService;
+ }
+
+ public IExportToolContentService getExportContentService() {
+ return exportContentService;
+ }
+
+ public void setExportContentService(IExportToolContentService exportContentService) {
+ this.exportContentService = exportContentService;
+ }
+
+ // =========================================================================================
+ /**
+ * @return Returns the coreNotebookService.
+ */
+ public ICoreNotebookService getCoreNotebookService() {
+ return coreNotebookService;
+ }
+
+ /**
+ * @param coreNotebookService
+ * The coreNotebookService to set.
+ */
+ public void setCoreNotebookService(ICoreNotebookService coreNotebookService) {
+ this.coreNotebookService = coreNotebookService;
+ }
+
+ public void setRatingService(IRatingService ratingService) {
+ this.ratingService = ratingService;
+ }
+
+ public void setEventNotificationService(IEventNotificationService eventNotificationService) {
+ this.eventNotificationService = eventNotificationService;
+ }
+
+ public void setMessageService(MessageService messageService) {
+ this.messageService = messageService;
+ }
+
+ @Override
+ public void updateEntry(NotebookEntry notebookEntry) {
+ coreNotebookService.updateEntry(notebookEntry);
+ }
+
+ public QaOutputFactory getQaOutputFactory() {
+ return qaOutputFactory;
+ }
+
+ public void setQaOutputFactory(QaOutputFactory qaOutputFactory) {
+ this.qaOutputFactory = qaOutputFactory;
+ }
+
+ public IQaConfigItemDAO getQaConfigItemDAO() {
+ return qaConfigItemDAO;
+ }
+
+ public void setQaConfigItemDAO(IQaConfigItemDAO qaConfigItemDAO) {
+ this.qaConfigItemDAO = qaConfigItemDAO;
+ }
+
+ public IQaWizardDAO getQaWizardDAO() {
+ return qaWizardDAO;
+ }
+
+ public void setQaWizardDAO(IQaWizardDAO qaWizardDAO) {
+ this.qaWizardDAO = qaWizardDAO;
+ }
+
+ @Override
+ public QaContent getQaContentBySessionId(Long sessionId) {
+ QaSession session = qaSessionDAO.getQaSessionById(sessionId);
+ // to skip CGLib problem
+ Long contentId = session.getQaContent().getQaContentId();
+ QaContent qaContent = qaDAO.getQaByContentId(contentId);
+ return qaContent;
+ }
+
+ @Override
+ public String createConditionName(Collection existingConditions) {
+ String uniqueNumber = null;
+ do {
+ uniqueNumber = String.valueOf(Math.abs(generator.nextInt()));
+ for (QaCondition condition : existingConditions) {
+ String[] splitedName = getQaOutputFactory().splitConditionName(condition.getName());
+ if (uniqueNumber.equals(splitedName[1])) {
+ uniqueNumber = null;
+ }
+ }
+ } while (uniqueNumber == null);
+ return getQaOutputFactory().buildUserAnswersConditionName(uniqueNumber);
+ }
+
+ @Override
+ public void deleteCondition(QaCondition condition) {
+ if ((condition != null) && (condition.getConditionId() != null)) {
+ qaDAO.deleteCondition(condition);
+ }
+ }
+
+ @Override
+ public QaConfigItem getConfigItem(String configKey) {
+ return qaConfigItemDAO.getConfigItemByKey(configKey);
+ }
+
+ @Override
+ public void saveOrUpdateConfigItem(QaConfigItem configItem) {
+ qaConfigItemDAO.saveOrUpdate(configItem);
+ }
+
+ @Override
+ public SortedSet getWizardCategories() {
+ return qaWizardDAO.getWizardCategories();
+ }
+
+ @Override
+ public void saveOrUpdateQaWizardCategories(SortedSet categories) {
+ qaWizardDAO.saveOrUpdateCategories(categories);
+ }
+
+ @Override
+ public void deleteWizardCategoryByUID(Long uid) {
+ qaWizardDAO.deleteWizardCategoryByUID(uid);
+ }
+
+ @Override
+ public void deleteWizardSkillByUID(Long uid) {
+ qaWizardDAO.deleteWizardSkillByUID(uid);
+ }
+
+ @Override
+ public void deleteWizardQuestionByUID(Long uid) {
+ qaWizardDAO.deleteWizardQuestionByUID(uid);
+ }
+
+ @Override
+ public void deleteAllWizardCategories() {
+ qaWizardDAO.deleteAllWizardCategories();
+ }
+
+ @Override
+ public void removeQuestionsFromCache(QaContent qaContent) {
+ qaDAO.removeQuestionsFromCache(qaContent);
+ }
+
+ @Override
+ public void removeQaContentFromCache(QaContent qaContent) {
+ qaDAO.removeQaContentFromCache(qaContent);
+ }
+
+ @Override
+ public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) {
+ return getQaOutputFactory().getSupportedDefinitionClasses(definitionType);
+ }
+
+ @Override
+ public ToolCompletionStatus getCompletionStatus(Long learnerId, Long toolSessionId) {
+ QaQueUsr learner = qaQueUsrDAO.getQaUserBySession(learnerId, toolSessionId);
+ if (learner == null) {
+ return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_NOT_ATTEMPTED, null, null);
+ }
+
+ Date startDate = null;
+ Date endDate = null;
+ Set attempts = learner.getQaUsrResps();
+ for (QaUsrResp item : attempts) {
+ Date newDate = item.getAttemptTime();
+ if (newDate != null) {
+ if (startDate == null || newDate.before(startDate))
+ startDate = newDate;
+ if (endDate == null || newDate.after(endDate))
+ endDate = newDate;
+ }
+ }
+
+ if (learner.isLearnerFinished())
+ return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_COMPLETED, startDate, endDate);
+ else
+ return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_ATTEMPTED, startDate, null);
+ }
+ // ****************** REST methods *************************
+
+ /**
+ * Rest call to create a new Q&A content. Required fields in toolContentJSON: title, instructions, questions. The
+ * questions entry should be JSONArray containing JSON objects, which in turn must contain "questionText",
+ * "displayOrder" and may also contain feedback and required (boolean)
+ */
+ @Override
+ public void createRestToolContent(Integer userID, Long toolContentID, JSONObject toolContentJSON)
+ throws JSONException {
+
+ QaContent qa = new QaContent();
+ Date updateDate = new Date();
+
+ qa.setCreationDate(updateDate);
+ qa.setUpdateDate(updateDate);
+ qa.setCreatedBy(userID.longValue());
+
+ qa.setQaContentId(toolContentID);
+ qa.setTitle(toolContentJSON.getString(RestTags.TITLE));
+ qa.setInstructions(toolContentJSON.getString(RestTags.INSTRUCTIONS));
+
+ qa.setDefineLater(false);
+
+ qa.setLockWhenFinished(JsonUtil.opt(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE));
+ qa.setNoReeditAllowed(JsonUtil.opt(toolContentJSON, "noReeditAllowed", Boolean.FALSE));
+ qa.setAllowRichEditor(JsonUtil.opt(toolContentJSON, RestTags.ALLOW_RICH_TEXT_EDITOR, Boolean.FALSE));
+ qa.setUseSelectLeaderToolOuput(
+ JsonUtil.opt(toolContentJSON, RestTags.USE_SELECT_LEADER_TOOL_OUTPUT, Boolean.FALSE));
+ qa.setMinimumRates(JsonUtil.opt(toolContentJSON, RestTags.MINIMUM_RATES, 0));
+ qa.setMaximumRates(JsonUtil.opt(toolContentJSON, RestTags.MAXIMUM_RATES, 0));
+ qa.setShowOtherAnswers(JsonUtil.opt(toolContentJSON, "showOtherAnswers", Boolean.TRUE));
+ qa.setUsernameVisible(JsonUtil.opt(toolContentJSON, "usernameVisible", Boolean.FALSE));
+ qa.setAllowRateAnswers(JsonUtil.opt(toolContentJSON, "allowRateAnswers", Boolean.FALSE));
+ qa.setNotifyTeachersOnResponseSubmit(
+ JsonUtil.opt(toolContentJSON, "notifyTeachersOnResponseSubmit", Boolean.FALSE));
+ qa.setReflect(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
+ qa.setReflectionSubject(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS, (String) null));
+ qa.setQuestionsSequenced(JsonUtil.opt(toolContentJSON, "questionsSequenced", Boolean.FALSE));
+
+ // submissionDeadline is set in monitoring
+ // qa.setMonitoringReportTitle(); Can't find this field in the database - assuming unused.
+ // qa.setReportTitle(); Can't find this field in the database - assuming unused.
+ // qa.setContent(content); Can't find this field in the database - assuming unused.
+
+ saveOrUpdateQaContent(qa);
+ // Questions
+ JSONArray questions = toolContentJSON.getJSONArray(RestTags.QUESTIONS);
+ for (int i = 0; i < questions.length(); i++) {
+ JSONObject questionData = (JSONObject) questions.get(i);
+ QaQueContent question = new QaQueContent(questionData.getString(RestTags.QUESTION_TEXT),
+ questionData.getInt(RestTags.DISPLAY_ORDER), JsonUtil.opt(questionData, "feedback", (String) null),
+ JsonUtil.opt(questionData, "required", Boolean.FALSE),
+ JsonUtil.opt(questionData, "minWordsLimit", 0), qa);
+ saveOrUpdateQuestion(question);
+ }
+
+ // TODO
+ // qa.setConditions(conditions);
+
+ }
+}
Fisheye: Tag 85ef8aca5722a36582117db1e8b988e2c16b6369 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml
===================================================================
diff -u -ra6641bf9262a01d07740a517643f8fe187ec5b1f -r85ef8aca5722a36582117db1e8b988e2c16b6369
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml (.../nbApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml (.../nbApplicationContext.xml) (revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
@@ -21,7 +21,7 @@
-
+