Skip to content

Commit

Permalink
Web: add special page of projects and their searches
Browse files Browse the repository at this point in the history
  • Loading branch information
@danjasuw
danjasuw committed Apr 21, 2018
1 parent febbce0 commit a37efeb
Show file tree
Hide file tree
Showing 3 changed files with 255 additions and 1 deletion.
75 changes: 75 additions & 0 deletions proxl_web_app/WebRoot/WEB-INF/jsp-pages/projectsSearchList.jsp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
<%@ include file="/WEB-INF/jsp-includes/pageEncodingDirective.jsp" %><%-- Always put this directive at the very top of the page --%>

<%@ include file="/WEB-INF/jsp-includes/strutsTaglibImport.jsp" %>

<%@ include file="/WEB-INF/jsp-includes/jstlTaglibImport.jsp" %>


<%-- List all the Projects and their searches for a user --%>

<c:set var="pageTitle">Projects Search List</c:set>

<c:set var="pageBodyClass" >projects-list-page</c:set>

<c:set var="headerAdditions">


<script type="text/javascript" src="${ contextPath }/js/handleServicesAJAXErrors.js"></script>

</c:set>


<%@ include file="/WEB-INF/jsp-includes/header_main.jsp" %>


<div class="overall-enclosing-block">

<div class="top-level-label your-projects-title" >Your Projects, their Searches and Researchers</div>



<%-- The list of projects will be put in this div by the Javascript --%>
<table border="0" width="100%" style="margin-left: 20px;">

<c:forEach var="project" items="${ projectList }">
<tr class="project_root_container_jq">
<td colspan="3" >
<a style="font-weight: bold; font-size: 18px;"
class="project-text-link project_title_jq tool_tip_attached_jq" data-tooltip="View project"
href="viewProject.do?<%= WebConstants.PARAMETER_PROJECT_ID %>=${ project.projectMain.id }"
><c:out value="${ project.projectMain.title }"></c:out></a>
</td>
</tr>
<tr>
<td></td>
<td colspan="2">
<span style="font-weight: bold">Researchers:</span> <c:out value="${ project.users }"></c:out>
</td>
<tr>
<td style="width: 20px;"></td>
<td colspan="2" style="font-weight: bold">
Searches for Project:
</td>
</tr>
<c:forEach var="search" items="${ project.searches }">
<tr>
<td></td>
<td style="width: 20px;"></td>
<td>
<c:out value="${ search.name }"></c:out> (<c:out value="${ search.searchId }"></c:out>)
</td>
</tr>
</c:forEach>
<tr class="project_separator_row_jq">
<td colspan="3">
<div class="project-container-bottom-border" ></div>
</td>
</tr>
</c:forEach>

</table>


</div>

<%@ include file="/WEB-INF/jsp-includes/footer_main.jsp" %>
9 changes: 8 additions & 1 deletion proxl_web_app/WebRoot/WEB-INF/struts-config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
</global-forwards>

<action-mappings>

<action path="/qc_Scan_MS1_All_IntensityHeatmapImage"
type="org.yeastrc.xlink.www.actions.QC_Scan_MS1_All_IntensityHeatmapImageAction"
scope="request"
Expand Down Expand Up @@ -169,6 +169,13 @@
<forward name="Success" path="/WEB-INF/jsp-pages/listProjects.jsp" redirect="false" />
<forward name="Failure" path="/WEB-INF/jsp-pages/listProjects.jsp" redirect="false" />
</action>

<action path="/projectSearchList"
type="org.yeastrc.xlink.www.actions.ProjectsSearchListAction"
scope="request"
validate="false">
<forward name="Success" path="/WEB-INF/jsp-pages/projectsSearchList.jsp" redirect="false"/>
</action>

<action path="/viewProject"
type="org.yeastrc.xlink.www.actions.ViewProjectAction"
Expand Down
172 changes: 172 additions & 0 deletions proxl_web_app/src/org/yeastrc/xlink/www/actions/ProjectsSearchListAction.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,172 @@
package org.yeastrc.xlink.www.actions;

import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;

