Merge branch 'dev'

merging dev to master

 Changes to be committed:
	modified:   README.md
	modified:   conf/web/WEB-INF/applicationContext.xml
	modified:   conf/web/WEB-INF/struts.xml
	modified:   src/java/main/com/topcoder/direct/services/view/action/project/ProjectContestsHealthAction.java
	modified:   src/java/main/com/topcoder/direct/services/view/action/project/ProjectOverviewAction.java
	modified:   src/java/main/com/topcoder/direct/services/view/action/project/ProjectWorkManagementAction.java
	modified:   src/java/main/com/topcoder/direct/services/view/util/DirectUtils.java
	modified:   src/web/WEB-INF/includes/modalWindows.jsp
	deleted:    src/web/WEB-INF/project-overview-contests-health.jsp
	deleted:    src/web/WEB-INF/project-overview-project-activities.jsp
	modified:   src/web/WEB-INF/project-overview-project-stats.jsp
	modified:   src/web/WEB-INF/project-overview.jsp
	modified:   src/web/WEB-INF/project-work-management.jsp
	modified:   src/web/scripts/ckeditor/ckeditor/config.js
	modified:   src/web/scripts/dashboard-view.js
	modified:   src/web/scripts/directProjectOverview.js
	modified:   src/web/scripts/launch/contestDetailSoftware.js
	modified:   src/web/scripts/launch/entity.js
	modified:   src/web/scripts/launchcontest.js
	modified:   src/web/scripts/projectWorkManager.js
	modified:   token.properties.docker
	modified:   token.properties.example

Author: TonyJ

README.md

@@ -36,17 +36,6 @@ In this configuration, we'll run the direct app in a docker container locally bu
 
 ## **old** instructions
 
-Setup on VM:
-* Once you get your VM, login into the VM with your private key and account 'direct'
-* Back up token.properties and topcoder_global.properties in /home/direct/direct somewhere
-* Delete the whole directory /home/direct/direct
-* Git Clone the direct-app repo into folder /home/direct/direct.
-* Copy the back up *.properties files back to /home/direct/direct
-* Among the *.properties, update topcoder_global.properties, add line 'direct_service_libdir=${libdir}/tcs/ejb' after tcs_libdir property
-* Make sure JDK7 is used: run
-* + export JAVA_HOME=/opt/jdk1.7.0_17
-* + export PATH=/opt/jdk1.7.0_17/bin:$PATH
-
 Setup on Local env - Refer to http://apps.topcoder.com/wiki/display/docs/TC+Direct+Setup+Guide
 * Instead of using SVN, you will use the codes from this git repo
 

conf/web/WEB-INF/applicationContext.xml

@@ -249,6 +249,24 @@
 
     <bean id="mimeTypeRetriever" class="com.topcoder.direct.services.view.action.contest.launch.MimeTypeRetriever"/>
 
+    <bean id="dbConnectionFactory" class="com.topcoder.db.connectionfactory.DBConnectionFactoryImpl">
+        <constructor-arg index="0" value="com.topcoder.db.connectionfactory.DBConnectionFactoryImpl"/>
+    </bean>
+
+    <bean id="resourcePersistence" class="com.topcoder.management.resource.persistence.sql.SqlResourcePersistence">
+        <constructor-arg index="0" ref="dbConnectionFactory"/>
+    </bean>
+
+    <bean id="searchBundleManager" class="com.topcoder.search.builder.SearchBundleManager">
+        <constructor-arg index="0" value="com.topcoder.searchbuilder.common"/>
+    </bean>
+
+    <bean id="persistenceResourceManager"
+          class="com.topcoder.management.resource.persistence.PersistenceResourceManager">
+        <constructor-arg index="0" ref="resourcePersistence"/>
+        <constructor-arg index="1" ref="searchBundleManager"/>
+    </bean>
+
     <!-- Actions -->
     <bean id="baseDirectStrutsAction"
           class="com.topcoder.direct.services.view.action.BaseDirectStrutsAction"
@@ -286,6 +304,7 @@
         <property name="userService" ref="userService"/>
         <property name="permissionServiceFacade" ref="permissionServiceFacade"/>
         <property name="copilotProjectDAO" ref="copilotProjectDAO"/>
+        <property name="memberProfileUrlBase" value="@member.profile.url.base@"/>
     </bean>
 
     <bean id="projectVMManagementAction"
@@ -299,6 +318,7 @@
         <property name="studioSubmissionBase" value="@studio.submission.base@"/>
         <property name="softwareSubmissionBase" value="@file_storage_location@"/>
         <property name="mimeTypeRetriever" ref="mimeTypeRetriever"/>
+        <property name="resourceManager" ref="persistenceResourceManager"/>
     </bean>
 
     <bean id="getProjectVMInstancesAction"

conf/web/WEB-INF/struts.xml

@@ -789,6 +789,12 @@
             <result name="error" type="json"/>
         </action>
 
