Revision 8dcdfa8d src/gr/ebs/gss/server/ejb/AdminAPIBean.java
b/src/gr/ebs/gss/server/ejb/AdminAPIBean.java | ||
---|---|---|
228 | 228 |
List<UserDTO> result = new ArrayList<UserDTO>(); |
229 | 229 |
for (User u : users){ |
230 | 230 |
UserDTO tempDTO = u.getDTO(); |
231 |
List<UserLogin> userLogins = api.getLastUserLogins(u.getId()); |
|
232 |
tempDTO.setCurrentLoginDate(userLogins.get(0).getLoginDate()); |
|
233 |
tempDTO.setLastLoginDate(userLogins.get(1).getLoginDate()); |
|
231 |
try { |
|
232 |
List<UserLogin> userLogins = api.getLastUserLogins(u.getId()); |
|
233 |
tempDTO.setCurrentLoginDate(userLogins.get(0).getLoginDate()); |
|
234 |
tempDTO.setLastLoginDate(userLogins.get(1).getLoginDate()); |
|
235 |
} |
|
236 |
catch (ObjectNotFoundException e) {//Do nothing |
|
237 |
} |
|
234 | 238 |
result.add(tempDTO); |
235 | 239 |
} |
236 | 240 |
return result; |
... | ... | |
241 | 245 |
User u = dao.getUser(username); |
242 | 246 |
if(u!=null){ |
243 | 247 |
UserDTO tempDTO = u.getDTO(); |
244 |
List<UserLogin> userLogins = api.getLastUserLogins(u.getId()); |
|
245 |
tempDTO.setCurrentLoginDate(userLogins.get(0).getLoginDate()); |
|
246 |
tempDTO.setLastLoginDate(userLogins.get(1).getLoginDate()); |
|
248 |
try { |
|
249 |
List<UserLogin> userLogins = api.getLastUserLogins(u.getId()); |
|
250 |
tempDTO.setCurrentLoginDate(userLogins.get(0).getLoginDate()); |
|
251 |
tempDTO.setLastLoginDate(userLogins.get(1).getLoginDate()); |
|
252 |
} |
|
253 |
catch (ObjectNotFoundException e) {//Do nothing |
|
254 |
} |
|
247 | 255 |
return tempDTO; |
248 | 256 |
|
249 | 257 |
} |
Also available in: Unified diff