From 232ccc086ca0cdf9ea3904a678c03e6a80066d66 Mon Sep 17 00:00:00 2001
From: BigTigerKU <bigtigerku@msn.com>
Date: Fri, 27 Sep 2024 10:57:23 -0700
Subject: [PATCH 1/2] Bug fix: Number of Groups in Group list doesn't match
 with Groups count in Dashboard

---
 src/GroupList.php       | 13 +------------
 src/PeopleDashboard.php |  2 +-
 src/v2/routes/root.php  |  1 -
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/GroupList.php b/src/GroupList.php
index e988a11395..7cbf434c37 100644
--- a/src/GroupList.php
+++ b/src/GroupList.php
@@ -52,18 +52,7 @@
 </div>
 
 <script src="skin/js/GroupList.js"></script>
-<script nonce="<?= SystemURLs::getCSPNonce() ?>">
-$( document).ready(function() {
-    var gS = localStorage.getItem("groupSelect");
-    if (gS != null)
-    {
-        tf = document.getElementById("table-filter");
-        tf.selectedIndex = gS;
+<script nonce="<?= SystemURLs::getCSPNonce() ?>"></script>
 
-        window.groupSelect = tf.value;
-    }
-});
-
-</script>
 <?php
 require 'Include/Footer.php';
diff --git a/src/PeopleDashboard.php b/src/PeopleDashboard.php
index 1ff7aadadd..baeca20753 100644
--- a/src/PeopleDashboard.php
+++ b/src/PeopleDashboard.php
@@ -183,7 +183,7 @@
         <div class="small-box bg-red">
             <div class="inner">
                 <h3>
-                    <?= $groupStats['groups'] - $groupStats['sundaySchoolClasses'] ?>
+                    <?= $groupStats['groups'] ?>
                 </h3>
 
                 <p>
diff --git a/src/v2/routes/root.php b/src/v2/routes/root.php
index 788ffa9f42..b9797d523a 100644
--- a/src/v2/routes/root.php
+++ b/src/v2/routes/root.php
@@ -41,7 +41,6 @@ function viewDashboard(Request $request, Response $response, array $args): Respo
         ->count();
 
     $dashboardCounts['Groups'] = GroupQuery::create()
-        ->filterByType(4, Criteria::NOT_EQUAL)
         ->count();
 
     $dashboardCounts['events'] = EventAttendQuery::create()

From 1a1e0b22bfef5887d60963c366bd618aedfd4adc Mon Sep 17 00:00:00 2001
From: George Dawoud <george@dawouds.com>
Date: Sat, 28 Sep 2024 10:38:29 -0700
Subject: [PATCH 2/2] removed unused script tag

---
 src/GroupList.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/GroupList.php b/src/GroupList.php
index 7cbf434c37..99cc6531a7 100644
--- a/src/GroupList.php
+++ b/src/GroupList.php
@@ -48,11 +48,9 @@
     <?php
 }
 ?>
-
 </div>
 
 <script src="skin/js/GroupList.js"></script>
-<script nonce="<?= SystemURLs::getCSPNonce() ?>"></script>
 
 <?php
 require 'Include/Footer.php';