Merge branch 'be_able_edit_dates_for_tasks' into dev

Author: skyhit

src/web/scripts/launch/contestDetailSoftware.js

@@ -1114,6 +1114,9 @@ function initContest(contestJson) {
     phaseOpen = contestJson.phaseOpen;
     isCompleted = contestJson.projectStatus.id == 7;
     isCancelled = (contestJson.projectStatus.id > 3) && !isCompleted;
+    var isTask = projectHeader.properties[TASK_FLAG] == "1";
+    var hasPhaseOpen = $("ul.progressContainer li.current").size() > 0
+    var morePhaseCompleted = $("ul.progressContainer li.completed").size() > 1
 
     // if has no write permission, no edit; if any phase is open, no edit
     $('#contestNameText').hide();
@@ -1170,16 +1173,22 @@ function initContest(contestJson) {
         if (contestJson.projectStatus != null && contestJson.projectStatus.name == DRAFT_STATUS) {
             isActiveContest = true;
             $(".edit_prize").parent().show();
-            if (contestJson.properties["Private Project Status"] == "1"){
+            if (isTask){
                 $(".edit_round").show();
                 $('#roundEdit').show();
                 $(".edit_prize").show();
             }
         } else {
             $(".edit_prize").show();
             $(".edit_round").show();
-            $('#roundEdit').hide();
-            $('#roundText').show();
+            //enable edit date for task, not have open phase, not have phase complete other than registration
+            if (isTask && !hasPhaseOpen && !morePhaseCompleted){
+                $('#roundEdit').show();
+                $('#roundText').hide();
+            }else {
+                $('#roundEdit').hide();
+                $('#roundText').show();
+            }
         }
 
         $(".edit_spec").show();
@@ -1194,7 +1203,7 @@ function initContest(contestJson) {
         $(".edit_round").hide();
         $(".privateCmd").hide();
     }else if (contestJson.projectStatus != null && contestJson.projectStatus.id == ACTIVE_PROJECT_STATUS &&
-    contestJson.properties["Private Project Status"] == "1"){
+    contestJson.properties[TASK_FLAG] == "1"){
         $(".privateCmd").show();
     }
 
@@ -1266,7 +1275,7 @@ function populateTypeSection() {
 	}
 
     if (isF2F() || isDesignF2F()) {
-        var privateProject = p["Private Project Status"];
+        var privateProject = p[TASK_FLAG];
         var registrants = [];
         for (var i=0; i < mainWidget.softwareCompetition.registrants.length; i++) {
             registrants.push(mainWidget.softwareCompetition.registrants[i]["handle"]);
@@ -2671,7 +2680,6 @@ function populateSpecSection(initFlag) {
 	$('#swDetailedRequirements').val(detailedRequirements);
 	$('#swGuidelines').val(guidelines);
     $('#swPrivateDescription').val(privateDescription);
-
     if(isDevOrDesign()) {
        if(mainWidget.softwareCompetition.assetDTO.directjsRootCategoryId != $('#catalogSelect').val() || initFlag) {
           $('#catalogSelect').val(mainWidget.softwareCompetition.assetDTO.directjsRootCategoryId);
@@ -2680,7 +2688,6 @@ function populateSpecSection(initFlag) {
        	  fillCategories();
        }
   }
-
   if(isTechnologyContest()) {
   	   //technlogies
       jQuery_1_11_1("#technologies").magicSuggest().setValue(mainWidget.softwareCompetition.assetDTO.directjsTechnologies);
@@ -2696,7 +2703,6 @@ function populateSpecSection(initFlag) {
       $('#rswTechnologies').html(selectedTechName.join("<br/>"));
       technologyAndPlatformSelectsChanged();
   }
-
     if(isPlatformContest()) {
         //platforms
         jQuery_1_11_1("#platforms").magicSuggest().setValue(mainWidget.softwareCompetition.platforms);
@@ -2719,7 +2725,6 @@ function populateSpecSection(initFlag) {
     } else {
         $("#swThurgoodDiv input").removeAttr("checked");
     }
-
   // for studio
   if (mainWidget.competitionType == "STUDIO") {
 	  $('#contestIntroduction').val(mainWidget.softwareCompetition.projectHeader.projectStudioSpecification.contestIntroduction);
@@ -2744,7 +2749,6 @@ function populateSpecSection(initFlag) {
               html += '<div><input type="checkbox" value="' + type.value +'" class="defaultFileType" /> <label>' + type.description + '</label></div>';
           }
       });
-
 	  // other file types
 	  $.each(types[1], function(i, type) {
 	      html += '<div><input type="checkbox" checked="checked" />&nbsp;&nbsp;<input type="text" class="text fileInput" value="' + type + '"/></div>';

src/web/scripts/launch/entity.js

@@ -193,6 +193,7 @@ var STUDIO_IDEA_GENERATION = 22;
 
 var DRAFT_STATUS = "Draft";
 var ACTIVE_STATUS = "Active";
+var TASK_FLAG = "Private Project Status";
 
 var PRODUCT_SKU ="Product SKU";
 

src/web/scripts/launch/main.js

@@ -1036,15 +1036,15 @@ function saveAsDraftRequest() {
 
     if (isF2F() || isDesignF2F()) {
         if ($("input[name=privateProject]:checked").length > 0){
-            mainWidget.softwareCompetition.projectHeader.properties["Private Project Status"] = "1";
-            if (mainWidget.softwareCompetition.projectHeader.properties["Private Project Status"] ==
+            mainWidget.softwareCompetition.projectHeader.properties[TASK_FLAG] = "1";
+            if (mainWidget.softwareCompetition.projectHeader.properties[TASK_FLAG] ==
                 $("input[name=preRegisterUsers]").val().trim()){
                 mainWidget.softwareCompetition.preRegisterUsers = "";
             }else{
                 mainWidget.softwareCompetition.preRegisterUsers = $("input[name=preRegisterUsers]").val();
             }
         }else{
-            mainWidget.softwareCompetition.projectHeader.properties["Private Project Status"] = "0";
+            mainWidget.softwareCompetition.projectHeader.properties[TASK_FLAG] = "0";
             mainWidget.softwareCompetition.preRegisterUsers = "";
         }
     }
@@ -3239,7 +3239,7 @@ function validateFileTypes(errors) {
  * Checks to see if the technology is needed for the contest
  */
 function isTechnologyContest() {
-   if(!mainWidget.softwareCompetition.projectHeader.projectCategory) {
+   if(!mainWidget.softwareCompetition.projectHeader.projectCategory || isDesignType()) {
        return false;
    } else {
        var categoryId = mainWidget.softwareCompetition.projectHeader.projectCategory.id;