Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java =================================================================== diff -u -r0e7d403e91b0916fd3842d8d3098b1c466d28ece -r3c3cfdd84fb32ca1bb3c1455f9f75c9f6fb1b57c --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java (.../ResourceItemVisitDAOHibernate.java) (revision 0e7d403e91b0916fd3842d8d3098b1c466d28ece) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java (.../ResourceItemVisitDAOHibernate.java) (revision 3c3cfdd84fb32ca1bb3c1455f9f75c9f6fb1b57c) @@ -100,10 +100,11 @@ @Override @SuppressWarnings("unchecked") public List getResourceItemLogBySession(Long sessionId, Long itemUid) { - return (List) doFind(FIND_BY_ITEM_BYSESSION, new Object[] { sessionId, itemUid }); + return doFind(FIND_BY_ITEM_BYSESSION, new Object[] { sessionId, itemUid }); } - private static String LOAD_USERS_ORDERED_BY_NAME_SELECT = " SELECT user.user_id, CONCAT(user.last_name, ' ', user.first_name), visit.complete_date, visit.access_date "; + private static String LOAD_USERS_ORDERED_BY_NAME_SELECT = " SELECT user.user_id, CONCAT(user.first_name, ' ', user.last_name, ' (', user.login_name, ')'), " + + "visit.complete_date, visit.access_date "; private static String LOAD_USERS_ORDERED_BY_NAME_FROM = " FROM tl_larsrc11_item_log visit " + " JOIN tl_larsrc11_user user ON visit.user_uid = user.uid " + " AND (CONCAT(user.last_name, ' ', user.first_name) LIKE CONCAT('%', :searchString, '%'))"; Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/ResourceItemDTO.java =================================================================== diff -u -r0a46648d9547d3fca73e1931d4e628be7e1acd7b -r3c3cfdd84fb32ca1bb3c1455f9f75c9f6fb1b57c --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/ResourceItemDTO.java (.../ResourceItemDTO.java) (revision 0a46648d9547d3fca73e1931d4e628be7e1acd7b) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/ResourceItemDTO.java (.../ResourceItemDTO.java) (revision 3c3cfdd84fb32ca1bb3c1455f9f75c9f6fb1b57c) @@ -21,14 +21,14 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.rsrc.dto; import java.util.ArrayList; import java.util.List; import org.lamsfoundation.lams.rating.dto.ItemRatingDTO; import org.lamsfoundation.lams.tool.rsrc.model.ResourceItem; +import org.lamsfoundation.lams.tool.rsrc.model.ResourceUser; /** * List contains following element:
@@ -50,7 +50,7 @@ private boolean itemCreateByAuthor; private boolean itemHide; private String itemTitle; - private List itemInstructions = new ArrayList(); + private List itemInstructions = new ArrayList<>(); private String username; private int viewNumber; private boolean allowRating; @@ -79,7 +79,11 @@ this.itemCreateByAuthor = item.isCreateByAuthor(); this.itemHide = item.isHide(); this.itemTitle = item.getTitle(); - this.username = item.getCreateBy() == null ? "" : item.getCreateBy().getLoginName(); + ResourceUser user = item.getCreateBy(); + if (user != null) { + this.username = user.getFirstName() + " " + user.getLastName() + " (" + user.getLoginName() + ")"; + } + this.setAllowRating(item.isAllowRating()); this.setAllowComments(item.isAllowComments()); } else { @@ -176,10 +180,10 @@ } public boolean isAllowComments() { - return allowComments; + return allowComments; } public void setAllowComments(boolean allowComments) { - this.allowComments = allowComments; + this.allowComments = allowComments; } } \ No newline at end of file