+        <action name="getSubmissionPushStatus" method="getSubmissionPushStatus" class="projectWorkManagementAction">
+            <interceptor-ref name="securedProjectPreProcessorStack"/>
+            <result name="success" type="json"/>
+            <result name="error" type="json"/>
+        </action>
+
         <action name="getWorkStepChallenges" method="getChallengesForWorkStepAndProject" class="projectWorkManagementAction">
             <interceptor-ref name="securedProjectPreProcessorStack"/>
             <result name="success" type="json"/>
@@ -821,7 +827,8 @@
 
         <action name="getProjectStatsAjax" method="getProjectStatsAjax" class="projectOverviewAction">
             <interceptor-ref name="securedProjectStack"/>
-            <result name="success">/WEB-INF/project-overview-project-stats.jsp</result>
+            <result name="success" type="json" />
+            <result name="error" type="json"/>
         </action>
 
         <action name="getProjectIssuesStatsAjax" method="getProjectIssuesStatsAjax" class="projectOverviewAction">
@@ -832,7 +839,8 @@
 
         <action name="getProjectActivitiesAjax" method="getProjectActivitiesAjax" class="projectOverviewAction">
             <interceptor-ref name="securedProjectStack"/>
-            <result name="success">/WEB-INF/project-overview-project-activities.jsp</result>
+            <result name="success" type="json"/>
+            <result name="error" type="json"/>
         </action>
 
         <action name="projectInfoExport" class="projectExportAction">
@@ -859,7 +867,8 @@
 
         <action name="projectContestsHealthAJAX" class="projectContestsHealthAction">
             <interceptor-ref name="securedDefaultStack"/>
-            <result name="success">/WEB-INF/project-overview-contests-health.jsp</result>
+            <result name="success" type="json"/>
+            <result name="error" type="json"/>
         </action>
 
         <action name="projectMilestoneView" class="projectMilestoneViewAction">

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

@@ -13,6 +13,9 @@
 import com.topcoder.security.TCSubject;
 import com.topcoder.shared.util.logging.Logger;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -92,15 +95,20 @@ protected void executeAction() {
             log.info("Retrieved contests health data for project " + getProjectId() 
                       + ", contests count = " + contests.size());
 
+            List<Map<String, Object> > results = new ArrayList<Map<String, Object> >();
             // Get dashboard data for each contest
             for (ContestBriefDTO contest : contests.keySet()) {
                 ContestDashboardDTO contestDashboardData =
                     DataProvider.getContestDashboardData(contest.getId(), !contest.isSoftware(), false);
                 contests.get(contest).setDashboardData(contestDashboardData);
-            }
 
+                Map<String, Object> contestResult = new HashMap<String, Object>();
+                contestResult.put("contest", contest);
+                contestResult.put("healthData", contests.get(contest));
+                results.add(contestResult);
+            }
 
