Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 386 → Rev 387

/impl/conf/berserk/sd.xml
68,6 → 68,16
<chain name="Logger"/>
</filterChains>
</service>
<service>
<name>LoadRoleAreaUsers</name>
<implementationClass>pt.estgp.estgweb.services.users.LoadUsersService</implementationClass>
<description>Load user of some class</description>
<isTransactional>true</isTransactional>
<defaultMethod>loadRoleArea</defaultMethod>
<filterChains>
<chain name="Logger"/>
</filterChains>
</service>
 
 
<!--URL Statistics-->
/impl/src/java/pt/estgp/estgweb/services/users/LoadUsersService.java
56,4 → 56,20
return null;
return UserView.getViews(users);
}
 
public List<UserView> loadRoleArea(String role, String area) throws ServiceException
{
List<User> users = DaoFactory.getUserDaoImpl().loadRoleAreaUsers(role,area);
if(users == null)
return null;
return UserView.getViews(users);
}
 
public List<UserView> load(String role) throws ServiceException
{
List<User> users = DaoFactory.getUserDaoImpl().loadRoleUsers(role);
if(users == null)
return null;
return UserView.getViews(users);
}
}
/impl/src/java/pt/estgp/estgweb/domain/dao/impl/UserDaoImpl.java
130,6 → 130,14
return createCriteria().add(like("roles", "%" + role + "%")).addOrder(Order.asc("name")).list();
}
 
public List<User> loadRoleAreaUsers(String role, String area)
{
Criteria c = createCriteria().add(like("roles", "%" + role + "%")).addOrder(Order.asc("name"));
if(area != null && area.trim().length() > 0)
c.add(eq("mainArea",area));
return c.list();
}
 
public List<User> findUsers(String textToSearch)
{
return findUsers(textToSearch, null);
/impl/src/java/pt/estgp/estgweb/web/controllers/contacts/ContactsController.java
37,11 → 37,12
HttpServletResponse response)
throws Throwable, ServletException
{
 
String area = request.getParameter("area");
request.setAttribute("area",area);
IServiceManager sm = ServiceManager.getInstance();
String[] names = new String[]{"role"};
Object[] args = new Object[]{Globals.TEACHER_ROLE};
List<UserView> teachers = (List<UserView>) sm.execute(RequestUtils.getRequester(request, response), "LoadRoleUsers", args, names);
String[] names = new String[]{"role","area"};
Object[] args = new Object[]{Globals.TEACHER_ROLE,area};
List<UserView> teachers = (List<UserView>) sm.execute(RequestUtils.getRequester(request, response), "LoadRoleAreaUsers", args, names);
request.setAttribute("teachers",teachers);
return mapping.findForward("contactTeachers");
}
/impl/src/web/user/contacts/listTeachers.jsp
7,39 → 7,77
<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
 
<div id="contentIntranet">
<div class="seccao">
<table class="dataTable">
<tr>
<th><bean:message key="name"/></th>
<th><bean:message key="area"/></th>
<th><bean:message key="office"/></th>
<th>EXT.</th>
<th><bean:message key="email"/></th>
</tr>
<logic:iterate id="userView" name="teachers" type="pt.estgp.estgweb.domain.views.UserView">
<%
String ce = "";
String ch = "";
String dg = "";
String eg = "";
String area = (String) request.getAttribute("area");
if(area != null)
{
if(area.equals("ce"))
{
ce="selected=\"selected\"";
}
else if(area.equals("ch"))
{
ch="selected=\"selected\"";
}
else if(area.equals("dg"))
{
dg="selected=\"selected\"";
}
else if(area.equals("eg"))
{
eg="selected=\"selected\"";
}
 
}
%>
<form action="<%=request.getContextPath()%>/user/listTeachers.do">
<input type="hidden" name="dispatch" value="listTeachersAZ"/>
<div id="contentIntranet">
<div class="seccao">
<table class="dataTable">
<tr>
<td>
${userView.name}
</td>
<td>
<logic:present name="userView" property="mainArea">
<logic:notEmpty name="userView" property="mainArea">
<bean:message key="area.${userView.mainArea}"/>
</logic:notEmpty>
</logic:present>
</td>
<td>
${userView.office}
</td>
<td>
${userView.ext}
</td>
<td>
${userView.username}@<%=Globals.EMAIL_LOCAL_SUFFIX%>
</td>
<th><bean:message key="name"/></th>
<th>
<select name="area" onchange="form.area.value=this.value;form.submit();">
<option value=""><bean:message key="area"/></option>
<option value="ce" <%=ce%>><bean:message key="area.ce"/></option>
<option value="ch" <%=ch%>><bean:message key="area.ch"/></option>
<option value="dg" <%=dg%>><bean:message key="area.dg"/></option>
<option value="eg" <%=eg%>><bean:message key="area.eg"/></option>
</select>
</th>
<th><bean:message key="office"/></th>
<th>EXT.</th>
<th><bean:message key="email"/></th>
</tr>
</logic:iterate>
</table>
<logic:iterate id="userView" name="teachers" type="pt.estgp.estgweb.domain.views.UserView">
<tr>
<td>
${userView.name}
</td>
<td>
<logic:present name="userView" property="mainArea">
<logic:notEmpty name="userView" property="mainArea">
<bean:message key="area.${userView.mainArea}"/>
</logic:notEmpty>
</logic:present>
</td>
<td>
${userView.office}
</td>
<td>
${userView.ext}
</td>
<td>
${userView.username}@<%=Globals.EMAIL_LOCAL_SUFFIX%>
</td>
</tr>
</logic:iterate>
</table>
</div>
</div>
</div>
</form>