Index: lams_common/web/admin/userContent.jsp =================================================================== diff -u -re4d1187c5ef8d87947258cc5e14709a11aaa9079 -r30eb1a0f8a850d83ea7eab511ddb3468e3f7dfe4 --- lams_common/web/admin/userContent.jsp (.../userContent.jsp) (revision e4d1187c5ef8d87947258cc5e14709a11aaa9079) +++ lams_common/web/admin/userContent.jsp (.../userContent.jsp) (revision 30eb1a0f8a850d83ea7eab511ddb3468e3f7dfe4) @@ -1,9 +1,4 @@ <%@ page contentType="text/html; charset=iso-8859-1" language="java" %> -<%@ 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.UserOrganisation" %> <%@ page import="com.lamsinternational.lams.usermanagement.Organisation" %> <%@ page import="com.lamsinternational.lams.usermanagement.Role" %> @@ -12,9 +7,8 @@ <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> -<%@ taglib uri="/WEB-INF/struts-template.tld" prefix="template" %> - +'" method="post"> "); + + out.println(""); + + out.println(""); + + out.print(""); + out.println(""); + } +%> + + + +
@@ -75,7 +69,12 @@ - * + + + + + + Index: lams_common/web/admin/usersaddContent.jsp =================================================================== diff -u --- lams_common/web/admin/usersaddContent.jsp (revision 0) +++ lams_common/web/admin/usersaddContent.jsp (revision 30eb1a0f8a850d83ea7eab511ddb3468e3f7dfe4) @@ -0,0 +1,108 @@ +<%@ page contentType="text/html; charset=iso-8859-1" language="java" %> +<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> +<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> +<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> +<%@ taglib uri="/WEB-INF/struts-template.tld" prefix="template" %> +<%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %> +<%@ page import="com.lamsinternational.lams.usermanagement.web.UsersAddActionForm"%> +<%@ page import="com.lamsinternational.lams.usermanagement.User"%> + + + + + + + + + + + + + + + +
+

Add Existing Users To

+ + +

Select an organisation from which to pick new users:

+ + +

+       + +

+

+ +

+
+ + +

Please select an organisation from the list above.

+ + +

Select a role. To select a role for a user, choose one of the available roles from the drop-down menus. Leave all entries blank for users that you don't want to add to the organisation

+ + + + + + + + + + +
+ : + + + + + + + + + + + + + + + +
+ +

Cancel  + <%=OrganisationAddUsersAction.SUBMIT_ADD_USERS%>   +

+ + + \ No newline at end of file Index: lams_common/web/admin/usersremoveContent.jsp =================================================================== diff -u --- lams_common/web/admin/usersremoveContent.jsp (revision 0) +++ lams_common/web/admin/usersremoveContent.jsp (revision 30eb1a0f8a850d83ea7eab511ddb3468e3f7dfe4) @@ -0,0 +1,87 @@ +<%@ page contentType="text/html; charset=iso-8859-1" language="java" %> +<%@ page import="java.util.Iterator" %> +<%@ page import="java.util.List" %> +<%@ 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.Role" %> +<%@ page import="com.lamsinternational.lams.usermanagement.User" %> +<%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %> + +<%! + /* Display ther user map, for a particular right */ + public void displayUsers( List users, javax.servlet.jsp.JspWriter out, UserManagementService service ) + { + if ( userMap == null ) + return; + + try { + out.println(""); + out.println(""); + Iterator iter = users.iterator(); + while ( iter.hasNext() ) + { + displayUser((User)iter.next(), out,service ); + } + out.println("
Remove?UserLAMS Roles
"); + } catch ( java.io.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, javax.servlet.jsp.JspWriter out, UserManagementService service) throws java.io.IOException + { + out.println("
"+user.getLogin()+": "+user.getFirstName()+" "+user.getLastName()+""); + Iterator iter = service.getRolesForUserByOrganisation(user,org.getOrganisationId()).iterator(); + while ( iter.hasNext() ) + { + Role role = (Role) iter.next(); + out.print(role.getName()+"  "); + } + out.println("
+ + + +
+

Remove Users:

+ +

Select the users that you wish to remove from the organisation.

+ + + +
+ + + <% + WebApplicationContext ctx = WebApplicationContextUtils.getWebApplicationContext(request.getSession().getServletContext()); + UserManagementService service = (UserManagementService)ctx.getBean("userManagementServiceTarget"); + displayUsers(users,out,service); + %> + +
+ +

Cancel   + Remove Users   +

+
+ + Index: lams_common/web/admin/userviewContent.jsp =================================================================== diff -u --- lams_common/web/admin/userviewContent.jsp (revision 0) +++ lams_common/web/admin/userviewContent.jsp (revision 30eb1a0f8a850d83ea7eab511ddb3468e3f7dfe4) @@ -0,0 +1,157 @@ +<%@ page contentType="text/html; charset=iso-8859-1" language="java" %> +<%@ page import="com.lamsinternational.lams.usermanagement.UserOrganisation" %> +<%@ 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" %> +<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> +<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> +<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> + +
+ + + + +
+

User Details

+ +

User details not found

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Login name: + +
Authentication Method: + +
Roles: + + +       + + +
Title: + +
First Name: + +
Last Name: + +
Email: + +
Address Line 1: + +
Address Line 2: + +
Address Line3: + +
City: + +
State: + +
Country: + +
Day Phone: + +
Evening Phone: + +
Mobile Phone: + +
Fax: + +
LAMS User Organisations
<%=member.getOrganisation().getName()%> + Description: <%=member.getOrganisation().getDescription()%>
+
+

+ ';" + onMouseOver="changeStyle(this,'longButtonover')" + onMouseOut="changeStyle(this,'longButton')" + value="Return to Organisation" /> +

+
+