Finish Hotfix-20190411

cmsWebApp/src/performa/search/SearchApplicant.java

 package performa.search;
 
-import oneit.objstore.BaseBusinessClass;
+import java.util.ArrayList;
+import java.util.List;
+import oneit.logging.LogLevel;
+import oneit.logging.LogMgr;
+import oneit.logging.LoggingArea;
+import oneit.objstore.*;
 import oneit.objstore.rdbms.filters.EqualsFilter;
-import performa.orm.Answer;
-import performa.orm.AssessmentCriteriaAnswer;
-import performa.orm.CultureCriteriaAnswer;
-import performa.orm.JobApplication;
+import oneit.objstore.services.TransactionTask;
+import oneit.utils.parsers.FieldException;
+import performa.orm.*;
+import performa.orm.types.*;
 
 
 public class SearchApplicant extends BaseSearchApplicant
 {
     private static final long serialVersionUID = 0L;
+    public  static final LoggingArea    LOG =   LoggingArea.createLoggingArea("SearchApplicant");
 
     // This constructor should not be called
     public SearchApplicant ()
@@ -21,16 +27,27 @@ public class SearchApplicant extends BaseSearchApplicant
     @Override
     public BaseBusinessClass[] doSearch() 
     {
-        JobApplication[] appResults = JobApplication.SearchByDetails()
-                                                .byName(getDetails())
-                                                .andJob(new EqualsFilter<>(getJob()))
-                                                .search(getTransaction());
+        final List<JobApplication> appResults = new ArrayList<>();
 
-        // add to make sure to have any new ones
-        if(getJob() != null)
+        try 
+        {
+            getTransaction().runInNewTX(new TransactionTask()
+            {                              
+                @Override
+                public void run(ObjectTransaction newObjTran) throws FieldException, StorageException
                 {
-            for(JobApplication app : appResults)
+                    JobApplication[]    results   =   JobApplication.SearchByDetails()
+                                                            .byName(getDetails())
+                                                            .andJob(new EqualsFilter<>(getJob()))
+                                                            .search(newObjTran); 
+                    for(JobApplication app : results)
                     {
+                        ApplicationStatus   appStatus   =   app.getApplicationStatus();
+                        
+                        app =   app.getInTransaction(getTransaction());
+                        
+                        app.setApplicationStatus(appStatus);
+                        
                         Answer[]    answers =   Answer.SearchByAll().andCandidate(new EqualsFilter<>(app.getCandidate())).search(getTransaction());
 
                         for (Answer answer: answers)
@@ -53,9 +70,18 @@ public class SearchApplicant extends BaseSearchApplicant
                         }
 
                         getJob().addToJobApplications(app);
+                        appResults.add(app);
                     }
                 }
                 
-        return appResults;
+            }); 
+        } 
+        catch (FieldException | StorageException ex) 
+        {
+            LogMgr.log(LOG, LogLevel.PROCESSING2 , ex, "Error when searching job applications");
+
+        }
+        
+        return appResults.toArray(new JobApplication[0]);
     }
 }
\ No newline at end of file

cmsWebApp/webroot/extensions/adminportal/edit_job.jsp

@@ -135,9 +135,7 @@
                                                value="<%= job.getOccupation() != null ? job.getOccupation() : "Select the occupation classification"%>"></input> 
                                         <oneit:ormInput obj="<%= job %>"  id="select-occupation-id"    attributeName="OccupationId" type="hidden"/> --%>
                                         
-                                        <oneit:ormInput obj="<%= job %>"    attributeName="OccupationId" type="hidden"/>
                                         <oneit:recalc   mode="EscapeHTML"   script="job.displayOccupation()" job="<%= job %>"/>
-
                                     </div>
                                 </div>
 

cmsWebApp/webroot/extensions/adminportal/edit_job_template.jsp

@@ -387,9 +387,7 @@
                                        value="<%= job.getOccupation() != null ? job.getOccupation() : "Select the occupation classification"%>"></input> 
                                 <oneit:ormInput obj="<%= job %>"  id="select-occupation-id"    attributeName="OccupationId" type="hidden"/> --%>
                                 
-                                <oneit:ormInput obj="<%= template %>"    attributeName="OccupationId" type="hidden"/>
                                 <oneit:recalc   mode="EscapeHTML"   script="template.displayOccupation()" template="<%= template %>"/>
-                                
                             </div>
                         </div>
                             

cmsWebApp/webroot/extensions/adminportal/job_detail.jsp

@@ -396,11 +396,7 @@
                                        value="<%= job.getOccupation() != null ? job.getOccupation() : "Select the occupation classification"%>"></input> 
                                 <oneit:ormInput obj="<%= job %>"  id="select-occupation-id"    attributeName="OccupationId" type="hidden"/> --%>
                                 
-                                <oneit:ormInput obj="<%= job %>"    attributeName="OccupationId" type="hidden"/>
-                                
                                 <oneit:recalc   mode="EscapeHTML"   script="job.displayOccupation()" job="<%= job %>"/>
-
-                                
                             </div>
                         </div>