development challenge and code work step type

Author: hohosky

conf/web/WEB-INF/applicationContext.xml

@@ -297,6 +297,7 @@
     <bean id="projectWorkManagementAction"
           class="com.topcoder.direct.services.view.action.project.ProjectWorkManagementAction" scope="prototype" parent="baseDirectStrutsAction">
         <property name="studioSubmissionBase" value="@studio.submission.base@"/>
+        <property name="softwareSubmissionBase" value="@file_storage_location@"/>
         <property name="mimeTypeRetriever" ref="mimeTypeRetriever"/>
     </bean>
 

conf/web/WEB-INF/struts.xml

@@ -789,7 +789,7 @@
             <result name="error" type="json"/>
         </action>
 
-        <action name="getWorkStepDesignChallenges" method="getDesignChallenges" class="projectWorkManagementAction">
+        <action name="getWorkStepChallenges" method="getChallengesForWorkStepAndProject" class="projectWorkManagementAction">
             <interceptor-ref name="securedProjectPreProcessorStack"/>
             <result name="success" type="json"/>
             <result name="error" type="json"/>

conf/web/WEB-INF/tld/tcdirect-functions.tld

@@ -171,6 +171,12 @@
         <function-class>com.topcoder.direct.services.view.util.JSPHelper</function-class>
         <function-signature>boolean hasPermissionToAccessWorkManager(long)</function-signature>
     </function>
+
+    <function>
+        <name>getDemandWorkId</name>
+        <function-class>com.topcoder.direct.services.view.util.JSPHelper</function-class>
+        <function-signature>java.lang.String getDirectProjectDemandWorkId(long)</function-signature>
+    </function>
 
     <function>
         <name>maxLong</name>

src/java/main/com/topcoder/direct/services/view/action/project/ProjectWorkManagementAction.java

