diff --git a/canapGEST/API/app/Http/Controllers/ApplicantsController.php b/canapGEST/API/app/Http/Controllers/ApplicantsController.php index 93ad26066e3a84697b8e632afc05241bf2607022..83a0b97d58090acac962d0cd2898cf528df5aeec 100644 --- a/canapGEST/API/app/Http/Controllers/ApplicantsController.php +++ b/canapGEST/API/app/Http/Controllers/ApplicantsController.php @@ -40,17 +40,18 @@ class ApplicantsController extends Controller ->join('position', 'applicant.fk_position', '=', 'position.position_id') ->join('job', 'position.fk_job', '=', 'job.job_id') ->join('location', 'position.fk_location', '=', 'location.location_id') + ->join('marker', 'applicant.applicant_id', '=', 'marker.fk_applicant_id') + ->where('marker_owner_sciper', $this->user_sciper) ->where('fk_status', 'Valide') ->get(); } - foreach ($job_applicants as $key => $applicant) { if (in_array($applicant->job_short_value, $this->user_permissions)) { array_push($applicants, $applicant); } } - return $applicants; + return $applicants; } public function getJobApplicants($job) diff --git a/canapGEST/API/app/Http/Controllers/AuthController.php b/canapGEST/API/app/Http/Controllers/AuthController.php index 730c98777fb0127c365dda3ce96448102058252f..35d9b35cfc1be0abb4f163e6f8d78005b70c61ab 100644 --- a/canapGEST/API/app/Http/Controllers/AuthController.php +++ b/canapGEST/API/app/Http/Controllers/AuthController.php @@ -74,7 +74,7 @@ class AuthController extends Controller public function tequilareturn() { return redirect()->to("https://canap-gest-dev.local:8080/#/?key=" . $_GET["key"]); - // return redirect()->to("https://canap-gest:8443/?key=" . $_GET["key"]); + // return redirect()->to("https://canap-gest:8443/#/?key=" . $_GET["key"]); } public function logout() diff --git a/canapGEST/Site/src/store/modules/user/actions.js b/canapGEST/Site/src/store/modules/user/actions.js index b314b198a424d62e1723b1c6d0ed33f283183743..c4212cea0b98354027fd75a6dbb5801f742600e0 100644 --- a/canapGEST/Site/src/store/modules/user/actions.js +++ b/canapGEST/Site/src/store/modules/user/actions.js @@ -17,8 +17,9 @@ export function logout(context, fullLogout) { localStorage.removeItem('stored_token') if (fullLogout) { window.location = 'https://tequila.epfl.ch/logout' + } else { + location.reload() } - // location.reload() }) } diff --git a/canapGEST/Site/src/views/ApplicationsView.vue b/canapGEST/Site/src/views/ApplicationsView.vue index 5cf33a8c313c0df648cb5aa1cd279569e2d3c407..1cb5d7d7f7dde89d84131ecf85a0b39b58b488db 100644 --- a/canapGEST/Site/src/views/ApplicationsView.vue +++ b/canapGEST/Site/src/views/ApplicationsView.vue @@ -88,10 +88,15 @@ </td> <td>{{ props.item.applicant_scolarity_end }}</td> <td>{{ getFormatedDate(props.item.applicant_application_date) }}</td> + <td v-if="!$store.getters['moduleUser/userIsResponsible']"> + <span> + {{props.item.marker_value}} + <v-icon inline small>star_rating</v-icon> + </span> + </td> <td> <v-select :items="$store.state.moduleApplications.available_status" - label="Statut" item-text="status_value" item-value="status_value" v-model="props.item.fk_status" @@ -139,6 +144,9 @@ export default { }, created() { this.loadApplications() + if (!this.$store.getters['moduleUser/userIsResponsible']) { + this.headers.splice(this.headers.length-1, 0, { text: 'Note', value: 'applicant_marker' }) + } }, computed: { hasSelected() { return this.selected.length > 0 }