Corrections API, Rapport

canapGEST/API/app/Helpers/AccessLevelHelper.php

@@ -68,6 +68,6 @@ class AccessLevelHelper
         }
       }
     }
-    return ["groups" => $user_alloweds, "role" => $user_role];
+    return ["groups" => array_unique($user_alloweds), "role" => $user_role];
   }
 }
\ No newline at end of file

canapGEST/API/app/Http/Controllers/ApplicantsController.php

@@ -26,17 +26,18 @@ class ApplicantsController extends Controller
 
   public function getAll()
   {
-    // Récupère toutes les candidatures autorisée
+    // Récupère toutes les candidatures autorisées
     $applicants = [];
-    foreach ($this->user_permissions as $job) {
-      $job_applicants = DB::table('applicant')
-        ->join('position', 'applicant.fk_position', '=', 'position.position_id')
-        ->join('job', 'position.fk_job', '=', 'job.job_id')
-        ->where('job_short_value', $job)
-        ->get();
 
-      if (count($job_applicants)) {
-        array_push($applicants, $job_applicants);
+    $job_applicants = DB::table('applicant')
+      ->join('position', 'applicant.fk_position', '=', 'position.position_id')
+      ->join('job', 'position.fk_job', '=', 'job.job_id')
+      ->join('location', 'position.fk_location', '=', 'location.location_id')
+      ->get();
+
+    foreach ($job_applicants as $key => $applicant) {
+      if (in_array($applicant->job_short_value, $this->user_permissions)) {
+        array_push($applicants, $applicant);
       }
     }
     return $applicants;

canapGEST/API/app/Http/Controllers/PositionController.php → canapGEST/API/app/Http/Controllers/PositionsController.php

@@ -8,7 +8,7 @@ use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Lang;
 use App\Helpers\AccessLevelHelper;
 
-class PositionController extends Controller
+class PositionsController extends Controller
 {
   private $request;
   private $user_permissions;

canapGEST/API/app/Http/Controllers/UsersController.php

@@ -33,8 +33,17 @@ class UsersController extends Controller
 
   public function getPermittedJobs()
   {
-    // TODO: return full job values too
-    return $this->user_permissions;
+    $result = [];
+
+    foreach (DB::table('job')->get() as $key => $value) {
+      foreach ($this->user_permissions as $key => $perm) {
+        if ($perm == $value->job_short_value) {
+          array_push($result, ["job_short_value" => $value->job_short_value, "job_full_value" => $value->job_full_value]);
+        }
+      }
+    }
+    return ($result);
+    // TODO: remove duplicates
   }
 
   public function getCommentedAndMarkedApplicantsByUser()

canapGEST/API/routes/web.php

@@ -35,14 +35,14 @@ $router->group(['middleware' => 'jwt.auth'], function () use ($router) {
   $router->patch('api/status/applicant/{id:[0-9]+}', 'StatusController@updateApplicantStatus');
 
   // Positions, jobs and locations
-  $router->get('api/positions', 'PositionController@getAll');
-  $router->get('api/locations', 'PositionController@getAvailableLocations');
-  $router->get('api/jobs', 'PositionController@getAvailableJobs');
-  $router->put('api/position', 'PositionController@createPosition');
-  $router->put('api/location', 'PositionController@createLocation');
-  $router->put('api/job', 'PositionController@createJob');
-  $router->patch('api/position/{id:[0-9]+}', 'PositionController@updatePosition');
-  $router->delete('api/position/{id:[0-9]+}', 'PositionController@deletePosition');
+  $router->get('api/positions', 'PositionsController@getAll');
+  $router->get('api/locations', 'PositionsController@getAvailableLocations');
+  $router->get('api/jobs', 'PositionsController@getAvailableJobs');
+  $router->put('api/position', 'PositionsController@createPosition');
+  $router->put('api/location', 'PositionsController@createLocation');
+  $router->put('api/job', 'PositionsController@createJob');
+  $router->patch('api/position/{id:[0-9]+}', 'PositionsController@updatePosition');
+  $router->delete('api/position/{id:[0-9]+}', 'PositionsController@deletePosition');
 
   // Files
   $router->get('api/file/{id:[0-9]+}', 'FilesController@getFile');

canapGEST/Site/src/views/ApplicationsView.vue

@@ -3,11 +3,17 @@
     <h1>Postulations</h1>
     <div>
       <!-- <pre>
-        {{$store.state.moduleApplications.applications[0]}}
-      </pre>-->
+        {{$store.state.moduleApplications.applications}}
+      </pre> -->
       <v-card-title>
-        Métier
-        {{$store.state.moduleUser.permittedJobs}}
+        <v-select
+          :items="$store.state.moduleUser.permittedJobs"
+          label="Métier (tous)"
+          item-text="job_full_value"
+          item-value="job_short_value"
+          v-model="jobFilter"
+        ></v-select>
+
         <v-spacer></v-spacer>
         <v-text-field
           v-model="search"
@@ -32,7 +38,7 @@
               <v-checkbox :input-value="props.selected" primary hide-details></v-checkbox>
             </td>
             <td>{{ props.item.applicant_name }} {{ props.item.applicant_fsname }}</td>
-            <td>{{ props.item.applicant_formation }}, {{ props.item.applicant_formation_location }}</td>
+            <td>{{ props.item.job_full_value }}, {{ props.item.location_site }}</td>
             <td>{{ props.item.applicant_address_street }} {{ props.item.applicant_address_npa }}</td>
             <td>{{ props.item.applicant_mail }}</td>
             <td>{{ props.item.applicant_foreign_authorization }}</td>
@@ -55,9 +61,6 @@
           </tr>
         </template>
       </v-data-table>
-      <div class="text-xs-center pt-2">
-        <v-pagination v-model="pagination.page" :length="pages"></v-pagination>
-      </div>
     </div>
   </div>
 </template>