From 057cc6dca5c7ea45d774245c5ce8b462e5dafd68 Mon Sep 17 00:00:00 2001
From: Yasen Pramatarov <yasen@lindeas.com>
Date: Wed, 29 Jan 2025 15:55:45 +0200
Subject: [PATCH] Cleans up components page code

---
 app/pages/components.php     | 34 +++++++++-------------------------
 app/templates/components.php | 13 +++++++++++--
 2 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/app/pages/components.php b/app/pages/components.php
index e34f661..72bc34b 100644
--- a/app/pages/components.php
+++ b/app/pages/components.php
@@ -8,12 +8,6 @@
  * Supports pagination.
  */
 
-// Get any new messages
-include '../app/includes/messages.php';
-include '../app/includes/messages-show.php';
-
-require '../app/classes/component.php';
-
 // connect to database
 $response = connectDB($config, 'jilo', $platformDetails[0]['jilo_database'], $platform_id);
 
@@ -66,8 +60,7 @@ if ($response['db'] === null) {
     // Component events listings
     //
 
-
-    // list of all component events (default)
+    require '../app/classes/component.php';
     $componentObject = new Component($db);
 
 
@@ -99,26 +92,17 @@ if ($response['db'] === null) {
         }
     }
 
-//    // prepare the widget
-//    $widget['full'] = false;
-//    $widget['name'] = 'AllComponents';
-//    $widget['filter'] = true;
-//    $widget['pagination'] = true;
-
-    // widget title
+    // filter message
+    $filterMessage = array();
     if (isset($_REQUEST['name']) && $_REQUEST['name'] != '') {
-        $widget['title'] = 'Jitsi events for component&nbsp;<strong>' . $_REQUEST['name'] . '</strong>';
+        array_push($filterMessage, 'Jitsi events for component&nbsp;"<strong>' . $_REQUEST['name'] . '</strong>"');
     } elseif (isset($_REQUEST['id']) && $_REQUEST['id'] != '') {
-        $widget['title'] = 'Jitsi events for component ID&nbsp;<strong>' . $_REQUEST['id'] . '</strong>';
-    } else {
-        $widget['title'] = 'Jitsi events for&nbsp;<strong>all components</strong>';
+        array_push($filterMessage, 'Jitsi events for component ID&nbsp;"<strong>' . $_REQUEST['id'] . '</strong>"');
     }
-//    // widget records
-//    if (!empty($components['records'])) {
-//        $widget['full'] = true;
-//        $widget['table_headers'] = array_keys($components['records'][0]);
-//        $widget['table_records'] = $components['records'];
-//    }
+
+    // Get any new messages
+    include '../app/includes/messages.php';
+    include '../app/includes/messages-show.php';
 
     // display the widget
     include '../app/templates/components.php';
diff --git a/app/templates/components.php b/app/templates/components.php
index ed02e1e..b213fa4 100644
--- a/app/templates/components.php
+++ b/app/templates/components.php
@@ -43,11 +43,20 @@
                             <!-- /component events filter -->
 
                             <!-- component events -->
-<?php if ($time_range_specified) { ?>
+<?php if ($time_range_specified || count($filterMessage)) { ?>
                             <div class="alert alert-info m-0 mb-3 small">
-                                <i class="fas fa-calendar-alt me-2"></i>Time period: <strong><?= htmlspecialchars($from_time) ?> - <?= htmlspecialchars($until_time) ?></strong>
+<?php   if ($time_range_specified) { ?>
+                                <p class="mb-0"><i class="fas fa-calendar-alt me-2"></i>Time period: <strong><?= htmlspecialchars($from_time) ?> - <?= htmlspecialchars($until_time) ?></strong></p>
+<?php   } ?>
+<?php   if (count($filterMessage)) {
+          foreach ($filterMessage as $message) { ?>
+                                <p class="mb-0"><i class="fas fa-users me-2"></i><?= $message ?></strong></p>
+<?php     } ?>
+<?php   } ?>
                             </div>
 <?php } ?>
+
+
                             <div class="mb-5">
 <?php if (!empty($components['records'])) { ?>
                                 <div class="table-responsive border">