Finish Hotfix-20171128

Conflicts:
	cmsWebApp/webroot/css/common.css

cmsWebApp/src/performa/form/SaveJobFP.java

@@ -34,18 +34,18 @@ public class SaveJobFP extends SaveFP
         LogMgr.log(Job.LOG, LogLevel.PROCESSING1,"In SaveJobFP saving job : ", job );
 
         Job oldJob  = (Job) job.getEarliestBackup();
-
-        if(openJob==Boolean.TRUE)
-        {
-            job.setJobStatus(JobStatus.OPEN);
-            
-            LogMgr.log(Job.LOG, LogLevel.PROCESSING1,"Job status changed as Open. ", job );
-        }
         
-        if(oldJob != null && oldJob.getJobStatus() == JobStatus.DRAFT && job.getJobStatus() == JobStatus.OPEN)
+        if(oldJob != null && oldJob.getJobStatus() == JobStatus.DRAFT && (job.getJobStatus() == JobStatus.OPEN || openJob==Boolean.TRUE))
         {
             job.setApplyBy(DateDiff.add(DateDiff.getToday(), Calendar.DATE, 30));
             job.setOpenDate(new Date());
+            
+            if(openJob==Boolean.TRUE)
+            {
+                job.setJobStatus(JobStatus.OPEN);
+
+                LogMgr.log(Job.LOG, LogLevel.PROCESSING1,"Job status changed as Open. ", job );
+            }
         }
         
         if(job.getJobStatus() == JobStatus.OPEN && job.getShortenedURL() == null)

cmsWebApp/src/performa/orm/Job.java

@@ -342,7 +342,7 @@ public class Job extends BaseJob
                     /* Create a copy of 'to' */
                     return BusinessCopyHelper.copyBusinessObject (to, copyType, newObjectRefs, this);
                 }
-                else if (to instanceof JobApplication)
+                else if (to instanceof JobApplication || to instanceof AssessmentCriteriaAnswer)
                 {
                     /* Do not create a copy of 'to' */
                     return null;

cmsWebApp/webroot/css/common.css

@@ -4746,7 +4746,7 @@ img.alert-icon {float: left;}
   .main-sc-section p {font-size: 12px;margin-bottom: 0;text-align: center;}
   .selection-form-title{font-size: 13px;margin-bottom: 12px;}
   .question-y-n label.second-label{font-size: 12px; margin-bottom: 17px;}
-  .wc-question-y-n{border: 2px #d3d3d3;border-style: solid none;}
+  .wc-question-y-n{border: 2px #d3d3d3;border-style: solid none none;}
   .wc-question-y-n label.second-label{font-size: 12px; margin-bottom: 17px;}
   .textarea-box textarea{margin-bottom: 32px;font-size: 12px;}
   .section-br-inside{margin: 25px 0 22px;}

cmsWebApp/webroot/extensions/applicantportal/application_outline.jsp

@@ -202,7 +202,7 @@
                             if(!(isSelectionComplete && isCultureComplete && isAssesmentComplete))
                             {
                         %>
-                                Total time to complete: Approximately <oneit:toString value="<%= jobApplication.getRemainingTime() %>"  mode="EscapeHTML"/> minutes
+                                Total time to complete: Approximately <%= jobApplication.getRemainingTime() %> minutes
                         <%
                             }
                         %>