Skip to content

P
PERFORMA_REPLICA
Commit 2fb4886a by Harsh Shah
Options

Finish Hotfix-20190411

parents 3835e65c 24281d25
Showing with 63 additions and 44 deletions
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,41 +27,61 @@ public class SearchApplicant extends BaseSearchApplicant
@Override
public BaseBusinessClass[] doSearch()
{
JobApplication[] appResults = JobApplication.SearchByDetails()
.byName(getDetails())
.andJob(new EqualsFilter<>(getJob()))
.search(getTransaction());
// add to make sure to have any new ones
if(getJob() != null)
final List<JobApplication> appResults = new ArrayList<>();
try
{
for(JobApplication app : appResults)
{
Answer[] answers = Answer.SearchByAll().andCandidate(new EqualsFilter<>(app.getCandidate())).search(getTransaction());
for (Answer answer: answers)
getTransaction().runInNewTX(new TransactionTask()
{
@Override
public void run(ObjectTransaction newObjTran) throws FieldException, StorageException
{
app.getCandidate().addToProfileAssessmentAnswers(answer);
}
AssessmentCriteriaAnswer[] requirements = AssessmentCriteriaAnswer.SearchByAll().andJobApplication(new EqualsFilter<>(app)).search(getTransaction());
for (AssessmentCriteriaAnswer requirement: requirements)
{
app.addToAssessmentCriteriaAnswers(requirement);
}
CultureCriteriaAnswer[] cultures = CultureCriteriaAnswer.SearchByAll().andCandidate(new EqualsFilter<>(app.getCandidate())).search(getTransaction());
for (CultureCriteriaAnswer culture: cultures)
{
app.getCandidate().addToCultureCriteriaAnswers(culture);
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)
{
app.getCandidate().addToProfileAssessmentAnswers(answer);
}
AssessmentCriteriaAnswer[] requirements = AssessmentCriteriaAnswer.SearchByAll().andJobApplication(new EqualsFilter<>(app)).search(getTransaction());
for (AssessmentCriteriaAnswer requirement: requirements)
{
app.addToAssessmentCriteriaAnswers(requirement);
}
CultureCriteriaAnswer[] cultures = CultureCriteriaAnswer.SearchByAll().andCandidate(new EqualsFilter<>(app.getCandidate())).search(getTransaction());
for (CultureCriteriaAnswer culture: cultures)
{
app.getCandidate().addToCultureCriteriaAnswers(culture);
}
getJob().addToJobApplications(app);
appResults.add(app);
}
}
getJob().addToJobApplications(app);
}
});
}
catch (FieldException | StorageException ex)
{
LogMgr.log(LOG, LogLevel.PROCESSING2 , ex, "Error when searching job applications");
}
return appResults;
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
......@@ -395,12 +395,8 @@
<%-- <input type="text" class="form-control select-occupation search-input " placeholder="Select the occupation classification"
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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment