From c6184d796523f6fdbd269b269a40d0c3a8459b35 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 28 Jan 2020 09:38:53 +0100
Subject: [PATCH] Admin: add config setting
 "allow_session_dates_in_user_portal" BT#16549

---
 main/inc/lib/userportal.lib.php               |  3 ++-
 main/install/configuration.dist.php           |  3 +++
 .../default/user_portal/classic_session.tpl   | 22 ++++++++++---------
 .../default/user_portal/grid_session.tpl      | 11 ++++++----
 4 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/main/inc/lib/userportal.lib.php b/main/inc/lib/userportal.lib.php
index ae6bb53046..469f27d604 100755
--- a/main/inc/lib/userportal.lib.php
+++ b/main/inc/lib/userportal.lib.php
@@ -1762,9 +1762,10 @@ class IndexManager
                                     }
 
                                     $this->tpl->assign('session', $sessionParams);
-                                    $this->tpl->assign('show_tutor', (api_get_setting('show_session_coach') === 'true' ? true : false));
+                                    $this->tpl->assign('show_tutor', api_get_setting('show_session_coach') === 'true');
                                     $this->tpl->assign('gamification_mode', $gameModeIsActive);
                                     $this->tpl->assign('remove_session_url', api_get_configuration_value('remove_session_url'));
+                                    $this->tpl->assign('allow_session_dates', api_get_configuration_value('allow_session_dates_in_user_portal'));
 
                                     if ($viewGridCourses) {
                                         $html_sessions .= $this->tpl->fetch(
diff --git a/main/install/configuration.dist.php b/main/install/configuration.dist.php
index 8ea66eb917..1946650844 100755
--- a/main/install/configuration.dist.php
+++ b/main/install/configuration.dist.php
@@ -1364,6 +1364,9 @@ ALTER TABLE notification_event ADD COLUMN event_id INT NULL;
 // ALTER TABLE sys_announcement ADD COLUMN promotion_id INT DEFAULT 0;
 //$_configuration['allow_careers_in_global_announcements'] = false;
 
+// Allow start/end dates in "My courses" page (user_portal.php)
+//$_configuration['allow_session_dates_in_user_portal'] = false;
+
 // KEEP THIS AT THE END
 // -------- Custom DB changes
 // Add user activation by confirmation email
diff --git a/main/template/default/user_portal/classic_session.tpl b/main/template/default/user_portal/classic_session.tpl
index f4730ad73b..87303e77cb 100644
--- a/main/template/default/user_portal/classic_session.tpl
+++ b/main/template/default/user_portal/classic_session.tpl
@@ -74,16 +74,18 @@
                                 </li>
                             {% endif %}
 
-                            {% if row.date %}
-                                <li>
-                                    <i class="fa fa-calendar" aria-hidden="true"></i>
-                                    {{ row.date }}
-                                </li>
-                            {% elseif row.duration %}
-                                <li>
-                                    <i class="fa fa-calendar" aria-hidden="true"></i>
-                                    {{ row.duration }}
-                                </li>
+                            {% if allow_session_dates == true %}
+                                {% if row.date %}
+                                    <li>
+                                        <i class="fa fa-calendar" aria-hidden="true"></i>
+                                        {{ row.date }}
+                                    </li>
+                                {% elseif row.duration %}
+                                    <li>
+                                        <i class="fa fa-calendar" aria-hidden="true"></i>
+                                        {{ row.duration }}
+                                    </li>
+                                {% endif %}
                             {% endif %}
                         </ul>
                         <div class="sessions-items">
diff --git a/main/template/default/user_portal/grid_session.tpl b/main/template/default/user_portal/grid_session.tpl
index 28d8837169..978329ee34 100644
--- a/main/template/default/user_portal/grid_session.tpl
+++ b/main/template/default/user_portal/grid_session.tpl
@@ -184,10 +184,13 @@
                         {{ row.coach_name }}
                     </li>
                 {% endif %}
-                <li>
-                    <i class="fa fa-calendar" aria-hidden="true"></i>
-                    {{ row.date ? row.date : row.duration }}
-                </li>
+
+                {% if allow_session_dates == true %}
+                    <li>
+                        <i class="fa fa-calendar" aria-hidden="true"></i>
+                        {{ row.date ? row.date : row.duration }}
+                    </li>
+                {% endif %}
             </ul>
             <div class="grid-courses">
                 {% if not group_courses %}