From 86c36e08ab3b7e7a73fdbddf151b3166e5581975 Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Wed, 16 Aug 2023 13:56:35 -0400
Subject: [PATCH] client tag cleanup in add and edit modal

---
 client_add_modal.php  | 8 +++++++-
 client_edit_modal.php | 8 +++++++-
 clients.php           | 9 +++------
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/client_add_modal.php b/client_add_modal.php
index 6f9dcb2f..6bfe7fba 100644
--- a/client_add_modal.php
+++ b/client_add_modal.php
@@ -298,7 +298,13 @@
                                     $tag_id_select = intval($row['tag_id']);
                                     $tag_name_select = nullable_htmlentities($row['tag_name']);
                                     $tag_color_select = nullable_htmlentities($row['tag_color']);
+                                    if (empty($tag_color_select)) {
+                                        $tag_color_select = "dark";
+                                    }
                                     $tag_icon_select = nullable_htmlentities($row['tag_icon']);
+                                    if (empty($tag_icon_select)) {
+                                        $tag_icon_select = "tag";
+                                    }
 
                                     ?>
                                     <li class="list-group-item">
@@ -306,7 +312,7 @@
                                             <input class="custom-control-input" type="checkbox" id="tagCheckbox<?php echo $tag_id_select; ?>" name="tags[]" value="<?php echo $tag_id_select; ?>">
                                             <label for="tagCheckbox<?php echo $tag_id_select; ?>" class="custom-control-label">
                                             <span class="badge bg-<?php echo $tag_color_select; ?>">
-                                                <?php echo "<i class='fa fw fa-$tag_icon_select'></i>"; ?> <?php echo $tag_name_select; ?>
+                                                <?php echo "<i class='fa fw fa-$tag_icon_select mr-2'></i>"; ?><?php echo $tag_name_select; ?>
                                             </span>
                                             </label>
                                         </div>
diff --git a/client_edit_modal.php b/client_edit_modal.php
index aebfc140..2fb0d015 100644
--- a/client_edit_modal.php
+++ b/client_edit_modal.php
@@ -164,7 +164,13 @@
                                     $tag_id_select = intval($row['tag_id']);
                                     $tag_name_select = nullable_htmlentities($row['tag_name']);
                                     $tag_color_select = nullable_htmlentities($row['tag_color']);
+                                    if (empty($tag_color_select)) {
+                                        $tag_color_select = "dark";
+                                    }
                                     $tag_icon_select = nullable_htmlentities($row['tag_icon']);
+                                    if (empty($tag_icon_select)) {
+                                        $tag_icon_select = "tag";
+                                    }
 
                                     ?>
                                     <li class="list-group-item">
@@ -172,7 +178,7 @@
                                             <input class="custom-control-input" type="checkbox" id="tagCheckbox<?php echo "$tag_id_select$client_id"; ?>" name="tags[]" value="<?php echo $tag_id_select; ?>" <?php if (in_array($tag_id_select, $client_tag_id_array)) { echo "checked"; } ?>>
                                             <label for="tagCheckbox<?php echo "$tag_id_select$client_id"; ?>" class="custom-control-label">
                                                 <span class="badge bg-<?php echo $tag_color_select; ?>">
-                                                    <?php echo "<i class='fa fw fa-$tag_icon_select'></i>"; ?> <?php echo $tag_name_select; ?>
+                                                    <?php echo "<i class='fa fw fa-$tag_icon_select mr-2'></i>"; ?><?php echo $tag_name_select; ?>
                                                 </span>
                                             </label>
                                         </div>
diff --git a/clients.php b/clients.php
index b74c2ba6..d44a3298 100644
--- a/clients.php
+++ b/clients.php
@@ -153,18 +153,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             $client_tag_id = intval($row['tag_id']);
                             $client_tag_name = nullable_htmlentities($row['tag_name']);
                             $client_tag_color = nullable_htmlentities($row['tag_color']);
+                            if (empty($client_tag_color)) {
+                                $client_tag_color = "dark";
+                            }
                             $client_tag_icon = nullable_htmlentities($row['tag_icon']);
                             if (empty($client_tag_icon)) {
                                 $client_tag_icon = "tag";
                             }
 
                             $client_tag_id_array[] = $client_tag_id;
-                            if (empty($client_tag_color)) {
-                                $client_tag_color = "dark";
-                            }
-                            if (empty($client_tag_icon)) {
-                                $client_tag_icon = "tag";
-                            }
                             $client_tag_name_display_array[] = "<a href='clients.php?q=$client_tag_name'><span class='badge bg-$client_tag_color'><i class='fa fa-fw fa-$client_tag_icon mr-2'></i>$client_tag_name</span></a> ";
                         }
                         $client_tags_display = implode('', $client_tag_name_display_array);