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/apprentice/list.php b/orif/plafor/Views/apprentice/list.php index 75447d48..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 * @@ -69,7 +69,7 @@ \ 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/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..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 @@ -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); }