@@ -1437,7 +1437,8 @@ public static LatestActivitiesDTO getLatestActivitiesForUserProjects(long userId
         final Map<Long, ProjectBriefDTO> projects = new HashMap<Long, ProjectBriefDTO>();
         final Map<Long, TypedContestBriefDTO> contests = new HashMap<Long, TypedContestBriefDTO>();//here
 
-        final ResultSetContainer resultContainer = dataAccessor.getData(request).get("direct_latest_activities_replatforming");
+        final ResultSetContainer resultContainer = dataAccessor.getData(request).get(
+                "direct_latest_activities_replatforming");
         final int recordNum = resultContainer.size();
 
         for (int i = 0; i < recordNum; i++) {
@@ -2043,7 +2044,7 @@ private static List<ForumPoster> getLatestThreePosters(String lastPosters) throw
     public static List<DashboardContestSearchResultDTO> searchUserContests(TCSubject tcSubject, String searchFor,
         final Date begin, final Date end) throws Exception {
         List<CommonProjectContestData> contests = DirectUtils.getContestServiceFacade().getCommonProjectContestData(
-            tcSubject);
+                tcSubject);
         List<CommonProjectContestData> filteredContests;
         if (StringUtils.isBlank(searchFor) && begin == null && end == null) {
             filteredContests = contests;
@@ -2416,7 +2417,7 @@ public static void getDashboardProjectMetricsReport(TCSubject currentUser, long
                 stats.setTotalBudget(row.getStringItem("total_budget"));
                 stats.setActualCost(row.getDoubleItem("actual_cost"));
                 stats.setStartDate(getDate(row,"create_date"));
-                stats.setCompletionDate(getDate(row,"completion_date"));
+                stats.setCompletionDate(getDate(row, "completion_date"));
                 stats.setTotalContests(row.getIntItem("total_number"));
 
                 // draft
@@ -2440,8 +2441,8 @@ public static void getDashboardProjectMetricsReport(TCSubject currentUser, long
                 stats.setCostCanceled(row.getDoubleItem("cost_cancelled"));
 
                 stats.setProjectedCost(row.getDoubleItem("cost_draft") + row.getDoubleItem("cost_scheduled") +
-                		row.getDoubleItem("cost_active") + row.getDoubleItem("cost_finished") +
-                		row.getDoubleItem("cost_cancelled") + row.getDoubleItem("project_level_cost"));
+                        row.getDoubleItem("cost_active") + row.getDoubleItem("cost_finished") +
+                        row.getDoubleItem("cost_cancelled") + row.getDoubleItem("project_level_cost"));
 
                 stats.setPlannedCost(row.getDoubleItem("planned_cost"));
                 statses.add(stats);
@@ -3006,7 +3007,8 @@ public static List<TypedContestBriefDTO> getProjectTypedContests(long userId, lo
         final Map<Long, ProjectBriefDTO> projects = new HashMap<Long, ProjectBriefDTO>();
         final List<TypedContestBriefDTO> contests = new ArrayList<TypedContestBriefDTO>();
 
-        final ResultSetContainer resultContainer = dataAccessor.getData(request).get("direct_my_typed_contests_replatforming");
+        final ResultSetContainer resultContainer = dataAccessor.getData(request).get(
+                "direct_my_typed_contests_replatforming");
         final int recordNum = resultContainer.size();
         for (int i = 0; i < recordNum; i++) {
             long tcDirectProjectId = resultContainer.getLongItem(i, "tc_direct_project_id");
@@ -7282,7 +7284,7 @@ public static List<EnterpriseDashboardMonthPipelineDTO> getEnterpriseDashboardCo
             String phases = resultContainer.getStringItem(i, "phases");
 
             long monthCount = resultContainer.getLongItem(i, "monthcount");
-            EnterpriseDashboardMonthPipelineDTO item = resultMap.get((monthCount/100) * 12 + (monthCount % 100) -1);
+            EnterpriseDashboardMonthPipelineDTO item = resultMap.get((monthCount / 100) * 12 + (monthCount % 100) - 1);
 
             if (currentPhase != null && ((String)status).equalsIgnoreCase(ProjectStatus.ACTIVE.getName())) {
                 // active
@@ -7499,7 +7501,7 @@ else if (((String)status).equalsIgnoreCase(ProjectStatus.DRAFT.getName()))
             long monthCount = resultContainer.getLongItem(i, "monthcount");
 
             EnterpriseDashboardMonthProjectPipelineDTO item =
-                    resultMap.get((monthCount/100) * 12 + (monthCount % 100) -1);
+                    resultMap.get((monthCount / 100) * 12 + (monthCount % 100) - 1);
 
             if (projectStatusId == 4L) {
                 item.setTotalCompletedProjects(item.getTotalCompletedProjects() + 1);
@@ -7914,6 +7916,34 @@ public static InputStream generateWinnerSheet(long tcDirectProjectId) throws Exc
         return new ByteArrayInputStream(saveTo.toByteArray());
     }
 
+    /**
+     * Gets the demand work id of the direct project, return null if the project does not exist or the direct project does not
+     * demand work id.
+     *
+     * @param tcDirectProjectId the id of the direct project
+     * @return the demand work id of the direct project or null the project does not exist or the direct project does not
+     * demand work id.
+     * @throws Exception if any error
+     */
+    public static String getDirectProjectDemandWorkId(long tcDirectProjectId) throws Exception {
+        DataAccess dataAccessor = new DataAccess(DBMS.TCS_OLTP_DATASOURCE_NAME);
+        Request request = new Request();
+        request.setContentHandle("project_name");
+        request.setProperty("tcdirectid", String.valueOf(tcDirectProjectId));
+        ResultSetContainer resultSetContainer = dataAccessor.getData(request).get("project_contest_results");
+
+        if (resultSetContainer != null && resultSetContainer.size() > 0) {
+            ResultSetRow resultSetRow = resultSetContainer.get(0);
+            if (resultSetRow.getItem("demand_work_id").getResultData() != null) {
+                return resultSetRow.getStringItem("demand_work_id");
+            } else {
+                return null;
+            }
+        }
+
+        return null;
+    }
+
     /**
      * <p>Generates  the <code>Excel</code> worksheet with results for contests for specified <code>TC Direct</code>
      * project.</p>

src/java/main/com/topcoder/direct/services/view/util/DataProvider.java

@@ -854,7 +854,7 @@ public final class DirectUtils {
      * 
      * @since 1.8.5
      */
-    private static final int FINAL_FIX_UPLOAD_TYPE_ID = 3;
+    public static final int FINAL_FIX_UPLOAD_TYPE_ID = 3;
 
     private static final String IS_CLIENT_USER_SQL = "SELECT client_id FROM client_user_xref cux, user_account ua, common_oltp:user u"
      + " WHERE cux.user_id = ua.user_account_id AND UPPER(ua.user_name) = UPPER(u.handle) AND u.user_id = ?";

src/java/main/com/topcoder/direct/services/view/util/DirectUtils.java

@@ -668,6 +668,17 @@ public static boolean hasPermissionToAccessWorkManager(long projectId) throws Ex
         return AuthorizationProvider.isUserGrantedToAccessWorkManager(DirectUtils.getTCSubjectFromSession(), projectId);
     }
 
+    /**
+     * Gets the demand work id of the specified direct project.
+     *
+     * @param projectId the id of the direct project.
+     * @return the demand work id, null if no exist or no demand work id.
+     * @throws Exception if any error occurs.
+     */
+    public static String getDirectProjectDemandWorkId(long projectId) throws Exception {
+        return DataProvider.getDirectProjectDemandWorkId(projectId);
+    }
+
     /**
      * Gets the current login user id.
      *

src/java/main/com/topcoder/direct/services/view/util/JSPHelper.java

@@ -490,8 +490,9 @@
         </li>
 
         <c:set var="hasWorkManagerPermission" value="${tcdirect:hasPermissionToAccessWorkManager(session.currentSelectDirectProjectID)}" scope="request"/>
+        <c:set var="demandWorkId" value="${tcdirect:getDemandWorkId(session.currentSelectDirectProjectID)}" scope="request"/>
 
-        <c:if test="${hasWorkManagerPermission}">
+        <c:if test="${hasWorkManagerPermission && demandWorkId != null}">
             <li <c:if test="${requestScope.CURRENT_TAB eq 'workManagement'}">class="active"</c:if>>
                 <a class="mil" href="<s:url action="projectWorkManager" namespace="/"> <s:param name="formData.projectId" value="sessionData.currentSelectDirectProjectID" /></s:url>"><span class="icon"></span>Work Manager</a>
             </li>

src/web/WEB-INF/includes/newHeader.jsp

@@ -1,3 +1,4 @@
+<%@ page import="com.topcoder.shared.util.ApplicationServer" %>
 <%--
   - Author: TCSASSEMBLER
   -
@@ -119,7 +120,16 @@
 
                             <!-- begin topLine -->
                             <div class="projectVMManagement">
-                                <h2>Work Management</h2>
+
+                                <%
+                                    String[] splits = ApplicationServer.SERVER_NAME.split(".");
+                                    String topServerName = "topcoder.com";
+                                    if (splits != null && splits.length >= 2) {
+                                        topServerName = splits[splits.length - 2] + "." + splits[splits.length - 1];
+                                    }
+                                %>
+
+                                <h2>Work Management</h2> <a href="https://work.<%=topServerName%>/customer/projects/${demandWorkId}/timeline" target="_blank">Work Manager Project</a>
                             </div>
                             <!-- end topLine -->
 

src/web/WEB-INF/project-work-management.jsp

@@ -15,7 +15,7 @@ $(document).ready(function() {
         $.ajax({
             type: 'POST',
             url:  ctx + "/pushSubmissions",
-            data: {contestId: currentChallenge.id, phaseName: currentPhase.label, workStepId: currentWorkStep.id, formData: {projectId: tcDirectProjectId}},
+            data: {contestId: currentChallenge.id, phaseName: currentPhase.label, workStepId: currentWorkStep.id, workStepName: currentWorkStep.workStepType, formData: {projectId: tcDirectProjectId}},
             cache: false,
             async: false,
             dataType: 'json',
@@ -45,7 +45,7 @@ $(document).ready(function() {
                 $.ajax({
                     type: 'POST',
                     url:  ctx + "/getSubmissionDataForPhase",
-                    data: {contestId: currentChallenge.id, phaseName: currentPhase.label, formData: {projectId: tcDirectProjectId}},
+                    data: {contestId: currentChallenge.id, phaseName: currentPhase.label, workStepName: currentWorkStep.workStepType, formData: {projectId: tcDirectProjectId}},
                     cache: false,
                     async: false,
                     dataType: 'json',
@@ -104,8 +104,8 @@ $(document).ready(function() {
                     modalPreloader();
                     $.ajax({
                         type: 'POST',
-                        url:  ctx + "/getWorkStepDesignChallenges",
-                        data: {formData: {projectId: tcDirectProjectId}},
+                        url:  ctx + "/getWorkStepChallenges",
+                        data: {formData: {projectId: tcDirectProjectId}, workStepName: currentWorkStep.workStepType},
                         cache: false,
                         async: false,
                         dataType: 'json',