import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.yeastrc.auth.dto.AuthUserDTO;
import org.yeastrc.xlink.www.constants.StrutsGlobalForwardNames;
import org.yeastrc.xlink.www.constants.WebConstants;
import org.yeastrc.xlink.www.constants.WebServiceErrorMessageConstants;
import org.yeastrc.xlink.www.dao.ProjectDAO;
import org.yeastrc.xlink.www.dto.SearchDTO;
import org.yeastrc.xlink.www.internal_services.GetUserDisplayListForSharedObjectId;
import org.yeastrc.xlink.www.objects.AuthAccessLevel;
import org.yeastrc.xlink.www.objects.ProjectTblSubPartsForProjectLists;
import org.yeastrc.xlink.www.objects.UserDisplay;
import org.yeastrc.xlink.www.searcher.SearchSearcher;
import org.yeastrc.xlink.www.user_account.UserSessionObject;
import org.yeastrc.xlink.www.user_web_utils.AccessAndSetupWebSessionResult;
import org.yeastrc.xlink.www.user_web_utils.GetAccessAndSetupWebSession;
import org.yeastrc.xlink.www.web_utils.GetPageHeaderData;
import org.yeastrc.xlink.www.web_utils.GetProjectListForCurrentLoggedInUser;
/**
*
*
*/
public class ProjectsSearchListAction extends Action {

private static final Logger log = Logger.getLogger(ProjectsSearchListAction.class);

public ActionForward execute( ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response ) throws Exception {
try {
// Get their session first.
HttpSession session = request.getSession( false );
AccessAndSetupWebSessionResult accessAndSetupWebSessionResult =
GetAccessAndSetupWebSession.getInstance().getAccessAndSetupWebSessionNoProjectId( request, response );
if ( accessAndSetupWebSessionResult.isNoSession() ) {
// No User session
return mapping.findForward( StrutsGlobalForwardNames.NO_USER_SESSION );
}
// Test access to application no project id
AuthAccessLevel authAccessLevel = accessAndSetupWebSessionResult.getAuthAccessLevel();
if ( ! authAccessLevel.isPublicAccessCodeReadAllowed() ) {
// No Access Allowed
return mapping.findForward( StrutsGlobalForwardNames.INSUFFICIENT_ACCESS_PRIVILEGE );
}
request.setAttribute( WebConstants.REQUEST_AUTH_ACCESS_LEVEL, authAccessLevel );
UserSessionObject userSessionObject = null;
if ( session != null ) {
userSessionObject = (UserSessionObject) session.getAttribute( WebConstants.SESSION_CONTEXT_USER_LOGGED_IN );
}
if ( userSessionObject == null ) {
// No User session
return mapping.findForward( StrutsGlobalForwardNames.NO_USER_SESSION );
}
if ( userSessionObject.getUserDBObject() == null || userSessionObject.getUserDBObject().getAuthUser() == null ) {
// No Access Allowed since not a logged in user
log.warn( "Forward to StrutsGlobalForwardNames.INSUFFICIENT_ACCESS_PRIVILEGE, IP: " + request.getRemoteAddr() );
return mapping.findForward( StrutsGlobalForwardNames.INSUFFICIENT_ACCESS_PRIVILEGE );
}
AuthUserDTO authUser = userSessionObject.getUserDBObject().getAuthUser();
if ( ! authUser.isEnabledAppSpecific() ) {
// No Access Allowed since user is disabled
return mapping.findForward( StrutsGlobalForwardNames.ACCOUNT_DISABLED );
}

/// Done Processing Auth Check and Auth Level
//////////////////////////////

GetPageHeaderData.getInstance().getPageHeaderDataWithoutProjectId( request );

List<ProjectTblSubPartsForProjectLists> projects = GetProjectListForCurrentLoggedInUser.getInstance().getProjectListForCurrentLoggedInUser( request );

List<ProjectForDisplay> projectList = new ArrayList<>( projects.size() );
for ( ProjectTblSubPartsForProjectLists project : projects ) {

int projectId = project.getId();

ProjectForDisplay projectForDisplay = new ProjectForDisplay();
projectForDisplay.projectMain = project;

Integer projectSharedObjectId = ProjectDAO.getInstance().getAuthShareableObjectIdForProjectId( projectId );
if ( projectSharedObjectId == null ) {
log.warn( "ListUsersForProjectIdService: projectId is not in database: " + projectId );
throw new WebApplicationException(
Response.status( WebServiceErrorMessageConstants.INVALID_PARAMETER_STATUS_CODE ) // Send HTTP code
.entity( WebServiceErrorMessageConstants.INVALID_PARAMETER_TEXT ) // This string will be passed to the client
.build()
);
}
List<UserDisplay> userListForProject = GetUserDisplayListForSharedObjectId.getInstance().getUserDisplayListExcludeAdminGlobalNoAccessAccountsForSharedObjectId( projectSharedObjectId );
// Sort on last name then first name
Collections.sort( userListForProject, new Comparator<UserDisplay>() {
@Override
public int compare(UserDisplay o1, UserDisplay o2) {
int lastNameCompare = o1.getxLinkUserDTO().getLastName().compareTo( o2.getxLinkUserDTO().getLastName() );
if ( lastNameCompare != 0 ) {
return lastNameCompare;
}
return o1.getxLinkUserDTO().getFirstName().compareTo( o2.getxLinkUserDTO().getFirstName() );
}
});
StringBuilder usersSB = new StringBuilder( 1000 );
for ( UserDisplay userDisplay : userListForProject ) {
if ( usersSB.length() != 0 ) {
usersSB.append( ", " );
}
usersSB.append( userDisplay.getxLinkUserDTO().getFirstName() );
usersSB.append( " " );
usersSB.append( userDisplay.getxLinkUserDTO().getLastName() );
}
String users = usersSB.toString();
projectForDisplay.users = users;

List<SearchDTO> searches = SearchSearcher.getInstance().getSearchsForProjectId( projectId );
projectForDisplay.searches = searches;

projectList.add(projectForDisplay);
}

request.setAttribute( "projectList" , projectList );

return mapping.findForward( "Success" );
} catch ( Exception e ) {
String msg = "Exception caught: " + e.toString();
log.error( msg, e );
throw e;
}
}

public static class ProjectForDisplay {
private ProjectTblSubPartsForProjectLists projectMain;
private List<SearchDTO> searches;
private String users;

public ProjectTblSubPartsForProjectLists getProjectMain() {
return projectMain;
}
public void setProjectMain(ProjectTblSubPartsForProjectLists projectMain) {
this.projectMain = projectMain;
}
public List<SearchDTO> getSearches() {
return searches;
}
public void setSearches(List<SearchDTO> searches) {
this.searches = searches;
}
public String getUsers() {
return users;
}
public void setUsers(String users) {
this.users = users;
}

}
}

0 comments on commit a37efeb

Please sign in to comment.