Index: lams_common/web/admin/adminContent.jsp =================================================================== diff -u --- lams_common/web/admin/adminContent.jsp (revision 0) +++ lams_common/web/admin/adminContent.jsp (revision 171f71996508467a73fb47abc833c3c0989b8b0b) @@ -0,0 +1,224 @@ +<%@ page contentType="text/html; charset=iso-8859-1" language="java" %> +<%@ page import="java.util.Iterator" %> +<%@ page import="java.util.List" %> +<%@ page import="java.io.IOException" %> +<%@ page import="javax.servlet.jsp.JspWriter" %> +<%@ page import="javax.servlet.http.HttpServletRequest" %> +<%@ page import="org.springframework.web.context.support.WebApplicationContextUtils" %> +<%@ page import="org.springframework.web.context.WebApplicationContext" %> +<%@ page import="com.lamsinternational.lams.usermanagement.service.UserManagementService" %> +<%@ page import="com.lamsinternational.lams.usermanagement.Organisation" %> +<%@ page import="com.lamsinternational.lams.usermanagement.Role" %> +<%@ page import="com.lamsinternational.lams.usermanagement.User" %> +<%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %> + + + + + + +<%! + /* Display the user map */ + public void displayUsers( List users, Organisation org, JspWriter out, HttpServletRequest request) + { + if ( users == null) + return; + + try { + Iterator iter = users.iterator(); + while ( iter.hasNext() ) + { + User user = (User) iter.next(); + displayUser(user, org, out, request); + } + } catch (IOException e ) { + System.err.println("Internal Error: Unable to show user details"); + e.printStackTrace(System.err); + } + } + + /* Display the user details, in a single column table row */ + public void displayUser( User user,Organisation org, JspWriter out, HttpServletRequest request) throws IOException + { + out.println(""); + + out.println(""+user.getLogin()+": "+user.getFirstName()+" "+user.getLastName()); + out.println(""); + + WebApplicationContext ctx = WebApplicationContextUtils.getWebApplicationContext(request.getSession().getServletContext()); + UserManagementService service = (UserManagementService)ctx.getBean("userManagementServiceTarget"); + + out.print(""); + Iterator iter = service.getRolesForUserByOrganisation(user,org.getOrganisationId()).iterator(); + while ( iter.hasNext() ) + { + Role role = (Role) iter.next(); + out.print(role.getName()+"  "); + } + out.println(""); + out.println(""); + out.println(""); + + out.println(""); + } +%> + + + + +
+ Maintain Organisations and Users + + + + + + + + + + + + + + + + +
Organisation:
Creation Date:
+ Organisation Description: +
+ Organisation Type: +
+ Organisation Type Description: +
+
+ +

+ ';" + onMouseOver="changeStyle(this,'extendingButtonover')" + onMouseOut="changeStyle(this,'extendingButton')" + value="Update this Organisation" /> +   + ';" + onMouseOver="changeStyle(this,'extendingButtonover')" + onMouseOut="changeStyle(this,'extendingButton')" + value="Create child organisation" /> +

+ +
+ + + Create records for all the people in your organisation who will use LAMS. Add each person only once. + +

+ + +
+ +

+ +

If you are not sure of the file format, please download template file

+ + + + + + + + + + +
Import Users From File:
+ +
 
+ + +
+
+
+
+ + + +

+ ';" + onMouseOver="changeStyle(this,'extendingButtonover')" + onMouseOut="changeStyle(this,'extendingButton')" + value="Create new user" /> +   + ';" + onMouseOver="changeStyle(this,'extendingButtonover')" + onMouseOut="changeStyle(this,'extendingButton')" + value="Add existing user" /> +   + ';" + onMouseOver="changeStyle(this,'extendingButtonover')" + onMouseOut="changeStyle(this,'extendingButton')" + value="Remove Users" /> +

+ +

+ + + + + + + + + + + + + + + + + + + <% displayUsers(users, organisation, out, request); %> +
Users 
UserRoles 
+ +

+ + + + + +
+ +
+
+ \ No newline at end of file Index: lams_common/web/admin/errorContent.jsp =================================================================== diff -u --- lams_common/web/admin/errorContent.jsp (revision 0) +++ lams_common/web/admin/errorContent.jsp (revision 171f71996508467a73fb47abc833c3c0989b8b0b) @@ -0,0 +1,22 @@ + + + + + + + + + + +
+

An error has occured

+

+ +

+
+ + \ No newline at end of file Index: lams_common/web/admin/organisationContent.jsp =================================================================== diff -u --- lams_common/web/admin/organisationContent.jsp (revision 0) +++ lams_common/web/admin/organisationContent.jsp (revision 171f71996508467a73fb47abc833c3c0989b8b0b) @@ -0,0 +1,58 @@ +<%@ page contentType="text/html; charset=iso-8859-1" language="java" %> +<%@ page import="com.lamsinternational.lams.usermanagement.web.OrganisationActionForm" %> +<%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %> +<%@ taglib uri="/WEB-INF/struts/struts-html.tld" prefix="html" %> + + + + + + +
+ Organisation Entry + +

+ An "organisation" is a grouping of users. It could be a high school, a particular year or a single class. + If could be a set of people doing a particular course. +

+ +

Required fields are marked with an asterisk.

+ + + + + + + + + + + + + + + + +
+ + Name: + + * +
+ Description: + + + * +
+ Parent Organisation: + + +
+

+ + + Save   + Cancel +

+
+ Fisheye: Tag 171f71996508467a73fb47abc833c3c0989b8b0b refers to a dead (removed) revision in file `lams_common/web/admin/sysadminContent.jsp'. Fisheye: No comparison available. Pass `N' to diff?