From 5d370b13420a7aa0be8769a17aa09ae9c10dd1be Mon Sep 17 00:00:00 2001 From: HeMa Date: Fri, 7 Jan 2022 11:22:31 +0100 Subject: [PATCH 1/3] Fixed migration ci_session --- .../Migrations/2021-03-19-090830_add_ci_sessions.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/orif/user/Database/Migrations/2021-03-19-090830_add_ci_sessions.php b/orif/user/Database/Migrations/2021-03-19-090830_add_ci_sessions.php index 4d2798cb..b33fc313 100644 --- a/orif/user/Database/Migrations/2021-03-19-090830_add_ci_sessions.php +++ b/orif/user/Database/Migrations/2021-03-19-090830_add_ci_sessions.php @@ -14,9 +14,8 @@ public function up() { $this->forge->addField([ 'id'=>[ - 'type' => 'INT', - 'constraint' => '128', - 'unsigned' => true, + 'type' => 'VARCHAR', + 'constraint' => '255', ], 'ip_address'=>[ 'type' => 'VARCHAR', From 7657243f174cc27c664ede03c53b41b9a2b73505 Mon Sep 17 00:00:00 2001 From: HeMa Date: Tue, 11 Jan 2022 10:11:07 +0100 Subject: [PATCH 2/3] Fixed migration ci_session --- app/Controllers/BaseController.php | 2 +- .../2021-06-14-090828_AddComment.php | 2 +- .../2021-06-14-090828_AddOpCompetence.php | 4 -- ...velModel.php => AcquisitionLevelModel.php} | 0 ...usModel.php => AcquisitionStatusModel.php} | 0 .../{commentModel.php => CommentModel.php} | 0 ...ainModel.php => CompetenceDomainModel.php} | 0 ...oursePlanModel.php => CoursePlanModel.php} | 0 ...{objectiveModel.php => ObjectiveModel.php} | 0 ...del.php => OperationalCompetenceModel.php} | 0 ...ceModel.php => TrainerApprenticeModel.php} | 0 ...serCourseModel.php => UserCourseModel.php} | 0 ...tusModel.php => UserCourseStatusModel.php} | 0 orif/plafor/Views/acquisition_status/view.php | 2 +- orif/plafor/Views/apprentice/list.php | 6 +- orif/plafor/Views/apprentice/view.php | 14 ++-- orif/plafor/Views/course_plan/list.php | 16 ++--- .../Views/operational_competence/view.php | 65 +++++++++++++++++-- orif/plafor/Views/templates/navigator.php | 2 +- orif/plafor/Views/user_course/view.php | 4 +- 20 files changed, 85 insertions(+), 32 deletions(-) rename orif/plafor/Models/{acquisitionLevelModel.php => AcquisitionLevelModel.php} (100%) rename orif/plafor/Models/{acquisitionStatusModel.php => AcquisitionStatusModel.php} (100%) rename orif/plafor/Models/{commentModel.php => CommentModel.php} (100%) rename orif/plafor/Models/{competenceDomainModel.php => CompetenceDomainModel.php} (100%) rename orif/plafor/Models/{coursePlanModel.php => CoursePlanModel.php} (100%) rename orif/plafor/Models/{objectiveModel.php => ObjectiveModel.php} (100%) rename orif/plafor/Models/{operationalCompetenceModel.php => OperationalCompetenceModel.php} (100%) rename orif/plafor/Models/{trainerApprenticeModel.php => TrainerApprenticeModel.php} (100%) rename orif/plafor/Models/{userCourseModel.php => UserCourseModel.php} (100%) rename orif/plafor/Models/{userCourseStatusModel.php => UserCourseStatusModel.php} (100%) diff --git a/app/Controllers/BaseController.php b/app/Controllers/BaseController.php index 882c1a1d..929f01d2 100644 --- a/app/Controllers/BaseController.php +++ b/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'); } } 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 fcfdd61e..75e63146 100644 --- a/orif/plafor/Database/Migrations/2021-06-14-090828_AddComment.php +++ b/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'); } 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 7d9d2f2f..1667b161 100644 --- a/orif/plafor/Database/Migrations/2021-06-14-090828_AddOpCompetence.php +++ b/orif/plafor/Database/Migrations/2021-06-14-090828_AddOpCompetence.php @@ -23,7 +23,6 @@ public function up() { 'name' => [ 'type' => 'varchar', 'constraint' => '150', - 'default' => 'null', ], 'symbol' => [ 'type' => 'varchar', @@ -31,15 +30,12 @@ public function up() { ], 'methodologic' => [ 'type' => 'text', - 'default' => 'null', ], 'social' => [ 'type' => 'text', - 'default' => 'null', ], 'personal' => [ 'type' => 'text', - 'default' => 'null', ], 'archive timestamp null', diff --git a/orif/plafor/Models/acquisitionLevelModel.php b/orif/plafor/Models/AcquisitionLevelModel.php similarity index 100% rename from orif/plafor/Models/acquisitionLevelModel.php rename to orif/plafor/Models/AcquisitionLevelModel.php diff --git a/orif/plafor/Models/acquisitionStatusModel.php b/orif/plafor/Models/AcquisitionStatusModel.php similarity index 100% rename from orif/plafor/Models/acquisitionStatusModel.php rename to orif/plafor/Models/AcquisitionStatusModel.php diff --git a/orif/plafor/Models/commentModel.php b/orif/plafor/Models/CommentModel.php similarity index 100% rename from orif/plafor/Models/commentModel.php rename to orif/plafor/Models/CommentModel.php diff --git a/orif/plafor/Models/competenceDomainModel.php b/orif/plafor/Models/CompetenceDomainModel.php similarity index 100% rename from orif/plafor/Models/competenceDomainModel.php rename to orif/plafor/Models/CompetenceDomainModel.php diff --git a/orif/plafor/Models/coursePlanModel.php b/orif/plafor/Models/CoursePlanModel.php similarity index 100% rename from orif/plafor/Models/coursePlanModel.php rename to orif/plafor/Models/CoursePlanModel.php diff --git a/orif/plafor/Models/objectiveModel.php b/orif/plafor/Models/ObjectiveModel.php similarity index 100% rename from orif/plafor/Models/objectiveModel.php rename to orif/plafor/Models/ObjectiveModel.php diff --git a/orif/plafor/Models/operationalCompetenceModel.php b/orif/plafor/Models/OperationalCompetenceModel.php similarity index 100% rename from orif/plafor/Models/operationalCompetenceModel.php rename to orif/plafor/Models/OperationalCompetenceModel.php diff --git a/orif/plafor/Models/trainerApprenticeModel.php b/orif/plafor/Models/TrainerApprenticeModel.php similarity index 100% rename from orif/plafor/Models/trainerApprenticeModel.php rename to orif/plafor/Models/TrainerApprenticeModel.php diff --git a/orif/plafor/Models/userCourseModel.php b/orif/plafor/Models/UserCourseModel.php similarity index 100% rename from orif/plafor/Models/userCourseModel.php rename to orif/plafor/Models/UserCourseModel.php diff --git a/orif/plafor/Models/userCourseStatusModel.php b/orif/plafor/Models/UserCourseStatusModel.php similarity index 100% rename from orif/plafor/Models/userCourseStatusModel.php rename to orif/plafor/Models/UserCourseStatusModel.php diff --git a/orif/plafor/Views/acquisition_status/view.php b/orif/plafor/Views/acquisition_status/view.php index 8977c1a8..c382f840 100644 --- a/orif/plafor/Views/acquisition_status/view.php +++ b/orif/plafor/Views/acquisition_status/view.php @@ -23,7 +23,7 @@

= config('\User\Config\UserConfig')->access_lvl_trainer) { ?> - +
diff --git a/orif/plafor/Views/apprentice/list.php b/orif/plafor/Views/apprentice/list.php index 2ca24fa3..c2f6570b 100644 --- a/orif/plafor/Views/apprentice/list.php +++ b/orif/plafor/Views/apprentice/list.php @@ -1,6 +1,6 @@ true]); -helper('Form'); +helper('form'); /** * Users List View * @@ -16,7 +16,7 @@
'GET']); - echo form_dropdown('trainer_id', $trainers, strval($trainer_id), ['class' => 'form-control', 'style' => 'width:unset!important;display:unset!important;margin-left:-10px;']); + echo form_dropdown('trainer_id', $trainers, strval($trainer_id), ['class' => 'form-control', 'style' => 'width:unset!important;display:unset!important;']); echo form_submit(null, lang('common_lang.btn_search'), ['class' => 'btn btn-primary', 'style' => 'vertical-align:unset!important;']); ?> $(document).ready(function () { - initProgress(""+'/',""); + setTimeout(()=>{initProgress(""+'/',"")},200); $('#toggle_deleted').change(e => { let checked = e.currentTarget.checked; $.post('' + ((checked == true ? '1' : '0')), {}, data => { diff --git a/orif/plafor/Views/apprentice/view.php b/orif/plafor/Views/apprentice/view.php index 9bd15958..89c57fb5 100644 --- a/orif/plafor/Views/apprentice/view.php +++ b/orif/plafor/Views/apprentice/view.php @@ -76,9 +76,9 @@
- - - + + + @@ -98,16 +98,16 @@

-

-
+

+
\ No newline at end of file diff --git a/orif/plafor/Views/templates/navigator.php b/orif/plafor/Views/templates/navigator.php index b0094706..ff8904b2 100644 --- a/orif/plafor/Views/templates/navigator.php +++ b/orif/plafor/Views/templates/navigator.php @@ -43,7 +43,7 @@ 1 && $i!=count($navigatorLink)-1 ? '' : ''?> - "> + "> diff --git a/orif/plafor/Views/user_course/view.php b/orif/plafor/Views/user_course/view.php index df8a029d..39900c5d 100644 --- a/orif/plafor/Views/user_course/view.php +++ b/orif/plafor/Views/user_course/view.php @@ -35,8 +35,8 @@ || ($_SESSION['user_access'] == config('\User\Config\UserConfig')->access_lvl_trainer && in_array($_SESSION['user_id'], $trainers_id)) || ($_SESSION['user_access'] == config('\User\Config\UserConfig')->access_level_apprentice && $user_course['fk_user'] == $apprentice['id'])): ?>
-

-
+

+
From c96eb4d4bc3c98b1f41c324a602e6ca2b8b578f5 Mon Sep 17 00:00:00 2001 From: Didier Viret Date: Tue, 11 Jan 2022 16:10:27 +0100 Subject: [PATCH 3/3] Make ci_sessions migration file correspond to ci_packbase --- .../2021-03-19-090830_add_ci_sessions.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/orif/user/Database/Migrations/2021-03-19-090830_add_ci_sessions.php b/orif/user/Database/Migrations/2021-03-19-090830_add_ci_sessions.php index b33fc313..eb1aad65 100644 --- a/orif/user/Database/Migrations/2021-03-19-090830_add_ci_sessions.php +++ b/orif/user/Database/Migrations/2021-03-19-090830_add_ci_sessions.php @@ -15,21 +15,22 @@ public function up() $this->forge->addField([ 'id'=>[ 'type' => 'VARCHAR', - 'constraint' => '255', + 'constraint' => '128', + '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); }