Fix release 4.0

Fix some uppercase / lowercase errors

app/Controllers/BaseController.php

@@ -141,7 +141,7 @@ public function display_view($view_parts, $data = NULL)
         foreach (config('Common\Config\AdminPanelConfig')->tabs as $tab){
             if (strstr(current_url(), $tab['pageLink'])) {
                 $data['title'] = lang($tab['title']);
-                echo view('\Common\Adminmenu');
+                echo view('\Common\adminMenu');
             }
         }
 

orif/plafor/Database/Migrations/2021-06-14-090828_AddComment.php

@@ -35,7 +35,7 @@ public function up() {
         $this->forge->addKey('id', true, true);
         $this->forge->addForeignKey('fk_trainer', 'user','id');
         $this->forge->addForeignKey('fk_acquisition_status', 'acquisition_status','id');
-        $this->forge->createTable('Comment');
+        $this->forge->createTable('comment');
 
     }
 

orif/plafor/Database/Migrations/2021-06-14-090828_AddOpCompetence.php

@@ -23,23 +23,19 @@ public function up() {
             'name' => [
                 'type' => 'varchar',
                 'constraint' => '150',
-                'default' => 'null',
             ],
             'symbol' => [
                 'type' => 'varchar',
                 'constraint' => '10',
             ],
             'methodologic' => [
                 'type' => 'text',
-                'default' => 'null',
             ],
             'social' => [
                 'type' => 'text',
-                'default' => 'null',
             ],
             'personal' => [
                 'type' => 'text',
-                'default' => 'null',
             ],
 
             'archive timestamp null',

orif/plafor/Views/apprentice/list.php

@@ -1,6 +1,6 @@
 <?php
 view('\Plafor\templates\navigator',['reset'=>true]);
-helper('Form');
+helper('form');
 /**
  * Users List View
  *
@@ -69,7 +69,7 @@
 <script type="text/babel" defer>
 
     $(document).ready(function () {
-        initProgress("<?=base_url("plafor/apprentice/getcourseplanprogress")?>"+'/',"<?=lang('plafor_lang.details_progress')?>");
+        setTimeout(()=>{initProgress("<?=base_url("plafor/apprentice/getcourseplanprogress")?>"+'/',"<?=lang('plafor_lang.details_progress')?>")},200);
         $('#toggle_deleted').change(e => {
             let checked = e.currentTarget.checked;
             $.post('<?php echo base_url("plafor/apprentice/list_apprentice") . '/'?>' + ((checked == true ? '1' : '0')), {}, data => {

orif/plafor/Views/apprentice/view.php

@@ -107,7 +107,7 @@
 <script type="text/babel">
     $(document).ready(()=>{
         $('#usercourseSelector').val(<?=isset($userCourseMax)?$userCourseMax['id']:null?>);
-            displayDetails(null,<?=json_encode($userCourseMax)?>,'integrated',"<?=base_url("plafor/apprentice/getcourseplanprogress")?>"+'/',"<?=base_url('plafor/apprentice/view_user_course')?>");
+            setTimeout(()=>{displayDetails(null,<?=json_encode($userCourseMax)?>,'integrated',"<?=base_url("plafor/apprentice/getcourseplanprogress")?>"+'/',"<?=base_url('plafor/apprentice/view_user_course')?>");},200)
             $('#usercourseSelector').change((event)=>{
                 let userCourses=<?= json_encode($user_courses)?>;
                 let coursePlans=<?= json_encode($course_plans)?>;

orif/plafor/Views/course_plan/list.php

@@ -1,6 +1,6 @@
 <?php
 view('\Plafor\templates\navigator',['reset'=>true]);
-helper('Form');
+helper('form');
 /**
  * Users List View
  *

orif/plafor/Views/operational_competence/view.php

@@ -103,13 +103,13 @@
         </div>
     </div>
 </div>
-<script type="text/javascript" defer>
+<script defer type="text/javascript">
     window.addEventListener('resize',()=>{
 
-        if (window.innerWidth<476){
+        if (window.innerWidth<490){
 
             if (document.querySelectorAll('.responsiveTable td:nth-child(2) .descTitle').item(0)!==null?window.getComputedStyle(document.querySelectorAll('.responsiveTable td:nth-child(2) .descTitle').item(0)).display!=="none":false)
-            document.querySelectorAll('.responsiveTable td:nth-child(2)').forEach((element)=>{
+                document.querySelectorAll('.responsiveTable td:nth-child(2)').forEach((element)=>{
                 let tax=document.createElement('span');
                 tax.innerHTML=`<span class='taxonomyResponsive'>${element.innerHTML}<span>`
 
@@ -129,15 +129,25 @@
         }
 
     });
-    if (window.getComputedStyle(document.querySelectorAll('.responsiveTable td:nth-child(2) .descTitle').item(0)).display!=="none")
-    document.querySelectorAll('.responsiveTable td:nth-child(2)').forEach((element)=>{
-        let tax=document.createElement('span');
-        tax.innerHTML=`<span class='taxonomyResponsive'>${element.innerHTML}<span>`
-
-        element.previousElementSibling.appendChild(tax);
-        element.remove();
+    if (window.innerWidth<490){
 
-    })
+        if (document.querySelectorAll('.responsiveTable td:nth-child(2) .descTitle').item(0)!==null?window.getComputedStyle(document.querySelectorAll('.responsiveTable td:nth-child(2) .descTitle').item(0)).display!=="none":false)
+            document.querySelectorAll('.responsiveTable td:nth-child(2)').forEach((element)=>{
+                let tax=document.createElement('span');
+                tax.innerHTML=`<span class='taxonomyResponsive'>${element.innerHTML}<span>`
 
+                element.previousElementSibling.appendChild(tax);
+                element.remove();
 
+            })
+    }
+    else{
+        document.querySelectorAll('.responsiveTable td:nth-child(1) .taxonomyResponsive').forEach((element)=>{
+            let td=document.createElement('td');
+            td.innerHTML=element.innerHTML;
+            if (element.parentElement.parentElement.nextElementSibling.querySelector('.descTitle')==null)
+                element.parentElement.parentElement.after(td);
+            element.remove();
+        })
+    }
 </script>

orif/plafor/Views/templates/navigator.php

@@ -43,7 +43,7 @@
             <?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("courseplan/list_course_plan") ?>">
+        <a id="navigator-back" class="btn btn-outline-primary mr-2 bi bi-arrow-left-circle" href="<?= base_url("plafor/courseplan/list_course_plan") ?>">
             <?= lang("common_lang.btn_back") ?>
         </a>
     <?php endif;?>

orif/user/Database/Migrations/2021-03-19-090830_add_ci_sessions.php

@@ -14,23 +14,23 @@ public function up()
     {
         $this->forge->addField([
             'id'=>[
-                'type'              => 'INT',
+                'type'              => 'VARCHAR',
                 'constraint'        => '128',
-                'unsigned'          => true,
+                'null'              => false
             ],
             'ip_address'=>[
                 'type'              => 'VARCHAR',
                 'constraint'        => '45',
-                'null'              => false,
+                'null'              => false
             ],
-            'timestamp timestamp DEFAULT CURRENT_TIMESTAMP',
+            'timestamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL',
             'data'=>[
-                'type'              => 'BLOB',
-                'null'              =>  false,
+                'type'              => 'blob',
+                'null'              => false
             ]
-
         ]);
-        $this->forge->addPrimaryKey('id');
+
+        $this->forge->addKey('id', TRUE);
         $this->forge->addKey('timestamp');
         $this->forge->createTable('ci_sessions',true);
     }