Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 385 → Rev 387

/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");
}