-            setResult(contests);
+            setResult(results);
         } catch (Exception e) {
             DirectUtils.getServletResponse().setStatus(500);
             log.error("Got an error", e);

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

@@ -10,6 +10,7 @@
 import com.topcoder.direct.services.view.action.AbstractAction;
 import com.topcoder.direct.services.view.action.FormAction;
 import com.topcoder.direct.services.view.action.ViewAction;
+import com.topcoder.direct.services.view.dto.ActivityDTO;
 import com.topcoder.direct.services.view.dto.TcJiraIssue;
 import com.topcoder.direct.services.view.dto.contest.ContestBriefDTO;
 import com.topcoder.direct.services.view.dto.contest.ContestHealthDTO;
@@ -235,6 +236,11 @@ public class ProjectOverviewAction extends AbstractAction implements FormAction<
      */
     private boolean export = false;
 
+    /**
+     * The member profile url base.
+     */
+    private String memberProfileUrlBase;
+
     /**
      * Gets the project service facade.
      *
@@ -497,6 +503,23 @@ public String getProjectStatsAjax() {
 
             // get and set dashboard stats
             setDashboardProjectStat();
+
+            Map<String, Object> result = new HashMap<String, Object>();
+            result.put("draftContestsNumber", projectStats.getDraftContestsNumber());
+            result.put("pipelineContestsNumber", projectStats.getPipelineContestsNumber());
+            result.put("runningContestsNumber", projectStats.getRunningContestsNumber());
+            result.put("finishedContestsNumber", projectStats.getFinishedContestsNumber());
+            result.put("cancelledNumber", viewData.getDashboardProjectStat().getCancelledNumber());
+            result.put("completedNumber", viewData.getDashboardProjectStat().getCompletedNumber());
+            result.put("totalMemberCost", viewData.getDashboardProjectStat().getTotalMemberCost());
+            result.put("averageMemberCostPerContest", viewData.getDashboardProjectStat().getAverageMemberCostPerContest());
+            result.put("totalContestFee", viewData.getDashboardProjectStat().getTotalContestFee());
+            result.put("averageContestFeePerContest", viewData.getDashboardProjectStat().getAverageContestFeePerContest());
+            result.put("totalProjectCost", viewData.getDashboardProjectStat().getTotalProjectCost());
+            result.put("averageContestDuration", viewData.getDashboardProjectStat().getAverageContestDuration());
+            result.put("averageFulfillment", viewData.getDashboardProjectStat().getAverageFulfillment());
+
+            setResult(result);
         } catch (Throwable error) {
             if(getModel() != null) {
                 setResult(error);
@@ -557,6 +580,28 @@ public String getProjectActivitiesAjax() {
             LatestProjectActivitiesDTO latestActivities
                     = DataProvider.getLatestActivitiesForProject(DirectUtils.getTCSubjectFromSession().getUserId(), getFormData().getProjectId());
             viewData.setLatestProjectActivities(latestActivities);
+
+            Map<String, List<Map<String, Object>>> m = new HashMap<String, List<Map<String, Object>>>();
+            for(Map.Entry<ContestBriefDTO, List<ActivityDTO>>  entry: latestActivities.getActivities().entrySet()) {
+                List<Map<String, Object>> activities = new ArrayList<Map<String, Object>>();
+                for(ActivityDTO activityDTO : entry.getValue()) {
+                    Map<String, Object> activity = new HashMap<String, Object>();
+                    activity.put("title", entry.getKey().getTitle());
+                    activity.put("typeShortName", activityDTO.getType().getShortName());
+                    activity.put("typeName", activityDTO.getType().getName());
+                    activity.put("typeActionText", activityDTO.getType().getActionText());
+                    activity.put("contestId", activityDTO.getContest().getId());
+                    activity.put("originatorId", activityDTO.getOriginatorId());
+                    activity.put("originatorHandle", activityDTO.getOriginatorHandle());
+                    activity.put("date", activityDTO.getDate());
+                    activity.put("memberProfileUrlBase", getMemberProfileUrlBase());
+
+                    activities.add(activity);
+                }
+                m.put(Long.toString(entry.getKey().getId()), activities);
+            }
+
+            setResult(m);
         } catch (Throwable error) {
             if(getModel() != null) {
                 setResult(error);
@@ -674,7 +719,7 @@ private void setProjectGeneralInfo(ProjectData project) throws Exception {
 
 
         getViewData().getProjectGeneralInfo().setActualCost(actualCost);
-        
+
         DataProvider.setProjectGeneralInfo(getViewData().getProjectGeneralInfo());
         // set project permission info
         setProjectPermissionInfo();
@@ -696,11 +741,11 @@ private void setProjectPermissionInfo() throws Exception {
         final List<Permission> permissionsByProject = getPermissionServiceFacade().getPermissionsByProject(currentUser, getFormData().getProjectId());
 
         ProjectPermissionInfoDTO permissionInfo = new ProjectPermissionInfoDTO();
-		boolean hasFullPermission = false;
-	
+        boolean hasFullPermission = false;
+
         if (permissionsByProject != null) {
-            for(Permission p : permissionsByProject) { 
-	
+            for(Permission p : permissionsByProject) {
+
                 if(p.getPermissionType().getPermissionTypeId() == PermissionType.PERMISSION_TYPE_PROJECT_REPORT) {
                     permissionInfo.setReportPermissionNumber(permissionInfo.getReportPermissionNumber() + 1);
                 } else if(p.getPermissionType().getPermissionTypeId() == PermissionType.PERMISSION_TYPE_PROJECT_READ) {
@@ -709,10 +754,10 @@ private void setProjectPermissionInfo() throws Exception {
                     permissionInfo.setWritePermissionNumber(permissionInfo.getWritePermissionNumber() + 1);
                 } else if(p.getPermissionType().getPermissionTypeId() == PermissionType.PERMISSION_TYPE_PROJECT_FULL) {
                     permissionInfo.setFullPermissionNumber(permissionInfo.getFullPermissionNumber() + 1);
-					if (p.getUserId() == currentUser.getUserId())
-					{
-						hasFullPermission = true;
-					}
+                    if (p.getUserId() == currentUser.getUserId())
+                    {
+                        hasFullPermission = true;
+                    }
                 }
             }
         }
@@ -757,4 +802,22 @@ public UserService getUserService() {
     public void setUserService(UserService userService) {
         this.userService = userService;
     }
+
+    /**
+     * Gets the memberProfileUrlBase.
+     *
+     * @return the memberProfileUrlBase.
+     */
+    public String getMemberProfileUrlBase() {
+        return memberProfileUrlBase;
+    }
+
+    /**
+     * Sets the memberProfileUrlBase.
+     *
+     * @param memberProfileUrlBase the memberProfileUrlBase.
+     */
+    public void setMemberProfileUrlBase(String memberProfileUrlBase) {
+        this.memberProfileUrlBase = memberProfileUrlBase;
+    }
 }