Skip to content
Snippets Groups Projects
Commit 4bcc53a7 authored by nicrausaz's avatar nicrausaz
Browse files

Fix candidatures sans notes

parent b0dc13aa
No related branches found
No related tags found
No related merge requests found
...@@ -41,8 +41,10 @@ class ApplicantsController extends Controller ...@@ -41,8 +41,10 @@ class ApplicantsController extends Controller
->join('position', 'applicant.fk_position', '=', 'position.position_id') ->join('position', 'applicant.fk_position', '=', 'position.position_id')
->join('job', 'position.fk_job', '=', 'job.job_id') ->join('job', 'position.fk_job', '=', 'job.job_id')
->join('location', 'position.fk_location', '=', 'location.location_id') ->join('location', 'position.fk_location', '=', 'location.location_id')
->join('marker', 'applicant.applicant_id', '=', 'marker.fk_applicant_id') ->leftJoin('marker', function($join) {
->where('marker_owner_sciper', $this->user_sciper) $join->on('applicant.applicant_id', '=', 'marker.fk_applicant_id');
$join->where('marker_owner_sciper', $this->user_sciper);
})
->where('fk_status', 'Valide') ->where('fk_status', 'Valide')
->get(); ->get();
} }
...@@ -52,7 +54,7 @@ class ApplicantsController extends Controller ...@@ -52,7 +54,7 @@ class ApplicantsController extends Controller
array_push($applicants, $applicant); array_push($applicants, $applicant);
} }
} }
return $applicants; return $applicants;
} }
public function getJobApplicants($job) public function getJobApplicants($job)
......
...@@ -91,10 +91,9 @@ ...@@ -91,10 +91,9 @@
<td>{{ props.item.applicant_scolarity_end }}</td> <td>{{ props.item.applicant_scolarity_end }}</td>
<td>{{ getFormatedDate(props.item.applicant_application_date) }}</td> <td>{{ getFormatedDate(props.item.applicant_application_date) }}</td>
<td v-if="!$store.getters['moduleUser/userIsResponsible']"> <td v-if="!$store.getters['moduleUser/userIsResponsible']">
<span> <span v-if="props.item.marker_value !== null">{{props.item.marker_value}}</span>
{{props.item.marker_value}} <span v-else></span>
<v-icon inline small>star_rating</v-icon> <v-icon inline small>star_rating</v-icon>
</span>
</td> </td>
<td> <td>
<v-select <v-select
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment