From 501bf53a13b64e2911183e2afb21b8b6e5dbdcbe Mon Sep 17 00:00:00 2001
From: HeMa <MaximeEugene.Herbez@formation.orif.ch>
Date: Wed, 12 Jan 2022 13:26:14 +0100
Subject: [PATCH 01/33] disable courseplan selection in update usercourse add
 comment redirect to the correct location add acquisition status on objective
 creation

---
 orif/plafor/Controllers/Apprentice.php | 17 ++++++++++-------
 orif/plafor/Controllers/CoursePlan.php | 16 ++++++++++++++--
 orif/plafor/Views/comment/save.php     |  2 +-
 orif/plafor/Views/course_plan/list.php |  1 -
 orif/plafor/Views/user_course/save.php |  4 ++--
 5 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/orif/plafor/Controllers/Apprentice.php b/orif/plafor/Controllers/Apprentice.php
index b93259dd..9f4d928f 100644
--- a/orif/plafor/Controllers/Apprentice.php
+++ b/orif/plafor/Controllers/Apprentice.php
@@ -78,11 +78,13 @@ public function list_apprentice($withDeleted=0)
                 $coursesList[$courseplan['id']]=$courseplan;
             $courses = UserCourseModel::getInstance()->findall();
         }else{
+            $apprentices=[];
+            if (count(TrainerApprenticeModel::getInstance()->where('fk_trainer', $trainer_id)->findall()))
                 $apprentices = User_Model::getInstance()->whereIn('id', array_column(TrainerApprenticeModel::getInstance()->where('fk_trainer', $trainer_id)->findall(), 'fk_apprentice'))->findall();
-                $coursesList=[];
-                foreach (CoursePlanModel::getInstance()->findall() as $courseplan)
-                    $coursesList[$courseplan['id']]=$courseplan;
-                $courses = UserCourseModel::getInstance()->findall();
+            $coursesList=[];
+            foreach (CoursePlanModel::getInstance()->findall() as $courseplan)
+                $coursesList[$courseplan['id']]=$courseplan;
+            $courses = UserCourseModel::getInstance()->findall();
             }
         
         
@@ -169,7 +171,8 @@ public function save_user_course($id_apprentice = null,$id_user_course = 0){
                 );
                 if ($id_user_course > 0) {
                     //update
-                    UserCourseModel::getInstance()->update($id_user_course, $user_course);
+                    //when we update the userCourse see if the courseplan is changed
+                        UserCourseModel::getInstance()->update($id_user_course, $user_course);
                 } else if (UserCourseModel::getInstance()->where('fk_user', $id_apprentice)->where('fk_course_plan', $fk_course_plan)->first() == null) {
                     //insert
                     $id_user_course = UserCourseModel::getInstance()->insert($user_course);
@@ -440,7 +443,7 @@ public function add_comment($acquisition_status_id = null, $comment_id = null){
             if (CommentModel::getInstance()->errors()==null) {
                 //if ok
 
-                return redirect()->to(base_url('plafor/courseplan/view_acquisition_status/'.$acquisition_status['id']));
+                return redirect()->to(base_url('plafor/apprentice/view_acquisition_status/'.$acquisition_status['id']));
             }
         
         }
@@ -460,7 +463,7 @@ public function add_comment($acquisition_status_id = null, $comment_id = null){
 
     public function delete_comment($comment_id = 0, $acquisition_status_id = 0) {
         CommentModel::getInstance()->delete($comment_id);
-        return redirect()->to(base_url('plafor/courseplan/view_acquisition_status/'.$acquisition_status_id));
+        return redirect()->to(base_url('plafor/apprentice/view_acquisition_status/'.$acquisition_status_id));
     }
 
 
diff --git a/orif/plafor/Controllers/CoursePlan.php b/orif/plafor/Controllers/CoursePlan.php
index 149d6ff6..7c5ff1d2 100644
--- a/orif/plafor/Controllers/CoursePlan.php
+++ b/orif/plafor/Controllers/CoursePlan.php
@@ -421,7 +421,19 @@ public function save_objective($objective_id = 0, $operational_competence_id = 0
                     ObjectiveModel::getInstance()->update($objective_id, $objective);
                 } else {
                     //insert
-                    ObjectiveModel::getInstance()->insert($objective);
+                    $objective_id=ObjectiveModel::getInstance()->insert($objective);
+                    //when we add objective we have to update all students acquisition_status whene operationnal
+                    $userCourses=CoursePlanModel::getUserCourses(
+                        OperationalCompetenceModel::getCompetenceDomain(
+                            ObjectiveModel::getOperationalCompetence(
+                                $objective['fk_operational_competence']
+                            )['fk_competence_domain']
+                        )['fk_course_plan']
+                    );
+                    foreach($userCourses as $userCourse){
+                     AcquisitionStatusModel::getInstance()->insert(['fk_objective'=>$objective_id,'fk_user_course'=>$userCourse['id'],'fk_acquisition_level'=>1]);
+
+                    }
                 }
                 if (ObjectiveModel::getInstance()->errors() == null) {
                     //if ok
@@ -499,7 +511,7 @@ public function delete_objective($objective_id, $action = 0)
      *
      * @return void
      */
-    public function list_course_plan($id_apprentice = null, bool $with_archived=false)
+    public function list_course_plan($id_apprentice = null, $with_archived=false)
     {
         $id_apprentice==0?$id_apprentice = null:null;
         $coursePlanModel=new CoursePlanModel();
diff --git a/orif/plafor/Views/comment/save.php b/orif/plafor/Views/comment/save.php
index f0816fe3..fc6be5ac 100644
--- a/orif/plafor/Views/comment/save.php
+++ b/orif/plafor/Views/comment/save.php
@@ -17,7 +17,7 @@
     <!-- TITLE -->
     <div class="row">
         <div class="col">
-            <h1 class="title-section"><?= lang('title_comment_'.($update ? 'update' : 'new')); ?></h1>
+            <h1 class="title-section"><?= lang('plafor_lang.title_comment_'.($update ? 'update' : 'new')); ?></h1>
         </div>
     </div>
 
diff --git a/orif/plafor/Views/course_plan/list.php b/orif/plafor/Views/course_plan/list.php
index ec75610e..c7a18798 100644
--- a/orif/plafor/Views/course_plan/list.php
+++ b/orif/plafor/Views/course_plan/list.php
@@ -57,7 +57,6 @@
 <script>
     $(document).ready(function(){
         $('#toggle_deleted').change(e => {
-            console.log('ewqewqe');
             let checked = e.currentTarget.checked;
             $.post('<?=base_url();?>/plafor/courseplan/list_course_plan/0/'+(+checked), {}, data => {
                 $('#course_planslist').empty();
diff --git a/orif/plafor/Views/user_course/save.php b/orif/plafor/Views/user_course/save.php
index 990f1d86..83e19548 100644
--- a/orif/plafor/Views/user_course/save.php
+++ b/orif/plafor/Views/user_course/save.php
@@ -36,7 +36,7 @@
         'id' => 'user_course_form',
         'name' => 'user_course_form'
     );
-    echo form_open('plafor/apprentice/save_user_course/'.$apprentice['id'], $attributes, [
+    echo form_open('plafor/apprentice/save_user_course/'.$apprentice['id'].(isset($user_course['id'])?'/'.$user_course['id']:''), $attributes, [
         'id' => $apprentice->id ?? 0
     ]);
     ?>
@@ -54,7 +54,7 @@
             <div class="col-sm-6 form-group">
                 <?= form_label(lang('plafor_lang.field_user_course_course_plan'), 'course_plan', ['class' => 'form-label']); ?>
                 <br />
-                <?= form_dropdown('course_plan',$course_plans,'','id="course_plan" class="form-control"')?>
+                <?= form_dropdown('course_plan',$course_plans,isset($user_course['fk_course_plan'])?$user_course['fk_course_plan']:'','id="course_plan" class="form-control" '.($update?'disabled':''))?>
             </div>
             <div class="col-sm-6 form-group">
                 <?= form_label(lang('plafor_lang.field_user_course_status'), 'status', ['class' => 'form-label']); ?>

From 05d6e15cf9653a3e1828320972bd2b43bd50b404 Mon Sep 17 00:00:00 2001
From: HeMa <MaximeEugene.Herbez@formation.orif.ch>
Date: Thu, 13 Jan 2022 11:46:47 +0100
Subject: [PATCH 02/33] Added functionality to delete user in plafor/Filters
 and method in controller plafor/Controllers/apprentice

---
 orif/plafor/Controllers/Apprentice.php | 57 ++++++++++++++++++++++++++
 orif/plafor/Filters/LoginFilter.php    | 18 +++++++-
 2 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/orif/plafor/Controllers/Apprentice.php b/orif/plafor/Controllers/Apprentice.php
index 9f4d928f..a3b5469e 100644
--- a/orif/plafor/Controllers/Apprentice.php
+++ b/orif/plafor/Controllers/Apprentice.php
@@ -564,4 +564,61 @@ public function view_user_course($id_user_course = null){
 
         $this->display_view('\Plafor\user_course/view',$output);
     }
+    /**
+     * Delete or deactivate a user depending on $action
+     *
+     * @param integer $user_id = ID of the user to affect
+     * @param integer $action = Action to apply on the user:
+     *  - 0 for displaying the confirmation
+     *  - 1 for deactivating (soft delete)
+     *  - 2 for deleting (hard delete)
+     * @return void
+     */
+    public function delete_user($user_id, $action = 0)
+    {
+        if ($_SESSION['user_access'] == config('\User\Config\UserConfig')->access_lvl_admin) {
+            $user = User_model::getInstance()->withDeleted()->find($user_id);
+            if (is_null($user)) {
+                return redirect()->to(base_url('/user/admin/list_user'));
+            }
+
+            switch ($action) {
+                case 0: // Display confirmation
+                    $output = array(
+                        'user' => $user,
+                        'title' => lang('user_lang.title_user_delete')
+                    );
+                    $this->display_view('\User\admin\delete_user', $output);
+                    break;
+                case 1: // Deactivate (soft delete) user
+                    if ($_SESSION['user_id'] != $user['id']) {
+                        User_model::getInstance()->delete($user_id, FALSE);
+                    }
+                    return redirect()->to('/user/admin/list_user');
+                case 2: // Delete user
+                    if ($_SESSION['user_id'] != $user['id']) {
+                        //here we have to delete associated infos
+                        foreach(TrainerApprenticeModel::getInstance()->where('fk_apprentice',$user['id'])->orWhere('fk_trainer',$user['id'])->findAll() as $trainerApprentice)
+                            $trainerApprentice==null?:TrainerApprenticeModel::getInstance()->delete($trainerApprentice['id']);
+                        if (count(UserCourseModel::getUser($user['id']))>0){
+                            foreach(UserCourseModel::getInstance()->where('fk_user',$user['id'])->findAll() as $userCourse){
+                                foreach(UserCourseModel::getAcquisitionStatus($userCourse['id']) as $acquisitionStatus){
+
+                                    foreach (CommentModel::getInstance()->where('fk_acquisition_status',$acquisitionStatus['id']) as $comment){
+                                        $comment==null?:CommentModel::getInstance()->delete($comment['id'],true);
+                                    }
+                                    AcquisitionStatusModel::getInstance()->delete($acquisitionStatus['id'],true);
+                                }
+                                UserCourseModel::getInstance()->delete($userCourse['id'],true);
+                            }
+
+                        }
+                        User_model::getInstance()->delete($user_id, TRUE);
+                    }
+                    return redirect()->to('/user/admin/list_user');
+                default: // Do nothing
+                    return redirect()->to('/user/admin/list_user');
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/orif/plafor/Filters/LoginFilter.php b/orif/plafor/Filters/LoginFilter.php
index eb0cda87..def803dc 100644
--- a/orif/plafor/Filters/LoginFilter.php
+++ b/orif/plafor/Filters/LoginFilter.php
@@ -4,6 +4,7 @@
 namespace Plafor\Filters;
 
 
+use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\View\View;
@@ -14,11 +15,12 @@ class LoginFilter implements \CodeIgniter\Filters\FilterInterface
 
     /**
      * @inheritDoc
+     * This function permit to delete user from plafor/apprentice/delete_user instead
+     * of using user/admin/delete_user
      */
     public function before(RequestInterface $request, $arguments = null)
     {
         try {
-            // TODO: Implement before() method.
             $appStatusFile=fopen(WRITEPATH.'appStatus.json','r');
             if (json_decode(fread($appStatusFile,100))->initialized!=false) {
                 $session = service('session');
@@ -33,6 +35,8 @@ public function before(RequestInterface $request, $arguments = null)
         }catch (\mysqli_sql_exception $e){
 
         }
+        return $this->redirectToPlaforDeleteUser();
+
 
     }
 
@@ -43,4 +47,16 @@ public function after(RequestInterface $request, ResponseInterface $response, $a
     {
         // TODO: Implement after() method.
     }
+
+    /**
+     *This function permit to delete user from plafor/apprentice/delete_user instead
+     *of using user/admin/delete_user
+     * @return RedirectResponse
+     */
+    private function redirectToPlaforDeleteUser(){
+        if((boolean)strpos($_SERVER['REQUEST_URI'],'user/admin/delete_user')){
+            $value=str_replace('plafor/public/user/admin/delete_user','plafor/apprentice/delete_user',$_SERVER['REQUEST_URI']);
+            return redirect()->to(base_url($value));
+        }
+    }
 }
\ No newline at end of file

From 1d4d3234248deb8b86aedd149cc82860d2da3a0e Mon Sep 17 00:00:00 2001
From: Didier Viret <didier.viret@orif.ch>
Date: Fri, 14 Jan 2022 16:29:42 +0100
Subject: [PATCH 03/33] cosmetic changes

---
 orif/plafor/Controllers/Apprentice.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/orif/plafor/Controllers/Apprentice.php b/orif/plafor/Controllers/Apprentice.php
index a3b5469e..a26f7d99 100644
--- a/orif/plafor/Controllers/Apprentice.php
+++ b/orif/plafor/Controllers/Apprentice.php
@@ -85,7 +85,7 @@ public function list_apprentice($withDeleted=0)
             foreach (CoursePlanModel::getInstance()->findall() as $courseplan)
                 $coursesList[$courseplan['id']]=$courseplan;
             $courses = UserCourseModel::getInstance()->findall();
-            }
+        }
         
         
         $output = array(
@@ -172,7 +172,7 @@ public function save_user_course($id_apprentice = null,$id_user_course = 0){
                 if ($id_user_course > 0) {
                     //update
                     //when we update the userCourse see if the courseplan is changed
-                        UserCourseModel::getInstance()->update($id_user_course, $user_course);
+                    UserCourseModel::getInstance()->update($id_user_course, $user_course);
                 } else if (UserCourseModel::getInstance()->where('fk_user', $id_apprentice)->where('fk_course_plan', $fk_course_plan)->first() == null) {
                     //insert
                     $id_user_course = UserCourseModel::getInstance()->insert($user_course);

From b4d09fbe68408d3ea52fed836bd07a0ebcd19278 Mon Sep 17 00:00:00 2001
From: HeMa <MaximeEugene.Herbez@formation.orif.ch>
Date: Wed, 19 Jan 2022 08:09:39 +0100
Subject: [PATCH 04/33] added generic items list

---
 orif/plafor/Controllers/CoursePlan.php        |  3 +-
 orif/plafor/Views/competence_domain/save.php  |  2 +-
 orif/plafor/Views/competence_domain/view.php  | 41 ++++++--------
 orif/plafor/Views/course_plan/list.php        | 53 ++++++++++---------
 orif/plafor/Views/course_plan/view.php        | 44 +++++++--------
 .../Views/operational_competence/view.php     | 12 +++--
 6 files changed, 74 insertions(+), 81 deletions(-)

diff --git a/orif/plafor/Controllers/CoursePlan.php b/orif/plafor/Controllers/CoursePlan.php
index 7c5ff1d2..2f6d4dc8 100644
--- a/orif/plafor/Controllers/CoursePlan.php
+++ b/orif/plafor/Controllers/CoursePlan.php
@@ -152,7 +152,7 @@ public function delete_course_plan($course_plan_id, $action = 0)
      * @param integer $competence_domain_id = The id of the course plan to modify, leave blank to create a new one
      * @return void
      */
-    public function save_competence_domain($competence_domain_id = 0, $course_plan_id = 0)
+    public function save_competence_domain($course_plan_id = 0,$competence_domain_id = 0)
     {
         if ($_SESSION['user_access'] >= config('\User\Config\UserConfig')->access_lvl_admin) {
 
@@ -513,6 +513,7 @@ public function delete_objective($objective_id, $action = 0)
      */
     public function list_course_plan($id_apprentice = null, $with_archived=false)
     {
+        $this->request->getGet('wa')!=null?$with_archived=$this->request->getGet('wa'):null;
         $id_apprentice==0?$id_apprentice = null:null;
         $coursePlanModel=new CoursePlanModel();
         $userCourseModel=new UserCourseModel();
diff --git a/orif/plafor/Views/competence_domain/save.php b/orif/plafor/Views/competence_domain/save.php
index d99f5308..f0e818c3 100644
--- a/orif/plafor/Views/competence_domain/save.php
+++ b/orif/plafor/Views/competence_domain/save.php
@@ -36,7 +36,7 @@
         'id' => 'competence_domain_form',
         'name' => 'competence_domain_form'
     );
-    echo form_open(base_url('plafor/courseplan/save_competence_domain'), $attributes, [
+    echo form_open(base_url('plafor/courseplan/save_competence_domain/0'), $attributes, [
         'id' => $competence_domain['id'] ?? 0
     ]);
     ?>
diff --git a/orif/plafor/Views/competence_domain/view.php b/orif/plafor/Views/competence_domain/view.php
index 0960ac47..5a7e8267 100644
--- a/orif/plafor/Views/competence_domain/view.php
+++ b/orif/plafor/Views/competence_domain/view.php
@@ -29,31 +29,24 @@
             <?php if(service('session')->get('user_access')>=config('\User\Config\UserConfig')->access_lvl_admin):?>
                 <a href="<?=base_url('plafor/courseplan/save_operational_competence/0/'.$competence_domain['id'])?>" class="btn btn-primary"><?=lang('common_lang.btn_new_f')?></a>
             <?php endif?>
+            <?php
+            $datas=[];
+            foreach (\Plafor\Models\CompetenceDomainModel::getOperationalCompetences($competence_domain['id']) as $operational_competence){
+                $datas[]=['id'=>$operational_competence['id'],'symbol'=>$operational_competence['symbol'],'opComp'=>$operational_competence['name']];
+            }
+            ?>
 
-            <table class="table table-hover mt-2">
-            <thead>
-                <tr>
-                    <th><span class="font-weight-bold"><?=lang('plafor_lang.symbol')?></span></th>
-                    <th><span class="font-weight-bold"><?=lang('plafor_lang.operational_competence')?></span></th>
-                    <?php if(service('session')->get('user_access')>=config('\User\Config\UserConfig')->access_lvl_admin):?>
-                        <th></th>
-                        <th></th>
-                    <?php endif;?>
-                </tr>
-            </thead>
-            <tbody>
-                <?php foreach (\Plafor\Models\CompetenceDomainModel::getOperationalCompetences($competence_domain['id']) as $operational_competence){ ?>
-                    <tr>
-                        <td><a href="<?= base_url('plafor/courseplan/view_operational_competence/'.$operational_competence['id'])?>"><?=$operational_competence['symbol']?></a></td>
-                        <td><a href="<?= base_url('plafor/courseplan/view_operational_competence/'.$operational_competence['id'])?>"><?=$operational_competence['name']?></a></td>
-                        <?php if(service('session')->get('user_access')>=config('\User\Config\UserConfig')->access_lvl_admin):?>
-                            <td><a href="<?= base_url('plafor/courseplan/save_operational_competence/'.$operational_competence['id'].'/'.$competence_domain['id']); ?>"><i class="bi-pencil" style="font-size: 20px;"></i></a></td>
-                            <td><a href="<?= base_url('plafor/courseplan/delete_operational_competence/'.$operational_competence['id']); ?>" ><i class="<?=$competence_domain['archive']==null?'bi bi-trash':'bi bi-reply-all-fill'?>" style="font-size: 20px;" ></a></td>
-                        <?php endif;?>
-                    </tr>
-                <?php  }?>
-            </tbody>
-            </table>
+            <?= view('Common\Views\items_list',[
+                'columns'=>[
+                    'symbol'=>lang('plafor_lang.symbol'),
+                    'opComp'=>lang('plafor_lang.operational_competence')
+                ],
+                'items'=>$datas,
+                'primary_key_field'=>'id',
+                'url_update'=>'plafor/courseplan/save_operational_competence/',
+                'url_delete'=>'plafor/courseplan/delete_operational_competence/',
+                'url_detail'=>'plafor/courseplan/view_operational_competence/',
+            ])?>
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/orif/plafor/Views/course_plan/list.php b/orif/plafor/Views/course_plan/list.php
index c7a18798..7953f712 100644
--- a/orif/plafor/Views/course_plan/list.php
+++ b/orif/plafor/Views/course_plan/list.php
@@ -31,26 +31,24 @@
     <div class="row mt-2">
      <div class="col-sm-3 offset-6">
 		</div>
-        <table class="table table-hover">
-            <thead>
-            <tr>
-                <th><?= lang('plafor_lang.field_course_plan_official_name'); ?></th>
-                <th></th>
-                <th></th>
-                <th></th>
-            </tr>
-            </thead>
-            <tbody id="course_planslist">
-            <?php foreach($course_plans as $course_plan) { ?>
-                <tr>
-                    <td><a href="<?= base_url('plafor/courseplan/view_course_plan/'.$course_plan['id']) ?>"><span class="font-weight-bold"><?= $course_plan['formation_number']?></span><?= $course_plan['official_name']; ?></td>
-                    <td><a href="<?= base_url('plafor/courseplan/view_course_plan/'.$course_plan['id'])?>"><?= lang('common_lang.btn_details')?></a></td>
-                    <td><a href="<?= base_url('plafor/courseplan/save_course_plan/'.$course_plan['id']); ?>"><?= lang('common_lang.btn_edit')?></a></td>
-                    <td><a href="<?= base_url('plafor/courseplan/delete_course_plan/'.$course_plan['id']); ?>" class="<?=$course_plan['archive']==null?'bi bi-trash':'bi bi-reply-all-fill'?>"></td>
-                </tr>
-            <?php } ?>
-            </tbody>
-        </table>
+        <?php
+        $datas=[];
+        foreach($course_plans as $course_plan) {
+            $datas[]=['id'=>$course_plan['id'],'formNumber'=>$course_plan['formation_number'],'coursePlan'=>$course_plan['official_name']];
+        }
+        ?>
+
+        <?= view('Common\Views\items_list',[
+            'columns'=>[
+                'formNumber'=>lang('plafor_lang.field_course_plan_formation_number'),
+                'coursePlan'=>lang('plafor_lang.field_course_plan_official_name')
+            ],
+            'items'=>$datas,
+            'primary_key_field'=>'id',
+            'url_update'=>'plafor/courseplan/save_competence_domain/',
+            'url_delete'=>'plafor/courseplan/delete_competence_domain/',
+            'url_detail'=>'plafor/courseplan/view_course_plan/',
+        ])?>
     </div>
 </div>
 
@@ -58,10 +56,15 @@
     $(document).ready(function(){
         $('#toggle_deleted').change(e => {
             let checked = e.currentTarget.checked;
-            $.post('<?=base_url();?>/plafor/courseplan/list_course_plan/0/'+(+checked), {}, data => {
-                $('#course_planslist').empty();
-                $('#course_planslist')[0].innerHTML = $(data).find('#course_planslist')[0].innerHTML;
-            });
-        });
+            history.replaceState(null,null,'<?=base_url('/plafor/courseplan/list_course_plan');?>?wa='+(checked?1:0))
+            $.get('<?=base_url('/plafor/courseplan/list_course_plan');?>?wa='+(checked?1:0),(datas)=>{
+                let parser=new DOMParser();
+                parser.parseFromString(datas,'text/html').querySelectorAll('table').forEach((domTag)=>{
+                    document.querySelectorAll('table').forEach((thisDomTag)=>{
+                        thisDomTag.innerHTML=domTag.innerHTML;
+                    })
+                })
+            })
+        })
     });
 </script>
diff --git a/orif/plafor/Views/course_plan/view.php b/orif/plafor/Views/course_plan/view.php
index ea329d05..7d036377 100644
--- a/orif/plafor/Views/course_plan/view.php
+++ b/orif/plafor/Views/course_plan/view.php
@@ -19,33 +19,27 @@
         </div>
         <div class="col-12">
             <?php if(service('session')->get('user_access')>=config('\User\Config\UserConfig')->access_lvl_admin):?>
-                <a href="<?=base_url('plafor/courseplan/save_competence_domain/'.'0/'.$course_plan['id'])?>" class="btn btn-primary"><?=lang('common_lang.btn_new_m')?></a>
+                <a href="<?=base_url('plafor/courseplan/save_competence_domain/'.$course_plan['id'].'/0/')?>" class="btn btn-primary"><?=lang('common_lang.btn_new_m')?></a>
             <?php endif; ?>
 
-            <table class="table table-hover mt-2">
-            <thead>
-                <tr>
-                    <th><span class="font-weight-bold"><?=lang('plafor_lang.symbol')?></span></th>
-                    <th><span class="font-weight-bold"><?=lang('plafor_lang.competence_domain')?></span></th>
-                    <?php if(service('session')->get('user_access')>=config('\User\Config\UserConfig')->access_lvl_admin):?>
-                        <th></th>
-                        <th></th>
-                    <?php endif;?>
-                </tr>
-            </thead>
-            <tbody>
-                <?php foreach ($competence_domains as $competence_domain){ ?>
-                    <tr>
-                        <td><a href="<?= base_url('plafor/courseplan/view_competence_domain/'.$competence_domain['id'])?>"><?=$competence_domain['symbol']?></a></td>
-                        <td><a href="<?= base_url('plafor/courseplan/view_competence_domain/'.$competence_domain['id'])?>"><?=$competence_domain['name']?></a></td>
-                        <?php if(service('session')->get('user_access')>=config('\User\Config\UserConfig')->access_lvl_admin):?>
-                            <td><a href="<?= base_url('plafor/courseplan/save_competence_domain/'.$competence_domain['id'].'/'.$course_plan['id']); ?>"><i class="bi-pencil" style="font-size: 20px;"></i></a></td>
-                            <td><a href="<?= base_url('plafor/courseplan/delete_competence_domain/'.$competence_domain['id']); ?>" ><i class="<?=$course_plan['archive']==null?'bi bi-trash':'bi bi-reply-all-fill' ?>" style="font-size: 20px;" ></td>
-                        <?php endif;?>
-                    </tr>
-                <?php } ?>
-            </tbody>
-            </table>
+            <?php
+            $datas=[];
+            foreach ($competence_domains as $competence_domain){
+                $datas[]=['id'=>$competence_domain['id'],'symbol'=>$competence_domain['symbol'],'compDom'=>$competence_domain['name']];
+            }
+            ?>
+
+            <?= view('Common\Views\items_list',[
+                'columns'=>[
+                    'symbol'=>lang('plafor_lang.symbol'),
+                    'compDom'=>lang('plafor_lang.competence_domain')
+                 ],
+                'items'=>$datas,
+                'primary_key_field'=>'id',
+                'url_update'=>'plafor/courseplan/save_competence_domain/',
+                'url_delete'=>'plafor/courseplan/delete_competence_domain/',
+                'url_detail'=>'plafor/courseplan/view_competence_domain/',
+                ])?>
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/orif/plafor/Views/operational_competence/view.php b/orif/plafor/Views/operational_competence/view.php
index 7f0c6687..6b7dcbab 100644
--- a/orif/plafor/Views/operational_competence/view.php
+++ b/orif/plafor/Views/operational_competence/view.php
@@ -65,7 +65,7 @@
             <?php if (service('session')->get('user_access')>=config('\User\Config\UserConfig')->access_lvl_admin): ?>
             <a href="<?=base_url('plafor/courseplan/save_objective/0/'.$operational_competence['id']) ?>" class="btn btn-primary"><?= lang('common_lang.btn_new_m')?></a>
             <?php endif;?>
-            <table class="responsiveTable table table-hover">
+            <table class="responsiveTable table table-striped table-hover">
             <thead>
                 <tr>
                     <th><span class="font-weight-bold"><?=lang('plafor_lang.field_objectives_symbols')?></span></th>
@@ -82,17 +82,19 @@
             foreach ($objectives as $objective){
                 ?><tr>
                     <td>
-                        <a class="font-weight-bold" href="<?= base_url('plafor/courseplan/view_objective/'.$objective['id'])?>"><?=$objective['symbol']?></a>
+                        <a><?=$objective['symbol']?></a>
 
                     </td>
                     <td>
                         <span class="font-weight-bold descTitle" style="display: none"><?=lang('plafor_lang.field_taxonomy')?></span>
-                        <a href="<?= base_url('plafor/courseplan/view_objective/'.$objective['id'])?>"><?=$objective['taxonomy']?></a>
+                        <a><?=$objective['taxonomy']?></a>
 
                     </td>
-                    <td><a href="<?= base_url('plafor/courseplan/view_objective/'.$objective['id'])?>"><?=$objective['name']?></a></td>
+                    <td><?=$objective['name']?></td>
+                    <td><a href="<?=base_url('plafor/courseplan/view_objective/'.$objective['id'])?>"><i class="bi bi-card-text"></i></td>
+
                 <?php if(service('session')->get('user_access')>=config('\User\Config\UserConfig')->access_lvl_admin):?>
-                    <td><a href="<?= base_url('plafor/courseplan/save_objective/'.$objective['id'].'/'.$operational_competence['id']); ?>"><?= lang('common_lang.btn_edit')?></a></td>
+                    <td><a href="<?= base_url('plafor/courseplan/save_objective/'.$objective['id'].'/'.$operational_competence['id']); ?>"><i class="bi bi-pencil"></i></a></td>
                     <td><a href="<?= base_url('plafor/courseplan/delete_objective/'.$objective['id']); ?>" class="<?=$operational_competence['archive']==null?'bi bi-trash':'bi bi-reply-all-fill'?>"></td>
                 <?php endif;?>
                 <?php

From ef98ad10818eb7e2cf9f8e870bc1b9dacd69dc26 Mon Sep 17 00:00:00 2001
From: HeMa <MaximeEugene.Herbez@formation.orif.ch>
Date: Wed, 19 Jan 2022 09:04:18 +0100
Subject: [PATCH 05/33] update database infos 2022

---
 .../Database/Seeds/addCoursePlan2021Datas.php |  6 +--
 orif/plafor/Database/Seeds/addUserDatas.php   | 48 ++-----------------
 2 files changed, 7 insertions(+), 47 deletions(-)

diff --git a/orif/plafor/Database/Seeds/addCoursePlan2021Datas.php b/orif/plafor/Database/Seeds/addCoursePlan2021Datas.php
index 4cfc900a..260b216e 100644
--- a/orif/plafor/Database/Seeds/addCoursePlan2021Datas.php
+++ b/orif/plafor/Database/Seeds/addCoursePlan2021Datas.php
@@ -6,9 +6,9 @@
 class addCoursePlan2021Datas extends Seeder{
     public function run(){
         $course_plans = array(
-            array('id' => '5','formation_number' => '88611','official_name' => ' Informaticienne / Informaticien Sys','date_begin' => '2020-11-19','archive' => NULL),
-            array('id' => '6','formation_number' => '88611','official_name' => ' Informaticienne / Informaticien Dev','date_begin' => '2020-11-19','archive' => NULL),
-            array('id' => '7','formation_number' => '88614','official_name' => ' Informaticienne d\'entreprise, Informaticien d\'entreprise','date_begin' => '0000-00-00','archive' => NULL)
+            array('id' => '5','formation_number' => '88611','official_name' => ' Informaticienne / Informaticien Orientation Exploitation et infrastructure CFC','date_begin' => '2022-08-01','archive' => NULL),
+            array('id' => '6','formation_number' => '88611','official_name' => ' Informaticienne / Informaticien Orientation Développement d’applications CFC','date_begin' => '2022-08-01','archive' => NULL),
+            array('id' => '7','formation_number' => '88614','official_name' => ' Informaticienne d\'entreprise, Informaticien d\'entreprise CFC','date_begin' => '2022-08-01','archive' => NULL)
         );
         foreach ($course_plans as $course_plan){
             $this->db->table('course_plan')->insert($course_plan);
diff --git a/orif/plafor/Database/Seeds/addUserDatas.php b/orif/plafor/Database/Seeds/addUserDatas.php
index a759d59f..2896d71f 100644
--- a/orif/plafor/Database/Seeds/addUserDatas.php
+++ b/orif/plafor/Database/Seeds/addUserDatas.php
@@ -21,51 +21,11 @@ public function run(){
             ),
             array (
                 'id' => '2',
-                'fk_user_type' => '2',
-                'username' => 'FormateurDev',
-                'password' => '$2y$10$Q3H8WodgKonQ60SIcu.eWuVKXmxqBw1X5hMpZzwjRKyCTB1H1l.pe',
-                'archive' => NULL,
-                'date_creation' => '2020-07-09 13:15:24',
-            ),
-            array (
-                'id' => '3',
-                'fk_user_type' => '2',
-                'username' => 'FormateurSysteme',
-                'password' => '$2y$10$Br7mIRYfLufWkrSpi2SyB.Wz0vHZQp7dQf7f2bKy5i/CkhHomSvli',
-                'archive' => NULL,
-                'date_creation' => '2020-07-09 13:15:47',
-            ),
-            array (
-                'id' => '4',
-                'fk_user_type' => '3',
-                'username' => 'ApprentiDev',
-                'password' => '$2y$10$6TLaMd5ljshybxANKgIYGOjY0Xur9EgdzcEPy1bgy2b8uyWYeVoEm',
-                'archive' => NULL,
-                'date_creation' => '2020-07-09 13:16:05',
-            ),
-            array (
-                'id' => '5',
-                'fk_user_type' => '3',
-                'username' => 'ApprentiSysteme',
-                'password' => '$2y$10$0ljkGcDQpTc0RDaN7Y2XcOhS8OB0t0QIhquLv9NcR79IVO9rCR/0.',
-                'archive' => NULL,
-                'date_creation' => '2020-07-09 13:16:27',
-            ),
-            array (
-                'id' => '6',
-                'fk_user_type' => '2',
-                'username' => 'FormateurOperateur',
-                'password' => '$2y$10$SbMYPxqnngLjxVGlG4hW..lrc.pr5Dd74nY.KqdANtEESIvmGRpWi',
-                'archive' => NULL,
-                'date_creation' => '2020-07-09 13:24:22',
-            ),
-            array (
-                'id' => '7',
-                'fk_user_type' => '3',
-                'username' => 'ApprentiOperateur',
-                'password' => '$2y$10$jPNxV2ZZ6Il2LiBQ.CWhNOoud6NsMRFILwHN8kpD410shWeiGpuxK',
+                'fk_user_type' => '1',
+                'username' => 'MH',
+                'password' => '$2y$10$UnH8eVjd5M51hwpSpP/uR.EteO7DtqzT447e.MqdR3EngnY8pXCcO',
                 'archive' => NULL,
-                'date_creation' => '2020-07-09 13:24:45',
+                'date_creation' => '2022-01-19 09:02:59',
             ),
         ];
         foreach ($users as $user){

From 4cbeca5628654858d8d133d1cb24683e90b9b196 Mon Sep 17 00:00:00 2001
From: HeMa <MaximeEugene.Herbez@formation.orif.ch>
Date: Wed, 19 Jan 2022 09:16:20 +0100
Subject: [PATCH 06/33] update database infos 2022

---
 .../Seeds/addAcquisitionStatusDatas.php       | 230 +-----------------
 .../Seeds/addTrainerApprenticeDatas.php       |   4 +-
 .../Database/Seeds/addUserCoursesDatas.php    |   4 +-
 orif/plafor/Database/Seeds/addUserDatas.php   |   2 +-
 4 files changed, 4 insertions(+), 236 deletions(-)

diff --git a/orif/plafor/Database/Seeds/addAcquisitionStatusDatas.php b/orif/plafor/Database/Seeds/addAcquisitionStatusDatas.php
index c4628eb9..6de82935 100644
--- a/orif/plafor/Database/Seeds/addAcquisitionStatusDatas.php
+++ b/orif/plafor/Database/Seeds/addAcquisitionStatusDatas.php
@@ -12,235 +12,7 @@ public function run()
     {
         //Acquisition status//
         $acquisition_status = array(
-            array('id' => '1','fk_objective' => '1','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '2','fk_objective' => '2','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '3','fk_objective' => '3','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '4','fk_objective' => '4','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '5','fk_objective' => '5','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '6','fk_objective' => '6','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '7','fk_objective' => '7','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '8','fk_objective' => '8','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '9','fk_objective' => '9','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '10','fk_objective' => '10','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '11','fk_objective' => '11','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '12','fk_objective' => '12','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '13','fk_objective' => '13','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '14','fk_objective' => '14','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '15','fk_objective' => '15','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '16','fk_objective' => '16','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '17','fk_objective' => '17','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '18','fk_objective' => '18','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '19','fk_objective' => '19','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '20','fk_objective' => '20','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '21','fk_objective' => '21','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '22','fk_objective' => '22','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '23','fk_objective' => '23','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '24','fk_objective' => '24','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '25','fk_objective' => '25','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '26','fk_objective' => '26','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '27','fk_objective' => '27','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '28','fk_objective' => '28','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '29','fk_objective' => '29','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '30','fk_objective' => '30','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '31','fk_objective' => '31','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '32','fk_objective' => '32','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '33','fk_objective' => '33','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '34','fk_objective' => '34','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '35','fk_objective' => '35','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '36','fk_objective' => '36','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '37','fk_objective' => '37','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '38','fk_objective' => '38','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '39','fk_objective' => '39','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '40','fk_objective' => '40','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '41','fk_objective' => '41','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '42','fk_objective' => '42','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '43','fk_objective' => '43','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '44','fk_objective' => '44','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '45','fk_objective' => '45','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '46','fk_objective' => '46','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '47','fk_objective' => '47','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '48','fk_objective' => '48','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '49','fk_objective' => '49','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '50','fk_objective' => '50','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '51','fk_objective' => '51','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '52','fk_objective' => '52','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '53','fk_objective' => '53','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '54','fk_objective' => '54','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '55','fk_objective' => '55','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '56','fk_objective' => '56','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '57','fk_objective' => '57','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '58','fk_objective' => '58','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '59','fk_objective' => '59','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '60','fk_objective' => '60','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '61','fk_objective' => '61','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '62','fk_objective' => '62','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '63','fk_objective' => '63','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '64','fk_objective' => '64','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '65','fk_objective' => '65','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '66','fk_objective' => '66','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '67','fk_objective' => '67','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '68','fk_objective' => '68','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '69','fk_objective' => '69','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '70','fk_objective' => '70','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '71','fk_objective' => '71','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '72','fk_objective' => '72','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '73','fk_objective' => '73','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '74','fk_objective' => '177','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '75','fk_objective' => '178','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '76','fk_objective' => '179','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '77','fk_objective' => '180','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '78','fk_objective' => '181','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '79','fk_objective' => '182','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '80','fk_objective' => '183','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '81','fk_objective' => '184','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '82','fk_objective' => '185','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '83','fk_objective' => '186','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '84','fk_objective' => '187','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '85','fk_objective' => '188','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '86','fk_objective' => '189','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '87','fk_objective' => '190','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '88','fk_objective' => '191','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '89','fk_objective' => '192','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '90','fk_objective' => '193','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '91','fk_objective' => '194','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '92','fk_objective' => '195','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '93','fk_objective' => '196','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '94','fk_objective' => '197','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '95','fk_objective' => '198','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '96','fk_objective' => '199','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '97','fk_objective' => '200','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '98','fk_objective' => '201','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '99','fk_objective' => '202','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '100','fk_objective' => '203','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '101','fk_objective' => '204','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '102','fk_objective' => '205','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '103','fk_objective' => '206','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '104','fk_objective' => '207','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '105','fk_objective' => '208','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '106','fk_objective' => '209','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '107','fk_objective' => '210','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '108','fk_objective' => '211','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '109','fk_objective' => '212','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '110','fk_objective' => '213','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '111','fk_objective' => '214','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '112','fk_objective' => '215','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '113','fk_objective' => '216','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '114','fk_objective' => '217','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '115','fk_objective' => '218','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '116','fk_objective' => '219','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '117','fk_objective' => '220','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '118','fk_objective' => '221','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '119','fk_objective' => '222','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '120','fk_objective' => '223','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '121','fk_objective' => '224','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '122','fk_objective' => '225','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '123','fk_objective' => '226','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '124','fk_objective' => '227','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '125','fk_objective' => '228','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '126','fk_objective' => '229','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '127','fk_objective' => '230','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '128','fk_objective' => '231','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '129','fk_objective' => '232','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '130','fk_objective' => '233','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '131','fk_objective' => '234','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '132','fk_objective' => '235','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '133','fk_objective' => '236','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '134','fk_objective' => '237','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '135','fk_objective' => '238','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '136','fk_objective' => '239','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '137','fk_objective' => '240','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '138','fk_objective' => '241','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '139','fk_objective' => '242','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '140','fk_objective' => '243','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '141','fk_objective' => '244','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '142','fk_objective' => '245','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '143','fk_objective' => '246','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '144','fk_objective' => '247','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '145','fk_objective' => '248','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '146','fk_objective' => '249','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '147','fk_objective' => '250','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '148','fk_objective' => '251','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '149','fk_objective' => '252','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '150','fk_objective' => '253','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '151','fk_objective' => '254','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '152','fk_objective' => '255','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '153','fk_objective' => '256','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '154','fk_objective' => '257','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '155','fk_objective' => '258','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '156','fk_objective' => '259','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '157','fk_objective' => '260','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '158','fk_objective' => '261','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '159','fk_objective' => '262','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '160','fk_objective' => '263','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '161','fk_objective' => '264','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '162','fk_objective' => '265','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '163','fk_objective' => '266','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '164','fk_objective' => '267','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '165','fk_objective' => '268','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '166','fk_objective' => '269','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '167','fk_objective' => '270','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '168','fk_objective' => '271','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '169','fk_objective' => '272','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '170','fk_objective' => '273','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '171','fk_objective' => '274','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '172','fk_objective' => '275','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '173','fk_objective' => '276','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '174','fk_objective' => '277','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '175','fk_objective' => '278','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '176','fk_objective' => '279','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '177','fk_objective' => '280','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '178','fk_objective' => '281','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '179','fk_objective' => '282','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '180','fk_objective' => '283','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '181','fk_objective' => '284','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '182','fk_objective' => '285','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '183','fk_objective' => '286','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '184','fk_objective' => '287','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '185','fk_objective' => '288','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '186','fk_objective' => '289','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '187','fk_objective' => '290','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '188','fk_objective' => '291','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '189','fk_objective' => '292','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '190','fk_objective' => '293','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '191','fk_objective' => '294','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '192','fk_objective' => '295','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '193','fk_objective' => '296','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '194','fk_objective' => '297','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '195','fk_objective' => '298','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '196','fk_objective' => '299','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '197','fk_objective' => '300','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '198','fk_objective' => '301','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '199','fk_objective' => '302','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '200','fk_objective' => '303','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '201','fk_objective' => '304','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '202','fk_objective' => '305','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '203','fk_objective' => '306','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '204','fk_objective' => '307','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '205','fk_objective' => '308','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '206','fk_objective' => '309','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '207','fk_objective' => '310','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '208','fk_objective' => '311','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '209','fk_objective' => '312','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '210','fk_objective' => '313','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '211','fk_objective' => '314','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '212','fk_objective' => '315','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '213','fk_objective' => '316','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '214','fk_objective' => '317','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '215','fk_objective' => '318','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '216','fk_objective' => '319','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '217','fk_objective' => '320','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '218','fk_objective' => '321','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '219','fk_objective' => '322','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '220','fk_objective' => '323','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '221','fk_objective' => '324','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '222','fk_objective' => '325','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '223','fk_objective' => '326','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '224','fk_objective' => '327','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '225','fk_objective' => '328','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '226','fk_objective' => '329','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '227','fk_objective' => '330','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '228','fk_objective' => '331','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '229','fk_objective' => '332','fk_user_course' => '3','fk_acquisition_level' => '1')
+            //array('id' => '1','fk_objective' => '1','fk_user_course' => '1','fk_acquisition_level' => '1'),
         );
         foreach ($acquisition_status as $acquisitionStatuse){
             $this->db->table('acquisition_status')->insert($acquisitionStatuse);
diff --git a/orif/plafor/Database/Seeds/addTrainerApprenticeDatas.php b/orif/plafor/Database/Seeds/addTrainerApprenticeDatas.php
index 714902c4..af2d307d 100644
--- a/orif/plafor/Database/Seeds/addTrainerApprenticeDatas.php
+++ b/orif/plafor/Database/Seeds/addTrainerApprenticeDatas.php
@@ -13,9 +13,7 @@ public function run()
     {
         //trainer_apprentice//
         $trainer_apprentice = array(
-            array('id' => '1','fk_trainer' => '2','fk_apprentice' => '4'),
-            array('id' => '2','fk_trainer' => '3','fk_apprentice' => '5'),
-            array('id' => '3','fk_trainer' => '6','fk_apprentice' => '7')
+            //array('id' => '1','fk_trainer' => '2','fk_apprentice' => '4'),
         );
         foreach ($trainer_apprentice as $trainer_apprenticee)
         $this->db->table('trainer_apprentice')->insert($trainer_apprenticee);
diff --git a/orif/plafor/Database/Seeds/addUserCoursesDatas.php b/orif/plafor/Database/Seeds/addUserCoursesDatas.php
index 0c61e550..8bde9ea8 100644
--- a/orif/plafor/Database/Seeds/addUserCoursesDatas.php
+++ b/orif/plafor/Database/Seeds/addUserCoursesDatas.php
@@ -12,9 +12,7 @@ public function run()
     {
         //user_course//
         $user_course = array(
-            array('id' => '1','fk_user' => '4','fk_course_plan' => '1','fk_status' => '1','date_begin' => '2020-07-09','date_end' => '0000-00-00'),
-            array('id' => '2','fk_user' => '5','fk_course_plan' => '3','fk_status' => '1','date_begin' => '2020-07-09','date_end' => '0000-00-00'),
-            array('id' => '3','fk_user' => '7','fk_course_plan' => '4','fk_status' => '1','date_begin' => '2020-07-09','date_end' => '0000-00-00')
+            //array('id' => '1','fk_user' => '4','fk_course_plan' => '1','fk_status' => '1','date_begin' => '2020-07-09','date_end' => '0000-00-00'),
         );
         foreach ($user_course as $user_coursee){
             $this->db->table('user_course')->insert($user_coursee);
diff --git a/orif/plafor/Database/Seeds/addUserDatas.php b/orif/plafor/Database/Seeds/addUserDatas.php
index 2896d71f..c8aca8a7 100644
--- a/orif/plafor/Database/Seeds/addUserDatas.php
+++ b/orif/plafor/Database/Seeds/addUserDatas.php
@@ -22,7 +22,7 @@ public function run(){
             array (
                 'id' => '2',
                 'fk_user_type' => '1',
-                'username' => 'MH',
+                'username' => 'HerbezME',
                 'password' => '$2y$10$UnH8eVjd5M51hwpSpP/uR.EteO7DtqzT447e.MqdR3EngnY8pXCcO',
                 'archive' => NULL,
                 'date_creation' => '2022-01-19 09:02:59',

From 93f6336126ac1e7a87d873a4b212454d4ccc2f64 Mon Sep 17 00:00:00 2001
From: HeMa <MaximeEugene.Herbez@formation.orif.ch>
Date: Wed, 19 Jan 2022 09:25:54 +0100
Subject: [PATCH 07/33] update database infos 2022

---
 orif/plafor/Database/Seeds/addCoursePlan2021Datas.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/orif/plafor/Database/Seeds/addCoursePlan2021Datas.php b/orif/plafor/Database/Seeds/addCoursePlan2021Datas.php
index 4cfc900a..260b216e 100644
--- a/orif/plafor/Database/Seeds/addCoursePlan2021Datas.php
+++ b/orif/plafor/Database/Seeds/addCoursePlan2021Datas.php
@@ -6,9 +6,9 @@
 class addCoursePlan2021Datas extends Seeder{
     public function run(){
         $course_plans = array(
-            array('id' => '5','formation_number' => '88611','official_name' => ' Informaticienne / Informaticien Sys','date_begin' => '2020-11-19','archive' => NULL),
-            array('id' => '6','formation_number' => '88611','official_name' => ' Informaticienne / Informaticien Dev','date_begin' => '2020-11-19','archive' => NULL),
-            array('id' => '7','formation_number' => '88614','official_name' => ' Informaticienne d\'entreprise, Informaticien d\'entreprise','date_begin' => '0000-00-00','archive' => NULL)
+            array('id' => '5','formation_number' => '88611','official_name' => ' Informaticienne / Informaticien Orientation Exploitation et infrastructure CFC','date_begin' => '2022-08-01','archive' => NULL),
+            array('id' => '6','formation_number' => '88611','official_name' => ' Informaticienne / Informaticien Orientation Développement d’applications CFC','date_begin' => '2022-08-01','archive' => NULL),
+            array('id' => '7','formation_number' => '88614','official_name' => ' Informaticienne d\'entreprise, Informaticien d\'entreprise CFC','date_begin' => '2022-08-01','archive' => NULL)
         );
         foreach ($course_plans as $course_plan){
             $this->db->table('course_plan')->insert($course_plan);

From a03fa02e7538504aad404ff474fe1f216205c183 Mon Sep 17 00:00:00 2001
From: HeMa <MaximeEugene.Herbez@formation.orif.ch>
Date: Wed, 19 Jan 2022 09:32:54 +0100
Subject: [PATCH 08/33] revert commit

---
 .../Seeds/addAcquisitionStatusDatas.php       | 232 +++++++++++++++++-
 .../Seeds/addTrainerApprenticeDatas.php       |   4 +-
 .../Database/Seeds/addUserCoursesDatas.php    |   4 +-
 orif/plafor/Database/Seeds/addUserDatas.php   |  48 +++-
 4 files changed, 281 insertions(+), 7 deletions(-)

diff --git a/orif/plafor/Database/Seeds/addAcquisitionStatusDatas.php b/orif/plafor/Database/Seeds/addAcquisitionStatusDatas.php
index 6de82935..d13be9e4 100644
--- a/orif/plafor/Database/Seeds/addAcquisitionStatusDatas.php
+++ b/orif/plafor/Database/Seeds/addAcquisitionStatusDatas.php
@@ -12,7 +12,237 @@ public function run()
     {
         //Acquisition status//
         $acquisition_status = array(
-            //array('id' => '1','fk_objective' => '1','fk_user_course' => '1','fk_acquisition_level' => '1'),
+
+            array('id' => '1','fk_objective' => '1','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '2','fk_objective' => '2','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '3','fk_objective' => '3','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '4','fk_objective' => '4','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '5','fk_objective' => '5','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '6','fk_objective' => '6','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '7','fk_objective' => '7','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '8','fk_objective' => '8','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '9','fk_objective' => '9','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '10','fk_objective' => '10','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '11','fk_objective' => '11','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '12','fk_objective' => '12','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '13','fk_objective' => '13','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '14','fk_objective' => '14','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '15','fk_objective' => '15','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '16','fk_objective' => '16','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '17','fk_objective' => '17','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '18','fk_objective' => '18','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '19','fk_objective' => '19','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '20','fk_objective' => '20','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '21','fk_objective' => '21','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '22','fk_objective' => '22','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '23','fk_objective' => '23','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '24','fk_objective' => '24','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '25','fk_objective' => '25','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '26','fk_objective' => '26','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '27','fk_objective' => '27','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '28','fk_objective' => '28','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '29','fk_objective' => '29','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '30','fk_objective' => '30','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '31','fk_objective' => '31','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '32','fk_objective' => '32','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '33','fk_objective' => '33','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '34','fk_objective' => '34','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '35','fk_objective' => '35','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '36','fk_objective' => '36','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '37','fk_objective' => '37','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '38','fk_objective' => '38','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '39','fk_objective' => '39','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '40','fk_objective' => '40','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '41','fk_objective' => '41','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '42','fk_objective' => '42','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '43','fk_objective' => '43','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '44','fk_objective' => '44','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '45','fk_objective' => '45','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '46','fk_objective' => '46','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '47','fk_objective' => '47','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '48','fk_objective' => '48','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '49','fk_objective' => '49','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '50','fk_objective' => '50','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '51','fk_objective' => '51','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '52','fk_objective' => '52','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '53','fk_objective' => '53','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '54','fk_objective' => '54','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '55','fk_objective' => '55','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '56','fk_objective' => '56','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '57','fk_objective' => '57','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '58','fk_objective' => '58','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '59','fk_objective' => '59','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '60','fk_objective' => '60','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '61','fk_objective' => '61','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '62','fk_objective' => '62','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '63','fk_objective' => '63','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '64','fk_objective' => '64','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '65','fk_objective' => '65','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '66','fk_objective' => '66','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '67','fk_objective' => '67','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '68','fk_objective' => '68','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '69','fk_objective' => '69','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '70','fk_objective' => '70','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '71','fk_objective' => '71','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '72','fk_objective' => '72','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '73','fk_objective' => '73','fk_user_course' => '1','fk_acquisition_level' => '1'),
+            array('id' => '74','fk_objective' => '177','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '75','fk_objective' => '178','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '76','fk_objective' => '179','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '77','fk_objective' => '180','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '78','fk_objective' => '181','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '79','fk_objective' => '182','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '80','fk_objective' => '183','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '81','fk_objective' => '184','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '82','fk_objective' => '185','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '83','fk_objective' => '186','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '84','fk_objective' => '187','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '85','fk_objective' => '188','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '86','fk_objective' => '189','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '87','fk_objective' => '190','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '88','fk_objective' => '191','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '89','fk_objective' => '192','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '90','fk_objective' => '193','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '91','fk_objective' => '194','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '92','fk_objective' => '195','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '93','fk_objective' => '196','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '94','fk_objective' => '197','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '95','fk_objective' => '198','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '96','fk_objective' => '199','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '97','fk_objective' => '200','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '98','fk_objective' => '201','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '99','fk_objective' => '202','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '100','fk_objective' => '203','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '101','fk_objective' => '204','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '102','fk_objective' => '205','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '103','fk_objective' => '206','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '104','fk_objective' => '207','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '105','fk_objective' => '208','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '106','fk_objective' => '209','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '107','fk_objective' => '210','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '108','fk_objective' => '211','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '109','fk_objective' => '212','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '110','fk_objective' => '213','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '111','fk_objective' => '214','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '112','fk_objective' => '215','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '113','fk_objective' => '216','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '114','fk_objective' => '217','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '115','fk_objective' => '218','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '116','fk_objective' => '219','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '117','fk_objective' => '220','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '118','fk_objective' => '221','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '119','fk_objective' => '222','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '120','fk_objective' => '223','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '121','fk_objective' => '224','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '122','fk_objective' => '225','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '123','fk_objective' => '226','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '124','fk_objective' => '227','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '125','fk_objective' => '228','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '126','fk_objective' => '229','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '127','fk_objective' => '230','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '128','fk_objective' => '231','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '129','fk_objective' => '232','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '130','fk_objective' => '233','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '131','fk_objective' => '234','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '132','fk_objective' => '235','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '133','fk_objective' => '236','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '134','fk_objective' => '237','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '135','fk_objective' => '238','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '136','fk_objective' => '239','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '137','fk_objective' => '240','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '138','fk_objective' => '241','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '139','fk_objective' => '242','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '140','fk_objective' => '243','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '141','fk_objective' => '244','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '142','fk_objective' => '245','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '143','fk_objective' => '246','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '144','fk_objective' => '247','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '145','fk_objective' => '248','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '146','fk_objective' => '249','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '147','fk_objective' => '250','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '148','fk_objective' => '251','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '149','fk_objective' => '252','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '150','fk_objective' => '253','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '151','fk_objective' => '254','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '152','fk_objective' => '255','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '153','fk_objective' => '256','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '154','fk_objective' => '257','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '155','fk_objective' => '258','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '156','fk_objective' => '259','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '157','fk_objective' => '260','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '158','fk_objective' => '261','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '159','fk_objective' => '262','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '160','fk_objective' => '263','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '161','fk_objective' => '264','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '162','fk_objective' => '265','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '163','fk_objective' => '266','fk_user_course' => '2','fk_acquisition_level' => '1'),
+            array('id' => '164','fk_objective' => '267','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '165','fk_objective' => '268','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '166','fk_objective' => '269','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '167','fk_objective' => '270','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '168','fk_objective' => '271','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '169','fk_objective' => '272','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '170','fk_objective' => '273','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '171','fk_objective' => '274','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '172','fk_objective' => '275','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '173','fk_objective' => '276','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '174','fk_objective' => '277','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '175','fk_objective' => '278','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '176','fk_objective' => '279','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '177','fk_objective' => '280','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '178','fk_objective' => '281','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '179','fk_objective' => '282','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '180','fk_objective' => '283','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '181','fk_objective' => '284','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '182','fk_objective' => '285','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '183','fk_objective' => '286','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '184','fk_objective' => '287','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '185','fk_objective' => '288','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '186','fk_objective' => '289','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '187','fk_objective' => '290','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '188','fk_objective' => '291','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '189','fk_objective' => '292','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '190','fk_objective' => '293','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '191','fk_objective' => '294','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '192','fk_objective' => '295','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '193','fk_objective' => '296','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '194','fk_objective' => '297','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '195','fk_objective' => '298','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '196','fk_objective' => '299','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '197','fk_objective' => '300','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '198','fk_objective' => '301','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '199','fk_objective' => '302','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '200','fk_objective' => '303','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '201','fk_objective' => '304','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '202','fk_objective' => '305','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '203','fk_objective' => '306','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '204','fk_objective' => '307','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '205','fk_objective' => '308','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '206','fk_objective' => '309','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '207','fk_objective' => '310','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '208','fk_objective' => '311','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '209','fk_objective' => '312','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '210','fk_objective' => '313','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '211','fk_objective' => '314','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '212','fk_objective' => '315','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '213','fk_objective' => '316','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '214','fk_objective' => '317','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '215','fk_objective' => '318','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '216','fk_objective' => '319','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '217','fk_objective' => '320','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '218','fk_objective' => '321','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '219','fk_objective' => '322','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '220','fk_objective' => '323','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '221','fk_objective' => '324','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '222','fk_objective' => '325','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '223','fk_objective' => '326','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '224','fk_objective' => '327','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '225','fk_objective' => '328','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '226','fk_objective' => '329','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '227','fk_objective' => '330','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '228','fk_objective' => '331','fk_user_course' => '3','fk_acquisition_level' => '1'),
+            array('id' => '229','fk_objective' => '332','fk_user_course' => '3','fk_acquisition_level' => '1')
+
         );
         foreach ($acquisition_status as $acquisitionStatuse){
             $this->db->table('acquisition_status')->insert($acquisitionStatuse);
diff --git a/orif/plafor/Database/Seeds/addTrainerApprenticeDatas.php b/orif/plafor/Database/Seeds/addTrainerApprenticeDatas.php
index af2d307d..714902c4 100644
--- a/orif/plafor/Database/Seeds/addTrainerApprenticeDatas.php
+++ b/orif/plafor/Database/Seeds/addTrainerApprenticeDatas.php
@@ -13,7 +13,9 @@ public function run()
     {
         //trainer_apprentice//
         $trainer_apprentice = array(
-            //array('id' => '1','fk_trainer' => '2','fk_apprentice' => '4'),
+            array('id' => '1','fk_trainer' => '2','fk_apprentice' => '4'),
+            array('id' => '2','fk_trainer' => '3','fk_apprentice' => '5'),
+            array('id' => '3','fk_trainer' => '6','fk_apprentice' => '7')
         );
         foreach ($trainer_apprentice as $trainer_apprenticee)
         $this->db->table('trainer_apprentice')->insert($trainer_apprenticee);
diff --git a/orif/plafor/Database/Seeds/addUserCoursesDatas.php b/orif/plafor/Database/Seeds/addUserCoursesDatas.php
index 8bde9ea8..0c61e550 100644
--- a/orif/plafor/Database/Seeds/addUserCoursesDatas.php
+++ b/orif/plafor/Database/Seeds/addUserCoursesDatas.php
@@ -12,7 +12,9 @@ public function run()
     {
         //user_course//
         $user_course = array(
-            //array('id' => '1','fk_user' => '4','fk_course_plan' => '1','fk_status' => '1','date_begin' => '2020-07-09','date_end' => '0000-00-00'),
+            array('id' => '1','fk_user' => '4','fk_course_plan' => '1','fk_status' => '1','date_begin' => '2020-07-09','date_end' => '0000-00-00'),
+            array('id' => '2','fk_user' => '5','fk_course_plan' => '3','fk_status' => '1','date_begin' => '2020-07-09','date_end' => '0000-00-00'),
+            array('id' => '3','fk_user' => '7','fk_course_plan' => '4','fk_status' => '1','date_begin' => '2020-07-09','date_end' => '0000-00-00')
         );
         foreach ($user_course as $user_coursee){
             $this->db->table('user_course')->insert($user_coursee);
diff --git a/orif/plafor/Database/Seeds/addUserDatas.php b/orif/plafor/Database/Seeds/addUserDatas.php
index c8aca8a7..a759d59f 100644
--- a/orif/plafor/Database/Seeds/addUserDatas.php
+++ b/orif/plafor/Database/Seeds/addUserDatas.php
@@ -21,11 +21,51 @@ public function run(){
             ),
             array (
                 'id' => '2',
-                'fk_user_type' => '1',
-                'username' => 'HerbezME',
-                'password' => '$2y$10$UnH8eVjd5M51hwpSpP/uR.EteO7DtqzT447e.MqdR3EngnY8pXCcO',
+                'fk_user_type' => '2',
+                'username' => 'FormateurDev',
+                'password' => '$2y$10$Q3H8WodgKonQ60SIcu.eWuVKXmxqBw1X5hMpZzwjRKyCTB1H1l.pe',
+                'archive' => NULL,
+                'date_creation' => '2020-07-09 13:15:24',
+            ),
+            array (
+                'id' => '3',
+                'fk_user_type' => '2',
+                'username' => 'FormateurSysteme',
+                'password' => '$2y$10$Br7mIRYfLufWkrSpi2SyB.Wz0vHZQp7dQf7f2bKy5i/CkhHomSvli',
+                'archive' => NULL,
+                'date_creation' => '2020-07-09 13:15:47',
+            ),
+            array (
+                'id' => '4',
+                'fk_user_type' => '3',
+                'username' => 'ApprentiDev',
+                'password' => '$2y$10$6TLaMd5ljshybxANKgIYGOjY0Xur9EgdzcEPy1bgy2b8uyWYeVoEm',
+                'archive' => NULL,
+                'date_creation' => '2020-07-09 13:16:05',
+            ),
+            array (
+                'id' => '5',
+                'fk_user_type' => '3',
+                'username' => 'ApprentiSysteme',
+                'password' => '$2y$10$0ljkGcDQpTc0RDaN7Y2XcOhS8OB0t0QIhquLv9NcR79IVO9rCR/0.',
+                'archive' => NULL,
+                'date_creation' => '2020-07-09 13:16:27',
+            ),
+            array (
+                'id' => '6',
+                'fk_user_type' => '2',
+                'username' => 'FormateurOperateur',
+                'password' => '$2y$10$SbMYPxqnngLjxVGlG4hW..lrc.pr5Dd74nY.KqdANtEESIvmGRpWi',
+                'archive' => NULL,
+                'date_creation' => '2020-07-09 13:24:22',
+            ),
+            array (
+                'id' => '7',
+                'fk_user_type' => '3',
+                'username' => 'ApprentiOperateur',
+                'password' => '$2y$10$jPNxV2ZZ6Il2LiBQ.CWhNOoud6NsMRFILwHN8kpD410shWeiGpuxK',
                 'archive' => NULL,
-                'date_creation' => '2022-01-19 09:02:59',
+                'date_creation' => '2020-07-09 13:24:45',
             ),
         ];
         foreach ($users as $user){

From cd9a53d372584ef1852ae9d96622e7430f171326 Mon Sep 17 00:00:00 2001
From: HeMa <MaximeEugene.Herbez@formation.orif.ch>
Date: Wed, 19 Jan 2022 13:16:57 +0100
Subject: [PATCH 09/33] fix navigator to redirect on good root

---
 orif/plafor/Views/templates/navigator.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/orif/plafor/Views/templates/navigator.php b/orif/plafor/Views/templates/navigator.php
index ff8904b2..b83f2719 100644
--- a/orif/plafor/Views/templates/navigator.php
+++ b/orif/plafor/Views/templates/navigator.php
@@ -6,7 +6,6 @@
 $navigatorLink=service('session')->get('navigator');
 if (isset($navigatorLink)){
     $index=null;
-
     for ($i=count($navigatorLink)-1;$i>=0;$i--){
         if ($navigatorLink[$i]['link']==((current_url().(strlen($_SERVER['QUERY_STRING'])?'?'.$_SERVER['QUERY_STRING']:'')))){
             $index=$i;
@@ -28,13 +27,15 @@
 }
 else{
 
-    service('session')->set('navigator',[['link'=>current_url().(strlen($_SERVER['QUERY_STRING'])?'?'.$_SERVER['QUERY_STRING']:''),'title'=>$title]]);
+    service('session')->set('navigator',[['link'=>service('session')->get('_ci_previous_url'),'title'=>''],['link'=>current_url().(strlen($_SERVER['QUERY_STRING'])?'?'.$_SERVER['QUERY_STRING']:''),'title'=>$title]]);
+
+
 }
 ?>
 <span id="navigator">
     <?php 
     $navigatorLink=service('session')->get('navigator');
-    if(count($navigatorLink)>1):?>
+    if(count($navigatorLink)>2):?>
         <a id="navigator-back" class="btn btn-outline-primary mr-2 bi bi-arrow-left-circle" href="<?=$navigatorLink[count($navigatorLink)-2]['link']?>">
             <?= lang("common_lang.btn_back") ?>
         </a>
@@ -42,8 +43,8 @@
             <a href="<?=$navigatorLink[$i]['link']?>"><?=$navigatorLink[$i]['title']?></a>
             <?php echo count($navigatorLink)>1 && $i!=count($navigatorLink)-1 ? '<span class="text-primary"><i class="bi bi-arrow-right-short" ></i></span>' : ''?>
         <?php } ?>
-    <?php else : ?>
-        <a id="navigator-back" class="btn btn-outline-primary mr-2 bi bi-arrow-left-circle" href="<?= base_url("plafor/courseplan/list_course_plan") ?>">
+    <?php else: ?>
+        <a id="navigator-back" class="btn btn-outline-primary mr-2 bi bi-arrow-left-circle" href="<?= $navigatorLink[0]['link'] ?>">
             <?= lang("common_lang.btn_back") ?>
         </a>
     <?php endif;?>

From c3c21645a45188087789bd9b960342068f20e37f Mon Sep 17 00:00:00 2001
From: HeMa <MaximeEugene.Herbez@formation.orif.ch>
Date: Wed, 19 Jan 2022 13:17:39 +0100
Subject: [PATCH 10/33] change design to put chexbox and text on right side of
 tableheader

---
 orif/plafor/Views/apprentice/list.php  | 15 +++++++++------
 orif/plafor/Views/course_plan/list.php |  9 +++++----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/orif/plafor/Views/apprentice/list.php b/orif/plafor/Views/apprentice/list.php
index c2f6570b..28b621fa 100644
--- a/orif/plafor/Views/apprentice/list.php
+++ b/orif/plafor/Views/apprentice/list.php
@@ -13,7 +13,8 @@
     <div class="row">
         <div class="col">
             <h1 class="title-section"><?= lang('plafor_lang.title_apprentice_list'); ?></h1>
-            <div style="display:flex;flex-direction:row;align-items:center;justify-content:space-between;flex-wrap: wrap">
+            <div class="row" >
+                <div class="col-sm-8">
                 <?php
                 echo form_open(base_url('plafor/apprentice/list_apprentice/'), ['method' => 'GET']);
                 echo form_dropdown('trainer_id', $trainers, strval($trainer_id), ['class' => 'form-control', 'style' => 'width:unset!important;display:unset!important;']);
@@ -21,16 +22,18 @@
                 <?php
                 echo form_close();
                 ?>
-                <span>
+                </div>
+                <span class="col-sm-4 text-right">
+                    <?= form_label(lang('common_lang.btn_show_disabled'), 'toggle_deleted', ['class' => 'form-check-label','style'=>'padding-right:30px']); ?>
 
-            <?= form_checkbox('toggle_deleted', '', $with_archived, [
-                'id' => 'toggle_deleted', 'class' => 'form-check-input','style' => 'margin-left:1px'
-            ]); ?>
-            <?= form_label(lang('common_lang.btn_show_disabled'), 'toggle_deleted', ['class' => 'form-check-label','style'=>'margin-left:1.5rem']); ?>
+                    <?= form_checkbox('toggle_deleted', '', $with_archived, [
+                        'id' => 'toggle_deleted', 'class' => 'form-check-input'
+                    ]); ?>
                 </span>
             </div>
 
 
+
         </div>
     </div>
 
diff --git a/orif/plafor/Views/course_plan/list.php b/orif/plafor/Views/course_plan/list.php
index 7953f712..6271f478 100644
--- a/orif/plafor/Views/course_plan/list.php
+++ b/orif/plafor/Views/course_plan/list.php
@@ -21,11 +21,12 @@
                 <?= lang('common_lang.btn_new_m'); ?>
             </a>
         </div>
-        <div style="margin-left: 20px; width:100%; padding: 0 15px 0 15px">
+        <div class="col-sm-9 text-right">
+            <?=form_label(lang('common_lang.btn_show_disabled'), 'toggle_deleted', ['class' => 'form-check-label','style'=>'padding-right:30px']);?>
+
             <?=form_checkbox('toggle_deleted', '', $with_archived, [
                 'id' => 'toggle_deleted', 'class' => 'form-check-input'
             ]);?>
-            <?=form_label(lang('common_lang.btn_show_disabled'), 'toggle_deleted', ['class' => 'form-check-label']);?>
         </div>
     </div>
     <div class="row mt-2">
@@ -45,8 +46,8 @@
             ],
             'items'=>$datas,
             'primary_key_field'=>'id',
-            'url_update'=>'plafor/courseplan/save_competence_domain/',
-            'url_delete'=>'plafor/courseplan/delete_competence_domain/',
+            'url_update'=>'plafor/courseplan/save_course_plan/',
+            'url_delete'=>'plafor/courseplan/delete_course_plan/',
             'url_detail'=>'plafor/courseplan/view_course_plan/',
         ])?>
     </div>

From 2275586929365e12bd68a117fe062acb3597a6b4 Mon Sep 17 00:00:00 2001
From: HeMa <MaximeEugene.Herbez@formation.orif.ch>
Date: Thu, 20 Jan 2022 12:53:06 +0100
Subject: [PATCH 11/33] fix update competence domain

---
 orif/plafor/Views/course_plan/view.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/orif/plafor/Views/course_plan/view.php b/orif/plafor/Views/course_plan/view.php
index 7d036377..5ee9707f 100644
--- a/orif/plafor/Views/course_plan/view.php
+++ b/orif/plafor/Views/course_plan/view.php
@@ -36,7 +36,7 @@
                  ],
                 'items'=>$datas,
                 'primary_key_field'=>'id',
-                'url_update'=>'plafor/courseplan/save_competence_domain/',
+                'url_update'=>'plafor/courseplan/save_competence_domain/'.$course_plan['id'].'/',
                 'url_delete'=>'plafor/courseplan/delete_competence_domain/',
                 'url_detail'=>'plafor/courseplan/view_competence_domain/',
                 ])?>

From 021c8c36729a39546cee36eddb917dcf5bb34064 Mon Sep 17 00:00:00 2001
From: HeMa <MaximeEugene.Herbez@formation.orif.ch>
Date: Mon, 24 Jan 2022 09:28:48 +0100
Subject: [PATCH 12/33] fix desactivate and activate courseplan

---
 orif/plafor/Controllers/Apprentice.php   | 14 +++++++-------
 orif/plafor/Controllers/CoursePlan.php   | 15 ++++++++++++++-
 orif/plafor/Language/fr/plafor_lang.php  |  3 +++
 orif/plafor/Models/CoursePlanModel.php   | 14 +++++++-------
 orif/plafor/Models/UserCourseModel.php   |  4 ++--
 orif/plafor/Views/course_plan/delete.php | 14 +++++++++-----
 public/commonUtils.js                    |  2 +-
 7 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/orif/plafor/Controllers/Apprentice.php b/orif/plafor/Controllers/Apprentice.php
index a3b5469e..6049b20e 100644
--- a/orif/plafor/Controllers/Apprentice.php
+++ b/orif/plafor/Controllers/Apprentice.php
@@ -74,17 +74,17 @@ public function list_apprentice($withDeleted=0)
             $apprentices = User_model::getApprentices($withDeleted);
 
             $coursesList=[];
-            foreach (CoursePlanModel::getInstance()->findall() as $courseplan)
+            foreach (CoursePlanModel::getInstance()->withDeleted(true)->findall() as $courseplan)
                 $coursesList[$courseplan['id']]=$courseplan;
-            $courses = UserCourseModel::getInstance()->findall();
+            $courses = UserCourseModel::getInstance()->withDeleted(true)->findall();
         }else{
             $apprentices=[];
             if (count(TrainerApprenticeModel::getInstance()->where('fk_trainer', $trainer_id)->findall()))
                 $apprentices = User_Model::getInstance()->whereIn('id', array_column(TrainerApprenticeModel::getInstance()->where('fk_trainer', $trainer_id)->findall(), 'fk_apprentice'))->findall();
             $coursesList=[];
-            foreach (CoursePlanModel::getInstance()->findall() as $courseplan)
+            foreach (CoursePlanModel::getInstance()->withDeleted(true)->findall() as $courseplan)
                 $coursesList[$courseplan['id']]=$courseplan;
-            $courses = UserCourseModel::getInstance()->findall();
+            $courses = UserCourseModel::getInstance()->withDeleted(true)->findall();
             }
         
         
@@ -118,15 +118,15 @@ public function view_apprentice($apprentice_id = null)
         }
 
         $user_course_status=[];
-        foreach (UserCourseStatusModel::getInstance()->findAll() as $usercoursetatus)
+        foreach (UserCourseStatusModel::getInstance()->withDeleted(true)->findAll() as $usercoursetatus)
         $user_course_status[$usercoursetatus['id']] = $usercoursetatus;
 
         $course_plans=[];
-        foreach (CoursePlanModel::getInstance()->findall() as $courseplan)
+        foreach (CoursePlanModel::getInstance()->withDeleted(true)->findall() as $courseplan)
         $course_plans[$courseplan['id']] = $courseplan;
 
         $trainers = [];
-        foreach (User_model::getInstance()->where('fk_user_type',User_type_model::getInstance()->where('name',lang('plafor_lang.title_trainer'))->first()['id'])->findall() as $trainer)
+        foreach (User_model::getInstance()->where('fk_user_type',User_type_model::getInstance()->where('name',lang('plafor_lang.title_trainer'))->first()['id'])->withDeleted(true)->findall() as $trainer)
             $trainers[$trainer['id']]= $trainer;
 
         $links = [];
diff --git a/orif/plafor/Controllers/CoursePlan.php b/orif/plafor/Controllers/CoursePlan.php
index 2f6d4dc8..a080d3d4 100644
--- a/orif/plafor/Controllers/CoursePlan.php
+++ b/orif/plafor/Controllers/CoursePlan.php
@@ -134,8 +134,21 @@ public function delete_course_plan($course_plan_id, $action = 0)
                     return redirect()->to('/plafor/courseplan/list_course_plan');
                     break;
                 case 3:
-                    //Reactiver le plan de formation
+                    //Reactiver le plan de formation et ses competence et objectifs associés
+                    foreach (CoursePlanModel::getCompetenceDomains($course_plan_id) as $competenceDomain){
+                        $competenceDomain['archive']=null;
+                        CompetenceDomainModel::getInstance()->update($competenceDomain['id'],$competenceDomain);
+                        foreach (CompetenceDomainModel::getOperationalCompetences($competenceDomain['id'],true) as $operationalCompetence){
+                            $operationalCompetence['archive']=null;
+                            OperationalCompetenceModel::getInstance()->update($operationalCompetence['id'],$operationalCompetence);
+                            foreach (ObjectiveModel::getInstance()->where('fk_operational_competence',$operationalCompetence['id'])->withDeleted(true)->findAll() as $objective){
+                                $objective['archive']=null;
+                                ObjectiveModel::getInstance()->update($objective['id'],$objective);
+                            }
+                        }
+                    }
                     CoursePlanModel::getInstance()->withDeleted()->update($course_plan_id, ['archive' => null]);
+
                     return redirect()->to(base_url('plafor/courseplan/list_course_plan'));
                     break;
                 default:
diff --git a/orif/plafor/Language/fr/plafor_lang.php b/orif/plafor/Language/fr/plafor_lang.php
index 74097b0a..e2cf108c 100644
--- a/orif/plafor/Language/fr/plafor_lang.php
+++ b/orif/plafor/Language/fr/plafor_lang.php
@@ -238,6 +238,7 @@
     'course_status'                  =>'Status des formations',
     'status'                         =>'Statut de la formation',
     'form_number_not_unique'         =>'Le numéro du plan de formation existe déjà',
+    'with_status'                    =>'Avec le status',
 
     'course_plan_enable_explanation' =>'Toutes les informations concernant ce plan de formation (domaines de compétences, compétences oppérationnelles et objectifs) seront réactivées.',
     'competence_domain_enable_explanation' =>'Toutes les informations concernant ce domaine de compétence (symbole, nom, compétences oppérationnelles et objectifs) seront réactivées.',
@@ -246,4 +247,6 @@
     'user_course_enable_explanation' =>'Toutes les informations concernant cette formation liée seront réactivées.',
     'apprentice_link_enable_explanation' =>'Toutes les informations concernant le lien entre cette apprenti et ce formateur seront réactivées.',
     'acquisition_status_enable_explanation' =>'Toutes les informations concernant le statut d\'acquisition seront réactivées.',
+
+    'apprentices_already_assigned_to_course_plan'   => 'Le(s) apprentis suivant sont déjà associé(s) au plan de formation'
 ];
\ No newline at end of file
diff --git a/orif/plafor/Models/CoursePlanModel.php b/orif/plafor/Models/CoursePlanModel.php
index c5921eb3..bfe1ea01 100644
--- a/orif/plafor/Models/CoursePlanModel.php
+++ b/orif/plafor/Models/CoursePlanModel.php
@@ -58,7 +58,7 @@ public static function getInstance(){
      * @return array
      */
     public static function getCompetenceDomains($coursePlanId){
-        return CompetenceDomainModel::getInstance()->where('fk_course_plan',$coursePlanId)->findAll();
+        return CompetenceDomainModel::getInstance()->where('fk_course_plan',$coursePlanId)->withDeleted(true)->findAll();
     }
 
     /**
@@ -66,7 +66,7 @@ public static function getCompetenceDomains($coursePlanId){
      * @return array
      */
     public static function getUserCourses($coursePlanId){
-        return UserCourseModel::getInstance()->where('fk_course_plan',$coursePlanId)->findAll();
+        return UserCourseModel::getInstance()->where('fk_course_plan',$coursePlanId)->withDeleted(true)->findAll();
     }
     /**
      * @param $userId //is the apprentice id
@@ -79,8 +79,8 @@ public function getCoursePlanProgress($userId){
         $coursePlanAssociated=[];
         function getCoursePlansDatas($userid){
             $coursplans=[];
-            foreach (UserCourseModel::getInstance()->where('fk_user',$userid)->findAll() as $userCourse){
-                $coursplans[$userCourse['fk_course_plan']]=UserCourseModel::getCoursePlan($userCourse['fk_course_plan']);
+            foreach (UserCourseModel::getInstance()->where('fk_user',$userid)->withDeleted(true)->findAll() as $userCourse){
+                $coursplans[$userCourse['fk_course_plan']]=UserCourseModel::getCoursePlan($userCourse['fk_course_plan'],true);
                 $coursplans[$userCourse['fk_course_plan']]['fk_acquisition_status']=$userCourse['fk_status'];
             }
             return $coursplans;
@@ -88,7 +88,7 @@ function getCoursePlansDatas($userid){
 
         function getCompetenceDomainsDatas($coursePlanId){
                 $indexedCompetenceDomains=[];
-                $competenceDomains=CompetenceDomainModel::getCompetenceDomains(false,$coursePlanId);
+                $competenceDomains=CompetenceDomainModel::getCompetenceDomains(true,$coursePlanId);
                 foreach ($competenceDomains as $competenceDomain) {
                     $indexedCompetenceDomains[$competenceDomain['id']]=$competenceDomain;
                 }
@@ -97,7 +97,7 @@ function getCompetenceDomainsDatas($coursePlanId){
         function getOperationalCompetencesDatas($competenceDomainId){
             $operationalCompetences=[];
             $indexedOperationalCompetences=[];
-            $operationalCompetences=OperationalCompetenceModel::getOperationalCompetences(false,$competenceDomainId);
+            $operationalCompetences=OperationalCompetenceModel::getOperationalCompetences(true,$competenceDomainId);
             foreach ($operationalCompetences as $operationalCompetence){
                 $indexedOperationalCompetences[$operationalCompetence['id']]=$operationalCompetence;
             }
@@ -106,7 +106,7 @@ function getOperationalCompetencesDatas($competenceDomainId){
         function getObjectivesDatas($opCompId,$userCourse){
             $intermediateArray=[];
 
-                    foreach (ObjectiveModel::getObjectives(false,$opCompId) as $objective){
+                    foreach (ObjectiveModel::getObjectives(true,$opCompId) as $objective){
 
                         ObjectiveModel::getAcquisitionStatus($objective['id'],$userCourse['id'])['fk_acquisition_level'];
                         $objective['fk_acquisition_level']=ObjectiveModel::getAcquisitionStatus($objective['id'],$userCourse['id'])['fk_acquisition_level'];
diff --git a/orif/plafor/Models/UserCourseModel.php b/orif/plafor/Models/UserCourseModel.php
index 8cc9fb56..4b2ac6bb 100644
--- a/orif/plafor/Models/UserCourseModel.php
+++ b/orif/plafor/Models/UserCourseModel.php
@@ -55,8 +55,8 @@ public static function getUser($fkUserId){
      * @param $fkCoursePlanId
      * @return array
      */
-    public static function getCoursePlan($fkCoursePlanId){
-        return CoursePlanModel::getInstance()->find($fkCoursePlanId);
+    public static function getCoursePlan($fkCoursePlanId,$with_archived=0){
+        return CoursePlanModel::getInstance()->withDeleted($with_archived)->find($fkCoursePlanId);
     }
 
     /**
diff --git a/orif/plafor/Views/course_plan/delete.php b/orif/plafor/Views/course_plan/delete.php
index 63b6eee4..f60c5ff7 100644
--- a/orif/plafor/Views/course_plan/delete.php
+++ b/orif/plafor/Views/course_plan/delete.php
@@ -7,6 +7,7 @@
 foreach ($courses as $course){
     $apprentices[]=\Plafor\Models\UserCourseModel::getUser($course['fk_user']);
     $userCourseStatus[]=\Plafor\Models\UserCourseModel::getUserCourseStatus($course['fk_status']);
+
 }
 /**@TODO
  * Make situation when there are multiple apprentices associated with the same Course Plan
@@ -17,14 +18,17 @@
         <div class="row">
             <div class="col-12">
                 <div>
+                    <h1><?=count($apprentices)>0?lang('plafor_lang.apprentices_already_assigned_to_course_plan'):''?></h1>
                     <?php
-                    if (count($apprentices)>0&&isset($apprentices[0])&&$apprentices[0]!=null){?>
-                    <h1><?= lang('plafor_lang.apprentice').' "'.$apprentices[0]['username'].'"' ?></h1>
-                    <?php } ?>
+                    foreach ($apprentices as $apprentice):
+                    ?>
+                        <h3><?= ' "'.$apprentice['username'].'"'. lang('plafor_lang.with_status') ?> "<?=\Plafor\Models\UserCourseStatusModel::getInstance()->find(\Plafor\Models\UserCourseModel::getInstance()->where('fk_user',$apprentice['id'])->where('fk_course_plan',$course_plan['id'])->first()['fk_status'])['name']?>"</h3>
 
-                    <h1><?= lang('plafor_lang.course_plan').' "'.$course_plan['official_name'].'"' ?></h1>
+                    <?php endforeach;?>
+                    <h1><?=lang('plafor_lang.course_plan').' '?></h1>
+                    <h3><?='"'.$course_plan['official_name'].'"' ?></h3>
                     <?php if (count($userCourseStatus)>0&&isset($userCourseStatus[0])&&$userCourseStatus[0]!=null){?>
-                    <h1><?= lang('plafor_lang.status').' "'.$userCourseStatus[0]['name'].'"' ?></h1>
+                    <h1></h1>
                     <?php } ?>
                     <h4><?= lang('user_lang.what_to_do')?></h4>
                     <div class = "alert alert-info" ><?= lang('plafor_lang.user_course_'.($course_plan['archive']==null?'disable_explanation':'enable_explanation'))?></div>
diff --git a/public/commonUtils.js b/public/commonUtils.js
index 00d5927b..a93a12b8 100644
--- a/public/commonUtils.js
+++ b/public/commonUtils.js
@@ -90,7 +90,7 @@ async function initProgress(getCourseplanProgressUrl,detailsLang) {
                     ReactDOM.render(<div><Progressbar colors={['#6ca77f', '#AE9B70', '#d9af47', '#D9918D']}
                                                       elements={coursePlanStats.progress}
                                                       timeToRefresh="10" elementToGroup={3}
-                                                      disabled={coursePlanStats.status > 2}
+                                                      disabled={coursePlan.archive!==null}
                     />
                         {
                             coursePlanStats.status <= 2 ?

From b6f01b1ca8a016f39f206e7ef23d6b5aa08bab84 Mon Sep 17 00:00:00 2001
From: HeMa <MaximeEugene.Herbez@formation.orif.ch>
Date: Mon, 24 Jan 2022 11:00:11 +0100
Subject: [PATCH 13/33] fix desactivate and activate competences fix cancel
 links

---
 orif/plafor/Controllers/CoursePlan.php        | 25 ++++--
 orif/plafor/Models/CoursePlanModel.php        |  4 +-
 .../Models/OperationalCompetenceModel.php     |  4 +-
 orif/plafor/Views/competence_domain/view.php  | 31 +++++++-
 orif/plafor/Views/course_plan/view.php        | 33 +++++++-
 orif/plafor/Views/objective/view.php          | 78 -------------------
 .../Views/operational_competence/delete.php   |  2 +-
 .../Views/operational_competence/save.php     |  2 +-
 .../Views/operational_competence/view.php     | 28 ++++++-
 9 files changed, 110 insertions(+), 97 deletions(-)
 delete mode 100644 orif/plafor/Views/objective/view.php

diff --git a/orif/plafor/Controllers/CoursePlan.php b/orif/plafor/Controllers/CoursePlan.php
index a080d3d4..1129f895 100644
--- a/orif/plafor/Controllers/CoursePlan.php
+++ b/orif/plafor/Controllers/CoursePlan.php
@@ -255,7 +255,14 @@ public function delete_competence_domain($competence_domain_id = null, $action =
 
                 case 3:
                     //Reactiver le domaine de compétences
-
+                    foreach(CompetenceDomainModel::getOperationalCompetences($competence_domain_id,true) as $operationalCompetence){
+                        foreach (OperationalCompetenceModel::getObjectives($operationalCompetence['id'],true) as $objective){
+                            $objective['archive']=null;
+                            ObjectiveModel::getInstance()->withDeleted(true)->update($objective['id'],$objective);
+                        }
+                        $operationalCompetence['archive']=null;
+                        OperationalCompetenceModel::getInstance()->withDeleted(true)->update($operationalCompetence['id'],$operationalCompetence);
+                    }
                     CompetenceDomainModel::getInstance()->withDeleted()->update($competence_domain_id, ['archive' => null]);
                     return redirect()->to(base_url('plafor/courseplan/view_course_plan/' . $competence_domain['fk_course_plan']));
                     break;
@@ -301,7 +308,7 @@ public function save_operational_competence($operational_competence_id = 0, $com
 
                 if (OperationalCompetenceModel::getInstance()->errors() == null) {
                     //when it's ok
-                    return redirect()->to(base_url('plafor/courseplan/view_competence_domain/' . $competence_domain_id));
+                    return redirect()->to(base_url('plafor/courseplan/view_competence_domain/' . $operational_competence['fk_competence_domain']));
                 }
             }
             $competenceDomains = [];
@@ -355,6 +362,10 @@ public function delete_operational_competence($operational_competence_id, $actio
                     break;
                 case 3:
                     //Reactiver la compétence opérationnelle
+                    foreach (OperationalCompetenceModel::getObjectives($operational_competence['id'],true) as $objective){
+                        $objective['archive']=null;
+                        ObjectiveModel::getInstance()->withDeleted(true)->update($objective['id'],$objective);
+                    }
                     OperationalCompetenceModel::getInstance()->withDeleted()->update($operational_competence_id, ['archive' => null]);
                     return redirect()->to(base_url('plafor/courseplan/view_competence_domain/' . $operational_competence['fk_competence_domain']));
                     break;
@@ -565,18 +576,19 @@ public function list_course_plan($id_apprentice = null, $with_archived=false)
      */
     public function view_course_plan($course_plan_id = null)
     {
+        $with_archived=$this->request->getGet('wa')!=null?$this->request->getGet('wa'):false;
         if(!isset($course_plan_id)) {
             // Back to course plans list
             return redirect()->to(base_url('plafor/courseplan/list_course_plan'));
         } else {
-            $course_plan = CoursePlanModel::getInstance()->withDeleted(true)->find($course_plan_id);
+            $course_plan = CoursePlanModel::getInstance()->withDeleted(false)->find($course_plan_id);
             if(is_null($course_plan)) {
                 // Back to course plans list
                 return redirect()->to(base_url('plafor/courseplan/list_course_plan'));
             }
         }
 
-        $competence_domains=CoursePlanModel::getCompetenceDomains($course_plan_id);
+        $competence_domains=CoursePlanModel::getCompetenceDomains($course_plan_id,$with_archived);
 
         // Format date
         $date_begin = Time::createFromFormat('Y-m-d', $course_plan['date_begin']);
@@ -610,6 +622,7 @@ public function view_competence_domain($competence_domain_id = null)
                 return redirect()->to(base_url('plafor/courseplan/list_course_plan'));
             }
         }
+        $with_archived=$this->request->getGet('wa')!=null?$this->request->getGet('wa'):false;
 
         $course_plan = CompetenceDomainModel::getCoursePlan($competence_domain['fk_course_plan'], true);
 
@@ -621,6 +634,7 @@ public function view_competence_domain($competence_domain_id = null)
             'title' =>lang('plafor_lang.title_view_competence_domain'),
             'course_plan' =>$course_plan,
             'competence_domain' => $competence_domain,
+            'with_archived'=>$with_archived,
         );
 
         return $this->display_view('\Plafor/competence_domain/view',$output);
@@ -638,6 +652,7 @@ public function view_operational_competence($operational_competence_id = null)
         if($operational_competence == null){
             return redirect()->to(base_url('plafor/courseplan/list_course_plan/'));
         }
+        $with_archived=$this->request->getGet('wa')!=null?$this->request->getGet('wa'):false;
 
         $competence_domain=null;
         $course_plan=null;
@@ -647,7 +662,7 @@ public function view_operational_competence($operational_competence_id = null)
         }catch (Exception $exception){
 
         }
-        $objectives=OperationalCompetenceModel::getObjectives($operational_competence['id']);
+        $objectives=OperationalCompetenceModel::getObjectives($operational_competence['id'],$with_archived);
         $output = array(
             'title'=>lang('plafor_lang.title_view_operational_competence'),
             'operational_competence' => $operational_competence,
diff --git a/orif/plafor/Models/CoursePlanModel.php b/orif/plafor/Models/CoursePlanModel.php
index bfe1ea01..733c228e 100644
--- a/orif/plafor/Models/CoursePlanModel.php
+++ b/orif/plafor/Models/CoursePlanModel.php
@@ -57,8 +57,8 @@ public static function getInstance(){
      * @param $coursePlanId
      * @return array
      */
-    public static function getCompetenceDomains($coursePlanId){
-        return CompetenceDomainModel::getInstance()->where('fk_course_plan',$coursePlanId)->withDeleted(true)->findAll();
+    public static function getCompetenceDomains($coursePlanId,$with_archived=0){
+        return CompetenceDomainModel::getInstance()->where('fk_course_plan',$coursePlanId)->withDeleted($with_archived)->findAll();
     }
 
     /**
diff --git a/orif/plafor/Models/OperationalCompetenceModel.php b/orif/plafor/Models/OperationalCompetenceModel.php
index a2316f88..8e759bae 100644
--- a/orif/plafor/Models/OperationalCompetenceModel.php
+++ b/orif/plafor/Models/OperationalCompetenceModel.php
@@ -66,8 +66,8 @@ public static function getCompetenceDomain($fkCompetenceDomainId){
      * @param $operationalCompetenceId
      * @return array
      */
-    public static function getObjectives($operationalCompetenceId){
-        return ObjectiveModel::getInstance()->where('fk_operational_competence',$operationalCompetenceId)->findAll();
+    public static function getObjectives($operationalCompetenceId,$with_archived=0){
+        return ObjectiveModel::getInstance()->withDeleted($with_archived)->where('fk_operational_competence',$operationalCompetenceId)->findAll();
     }
 
     public static function getOperationalCompetences($with_archived = false, $competence_domain_id = 0) { 
diff --git a/orif/plafor/Views/competence_domain/view.php b/orif/plafor/Views/competence_domain/view.php
index 5a7e8267..ab553f7c 100644
--- a/orif/plafor/Views/competence_domain/view.php
+++ b/orif/plafor/Views/competence_domain/view.php
@@ -1,5 +1,6 @@
+<?php helper('form'); ?>
 <div class="container">
-    <?=view('\Plafor\templates\navigator',['title'=>lang('plafor_lang.details_competence_domain')])?>
+     <?=view('\Plafor\templates\navigator',['title'=>lang('plafor_lang.details_competence_domain')])?>
     <div class="row">
         <div class="col-12">
             <p class="bg-primary text-white"><?=lang('plafor_lang.title_view_course_plan')?></p>
@@ -26,12 +27,20 @@
             <p class="bg-primary text-white"><?=lang('plafor_lang.title_view_operational_competence_linked')?></p>
         </div>
         <div class="col-12">
+            <div class="col-sm-12 text-right d-flex justify-content-between">
             <?php if(service('session')->get('user_access')>=config('\User\Config\UserConfig')->access_lvl_admin):?>
                 <a href="<?=base_url('plafor/courseplan/save_operational_competence/0/'.$competence_domain['id'])?>" class="btn btn-primary"><?=lang('common_lang.btn_new_f')?></a>
             <?php endif?>
+                <span>
+                <?=form_label(lang('common_lang.btn_show_disabled'), 'toggle_deleted', ['class' => 'form-check-label','style'=>'padding-right:30px']);?>
+                <?=form_checkbox('toggle_deleted', '', isset($with_archived)?$with_archived:false, [
+                    'id' => 'toggle_deleted', 'class' => 'form-check-input'
+                ]);?>
+                </span>
+            </div>
             <?php
             $datas=[];
-            foreach (\Plafor\Models\CompetenceDomainModel::getOperationalCompetences($competence_domain['id']) as $operational_competence){
+            foreach (\Plafor\Models\CompetenceDomainModel::getOperationalCompetences($competence_domain['id'],$with_archived) as $operational_competence){
                 $datas[]=['id'=>$operational_competence['id'],'symbol'=>$operational_competence['symbol'],'opComp'=>$operational_competence['name']];
             }
             ?>
@@ -49,4 +58,20 @@
             ])?>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
+<script defer>
+    $(document).ready(function(){
+        $('#toggle_deleted').change(e => {
+            let checked = e.currentTarget.checked;
+            history.replaceState(null,null,'<?=base_url('/plafor/courseplan/view_competence_domain/'.$competence_domain['id']);?>?wa='+(checked?1:0))
+            $.get('<?=base_url('/plafor/courseplan/view_competence_domain/')."/${competence_domain['id']}";?>?wa='+(checked?1:0),(datas)=>{
+                let parser=new DOMParser();
+                parser.parseFromString(datas,'text/html').querySelectorAll('table').forEach((domTag)=>{
+                    document.querySelectorAll('table').forEach((thisDomTag)=>{
+                        thisDomTag.innerHTML=domTag.innerHTML;
+                    })
+                })
+            })
+        })
+    });
+</script>
\ No newline at end of file
diff --git a/orif/plafor/Views/course_plan/view.php b/orif/plafor/Views/course_plan/view.php
index 5ee9707f..704a4cdf 100644
--- a/orif/plafor/Views/course_plan/view.php
+++ b/orif/plafor/Views/course_plan/view.php
@@ -1,3 +1,4 @@
+<?php helper('form'); ?>
 <div class="container">
     <?=view('\Plafor\templates\navigator',['title'=>lang('plafor_lang.title_view_course_plan')])?>
     <div class="row">
@@ -18,9 +19,17 @@
             <p class="bg-primary text-white"><?=lang('plafor_lang.title_view_competence_domains_linked')?></p>
         </div>
         <div class="col-12">
-            <?php if(service('session')->get('user_access')>=config('\User\Config\UserConfig')->access_lvl_admin):?>
-                <a href="<?=base_url('plafor/courseplan/save_competence_domain/'.$course_plan['id'].'/0/')?>" class="btn btn-primary"><?=lang('common_lang.btn_new_m')?></a>
-            <?php endif; ?>
+            <div class="col-sm-12 text-right d-flex justify-content-between">
+                <?php if(service('session')->get('user_access')>=config('\User\Config\UserConfig')->access_lvl_admin):?>
+                    <a href="<?=base_url('plafor/courseplan/save_competence_domain/'.$course_plan['id'].'/0/')?>" class="btn btn-primary"><?=lang('common_lang.btn_new_m')?></a>
+                <?php endif; ?>
+                <span>
+                <?=form_label(lang('common_lang.btn_show_disabled'), 'toggle_deleted', ['class' => 'form-check-label','style'=>'padding-right:30px']);?>
+                <?=form_checkbox('toggle_deleted', '', isset($with_archived)?$with_archived:false, [
+                    'id' => 'toggle_deleted', 'class' => 'form-check-input'
+                ]);?>
+                </span>
+            </div>
 
             <?php
             $datas=[];
@@ -42,4 +51,20 @@
                 ])?>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
+<script defer>
+    $(document).ready(function(){
+        $('#toggle_deleted').change(e => {
+            let checked = e.currentTarget.checked;
+            history.replaceState(null,null,'<?=base_url('/plafor/courseplan/view_course_plan/'.$course_plan['id']);?>?wa='+(checked?1:0))
+            $.get('<?=base_url('/plafor/courseplan/view_course_plan/')."/${course_plan['id']}";?>?wa='+(checked?1:0),(datas)=>{
+                let parser=new DOMParser();
+                parser.parseFromString(datas,'text/html').querySelectorAll('table').forEach((domTag)=>{
+                    document.querySelectorAll('table').forEach((thisDomTag)=>{
+                        thisDomTag.innerHTML=domTag.innerHTML;
+                    })
+                })
+            })
+        })
+    });
+</script>
\ No newline at end of file
diff --git a/orif/plafor/Views/objective/view.php b/orif/plafor/Views/objective/view.php
deleted file mode 100644
index ac7002f7..00000000
--- a/orif/plafor/Views/objective/view.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<div class="container">
-    <?=view('\Plafor\templates\navigator',['title'=>lang('plafor_lang.title_view_objective')])?>
-
-    <div class="row">
-        <div class="col-md-12">
-            <p class="bg-primary text-white"><?=lang('plafor_lang.title_view_course_plan')?></p>
-        </div>
-        <?php if(isset($course_plan)): ?>
-        <div class="col-md-6">
-            <p class="font-weight-bold"><?=lang('plafor_lang.field_course_plan_formation_number')?></p>
-            <a href="<?= base_url('plafor/courseplan/view_course_plan/'.$course_plan['id'])?>"><?=$course_plan['formation_number']?></a>
-        </div>
-        <div class="col-md-6">
-            <p class="font-weight-bold"><?=lang('plafor_lang.field_course_plan_official_name')?></p>
-            <a href="<?= base_url('plafor/courseplan/view_course_plan/'.$course_plan['id'])?>"><?=$course_plan['official_name']?></a>
-        </div>
-        <?php endif;?>
-    </div>
-    <div class="row">
-        <div class="col-md-12">
-            <p class="bg-primary text-white"><?=lang('plafor_lang.title_view_competence_domain')?></p>
-        </div>
-        <?php if (isset($competence_domain)): ?>
-        <div class="col-md-6">
-            <p class="font-weight-bold"><?=lang('plafor_lang.field_competence_domain_symbol')?></p>
-            <a href="<?= base_url('plafor/courseplan/view_competence_domain/'.$competence_domain['id']) ?>"><?=$competence_domain['symbol']?></a>
-        </div>
-        <div class="col-md-6">
-            <p class="font-weight-bold"><?=lang('plafor_lang.field_competence_domain_name')?></p>
-            <a href="<?= base_url('plafor/courseplan/view_competence_domain/'.$competence_domain['id']) ?>"><?=$competence_domain['name']?></a>
-        </div>
-        <?php endif; ?>
-    </div>
-    <div class="row">
-        <div class="col-md-12">
-            <p class="bg-primary text-white"><?=lang('plafor_lang.title_view_operational_competence')?></p>
-        </div>
-        <?php if (isset($operational_competence)): ?>
-        <div class="col-md-6">
-            <p class="font-weight-bold"><?=lang('plafor_lang.field_operational_competence_symbol')?></p>
-            <a href="<?= base_url('plafor/courseplan/view_operational_competence/'.$operational_competence['id']) ?>"><?=$operational_competence['symbol']?></a>
-        </div>
-        <div class="col-md-6">
-            <p class="font-weight-bold"><?=lang('plafor_lang.field_operational_competence_name')?></p>
-            <a href="<?= base_url('plafor/courseplan/view_operational_competence/'.$operational_competence['id']) ?>"><?=$operational_competence['name']?></a>
-        </div>
-        <div class="col-md-4">
-            <p class="font-weight-bold"><?=lang('plafor_lang.field_operational_competence_methodologic')?></p>
-            <a href="<?= base_url('plafor/courseplan/view_operational_competence/'.$operational_competence['id']) ?>"><?=$operational_competence['methodologic']?></a>
-        </div>
-        <div class="col-md-4">
-            <p class="font-weight-bold"><?=lang('plafor_lang.field_operational_competence_social')?></p>
-            <a href="<?= base_url('plafor/courseplan/view_operational_competence/'.$operational_competence['id']) ?>"><?=$operational_competence['social']?></a>
-        </div>
-        <div class="col-md-4">
-            <p class="font-weight-bold"><?=lang('plafor_lang.field_operational_competence_personal')?></p>
-            <a href="<?= base_url('plafor/courseplan/view_operational_competence/'.$operational_competence['id']) ?>"><?=$operational_competence['personal']?></a>
-        </div>
-        <?php endif; ?>
-    </div>
-    <div class="row">
-        <div class="col-md-12">
-            <p class="bg-primary text-white"><?=lang('plafor_lang.title_view_objective')?></p>
-        </div>
-        <div class="col-md-4">
-            <p class="font-weight-bold"><?=lang('plafor_lang.field_objective_symbol')?></p>
-            <p><?=$objective['symbol']?></p>
-        </div>
-        <div class="col-md-4">
-            <p class="font-weight-bold"><?=lang('plafor_lang.field_objective_taxonomy')?></p>
-            <p><?=$objective['taxonomy']?></p>
-        </div>
-        <div class="col-md-4">
-            <p class="font-weight-bold"><?=lang('plafor_lang.field_objective_name')?></p>
-            <p><?=$objective['name']?></p>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/orif/plafor/Views/operational_competence/delete.php b/orif/plafor/Views/operational_competence/delete.php
index c1c963bb..f9a0f032 100644
--- a/orif/plafor/Views/operational_competence/delete.php
+++ b/orif/plafor/Views/operational_competence/delete.php
@@ -10,7 +10,7 @@
                     <div class = "alert alert-info" ><?= lang('plafor_lang.operational_competence_'.($operational_competence['archive']==null?'disable_explanation':'enable_explanation'))?></div>
                 </div>
                 <div class="text-right">
-                    <a href="<?= base_url('plafor/courseplan/view_competence_domain/'.\Plafor\Models\CompetenceDomainModel::getCoursePlan(\Plafor\Models\CompetenceDomainModel::getInstance()->find($operational_competence['fk_competence_domain'])['fk_course_plan'])['id']); ?>" class="btn btn-default">
+                    <a href="<?= base_url('plafor/courseplan/view_competence_domain/'.$operational_competence['fk_competence_domain']); ?>" class="btn btn-default">
                         <?= lang('common_lang.btn_cancel'); ?>
                     </a>
                     <?php 
diff --git a/orif/plafor/Views/operational_competence/save.php b/orif/plafor/Views/operational_competence/save.php
index 942c9440..90d5a77c 100644
--- a/orif/plafor/Views/operational_competence/save.php
+++ b/orif/plafor/Views/operational_competence/save.php
@@ -97,7 +97,7 @@
         <!-- FORM BUTTONS -->
         <div class="row">
             <div class="col text-right">
-                <a class="btn btn-default" href="<?= base_url('plafor/courseplan/view_competence_domain/'.$competence_domain_id) ?>"><?= lang('common_lang.btn_cancel'); ?></a>
+                <a class="btn btn-default" href="<?= base_url('plafor/courseplan/view_competence_domain/'.$operational_competence['fk_competence_domain']) ?>"><?= lang('common_lang.btn_cancel'); ?></a>
                 <?= form_submit('save', lang('common_lang.btn_save'), ['class' => 'btn btn-primary']); ?>
             </div>
         </div>
diff --git a/orif/plafor/Views/operational_competence/view.php b/orif/plafor/Views/operational_competence/view.php
index 6b7dcbab..b975d041 100644
--- a/orif/plafor/Views/operational_competence/view.php
+++ b/orif/plafor/Views/operational_competence/view.php
@@ -1,3 +1,6 @@
+<?php
+helper('form');
+?>
 <div class="container">
     <?=view('\Plafor\templates\navigator',['title'=>lang('plafor_lang.title_view_operational_competence')])?>
     <div class="row">
@@ -62,9 +65,17 @@
             <p class="bg-primary text-white"><?=lang('plafor_lang.field_linked_objectives')?></p>
         </div>
         <div class="col-md-12">
+            <div class="col-sm-12 text-right d-flex justify-content-between">
             <?php if (service('session')->get('user_access')>=config('\User\Config\UserConfig')->access_lvl_admin): ?>
             <a href="<?=base_url('plafor/courseplan/save_objective/0/'.$operational_competence['id']) ?>" class="btn btn-primary"><?= lang('common_lang.btn_new_m')?></a>
             <?php endif;?>
+                <span>
+                <?=form_label(lang('common_lang.btn_show_disabled'), 'toggle_deleted', ['class' => 'form-check-label','style'=>'padding-right:30px']);?>
+                <?=form_checkbox('toggle_deleted', '', isset($with_archived)?$with_archived:false, [
+                    'id' => 'toggle_deleted', 'class' => 'form-check-input'
+                ]);?>
+                </span>
+            </div>
             <table class="responsiveTable table table-striped table-hover">
             <thead>
                 <tr>
@@ -91,7 +102,6 @@
 
                     </td>
                     <td><?=$objective['name']?></td>
-                    <td><a href="<?=base_url('plafor/courseplan/view_objective/'.$objective['id'])?>"><i class="bi bi-card-text"></i></td>
 
                 <?php if(service('session')->get('user_access')>=config('\User\Config\UserConfig')->access_lvl_admin):?>
                     <td><a href="<?= base_url('plafor/courseplan/save_objective/'.$objective['id'].'/'.$operational_competence['id']); ?>"><i class="bi bi-pencil"></i></a></td>
@@ -105,6 +115,22 @@
         </div>
     </div>
 </div>
+<script defer>
+    $(document).ready(function(){
+        $('#toggle_deleted').change(e => {
+            let checked = e.currentTarget.checked;
+            history.replaceState(null,null,'<?=base_url('/plafor/courseplan/view_operational_competence/'.$operational_competence['id']);?>?wa='+(checked?1:0))
+            $.get('<?=base_url('/plafor/courseplan/view_operational_competence/')."/${operational_competence['id']}";?>?wa='+(checked?1:0),(datas)=>{
+                let parser=new DOMParser();
+                parser.parseFromString(datas,'text/html').querySelectorAll('table').forEach((domTag)=>{
+                    document.querySelectorAll('table').forEach((thisDomTag)=>{
+                        thisDomTag.innerHTML=domTag.innerHTML;
+                    })
+                })
+            })
+        })
+    });
+</script>
 <script defer type="text/javascript">
     window.addEventListener('resize',()=>{
 

From 43396336b401ad8a7abcd70c491fc10921121301 Mon Sep 17 00:00:00 2001
From: HeMa <MaximeEugene.Herbez@formation.orif.ch>
Date: Thu, 3 Feb 2022 08:25:04 +0100
Subject: [PATCH 14/33] fix dropdown selected competence domain in
 operational_competence_save

---
 orif/plafor/Views/operational_competence/save.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/orif/plafor/Views/operational_competence/save.php b/orif/plafor/Views/operational_competence/save.php
index 90d5a77c..6c0e3ecd 100644
--- a/orif/plafor/Views/operational_competence/save.php
+++ b/orif/plafor/Views/operational_competence/save.php
@@ -78,7 +78,7 @@
             <div class="col-sm-12 form-group">
                 <?= form_label(lang('plafor_lang.field_operational_competence_domain'), 'competence_domain', ['class' => 'form-label']); ?>
                 <br />
-                <?= form_dropdown('competence_domain',$competence_domains,$competence_domain_id?? '','id="competence_domain" class="form-control"')?>
+                <?= form_dropdown('competence_domain',$competence_domains,$operational_competence['fk_competence_domain']?? '','id="competence_domain" class="form-control"')?>
             </div>
             <div class="col-sm-12 form-group">
                 <?= form_label(lang('plafor_lang.field_operational_competence_symbol'), 'operational_competence_symbol', ['class' => 'form-label']); ?>

From 6440fc8a16edce69ff4af7facabdc3aa858e67cc Mon Sep 17 00:00:00 2001
From: Didier Viret <didier.viret@orif.ch>
Date: Thu, 3 Feb 2022 10:27:20 +0100
Subject: [PATCH 15/33] Fix errors in new course plans titles and dates

---
 orif/plafor/Database/Seeds/addCoursePlan2021Datas.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/orif/plafor/Database/Seeds/addCoursePlan2021Datas.php b/orif/plafor/Database/Seeds/addCoursePlan2021Datas.php
index 260b216e..412ad9f8 100644
--- a/orif/plafor/Database/Seeds/addCoursePlan2021Datas.php
+++ b/orif/plafor/Database/Seeds/addCoursePlan2021Datas.php
@@ -6,9 +6,9 @@
 class addCoursePlan2021Datas extends Seeder{
     public function run(){
         $course_plans = array(
-            array('id' => '5','formation_number' => '88611','official_name' => ' Informaticienne / Informaticien Orientation Exploitation et infrastructure CFC','date_begin' => '2022-08-01','archive' => NULL),
-            array('id' => '6','formation_number' => '88611','official_name' => ' Informaticienne / Informaticien Orientation Développement d’applications CFC','date_begin' => '2022-08-01','archive' => NULL),
-            array('id' => '7','formation_number' => '88614','official_name' => ' Informaticienne d\'entreprise, Informaticien d\'entreprise CFC','date_begin' => '2022-08-01','archive' => NULL)
+            array('id' => '5','formation_number' => '88611','official_name' => 'Informaticienne / Informaticien avec CFC, orientation exploitation et infrastructure','date_begin' => '2021-08-01','archive' => NULL),
+            array('id' => '6','formation_number' => '88611','official_name' => 'Informaticienne / Informaticien avec CFC, orientation développement d\'applications','date_begin' => '2021-08-01','archive' => NULL),
+            array('id' => '7','formation_number' => '88614','official_name' => 'Informaticienne d\'entreprise, Informaticien d\'entreprise avec CFC','date_begin' => '2021-08-01','archive' => NULL)
         );
         foreach ($course_plans as $course_plan){
             $this->db->table('course_plan')->insert($course_plan);

From a13912dfdcb2202259e992766a59926bfc33e8c5 Mon Sep 17 00:00:00 2001
From: Didier Viret <didier.viret@orif.ch>
Date: Thu, 3 Feb 2022 10:30:51 +0100
Subject: [PATCH 16/33] Fix error in language file

---
 orif/plafor/Language/fr/plafor_lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/orif/plafor/Language/fr/plafor_lang.php b/orif/plafor/Language/fr/plafor_lang.php
index e2cf108c..64085b14 100644
--- a/orif/plafor/Language/fr/plafor_lang.php
+++ b/orif/plafor/Language/fr/plafor_lang.php
@@ -248,5 +248,5 @@
     'apprentice_link_enable_explanation' =>'Toutes les informations concernant le lien entre cette apprenti et ce formateur seront réactivées.',
     'acquisition_status_enable_explanation' =>'Toutes les informations concernant le statut d\'acquisition seront réactivées.',
 
-    'apprentices_already_assigned_to_course_plan'   => 'Le(s) apprentis suivant sont déjà associé(s) au plan de formation'
+    'apprentices_already_assigned_to_course_plan'   => 'Le(s) apprentis suivant(s) sont déjà associé(s) au plan de formation'
 ];
\ No newline at end of file

From 409c2b2dd83a290b6ceefd969a5268b2a832ab3a Mon Sep 17 00:00:00 2001
From: Didier Viret <didier.viret@orif.ch>
Date: Thu, 3 Feb 2022 10:50:00 +0100
Subject: [PATCH 17/33] Add only an admin user in database seeds

---
 orif/plafor/Database/Seeds/addUserDatas.php | 48 ---------------------
 1 file changed, 48 deletions(-)

diff --git a/orif/plafor/Database/Seeds/addUserDatas.php b/orif/plafor/Database/Seeds/addUserDatas.php
index a759d59f..db59f457 100644
--- a/orif/plafor/Database/Seeds/addUserDatas.php
+++ b/orif/plafor/Database/Seeds/addUserDatas.php
@@ -19,54 +19,6 @@ public function run(){
                 'archive' => NULL,
                 'date_creation' => '2020-07-09 08:11:05',
             ),
-            array (
-                'id' => '2',
-                'fk_user_type' => '2',
-                'username' => 'FormateurDev',
-                'password' => '$2y$10$Q3H8WodgKonQ60SIcu.eWuVKXmxqBw1X5hMpZzwjRKyCTB1H1l.pe',
-                'archive' => NULL,
-                'date_creation' => '2020-07-09 13:15:24',
-            ),
-            array (
-                'id' => '3',
-                'fk_user_type' => '2',
-                'username' => 'FormateurSysteme',
-                'password' => '$2y$10$Br7mIRYfLufWkrSpi2SyB.Wz0vHZQp7dQf7f2bKy5i/CkhHomSvli',
-                'archive' => NULL,
-                'date_creation' => '2020-07-09 13:15:47',
-            ),
-            array (
-                'id' => '4',
-                'fk_user_type' => '3',
-                'username' => 'ApprentiDev',
-                'password' => '$2y$10$6TLaMd5ljshybxANKgIYGOjY0Xur9EgdzcEPy1bgy2b8uyWYeVoEm',
-                'archive' => NULL,
-                'date_creation' => '2020-07-09 13:16:05',
-            ),
-            array (
-                'id' => '5',
-                'fk_user_type' => '3',
-                'username' => 'ApprentiSysteme',
-                'password' => '$2y$10$0ljkGcDQpTc0RDaN7Y2XcOhS8OB0t0QIhquLv9NcR79IVO9rCR/0.',
-                'archive' => NULL,
-                'date_creation' => '2020-07-09 13:16:27',
-            ),
-            array (
-                'id' => '6',
-                'fk_user_type' => '2',
-                'username' => 'FormateurOperateur',
-                'password' => '$2y$10$SbMYPxqnngLjxVGlG4hW..lrc.pr5Dd74nY.KqdANtEESIvmGRpWi',
-                'archive' => NULL,
-                'date_creation' => '2020-07-09 13:24:22',
-            ),
-            array (
-                'id' => '7',
-                'fk_user_type' => '3',
-                'username' => 'ApprentiOperateur',
-                'password' => '$2y$10$jPNxV2ZZ6Il2LiBQ.CWhNOoud6NsMRFILwHN8kpD410shWeiGpuxK',
-                'archive' => NULL,
-                'date_creation' => '2020-07-09 13:24:45',
-            ),
         ];
         foreach ($users as $user){
             $this->db->table('user')->insert($user);

From 5f4edf4944fe67c693dcaebedf6bb1afaca0eb36 Mon Sep 17 00:00:00 2001
From: Didier Viret <didier.viret@orif.ch>
Date: Thu, 3 Feb 2022 10:51:38 +0100
Subject: [PATCH 18/33] Suppress user seeds from plafor module

---
 orif/plafor/Database/Seeds/addUserDatas.php | 28 ---------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 orif/plafor/Database/Seeds/addUserDatas.php

diff --git a/orif/plafor/Database/Seeds/addUserDatas.php b/orif/plafor/Database/Seeds/addUserDatas.php
deleted file mode 100644
index db59f457..00000000
--- a/orif/plafor/Database/Seeds/addUserDatas.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-
-namespace Plafor\Database\Seeds;
-
-
-use CodeIgniter\Database\Seeder;
-
-class addUserDatas extends Seeder
-{
-    public function run(){
-        //user//
-        $users=[
-            array (
-                'id' => '1',
-                'fk_user_type' => '1',
-                'username' => 'admin',
-                'password' => '$2y$10$tUB5R1MGgbO.zD//WArnceTY8IgnFkVVsudIdHBxIrEXJ2z3WBvcK',
-                'archive' => NULL,
-                'date_creation' => '2020-07-09 08:11:05',
-            ),
-        ];
-        foreach ($users as $user){
-            $this->db->table('user')->insert($user);
-        }
-    }
-
-}
\ No newline at end of file

From fb44e3495a60b399c3972389fb7313089d332e17 Mon Sep 17 00:00:00 2001
From: HeMa <MaximeEugene.Herbez@formation.orif.ch>
Date: Thu, 3 Feb 2022 11:04:46 +0100
Subject: [PATCH 19/33] fix delete course_plan competence_domain
 operational_comp to delete only parent and doesn't affects children

---
 orif/plafor/Controllers/CoursePlan.php | 64 +-------------------------
 orif/plafor/Models/CoursePlanModel.php |  6 +--
 2 files changed, 5 insertions(+), 65 deletions(-)

diff --git a/orif/plafor/Controllers/CoursePlan.php b/orif/plafor/Controllers/CoursePlan.php
index 1129f895..91030b88 100644
--- a/orif/plafor/Controllers/CoursePlan.php
+++ b/orif/plafor/Controllers/CoursePlan.php
@@ -103,50 +103,11 @@ public function delete_course_plan($course_plan_id, $action = 0)
                 case 1: // Deactivate (soft delete) course plan
                     //get linked competence domain
 
-                    $competenceDomains = CoursePlanModel::getCompetenceDomains($course_plan['id']);
-                    $operationalCompetences = [];
-                    $objectives = [];
-
-                    foreach ($competenceDomains as $competence_domain) {
-                        //get all operationnal competences in an array($operational_competences) which format is [[:competencedomainid]=>[operationalCompetence id, name, etc...],[:competencedomainid]=>[operationalCompetence id, name, etc...]
-                        $operationalCompetences[$competence_domain['id']] = CompetenceDomainModel::getOperationalCompetences($competence_domain['id']);
-                        //get all objectives assiociated with an operational_competence in an array($objectives) which format is [[operationalcompetenceid]=>[objectives id,fkop, symbol, etc...]
-                        try {
-                            foreach ($operationalCompetences as list($operationalCompetence)) {
-                                $objectives[$operationalCompetence['id']] = OperationalCompetenceModel::getObjectives($operationalCompetence['id']);
-                            }
-                        } catch (\Exception $e) {
-                        };
-
-                    }
-                    //get all ids
-                    $competenceDomainIds = array_column($competenceDomains, 'id');
-                    foreach ($objectives as list($objective)) {
-                        $objectiveIds[] = $objective['id'];
-
-                    }
-
-
-                    count($objectiveIds) > 0 ? ObjectiveModel::getInstance()->whereIn('id', $objectiveIds)->delete() : null;
-                    count($competenceDomainIds) > 0 ? OperationalCompetenceModel::getInstance()->whereIn('fk_competence_domain', $competenceDomainIds)->delete() : null;
-                    CompetenceDomainModel::getInstance()->where('fk_course_plan', $course_plan_id);
-                    CoursePlanModel::getInstance()->delete($course_plan_id, FALSE);
+                    CoursePlanModel::getInstance()->delete($course_plan_id);
                     return redirect()->to('/plafor/courseplan/list_course_plan');
                     break;
                 case 3:
                     //Reactiver le plan de formation et ses competence et objectifs associés
-                    foreach (CoursePlanModel::getCompetenceDomains($course_plan_id) as $competenceDomain){
-                        $competenceDomain['archive']=null;
-                        CompetenceDomainModel::getInstance()->update($competenceDomain['id'],$competenceDomain);
-                        foreach (CompetenceDomainModel::getOperationalCompetences($competenceDomain['id'],true) as $operationalCompetence){
-                            $operationalCompetence['archive']=null;
-                            OperationalCompetenceModel::getInstance()->update($operationalCompetence['id'],$operationalCompetence);
-                            foreach (ObjectiveModel::getInstance()->where('fk_operational_competence',$operationalCompetence['id'])->withDeleted(true)->findAll() as $objective){
-                                $objective['archive']=null;
-                                ObjectiveModel::getInstance()->update($objective['id'],$objective);
-                            }
-                        }
-                    }
                     CoursePlanModel::getInstance()->withDeleted()->update($course_plan_id, ['archive' => null]);
 
                     return redirect()->to(base_url('plafor/courseplan/list_course_plan'));
@@ -239,14 +200,6 @@ public function delete_competence_domain($competence_domain_id = null, $action =
                     $this->display_view('\Plafor/competence_domain/delete', $output);
                     break;
                 case 1: // Deactivate (soft delete) competence domain
-                    $operationalCompetenceIds = [];
-                    foreach (CompetenceDomainModel::getOperationalCompetences($competence_domain_id) as $operational_competence) {
-                        $operationalCompetenceIds[] = $operational_competence['id'];
-                    }
-
-                    if (count($operationalCompetenceIds))
-                        ObjectiveModel::getInstance()->whereIn('fk_operational_competence', $operationalCompetenceIds)->delete();
-                    OperationalCompetenceModel::getInstance()->where('fk_competence_domain', $competence_domain_id)->delete();
                     $courseplanId = CompetenceDomainModel::getInstance()->find($competence_domain_id)['fk_course_plan'];
                     CompetenceDomainModel::getInstance()->delete($competence_domain_id);
 
@@ -255,14 +208,6 @@ public function delete_competence_domain($competence_domain_id = null, $action =
 
                 case 3:
                     //Reactiver le domaine de compétences
-                    foreach(CompetenceDomainModel::getOperationalCompetences($competence_domain_id,true) as $operationalCompetence){
-                        foreach (OperationalCompetenceModel::getObjectives($operationalCompetence['id'],true) as $objective){
-                            $objective['archive']=null;
-                            ObjectiveModel::getInstance()->withDeleted(true)->update($objective['id'],$objective);
-                        }
-                        $operationalCompetence['archive']=null;
-                        OperationalCompetenceModel::getInstance()->withDeleted(true)->update($operationalCompetence['id'],$operationalCompetence);
-                    }
                     CompetenceDomainModel::getInstance()->withDeleted()->update($competence_domain_id, ['archive' => null]);
                     return redirect()->to(base_url('plafor/courseplan/view_course_plan/' . $competence_domain['fk_course_plan']));
                     break;
@@ -356,16 +301,11 @@ public function delete_operational_competence($operational_competence_id, $actio
                     $this->display_view('\Plafor\operational_competence/delete', $output);
                     break;
                 case 1: // Deactivate (soft delete) operational competence
-                    ObjectiveModel::getInstance()->where('fk_operational_competence', $operational_competence_id)->delete();
                     OperationalCompetenceModel::getInstance()->delete($operational_competence_id, FALSE);
                     return redirect()->to(base_url('plafor/courseplan/view_competence_domain/' . $operational_competence['fk_competence_domain']));
                     break;
                 case 3:
                     //Reactiver la compétence opérationnelle
-                    foreach (OperationalCompetenceModel::getObjectives($operational_competence['id'],true) as $objective){
-                        $objective['archive']=null;
-                        ObjectiveModel::getInstance()->withDeleted(true)->update($objective['id'],$objective);
-                    }
                     OperationalCompetenceModel::getInstance()->withDeleted()->update($operational_competence_id, ['archive' => null]);
                     return redirect()->to(base_url('plafor/courseplan/view_competence_domain/' . $operational_competence['fk_competence_domain']));
                     break;
@@ -581,7 +521,7 @@ public function view_course_plan($course_plan_id = null)
             // Back to course plans list
             return redirect()->to(base_url('plafor/courseplan/list_course_plan'));
         } else {
-            $course_plan = CoursePlanModel::getInstance()->withDeleted(false)->find($course_plan_id);
+            $course_plan = CoursePlanModel::getInstance()->withDeleted(true)->find($course_plan_id);
             if(is_null($course_plan)) {
                 // Back to course plans list
                 return redirect()->to(base_url('plafor/courseplan/list_course_plan'));
diff --git a/orif/plafor/Models/CoursePlanModel.php b/orif/plafor/Models/CoursePlanModel.php
index 733c228e..32b6c10a 100644
--- a/orif/plafor/Models/CoursePlanModel.php
+++ b/orif/plafor/Models/CoursePlanModel.php
@@ -88,7 +88,7 @@ function getCoursePlansDatas($userid){
 
         function getCompetenceDomainsDatas($coursePlanId){
                 $indexedCompetenceDomains=[];
-                $competenceDomains=CompetenceDomainModel::getCompetenceDomains(true,$coursePlanId);
+                $competenceDomains=CompetenceDomainModel::getCompetenceDomains(false,$coursePlanId);
                 foreach ($competenceDomains as $competenceDomain) {
                     $indexedCompetenceDomains[$competenceDomain['id']]=$competenceDomain;
                 }
@@ -97,7 +97,7 @@ function getCompetenceDomainsDatas($coursePlanId){
         function getOperationalCompetencesDatas($competenceDomainId){
             $operationalCompetences=[];
             $indexedOperationalCompetences=[];
-            $operationalCompetences=OperationalCompetenceModel::getOperationalCompetences(true,$competenceDomainId);
+            $operationalCompetences=OperationalCompetenceModel::getOperationalCompetences(false,$competenceDomainId);
             foreach ($operationalCompetences as $operationalCompetence){
                 $indexedOperationalCompetences[$operationalCompetence['id']]=$operationalCompetence;
             }
@@ -106,7 +106,7 @@ function getOperationalCompetencesDatas($competenceDomainId){
         function getObjectivesDatas($opCompId,$userCourse){
             $intermediateArray=[];
 
-                    foreach (ObjectiveModel::getObjectives(true,$opCompId) as $objective){
+                    foreach (ObjectiveModel::getObjectives(false,$opCompId) as $objective){
 
                         ObjectiveModel::getAcquisitionStatus($objective['id'],$userCourse['id'])['fk_acquisition_level'];
                         $objective['fk_acquisition_level']=ObjectiveModel::getAcquisitionStatus($objective['id'],$userCourse['id'])['fk_acquisition_level'];

From 8ba8b484bc35cd043e609e14d69b0b888e54cc56 Mon Sep 17 00:00:00 2001
From: Didier Viret <didier.viret@orif.ch>
Date: Thu, 3 Feb 2022 14:26:22 +0100
Subject: [PATCH 20/33] Delete acquisition_status in seeds

---
 .../Seeds/addAcquisitionStatusDatas.php       | 254 ------------------
 1 file changed, 254 deletions(-)
 delete mode 100644 orif/plafor/Database/Seeds/addAcquisitionStatusDatas.php

diff --git a/orif/plafor/Database/Seeds/addAcquisitionStatusDatas.php b/orif/plafor/Database/Seeds/addAcquisitionStatusDatas.php
deleted file mode 100644
index d13be9e4..00000000
--- a/orif/plafor/Database/Seeds/addAcquisitionStatusDatas.php
+++ /dev/null
@@ -1,254 +0,0 @@
-<?php
-
-
-namespace Plafor\Database\Seeds;
-
-
-use CodeIgniter\Database\Seeder;
-
-class addAcquisitionStatusDatas extends Seeder
-{
-    public function run()
-    {
-        //Acquisition status//
-        $acquisition_status = array(
-
-            array('id' => '1','fk_objective' => '1','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '2','fk_objective' => '2','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '3','fk_objective' => '3','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '4','fk_objective' => '4','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '5','fk_objective' => '5','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '6','fk_objective' => '6','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '7','fk_objective' => '7','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '8','fk_objective' => '8','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '9','fk_objective' => '9','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '10','fk_objective' => '10','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '11','fk_objective' => '11','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '12','fk_objective' => '12','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '13','fk_objective' => '13','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '14','fk_objective' => '14','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '15','fk_objective' => '15','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '16','fk_objective' => '16','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '17','fk_objective' => '17','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '18','fk_objective' => '18','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '19','fk_objective' => '19','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '20','fk_objective' => '20','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '21','fk_objective' => '21','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '22','fk_objective' => '22','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '23','fk_objective' => '23','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '24','fk_objective' => '24','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '25','fk_objective' => '25','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '26','fk_objective' => '26','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '27','fk_objective' => '27','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '28','fk_objective' => '28','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '29','fk_objective' => '29','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '30','fk_objective' => '30','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '31','fk_objective' => '31','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '32','fk_objective' => '32','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '33','fk_objective' => '33','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '34','fk_objective' => '34','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '35','fk_objective' => '35','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '36','fk_objective' => '36','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '37','fk_objective' => '37','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '38','fk_objective' => '38','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '39','fk_objective' => '39','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '40','fk_objective' => '40','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '41','fk_objective' => '41','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '42','fk_objective' => '42','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '43','fk_objective' => '43','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '44','fk_objective' => '44','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '45','fk_objective' => '45','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '46','fk_objective' => '46','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '47','fk_objective' => '47','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '48','fk_objective' => '48','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '49','fk_objective' => '49','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '50','fk_objective' => '50','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '51','fk_objective' => '51','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '52','fk_objective' => '52','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '53','fk_objective' => '53','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '54','fk_objective' => '54','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '55','fk_objective' => '55','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '56','fk_objective' => '56','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '57','fk_objective' => '57','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '58','fk_objective' => '58','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '59','fk_objective' => '59','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '60','fk_objective' => '60','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '61','fk_objective' => '61','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '62','fk_objective' => '62','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '63','fk_objective' => '63','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '64','fk_objective' => '64','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '65','fk_objective' => '65','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '66','fk_objective' => '66','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '67','fk_objective' => '67','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '68','fk_objective' => '68','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '69','fk_objective' => '69','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '70','fk_objective' => '70','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '71','fk_objective' => '71','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '72','fk_objective' => '72','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '73','fk_objective' => '73','fk_user_course' => '1','fk_acquisition_level' => '1'),
-            array('id' => '74','fk_objective' => '177','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '75','fk_objective' => '178','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '76','fk_objective' => '179','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '77','fk_objective' => '180','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '78','fk_objective' => '181','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '79','fk_objective' => '182','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '80','fk_objective' => '183','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '81','fk_objective' => '184','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '82','fk_objective' => '185','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '83','fk_objective' => '186','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '84','fk_objective' => '187','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '85','fk_objective' => '188','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '86','fk_objective' => '189','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '87','fk_objective' => '190','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '88','fk_objective' => '191','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '89','fk_objective' => '192','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '90','fk_objective' => '193','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '91','fk_objective' => '194','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '92','fk_objective' => '195','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '93','fk_objective' => '196','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '94','fk_objective' => '197','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '95','fk_objective' => '198','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '96','fk_objective' => '199','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '97','fk_objective' => '200','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '98','fk_objective' => '201','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '99','fk_objective' => '202','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '100','fk_objective' => '203','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '101','fk_objective' => '204','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '102','fk_objective' => '205','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '103','fk_objective' => '206','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '104','fk_objective' => '207','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '105','fk_objective' => '208','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '106','fk_objective' => '209','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '107','fk_objective' => '210','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '108','fk_objective' => '211','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '109','fk_objective' => '212','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '110','fk_objective' => '213','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '111','fk_objective' => '214','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '112','fk_objective' => '215','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '113','fk_objective' => '216','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '114','fk_objective' => '217','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '115','fk_objective' => '218','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '116','fk_objective' => '219','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '117','fk_objective' => '220','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '118','fk_objective' => '221','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '119','fk_objective' => '222','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '120','fk_objective' => '223','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '121','fk_objective' => '224','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '122','fk_objective' => '225','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '123','fk_objective' => '226','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '124','fk_objective' => '227','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '125','fk_objective' => '228','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '126','fk_objective' => '229','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '127','fk_objective' => '230','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '128','fk_objective' => '231','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '129','fk_objective' => '232','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '130','fk_objective' => '233','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '131','fk_objective' => '234','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '132','fk_objective' => '235','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '133','fk_objective' => '236','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '134','fk_objective' => '237','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '135','fk_objective' => '238','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '136','fk_objective' => '239','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '137','fk_objective' => '240','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '138','fk_objective' => '241','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '139','fk_objective' => '242','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '140','fk_objective' => '243','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '141','fk_objective' => '244','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '142','fk_objective' => '245','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '143','fk_objective' => '246','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '144','fk_objective' => '247','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '145','fk_objective' => '248','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '146','fk_objective' => '249','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '147','fk_objective' => '250','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '148','fk_objective' => '251','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '149','fk_objective' => '252','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '150','fk_objective' => '253','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '151','fk_objective' => '254','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '152','fk_objective' => '255','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '153','fk_objective' => '256','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '154','fk_objective' => '257','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '155','fk_objective' => '258','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '156','fk_objective' => '259','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '157','fk_objective' => '260','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '158','fk_objective' => '261','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '159','fk_objective' => '262','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '160','fk_objective' => '263','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '161','fk_objective' => '264','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '162','fk_objective' => '265','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '163','fk_objective' => '266','fk_user_course' => '2','fk_acquisition_level' => '1'),
-            array('id' => '164','fk_objective' => '267','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '165','fk_objective' => '268','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '166','fk_objective' => '269','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '167','fk_objective' => '270','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '168','fk_objective' => '271','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '169','fk_objective' => '272','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '170','fk_objective' => '273','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '171','fk_objective' => '274','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '172','fk_objective' => '275','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '173','fk_objective' => '276','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '174','fk_objective' => '277','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '175','fk_objective' => '278','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '176','fk_objective' => '279','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '177','fk_objective' => '280','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '178','fk_objective' => '281','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '179','fk_objective' => '282','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '180','fk_objective' => '283','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '181','fk_objective' => '284','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '182','fk_objective' => '285','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '183','fk_objective' => '286','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '184','fk_objective' => '287','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '185','fk_objective' => '288','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '186','fk_objective' => '289','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '187','fk_objective' => '290','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '188','fk_objective' => '291','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '189','fk_objective' => '292','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '190','fk_objective' => '293','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '191','fk_objective' => '294','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '192','fk_objective' => '295','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '193','fk_objective' => '296','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '194','fk_objective' => '297','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '195','fk_objective' => '298','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '196','fk_objective' => '299','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '197','fk_objective' => '300','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '198','fk_objective' => '301','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '199','fk_objective' => '302','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '200','fk_objective' => '303','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '201','fk_objective' => '304','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '202','fk_objective' => '305','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '203','fk_objective' => '306','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '204','fk_objective' => '307','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '205','fk_objective' => '308','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '206','fk_objective' => '309','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '207','fk_objective' => '310','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '208','fk_objective' => '311','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '209','fk_objective' => '312','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '210','fk_objective' => '313','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '211','fk_objective' => '314','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '212','fk_objective' => '315','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '213','fk_objective' => '316','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '214','fk_objective' => '317','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '215','fk_objective' => '318','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '216','fk_objective' => '319','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '217','fk_objective' => '320','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '218','fk_objective' => '321','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '219','fk_objective' => '322','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '220','fk_objective' => '323','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '221','fk_objective' => '324','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '222','fk_objective' => '325','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '223','fk_objective' => '326','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '224','fk_objective' => '327','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '225','fk_objective' => '328','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '226','fk_objective' => '329','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '227','fk_objective' => '330','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '228','fk_objective' => '331','fk_user_course' => '3','fk_acquisition_level' => '1'),
-            array('id' => '229','fk_objective' => '332','fk_user_course' => '3','fk_acquisition_level' => '1')
-
-        );
-        foreach ($acquisition_status as $acquisitionStatuse){
-            $this->db->table('acquisition_status')->insert($acquisitionStatuse);
-        }
-
-
-    }
-
-}
\ No newline at end of file

From 83c5a0a5ae7eac27b140057260f95257392420d1 Mon Sep 17 00:00:00 2001
From: HeMa <MaximeEugene.Herbez@formation.orif.ch>
Date: Mon, 7 Feb 2022 08:41:55 +0100
Subject: [PATCH 21/33] Let only update the acquisition status when operational
 competence and competence domain are active else returns error

---
 orif/plafor/Controllers/Apprentice.php  | 20 +++++++++++++++++---
 orif/plafor/Language/fr/plafor_lang.php |  2 ++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/orif/plafor/Controllers/Apprentice.php b/orif/plafor/Controllers/Apprentice.php
index 9d96c840..f32020f8 100644
--- a/orif/plafor/Controllers/Apprentice.php
+++ b/orif/plafor/Controllers/Apprentice.php
@@ -5,6 +5,8 @@
 
 
 use CodeIgniter\Config\Services;
+use CodeIgniter\HTTP\Response;
+use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\I18n\Time;
 use CodeIgniter\Validation\Validation;
 use Exception;
@@ -375,7 +377,7 @@ public function view_acquisition_status($acquisition_status_id = null){
      * Changes an acquisition status for an apprentice
      *
      * @param int $acquisition_status_id = ID of the acquisition status to change
-     * @return void
+     * @return Response|ResponseInterface
      */
     public function save_acquisition_status($acquisition_status_id = 0) {
         $acquisitionStatus = AcquisitionStatusModel::getInstance()->find($acquisition_status_id);
@@ -401,9 +403,21 @@ public function save_acquisition_status($acquisition_status_id = 0) {
             $acquisitionStatus = [
                 'fk_acquisition_level' => $acquisitionLevel
             ];
+            //check if opcomp and compdom is avtive
+            $objective=ObjectiveModel::getInstance()->find($acquisitionStatus['fk_objective']);
+            $opeationalCompetence=ObjectiveModel::getOperationalCompetence($objective['fk_operational_competence']);
+            //verify if op comp is disabled
+            if ($opeationalCompetence==null||$opeationalCompetence['archive']!=null){
+                return $this->response->setContentType('application/json')->setStatusCode(409)->setBody(json_encode(['error'=>lang('plafor_lang.associated_op_comp_disabled')]));
+            }
+            //if not verify if competence domain is active
+            else{
+                $competenceDomain=OperationalCompetenceModel::getCompetenceDomain($opeationalCompetence['fk_competence_domain']);
+                if ($competenceDomain==null|$competenceDomain['archive']!=null){
+                    return $this->response->setContentType('application/json')->setStatusCode(409)->setBody(json_encode(['error'=>lang('plafor_lang.associated_comp_dom_disabled')]));
+                }
+            }
             AcquisitionStatusModel::getInstance()->update($acquisition_status_id, $acquisitionStatus);
-
-
             if (AcquisitionStatusModel::getInstance()->errors()==null) {
 
                 //if ok
diff --git a/orif/plafor/Language/fr/plafor_lang.php b/orif/plafor/Language/fr/plafor_lang.php
index 64085b14..266e310d 100644
--- a/orif/plafor/Language/fr/plafor_lang.php
+++ b/orif/plafor/Language/fr/plafor_lang.php
@@ -194,6 +194,8 @@
     // Error messages
     'msg_err_course_plan_not_exist'  =>'Le plan de formation sélectionné n\'existe pas',
     'msg_err_course_plan_not_unique' =>'Ce plan de formation est déjà utilisé, merci d\'en choisir un autre',
+    'associated_op_comp_disabled'    =>'La compétence opérationnelle associée à cet objectif est désactivée',
+    'associated_comp_dom_disabled'   =>'Le domaine de ccompétence associé est désactivé',
 
     // Other texts
     'course_plan'                    =>'Plan de formation',

From 4bd3a9951c1bb700b6a52c88aa52d0c964849f8f Mon Sep 17 00:00:00 2001
From: HeMa <MaximeEugene.Herbez@formation.orif.ch>
Date: Mon, 7 Feb 2022 09:25:06 +0100
Subject: [PATCH 22/33] Ajout des cartouches

---
 orif/plafor/Config/PlaforConfig.php           |  4 +--
 orif/plafor/Controllers/Apprentice.php        |  8 +++++
 orif/plafor/Controllers/CoursePlan.php        |  8 ++++-
 orif/plafor/Controllers/Migration.php         |  9 +++++-
 .../2021-06-14-090828_AddAcquisitionLevel.php |  7 +++++
 ...2021-06-14-090828_AddAcquisitionStatus.php |  8 ++++-
 .../2021-06-14-090828_AddComment.php          |  7 +++++
 .../2021-06-14-090828_AddCompetenceDomain.php |  7 +++++
 .../2021-06-14-090828_AddCoursePlan.php       |  7 +++++
 .../2021-06-14-090828_AddObjective.php        |  7 +++++
 .../2021-06-14-090828_AddOpCompetence.php     |  7 +++++
 ...2021-06-14-090828_AddTrainerApprentice.php |  7 +++++
 .../2021-06-14-090828_AddUserCourse.php       |  7 +++++
 .../2021-06-14-090828_AddUserCourseStatus.php |  7 +++++
 .../2021-09-28-090428_AddCompetenceDomain.php |  8 +++++
 .../2021-09-28-090428_AddCoursePlan.php       |  8 +++++
 .../2021-09-28-090428_AddObjective.php        |  8 +++++
 .../2021-09-28-090428_AddOpCompetence.php     |  8 +++++
 orif/plafor/Database/Seeds/README.md          | 30 +++++++++++++++++++
 orif/plafor/Filters/LoginFilter.php           | 11 +++++--
 orif/plafor/Language/fr/plafor_lang.php       | 10 ++++++-
 orif/plafor/Models/AcquisitionLevelModel.php  |  9 +++++-
 orif/plafor/Models/AcquisitionStatusModel.php | 10 +++++--
 orif/plafor/Models/CommentModel.php           |  9 +++++-
 orif/plafor/Models/CompetenceDomainModel.php  |  9 +++++-
 orif/plafor/Models/CoursePlanModel.php        |  7 +++++
 orif/plafor/Models/ObjectiveModel.php         |  8 ++++-
 .../Models/OperationalCompetenceModel.php     |  8 ++++-
 orif/plafor/Models/TrainerApprenticeModel.php |  8 ++++-
 orif/plafor/Models/UserCourseModel.php        |  8 ++++-
 orif/plafor/Models/UserCourseStatusModel.php  |  8 ++++-
 orif/plafor/Validation/PlaforRules.php        |  8 ++++-
 orif/plafor/Views/acquisition_status/save.php |  9 ++++++
 orif/plafor/Views/acquisition_status/view.php |  9 ++++++
 orif/plafor/Views/apprentice/delete.php       |  9 ++++++
 orif/plafor/Views/apprentice/link.php         |  9 ++++++
 orif/plafor/Views/apprentice/list.php         |  9 ++++++
 orif/plafor/Views/apprentice/view.php         |  9 ++++++
 orif/plafor/Views/comment/save.php            |  9 ++++++
 .../plafor/Views/competence_domain/delete.php | 10 +++++++
 orif/plafor/Views/competence_domain/save.php  |  9 ++++++
 orif/plafor/Views/competence_domain/view.php  |  9 ++++++
 orif/plafor/Views/course_plan/delete.php      |  9 ++++++
 orif/plafor/Views/course_plan/save.php        |  9 ++++++
 orif/plafor/Views/course_plan/view.php        |  9 ++++++
 orif/plafor/Views/migrationIndex.php          |  7 +++++
 orif/plafor/Views/objective/delete.php        |  9 ++++++
 orif/plafor/Views/objective/save.php          |  9 ++++++
 .../Views/operational_competence/delete.php   |  9 ++++++
 .../Views/operational_competence/save.php     |  9 ++++++
 .../Views/operational_competence/view.php     |  9 ++++++
 orif/plafor/Views/templates/navigator.php     | 13 ++++++++
 52 files changed, 439 insertions(+), 19 deletions(-)
 create mode 100644 orif/plafor/Database/Seeds/README.md

diff --git a/orif/plafor/Config/PlaforConfig.php b/orif/plafor/Config/PlaforConfig.php
index e53ad6d9..ac97aeab 100644
--- a/orif/plafor/Config/PlaforConfig.php
+++ b/orif/plafor/Config/PlaforConfig.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * Config for user module
+ * Config for plafor module
  *
- * @author      Orif (ViDi,HeMa)
+ * @author      Orif (ViDi, HeMa)
  * @link        https://github.com/OrifInformatique
  * @copyright   Copyright (c), Orif (https://www.orif.ch)
  */
diff --git a/orif/plafor/Controllers/Apprentice.php b/orif/plafor/Controllers/Apprentice.php
index f32020f8..d403e24d 100644
--- a/orif/plafor/Controllers/Apprentice.php
+++ b/orif/plafor/Controllers/Apprentice.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Controller pour la gestion des apprentis
+ * Required level apprentice
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
 
 
 namespace Plafor\Controllers;
diff --git a/orif/plafor/Controllers/CoursePlan.php b/orif/plafor/Controllers/CoursePlan.php
index 91030b88..bbc25932 100644
--- a/orif/plafor/Controllers/CoursePlan.php
+++ b/orif/plafor/Controllers/CoursePlan.php
@@ -1,5 +1,11 @@
 <?php
-
+/**
+ * Controller pour la gestion des plan de formation non associés à un apprenti
+ * Required level connected
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
 
 namespace Plafor\Controllers;
 
diff --git a/orif/plafor/Controllers/Migration.php b/orif/plafor/Controllers/Migration.php
index 1356e592..38298395 100644
--- a/orif/plafor/Controllers/Migration.php
+++ b/orif/plafor/Controllers/Migration.php
@@ -1,5 +1,12 @@
 <?php
-
+/**
+ * Controller pour faire la migration des données
+ * Effacé après initialisation
+ * Required level all pour la migration mot de passe
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
 
 namespace Plafor\Controllers;
 
diff --git a/orif/plafor/Database/Migrations/2021-06-14-090828_AddAcquisitionLevel.php b/orif/plafor/Database/Migrations/2021-06-14-090828_AddAcquisitionLevel.php
index 3166fbce..2f7dc74d 100644
--- a/orif/plafor/Database/Migrations/2021-06-14-090828_AddAcquisitionLevel.php
+++ b/orif/plafor/Database/Migrations/2021-06-14-090828_AddAcquisitionLevel.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * Fichier de migration créant la table acquisition_level
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
 namespace Plafor\Database\Migrations;
 use CodeIgniter\Database\Migration;
 
diff --git a/orif/plafor/Database/Migrations/2021-06-14-090828_AddAcquisitionStatus.php b/orif/plafor/Database/Migrations/2021-06-14-090828_AddAcquisitionStatus.php
index a4d3777e..09a2440e 100644
--- a/orif/plafor/Database/Migrations/2021-06-14-090828_AddAcquisitionStatus.php
+++ b/orif/plafor/Database/Migrations/2021-06-14-090828_AddAcquisitionStatus.php
@@ -1,5 +1,11 @@
 <?php
-
+/**
+ * Fichier de migration créant la table acquisition_status
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
 
 namespace Plafor\Database\Migrations;
 
diff --git a/orif/plafor/Database/Migrations/2021-06-14-090828_AddComment.php b/orif/plafor/Database/Migrations/2021-06-14-090828_AddComment.php
index 75e63146..c9e2404c 100644
--- a/orif/plafor/Database/Migrations/2021-06-14-090828_AddComment.php
+++ b/orif/plafor/Database/Migrations/2021-06-14-090828_AddComment.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * Fichier de migration créant la table comment
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
 namespace Plafor\Database\Migrations;
 use CodeIgniter\Database\Migration;
 
diff --git a/orif/plafor/Database/Migrations/2021-06-14-090828_AddCompetenceDomain.php b/orif/plafor/Database/Migrations/2021-06-14-090828_AddCompetenceDomain.php
index 096f675d..7a31ceb9 100644
--- a/orif/plafor/Database/Migrations/2021-06-14-090828_AddCompetenceDomain.php
+++ b/orif/plafor/Database/Migrations/2021-06-14-090828_AddCompetenceDomain.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * Fichier de migration créant la table competence_domain
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
 namespace Plafor\Database\Migrations;
 use CodeIgniter\Database\Migration;
 
diff --git a/orif/plafor/Database/Migrations/2021-06-14-090828_AddCoursePlan.php b/orif/plafor/Database/Migrations/2021-06-14-090828_AddCoursePlan.php
index 686b40f1..4ef93f3e 100644
--- a/orif/plafor/Database/Migrations/2021-06-14-090828_AddCoursePlan.php
+++ b/orif/plafor/Database/Migrations/2021-06-14-090828_AddCoursePlan.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * Fichier de migration créant la table course_plan
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
 namespace Plafor\Database\Migrations;
 use CodeIgniter\Database\Migration;
 
diff --git a/orif/plafor/Database/Migrations/2021-06-14-090828_AddObjective.php b/orif/plafor/Database/Migrations/2021-06-14-090828_AddObjective.php
index ff20b7d5..076ca52a 100644
--- a/orif/plafor/Database/Migrations/2021-06-14-090828_AddObjective.php
+++ b/orif/plafor/Database/Migrations/2021-06-14-090828_AddObjective.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * Fichier de migration créant la table objective
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
 namespace Plafor\Database\Migrations;
 use CodeIgniter\Database\Migration;
 
diff --git a/orif/plafor/Database/Migrations/2021-06-14-090828_AddOpCompetence.php b/orif/plafor/Database/Migrations/2021-06-14-090828_AddOpCompetence.php
index 1667b161..d3d41327 100644
--- a/orif/plafor/Database/Migrations/2021-06-14-090828_AddOpCompetence.php
+++ b/orif/plafor/Database/Migrations/2021-06-14-090828_AddOpCompetence.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * Fichier de migration créant la table operational_competence
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
 namespace Plafor\Database\Migrations;
 use CodeIgniter\Database\Migration;
 
diff --git a/orif/plafor/Database/Migrations/2021-06-14-090828_AddTrainerApprentice.php b/orif/plafor/Database/Migrations/2021-06-14-090828_AddTrainerApprentice.php
index 1169c5f8..3c646d79 100644
--- a/orif/plafor/Database/Migrations/2021-06-14-090828_AddTrainerApprentice.php
+++ b/orif/plafor/Database/Migrations/2021-06-14-090828_AddTrainerApprentice.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * Fichier de migration créant la table trainer_apprentice
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
 namespace Plafor\Database\Migrations;
 use CodeIgniter\Database\Migration;
 class AddTrainerApprentice extends Migration{
diff --git a/orif/plafor/Database/Migrations/2021-06-14-090828_AddUserCourse.php b/orif/plafor/Database/Migrations/2021-06-14-090828_AddUserCourse.php
index 92c1edac..1a49bb9d 100644
--- a/orif/plafor/Database/Migrations/2021-06-14-090828_AddUserCourse.php
+++ b/orif/plafor/Database/Migrations/2021-06-14-090828_AddUserCourse.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * Fichier de migration créant la table user_course
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
 namespace Plafor\Database\Migrations;
 use CodeIgniter\Database\Migration;
 class AddUserCourse extends Migration{
diff --git a/orif/plafor/Database/Migrations/2021-06-14-090828_AddUserCourseStatus.php b/orif/plafor/Database/Migrations/2021-06-14-090828_AddUserCourseStatus.php
index 4ca76db9..a1de441c 100644
--- a/orif/plafor/Database/Migrations/2021-06-14-090828_AddUserCourseStatus.php
+++ b/orif/plafor/Database/Migrations/2021-06-14-090828_AddUserCourseStatus.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * Fichier de migration créant la table user_course_status
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
 namespace Plafor\Database\Migrations;
 use CodeIgniter\Database\Migration;
 class AddUserCourseStatus extends Migration{
diff --git a/orif/plafor/Database/Migrations/mig2021/2021-09-28-090428_AddCompetenceDomain.php b/orif/plafor/Database/Migrations/mig2021/2021-09-28-090428_AddCompetenceDomain.php
index 29c443b8..8fdb5e5a 100644
--- a/orif/plafor/Database/Migrations/mig2021/2021-09-28-090428_AddCompetenceDomain.php
+++ b/orif/plafor/Database/Migrations/mig2021/2021-09-28-090428_AddCompetenceDomain.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Fichier de migration créant la table
+ * competence_domain avec les nouveaux domaines de compétences
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
 namespace Plafor\Database\Migrations\mig2021;
 use CodeIgniter\Database\Migration;
 
diff --git a/orif/plafor/Database/Migrations/mig2021/2021-09-28-090428_AddCoursePlan.php b/orif/plafor/Database/Migrations/mig2021/2021-09-28-090428_AddCoursePlan.php
index 9f6ee082..a23a42a5 100644
--- a/orif/plafor/Database/Migrations/mig2021/2021-09-28-090428_AddCoursePlan.php
+++ b/orif/plafor/Database/Migrations/mig2021/2021-09-28-090428_AddCoursePlan.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Fichier de migration créant la table
+ * competence_domain avec les nouveaux plans si n'existent pas
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
 namespace Plafor\Database\Migrations\mig2021;
 use CodeIgniter\Database\Migration;
 
diff --git a/orif/plafor/Database/Migrations/mig2021/2021-09-28-090428_AddObjective.php b/orif/plafor/Database/Migrations/mig2021/2021-09-28-090428_AddObjective.php
index 7e24e3c2..23557ad7 100644
--- a/orif/plafor/Database/Migrations/mig2021/2021-09-28-090428_AddObjective.php
+++ b/orif/plafor/Database/Migrations/mig2021/2021-09-28-090428_AddObjective.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Fichier de migration créant la table
+ * competence_domain avec les nouveaux objectifs si n'existent pas
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
 namespace Plafor\Database\Migrations\mig2021;
 use CodeIgniter\Database\Migration;
 
diff --git a/orif/plafor/Database/Migrations/mig2021/2021-09-28-090428_AddOpCompetence.php b/orif/plafor/Database/Migrations/mig2021/2021-09-28-090428_AddOpCompetence.php
index 8398e6c8..456984d3 100644
--- a/orif/plafor/Database/Migrations/mig2021/2021-09-28-090428_AddOpCompetence.php
+++ b/orif/plafor/Database/Migrations/mig2021/2021-09-28-090428_AddOpCompetence.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Fichier de migration créant la table
+ * operational_competence avec les nouvelles competence operationnelles si n'existent pas
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
 namespace Plafor\Database\Migrations\mig2021;
 use CodeIgniter\Database\Migration;
 
diff --git a/orif/plafor/Database/Seeds/README.md b/orif/plafor/Database/Seeds/README.md
new file mode 100644
index 00000000..8f112654
--- /dev/null
+++ b/orif/plafor/Database/Seeds/README.md
@@ -0,0 +1,30 @@
+# Plafor
+
+Web application to manage course plans of students in computer science CFC.
+## Repository with datas included in database by migration files
+#### Files
+* addAcquisitionLevelDatas.php
+* addCompetenceDomain2021Datas.php
+* addCompetenceDomainDatas.php
+* addCoursePlan2021Datas.php
+* addCoursePlanDatas.php
+* addObjective2021Datas.php
+* addObjectiveDatas.php
+* addOperationalCompetences2021Datas.php
+* addOperationalCompetencesDatas.php
+* addTrainerApprenticeDatas.php
+* addUserCoursesDatas.php
+* addUserCoursesStatusDatas.php
+* addUserDatas.php
+* addUserTypeDatas.php
+## Built With
+
+* [CodeIgniter 4.x](https://www.codeigniter.com/) - PHP framework
+* [Bootstrap](https://getbootstrap.com/) - Design library with personalized css
+* [ReactJS v17.0.2](https://fr.reactjs.org/) - Design Library to add simple interactivity
+
+## Authors
+
+* **Orif, domaine informatique** - *Initiating and following the project* - [GitHub account](https://github.com/OrifInformatique)
+
+See also the list of [contributors](https://github.com/OrifInformatique/plafor/contributors) who participated in this project.
diff --git a/orif/plafor/Filters/LoginFilter.php b/orif/plafor/Filters/LoginFilter.php
index def803dc..bd5951e2 100644
--- a/orif/plafor/Filters/LoginFilter.php
+++ b/orif/plafor/Filters/LoginFilter.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+ * Fichier de filtre pour vérifier si l'application est initialisé
+ * Ansi que s'occupant de la redirection lors de la suppression d'un utilisateur dans le module plafor
+ * competence_domain avec les nouveaux plans si n'existent pas
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
 
 namespace Plafor\Filters;
 
@@ -45,7 +53,6 @@ public function before(RequestInterface $request, $arguments = null)
      */
     public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
     {
-        // TODO: Implement after() method.
     }
 
     /**
diff --git a/orif/plafor/Language/fr/plafor_lang.php b/orif/plafor/Language/fr/plafor_lang.php
index 266e310d..121ebee9 100644
--- a/orif/plafor/Language/fr/plafor_lang.php
+++ b/orif/plafor/Language/fr/plafor_lang.php
@@ -1,4 +1,12 @@
-<?php 
+<?php
+/**
+ * Fichier de language pour le module plafor
+ * competence_domain avec les nouveaux plans si n'existent pas
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
 
 return [
 
diff --git a/orif/plafor/Models/AcquisitionLevelModel.php b/orif/plafor/Models/AcquisitionLevelModel.php
index 9f99fb2c..26ebf8b5 100644
--- a/orif/plafor/Models/AcquisitionLevelModel.php
+++ b/orif/plafor/Models/AcquisitionLevelModel.php
@@ -1,4 +1,11 @@
-<?php 
+<?php
+/**
+ * Fichier de model pour acquisition_level
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
 
 namespace Plafor\Models;
 use CodeIgniter\Model;
diff --git a/orif/plafor/Models/AcquisitionStatusModel.php b/orif/plafor/Models/AcquisitionStatusModel.php
index affb82a7..dc8e1c81 100644
--- a/orif/plafor/Models/AcquisitionStatusModel.php
+++ b/orif/plafor/Models/AcquisitionStatusModel.php
@@ -1,5 +1,11 @@
-<?php 
-
+<?php
+/**
+ * Fichier de model pour acquisition_status
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
 namespace Plafor\Models;
 use CodeIgniter\Database\ConnectionInterface;
 use CodeIgniter\Model;
diff --git a/orif/plafor/Models/CommentModel.php b/orif/plafor/Models/CommentModel.php
index 2bd2a317..5ce2d491 100644
--- a/orif/plafor/Models/CommentModel.php
+++ b/orif/plafor/Models/CommentModel.php
@@ -1,4 +1,11 @@
-<?php 
+<?php
+/**
+ * Fichier de model pour comment
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
 
 namespace Plafor\Models;
 use CodeIgniter\Database\ConnectionInterface;
diff --git a/orif/plafor/Models/CompetenceDomainModel.php b/orif/plafor/Models/CompetenceDomainModel.php
index 13c14cf3..cdf4445c 100644
--- a/orif/plafor/Models/CompetenceDomainModel.php
+++ b/orif/plafor/Models/CompetenceDomainModel.php
@@ -1,4 +1,11 @@
-<?php 
+<?php
+/**
+ * Fichier de model pour competence_domain
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
 
 namespace Plafor\Models;
 use CodeIgniter\Database\ConnectionInterface;
diff --git a/orif/plafor/Models/CoursePlanModel.php b/orif/plafor/Models/CoursePlanModel.php
index 32b6c10a..74672c77 100644
--- a/orif/plafor/Models/CoursePlanModel.php
+++ b/orif/plafor/Models/CoursePlanModel.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * Fichier de model pour course_plan
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
 namespace Plafor\Models;
 
 use CodeIgniter\Database\ConnectionInterface;
diff --git a/orif/plafor/Models/ObjectiveModel.php b/orif/plafor/Models/ObjectiveModel.php
index 56002038..9ac1917c 100644
--- a/orif/plafor/Models/ObjectiveModel.php
+++ b/orif/plafor/Models/ObjectiveModel.php
@@ -1,5 +1,11 @@
 <?php
-
+/**
+ * Fichier de model pour objective
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
 
 namespace Plafor\Models;
 
diff --git a/orif/plafor/Models/OperationalCompetenceModel.php b/orif/plafor/Models/OperationalCompetenceModel.php
index 8e759bae..f6186484 100644
--- a/orif/plafor/Models/OperationalCompetenceModel.php
+++ b/orif/plafor/Models/OperationalCompetenceModel.php
@@ -1,5 +1,11 @@
 <?php
-
+/**
+ * Fichier de model pour operational_competence
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
 
 namespace Plafor\Models;
 
diff --git a/orif/plafor/Models/TrainerApprenticeModel.php b/orif/plafor/Models/TrainerApprenticeModel.php
index b2e42276..0c3db249 100644
--- a/orif/plafor/Models/TrainerApprenticeModel.php
+++ b/orif/plafor/Models/TrainerApprenticeModel.php
@@ -1,5 +1,11 @@
 <?php
-
+/**
+ * Fichier de model pour trainer_apprentice
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
 
 namespace Plafor\Models;
 
diff --git a/orif/plafor/Models/UserCourseModel.php b/orif/plafor/Models/UserCourseModel.php
index 4b2ac6bb..c27fe246 100644
--- a/orif/plafor/Models/UserCourseModel.php
+++ b/orif/plafor/Models/UserCourseModel.php
@@ -1,5 +1,11 @@
 <?php
-
+/**
+ * Fichier de model pour user_course
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
 
 namespace Plafor\Models;
 
diff --git a/orif/plafor/Models/UserCourseStatusModel.php b/orif/plafor/Models/UserCourseStatusModel.php
index 28e0d72f..0660c8ce 100644
--- a/orif/plafor/Models/UserCourseStatusModel.php
+++ b/orif/plafor/Models/UserCourseStatusModel.php
@@ -1,5 +1,11 @@
 <?php
-
+/**
+ * Fichier de model pour user_course_status
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
 
 namespace Plafor\Models;
 
diff --git a/orif/plafor/Validation/PlaforRules.php b/orif/plafor/Validation/PlaforRules.php
index a1ce9af6..27d2bcb7 100644
--- a/orif/plafor/Validation/PlaforRules.php
+++ b/orif/plafor/Validation/PlaforRules.php
@@ -1,5 +1,11 @@
 <?php
-
+/**
+ * Fichier de validation pour plafor
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
 
 namespace Plafor\Validation;
 
diff --git a/orif/plafor/Views/acquisition_status/save.php b/orif/plafor/Views/acquisition_status/save.php
index 8dc3ae68..937368d2 100644
--- a/orif/plafor/Views/acquisition_status/save.php
+++ b/orif/plafor/Views/acquisition_status/save.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * Fichier de vue pour save_acquisition_status
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
+?>
+<?php
 helper('form');
 ?>
 <div class="container">
diff --git a/orif/plafor/Views/acquisition_status/view.php b/orif/plafor/Views/acquisition_status/view.php
index c382f840..7395e85e 100644
--- a/orif/plafor/Views/acquisition_status/view.php
+++ b/orif/plafor/Views/acquisition_status/view.php
@@ -1,3 +1,12 @@
+<?php
+/**
+ * Fichier de vue pour view_acquisition_status
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
+?>
 <div class="container">
     <?=view('\Plafor\templates\navigator',['title'=>lang('plafor_lang.title_view_acquisition_status')])?>
     <div class="row">
diff --git a/orif/plafor/Views/apprentice/delete.php b/orif/plafor/Views/apprentice/delete.php
index 9b29d8d6..189b5ef6 100644
--- a/orif/plafor/Views/apprentice/delete.php
+++ b/orif/plafor/Views/apprentice/delete.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * Fichier de vue pour delete_apprentice
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
+?>
+<?php
 ?>
 <div id="page-content-wrapper">
     <div class="container">
diff --git a/orif/plafor/Views/apprentice/link.php b/orif/plafor/Views/apprentice/link.php
index 0f66d43d..5c55787b 100644
--- a/orif/plafor/Views/apprentice/link.php
+++ b/orif/plafor/Views/apprentice/link.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * Fichier de vue pour link_apprentice
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
+?>
+<?php
 $update = !is_null($link);
 helper('form');
 $validation=\CodeIgniter\Config\Services::validation()
diff --git a/orif/plafor/Views/apprentice/list.php b/orif/plafor/Views/apprentice/list.php
index 28b621fa..e6c245df 100644
--- a/orif/plafor/Views/apprentice/list.php
+++ b/orif/plafor/Views/apprentice/list.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * Fichier de vue pour list_apprentice
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
+?>
+<?php
 view('\Plafor\templates\navigator',['reset'=>true]);
 helper('form');
 /**
diff --git a/orif/plafor/Views/apprentice/view.php b/orif/plafor/Views/apprentice/view.php
index 89c57fb5..abec6722 100644
--- a/orif/plafor/Views/apprentice/view.php
+++ b/orif/plafor/Views/apprentice/view.php
@@ -1,3 +1,12 @@
+<?php
+/**
+ * Fichier de vue pour view_apprentice
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
+?>
 <div class="container">
     <?=view('\Plafor\templates\navigator',['title'=>lang('plafor_lang.title_view_apprentice')])?>
     <?php
diff --git a/orif/plafor/Views/comment/save.php b/orif/plafor/Views/comment/save.php
index fc6be5ac..c47e4ae9 100644
--- a/orif/plafor/Views/comment/save.php
+++ b/orif/plafor/Views/comment/save.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * Fichier de vue pour save_comment
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
+?>
+<?php
 $update = !is_null($comment_id);
 
     // For some reasons, you can only set a type to input made with form_input if done with only a array as param, may need to be checked for later uses.
diff --git a/orif/plafor/Views/competence_domain/delete.php b/orif/plafor/Views/competence_domain/delete.php
index c8a55e95..fdc6fdff 100644
--- a/orif/plafor/Views/competence_domain/delete.php
+++ b/orif/plafor/Views/competence_domain/delete.php
@@ -1,3 +1,13 @@
+<?php
+/**
+ * Fichier de vue pour delete_competence_domain
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
+?>
+
 <?php
 $session=\CodeIgniter\Config\Services::session();
 ?>
diff --git a/orif/plafor/Views/competence_domain/save.php b/orif/plafor/Views/competence_domain/save.php
index f0e818c3..55264f92 100644
--- a/orif/plafor/Views/competence_domain/save.php
+++ b/orif/plafor/Views/competence_domain/save.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * Fichier de vue pour save_competence_domain
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
+?>
+<?php
 $update = !is_null($competence_domain);
 helper('form');
 $validation = \CodeIgniter\Config\Services::validation();
diff --git a/orif/plafor/Views/competence_domain/view.php b/orif/plafor/Views/competence_domain/view.php
index ab553f7c..06061f9c 100644
--- a/orif/plafor/Views/competence_domain/view.php
+++ b/orif/plafor/Views/competence_domain/view.php
@@ -1,3 +1,12 @@
+<?php
+/**
+ * Fichier de vue pour save_competence_domain
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
+?>
 <?php helper('form'); ?>
 <div class="container">
      <?=view('\Plafor\templates\navigator',['title'=>lang('plafor_lang.details_competence_domain')])?>
diff --git a/orif/plafor/Views/course_plan/delete.php b/orif/plafor/Views/course_plan/delete.php
index f60c5ff7..cd1f9457 100644
--- a/orif/plafor/Views/course_plan/delete.php
+++ b/orif/plafor/Views/course_plan/delete.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * Fichier de vue pour delete_course_plan
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
+?>
+<?php
 $courses=\Plafor\Models\CoursePlanModel::getUserCourses($course_plan['id']);
 $apprentices=[];
 $userCourseStatus=[];
diff --git a/orif/plafor/Views/course_plan/save.php b/orif/plafor/Views/course_plan/save.php
index ebe8ae8a..a3e0c0a1 100644
--- a/orif/plafor/Views/course_plan/save.php
+++ b/orif/plafor/Views/course_plan/save.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * Fichier de vue pour save_course_plan
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
+?>
+<?php
 $update = !is_null($course_plan);
 ?>
 <?php
diff --git a/orif/plafor/Views/course_plan/view.php b/orif/plafor/Views/course_plan/view.php
index 704a4cdf..bbe27da9 100644
--- a/orif/plafor/Views/course_plan/view.php
+++ b/orif/plafor/Views/course_plan/view.php
@@ -1,3 +1,12 @@
+<?php
+/**
+ * Fichier de vue pour view_course_plan
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
+?>
 <?php helper('form'); ?>
 <div class="container">
     <?=view('\Plafor\templates\navigator',['title'=>lang('plafor_lang.title_view_course_plan')])?>
diff --git a/orif/plafor/Views/migrationIndex.php b/orif/plafor/Views/migrationIndex.php
index f1d55c8e..f58ec89f 100644
--- a/orif/plafor/Views/migrationIndex.php
+++ b/orif/plafor/Views/migrationIndex.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * Fichier de vue pour effectuer la migration
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
 ?>
 <style>
     .header{
diff --git a/orif/plafor/Views/objective/delete.php b/orif/plafor/Views/objective/delete.php
index b7a3dc64..13553bfe 100644
--- a/orif/plafor/Views/objective/delete.php
+++ b/orif/plafor/Views/objective/delete.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * Fichier de vue pour delete_objective
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
+?>
+<?php
 ?>
 <div id="page-content-wrapper">
     <div class="container">
diff --git a/orif/plafor/Views/objective/save.php b/orif/plafor/Views/objective/save.php
index 5aaef22a..109837dd 100644
--- a/orif/plafor/Views/objective/save.php
+++ b/orif/plafor/Views/objective/save.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * Fichier de vue pour save_objective
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
+?>
+<?php
 $update = !is_null($objective);
 helper('form');
 $validation=\CodeIgniter\Config\Services::validation();
diff --git a/orif/plafor/Views/operational_competence/delete.php b/orif/plafor/Views/operational_competence/delete.php
index f9a0f032..28f7c370 100644
--- a/orif/plafor/Views/operational_competence/delete.php
+++ b/orif/plafor/Views/operational_competence/delete.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * Fichier de vue pour delete_operational_competence
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
+?>
+<?php
 ?>
 <div id="page-content-wrapper">
     <div class="container">
diff --git a/orif/plafor/Views/operational_competence/save.php b/orif/plafor/Views/operational_competence/save.php
index 6c0e3ecd..aba0cdb9 100644
--- a/orif/plafor/Views/operational_competence/save.php
+++ b/orif/plafor/Views/operational_competence/save.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * Fichier de vue pour save_operational_competence
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
+?>
+<?php
 $update = !is_null($operational_competence);
 helper('form');
 $validation=\CodeIgniter\Config\Services::validation();
diff --git a/orif/plafor/Views/operational_competence/view.php b/orif/plafor/Views/operational_competence/view.php
index b975d041..55f5c1bc 100644
--- a/orif/plafor/Views/operational_competence/view.php
+++ b/orif/plafor/Views/operational_competence/view.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * Fichier de vue pour save_operational_competence
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
+?>
+<?php
 helper('form');
 ?>
 <div class="container">
diff --git a/orif/plafor/Views/templates/navigator.php b/orif/plafor/Views/templates/navigator.php
index b83f2719..f3bd997e 100644
--- a/orif/plafor/Views/templates/navigator.php
+++ b/orif/plafor/Views/templates/navigator.php
@@ -1,4 +1,17 @@
 <?php
+/**
+ * Fichier de vue pour la navigation
+ *
+ * @author      Orif (ViDi, HeMa)
+ * @link        https://github.com/OrifInformatique
+ * @copyright   Copyright (c), Orif (https://www.orif.ch)
+ */
+/**
+ * Params $reset
+ * Call reset on navigation root
+ */
+?>
+<?php
 if (isset($reset)){
     service('session')->remove('navigator');
 }

From 980410911094d91fa37f148dcdc1612e7d5e9f89 Mon Sep 17 00:00:00 2001
From: HeMa <MaximeEugene.Herbez@formation.orif.ch>
Date: Mon, 7 Feb 2022 09:35:38 +0100
Subject: [PATCH 23/33] course_plan begin_date added to list_course_plan view

---
 orif/plafor/Views/course_plan/list.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/orif/plafor/Views/course_plan/list.php b/orif/plafor/Views/course_plan/list.php
index 6271f478..cb38fb2c 100644
--- a/orif/plafor/Views/course_plan/list.php
+++ b/orif/plafor/Views/course_plan/list.php
@@ -1,4 +1,7 @@
 <?php
+
+use CodeIgniter\I18n\Time;
+
 view('\Plafor\templates\navigator',['reset'=>true]);
 helper('form');
 /**
@@ -35,14 +38,15 @@
         <?php
         $datas=[];
         foreach($course_plans as $course_plan) {
-            $datas[]=['id'=>$course_plan['id'],'formNumber'=>$course_plan['formation_number'],'coursePlan'=>$course_plan['official_name']];
+            $datas[]=['id'=>$course_plan['id'],'formNumber'=>$course_plan['formation_number'],'coursePlan'=>$course_plan['official_name'],'begin_date'=>Time::createFromFormat('Y-m-d', $course_plan['date_begin'])->toLocalizedString('dd.MM.Y')];
         }
         ?>
 
         <?= view('Common\Views\items_list',[
             'columns'=>[
                 'formNumber'=>lang('plafor_lang.field_course_plan_formation_number'),
-                'coursePlan'=>lang('plafor_lang.field_course_plan_official_name')
+                'coursePlan'=>lang('plafor_lang.field_course_plan_official_name'),
+                'begin_date'=>lang('plafor_lang.field_course_plan_into_effect')
             ],
             'items'=>$datas,
             'primary_key_field'=>'id',

From 2ee79d80586d24e74606dbd9374d15b103c6c00c Mon Sep 17 00:00:00 2001
From: HeMa <MaximeEugene.Herbez@formation.orif.ch>
Date: Mon, 7 Feb 2022 09:42:24 +0100
Subject: [PATCH 24/33] updated view_user_course view style

---
 public/css/MY_styles.css | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/public/css/MY_styles.css b/public/css/MY_styles.css
index c56ac114..2647bd62 100644
--- a/public/css/MY_styles.css
+++ b/public/css/MY_styles.css
@@ -98,7 +98,11 @@ p.bg-primary {
         flex-direction: row;
         flex-wrap: wrap;
         align-items: center;
-        justify-content: center;
+    }
+    @media screen and (max-width: 522px) {
+        #objectiveListContentResponsive {
+            justify-content: center;
+        }
     }
 }
 

From 3d63a072943a36666d8c6ad4f3f0465415197241 Mon Sep 17 00:00:00 2001
From: HeMa <MaximeEugene.Herbez@formation.orif.ch>
Date: Tue, 8 Feb 2022 08:05:11 +0100
Subject: [PATCH 25/33] fixed delete user when disabled

---
 orif/plafor/Models/UserCourseModel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/orif/plafor/Models/UserCourseModel.php b/orif/plafor/Models/UserCourseModel.php
index c27fe246..5ae75633 100644
--- a/orif/plafor/Models/UserCourseModel.php
+++ b/orif/plafor/Models/UserCourseModel.php
@@ -54,7 +54,7 @@ public static function getInstance(){
      * @return array
      */
     public static function getUser($fkUserId){
-        return User_model::getInstance()->find($fkUserId);
+        return User_model::getInstance()->withDeleted()->find($fkUserId);
     }
 
     /**

From 24197bf5472d500347f0cea3b817b92e52abd3a3 Mon Sep 17 00:00:00 2001
From: HeMa <MaximeEugene.Herbez@formation.orif.ch>
Date: Tue, 8 Feb 2022 08:22:49 +0100
Subject: [PATCH 26/33] fixed update acquisition_status

---
 orif/plafor/Controllers/Apprentice.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/orif/plafor/Controllers/Apprentice.php b/orif/plafor/Controllers/Apprentice.php
index d403e24d..b9403e84 100644
--- a/orif/plafor/Controllers/Apprentice.php
+++ b/orif/plafor/Controllers/Apprentice.php
@@ -406,12 +406,13 @@ public function save_acquisition_status($acquisition_status_id = 0) {
             $acquisitionLevels[$acquisitionLevel['id']]=$acquisitionLevel['name'];
 
         // Check if data was sent
+
         if (!empty($_POST)) {
             $acquisitionLevel = $this->request->getPost('field_acquisition_level');
-            $acquisitionStatus = [
-                'fk_acquisition_level' => $acquisitionLevel
-            ];
+            $acquisitionStatus=AcquisitionStatusModel::getInstance()->find($acquisition_status_id);
+            $acquisitionStatus['fk_acquisition_level'] = $acquisitionLevel;
             //check if opcomp and compdom is avtive
+
             $objective=ObjectiveModel::getInstance()->find($acquisitionStatus['fk_objective']);
             $opeationalCompetence=ObjectiveModel::getOperationalCompetence($objective['fk_operational_competence']);
             //verify if op comp is disabled

From 9ef4a9757532db1bb78badc18ba43fc65f73126f Mon Sep 17 00:00:00 2001
From: HeMa <MaximeEugene.Herbez@formation.orif.ch>
Date: Tue, 8 Feb 2022 08:41:17 +0100
Subject: [PATCH 27/33] fixed update user_course

---
 orif/plafor/Views/user_course/save.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/orif/plafor/Views/user_course/save.php b/orif/plafor/Views/user_course/save.php
index 83e19548..df1cdda0 100644
--- a/orif/plafor/Views/user_course/save.php
+++ b/orif/plafor/Views/user_course/save.php
@@ -54,7 +54,7 @@
             <div class="col-sm-6 form-group">
                 <?= form_label(lang('plafor_lang.field_user_course_course_plan'), 'course_plan', ['class' => 'form-label']); ?>
                 <br />
-                <?= form_dropdown('course_plan',$course_plans,isset($user_course['fk_course_plan'])?$user_course['fk_course_plan']:'','id="course_plan" class="form-control" '.($update?'disabled':''))?>
+                <?= form_dropdown('course_plan',$course_plans,isset($user_course['fk_course_plan'])?$user_course['fk_course_plan']:'','id="course_plan" class="form-control" '.($update?'style="pointer-events:none;background-color:rgba(0,0,0,0.2)"':''))?>
             </div>
             <div class="col-sm-6 form-group">
                 <?= form_label(lang('plafor_lang.field_user_course_status'), 'status', ['class' => 'form-label']); ?>

From 4dfc45aa400490c9e47c564031e2043791fead15 Mon Sep 17 00:00:00 2001
From: HeMa <MaximeEugene.Herbez@formation.orif.ch>
Date: Tue, 8 Feb 2022 08:45:01 +0100
Subject: [PATCH 28/33] removed link on view objective

---
 orif/plafor/Views/acquisition_status/view.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/orif/plafor/Views/acquisition_status/view.php b/orif/plafor/Views/acquisition_status/view.php
index 7395e85e..ea244763 100644
--- a/orif/plafor/Views/acquisition_status/view.php
+++ b/orif/plafor/Views/acquisition_status/view.php
@@ -14,13 +14,13 @@
             <p class="bg-primary text-white"><?=lang('plafor_lang.details_acquisition_status')?></p>
         </div><div class="col-md-2">
             <p class="font-weight-bold"><?=lang('plafor_lang.field_objective_symbol')?></p>
-            <a href="<?= base_url('plafor/courseplan/view_objective/'.$objective['id'])?>"><?=$objective['symbol']?></a>
+            <a><?=$objective['symbol']?></a>
         </div><div class="col-md-6">
             <p class="font-weight-bold"><?=lang('plafor_lang.field_objective_name')?></p>
-            <a href="<?= base_url('plafor/courseplan/view_objective/'.$objective['id'])?>"><?=$objective['name']?></a>
+            <a ><?=$objective['name']?></a>
         </div><div class="col-md-2">
             <p class="font-weight-bold"><?=lang('plafor_lang.field_objective_taxonomy')?></p>
-            <a href="<?= base_url('plafor/courseplan/view_objective/'.$objective['id'])?>"><?=$objective['taxonomy']?></a>
+            <a ><?=$objective['taxonomy']?></a>
         </div>
         <div class="col-md-2">
             <p class="font-weight-bold"><?=lang('plafor_lang.field_acquisition_level')?></p>

From e1341f1f3e287bf2d2c23be9182787ac2915ac0b Mon Sep 17 00:00:00 2001
From: Didier Viret <didier.viret@orif.ch>
Date: Thu, 9 Nov 2023 14:14:54 +0100
Subject: [PATCH 29/33] Remove readme file from plafor/database/seeds

---
 orif/plafor/Database/Seeds/README.md | 30 ----------------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 orif/plafor/Database/Seeds/README.md

diff --git a/orif/plafor/Database/Seeds/README.md b/orif/plafor/Database/Seeds/README.md
deleted file mode 100644
index 8f112654..00000000
--- a/orif/plafor/Database/Seeds/README.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# Plafor
-
-Web application to manage course plans of students in computer science CFC.
-## Repository with datas included in database by migration files
-#### Files
-* addAcquisitionLevelDatas.php
-* addCompetenceDomain2021Datas.php
-* addCompetenceDomainDatas.php
-* addCoursePlan2021Datas.php
-* addCoursePlanDatas.php
-* addObjective2021Datas.php
-* addObjectiveDatas.php
-* addOperationalCompetences2021Datas.php
-* addOperationalCompetencesDatas.php
-* addTrainerApprenticeDatas.php
-* addUserCoursesDatas.php
-* addUserCoursesStatusDatas.php
-* addUserDatas.php
-* addUserTypeDatas.php
-## Built With
-
-* [CodeIgniter 4.x](https://www.codeigniter.com/) - PHP framework
-* [Bootstrap](https://getbootstrap.com/) - Design library with personalized css
-* [ReactJS v17.0.2](https://fr.reactjs.org/) - Design Library to add simple interactivity
-
-## Authors
-
-* **Orif, domaine informatique** - *Initiating and following the project* - [GitHub account](https://github.com/OrifInformatique)
-
-See also the list of [contributors](https://github.com/OrifInformatique/plafor/contributors) who participated in this project.

From 0dec455d310717bee89d426e886135065acae1b2 Mon Sep 17 00:00:00 2001
From: Didier Viret <didier.viret@orif.ch>
Date: Thu, 9 Nov 2023 15:00:22 +0100
Subject: [PATCH 30/33] Add ? in .htaccess for compatibility with Laragon

---
 public/.htaccess | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/.htaccess b/public/.htaccess
index a5d6c2a5..768f1e7e 100644
--- a/public/.htaccess
+++ b/public/.htaccess
@@ -31,7 +31,7 @@ Options All -Indexes
 	# request to the front controller, index.php
 	RewriteCond %{REQUEST_FILENAME} !-f
 	RewriteCond %{REQUEST_FILENAME} !-d
-	RewriteRule ^([\s\S]*)$ index.php/$1 [L,NC,QSA]
+	RewriteRule ^([\s\S]*)$ index.php?/$1 [L,NC,QSA]
 
 	# Ensure Authorization header is passed along
 	RewriteCond %{HTTP:Authorization} .

From 836bd6ae537a405c9b6d439e527c6f917107d846 Mon Sep 17 00:00:00 2001
From: Didier Viret <didier.viret@orif.ch>
Date: Thu, 9 Nov 2023 15:42:03 +0100
Subject: [PATCH 31/33] Fix seeders errors

---
 .../Migrations/2021-06-14-090828_AddAcquisitionStatus.php    | 1 -
 orif/user/Database/Migrations/2021-03-19-090829_add_user.php | 5 +----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/orif/plafor/Database/Migrations/2021-06-14-090828_AddAcquisitionStatus.php b/orif/plafor/Database/Migrations/2021-06-14-090828_AddAcquisitionStatus.php
index 09a2440e..0f8d4eff 100644
--- a/orif/plafor/Database/Migrations/2021-06-14-090828_AddAcquisitionStatus.php
+++ b/orif/plafor/Database/Migrations/2021-06-14-090828_AddAcquisitionStatus.php
@@ -51,7 +51,6 @@ public function up()
         $this->db->disableForeignKeyChecks();
         $this->forge->createTable('acquisition_status');
         $seeder = \Config\Database::seeder();
-        $seeder->call('\Plafor\Database\Seeds\addAcquisitionStatusDatas');
     }
 
 
diff --git a/orif/user/Database/Migrations/2021-03-19-090829_add_user.php b/orif/user/Database/Migrations/2021-03-19-090829_add_user.php
index 3596c2a4..0bfc2647 100644
--- a/orif/user/Database/Migrations/2021-03-19-090829_add_user.php
+++ b/orif/user/Database/Migrations/2021-03-19-090829_add_user.php
@@ -47,10 +47,7 @@ public function up()
         $this->forge->addForeignKey('fk_user_type','user_type','id');
         $this->forge->createTable('user',true);
         $seeder=\Config\Database::seeder();
-        //for plafor module
-        //$seeder->call('\User\Database\Seeds\AddUserDatas');
-        // only for application
-        $seeder->call('\Plafor\Database\Seeds\addUserDatas');
+        $seeder->call('\User\Database\Seeds\AddUserDatas');
     }
 
     /**

From db33d2e510bb0b985a56809fd3f7647b826f5d25 Mon Sep 17 00:00:00 2001
From: Didier Viret <didier.viret@orif.ch>
Date: Thu, 9 Nov 2023 15:50:21 +0100
Subject: [PATCH 32/33] Update old course plans official names

---
 orif/plafor/Database/Seeds/addCoursePlanDatas.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/orif/plafor/Database/Seeds/addCoursePlanDatas.php b/orif/plafor/Database/Seeds/addCoursePlanDatas.php
index 0fe256ba..67410d22 100644
--- a/orif/plafor/Database/Seeds/addCoursePlanDatas.php
+++ b/orif/plafor/Database/Seeds/addCoursePlanDatas.php
@@ -12,10 +12,10 @@ public function run()
     {
         //course_plan//
         $course_plan = array(
-            array('id' => '1','formation_number' => '88601','official_name' => ' Informaticien/-ne CFC Développement d\'applications','date_begin' => '2014-08-01','archive' => NULL),
-            array('id' => '2','formation_number' => '88602','official_name' => ' Informaticien/-ne CFC Informatique d\'entreprise','date_begin' => '2014-08-01','archive' => NULL),
-            array('id' => '3','formation_number' => '88603','official_name' => ' Informaticien/-ne CFC Technique des systèmes','date_begin' => '2014-08-01','archive' => NULL),
-            array('id' => '4','formation_number' => '88605','official_name' => ' Opératrice en informatique / Opérateur en informatique CFC','date_begin' => '2018-08-01','archive' => NULL)
+            array('id' => '1','formation_number' => '88601','official_name' => '[2014-2020] Informaticienne, Informaticien avec CFC, orientation développement d\'applications','date_begin' => '2014-08-01','archive' => NULL),
+            array('id' => '2','formation_number' => '88602','official_name' => '[2014-2020] Informaticienne, Informaticien avec CFC, orientation informatique d\'entreprise','date_begin' => '2014-08-01','archive' => NULL),
+            array('id' => '3','formation_number' => '88603','official_name' => '[2014-2020] Informaticienne, Informaticien avec CFC, orientation technique des systèmes','date_begin' => '2014-08-01','archive' => NULL),
+            array('id' => '4','formation_number' => '88605','official_name' => 'Opératrice en informatique / Opérateur en informatique avec CFC','date_begin' => '2018-08-01','archive' => NULL)
         );
 
         foreach ($course_plan as $course_plan){

From 39e5ab829b18d4d60c4a87cc98b5252eddc5e010 Mon Sep 17 00:00:00 2001
From: Didier Viret <didier.viret@orif.ch>
Date: Tue, 19 Dec 2023 16:20:01 +0100
Subject: [PATCH 33/33] Fix language file

---
 orif/plafor/Language/fr/plafor_lang.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/orif/plafor/Language/fr/plafor_lang.php b/orif/plafor/Language/fr/plafor_lang.php
index 121ebee9..61f6206a 100644
--- a/orif/plafor/Language/fr/plafor_lang.php
+++ b/orif/plafor/Language/fr/plafor_lang.php
@@ -203,7 +203,7 @@
     'msg_err_course_plan_not_exist'  =>'Le plan de formation sélectionné n\'existe pas',
     'msg_err_course_plan_not_unique' =>'Ce plan de formation est déjà utilisé, merci d\'en choisir un autre',
     'associated_op_comp_disabled'    =>'La compétence opérationnelle associée à cet objectif est désactivée',
-    'associated_comp_dom_disabled'   =>'Le domaine de ccompétence associé est désactivé',
+    'associated_comp_dom_disabled'   =>'Le domaine de compétence associé est désactivé',
 
     // Other texts
     'course_plan'                    =>'Plan de formation',
@@ -248,7 +248,7 @@
     'course_status'                  =>'Status des formations',
     'status'                         =>'Statut de la formation',
     'form_number_not_unique'         =>'Le numéro du plan de formation existe déjà',
-    'with_status'                    =>'Avec le status',
+    'with_status'                    =>'Avec le statut',
 
     'course_plan_enable_explanation' =>'Toutes les informations concernant ce plan de formation (domaines de compétences, compétences oppérationnelles et objectifs) seront réactivées.',
     'competence_domain_enable_explanation' =>'Toutes les informations concernant ce domaine de compétence (symbole, nom, compétences oppérationnelles et objectifs) seront réactivées.',
@@ -258,5 +258,5 @@
     'apprentice_link_enable_explanation' =>'Toutes les informations concernant le lien entre cette apprenti et ce formateur seront réactivées.',
     'acquisition_status_enable_explanation' =>'Toutes les informations concernant le statut d\'acquisition seront réactivées.',
 
-    'apprentices_already_assigned_to_course_plan'   => 'Le(s) apprentis suivant(s) sont déjà associé(s) au plan de formation'
+    'apprentices_already_assigned_to_course_plan'   => 'Les apprentis suivants sont déjà associés au plan de formation'
 ];
\ No newline at end of file