From f2814e1ad9d88cbf8eab084fe5d0c5bc52c231e7 Mon Sep 17 00:00:00 2001
From: HeMa <MaximeEugene.Herbez@formation.orif.ch>
Date: Wed, 12 Jan 2022 08:34:23 +0100
Subject: [PATCH 1/3] fix comment error in list_user.php and reformat
 common/header.php lang name

---
 orif/common/Views/header.php        | 4 ++--
 orif/user/Views/admin/list_user.php | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/orif/common/Views/header.php b/orif/common/Views/header.php
index 02dd6321..169d2d7b 100644
--- a/orif/common/Views/header.php
+++ b/orif/common/Views/header.php
@@ -16,9 +16,9 @@
 
     <title><?php
         if (!isset($title) || is_null($title) || $title == '') {
-            echo lang('Common_lang.page_prefix');
+            echo lang('common_lang.page_prefix');
         } else {
-            echo lang('Common_lang.page_prefix').' - '.$title;
+            echo lang('common_lang.page_prefix').' - '.$title;
         }
     ?></title>
 
diff --git a/orif/user/Views/admin/list_user.php b/orif/user/Views/admin/list_user.php
index 455ebc09..a3925c51 100644
--- a/orif/user/Views/admin/list_user.php
+++ b/orif/user/Views/admin/list_user.php
@@ -43,7 +43,6 @@
             <?php foreach($users as $user) { ?>
                 <tr>
                     <td><a href="<?= base_url('user/admin/save_user/'.$user['id']); ?>"><?= esc($user['username']); ?></td>
-                    <!--<td><?php// esc($user['email']); ?></td> -->
                     <td><?= $user_types[$user['fk_user_type']]; ?></td>
                     <td><?= lang($user['archive'] ? 'common_lang.no' : 'common_lang.yes'); ?></td>
                     <td><a href="<?= base_url('user/admin/delete_user/'.$user['id']); ?>" class="close">×</td>

From a225fafc4310e3fc2f86676bee2c2167b951a6fd Mon Sep 17 00:00:00 2001
From: HeMa <MaximeEugene.Herbez@formation.orif.ch>
Date: Wed, 12 Jan 2022 08:38:04 +0100
Subject: [PATCH 2/3] rename js ProgressView.js to progressView.js

---
 public/jsComponents/{ProgressView.js => progressView.js} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename public/jsComponents/{ProgressView.js => progressView.js} (100%)

diff --git a/public/jsComponents/ProgressView.js b/public/jsComponents/progressView.js
similarity index 100%
rename from public/jsComponents/ProgressView.js
rename to public/jsComponents/progressView.js

From 01ac87083c6ac0e2a075ce701acae0df3c918c88 Mon Sep 17 00:00:00 2001
From: HeMa <MaximeEugene.Herbez@formation.orif.ch>
Date: Wed, 12 Jan 2022 08:43:00 +0100
Subject: [PATCH 3/3] remove console.log()

---
 public/jsComponents/progressView.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/jsComponents/progressView.js b/public/jsComponents/progressView.js
index d5e4717a..89969b44 100644
--- a/public/jsComponents/progressView.js
+++ b/public/jsComponents/progressView.js
@@ -304,7 +304,6 @@ var OperationalCompetenceView = function (_React$Component3) {
     _createClass(OperationalCompetenceView, [{
         key: 'render',
         value: function render() {
-            console.log(this.props.operationalCompetenceDatas);
             if (this.props.mobiledisplay) {
                 return React.createElement(
                     'div',