From 0a98c4322c689dfe5d3097c7cd0ab36390d4a25f Mon Sep 17 00:00:00 2001 From: o-psi Date: Sat, 14 Oct 2023 14:10:41 -0500 Subject: [PATCH 1/3] Allow unarchiving in Post.php --- post/category.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/post/category.php b/post/category.php index 13a6c60b..72ec5273 100644 --- a/post/category.php +++ b/post/category.php @@ -50,6 +50,20 @@ if (isset($_GET['archive_category'])) { } +if (isset($_GET['unarchive_category'])) { + $category_id = intval($_GET['unarchive_category']); + + mysqli_query($mysqli,"UPDATE categories SET category_archived_at = NULL WHERE category_id = $category_id"); + + //logging + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Category', log_action = 'Unarchive', log_description = '$category_id'"); + + $_SESSION['alert_message'] = "Category Unarchived"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + if (isset($_GET['delete_category'])) { $category_id = intval($_GET['delete_category']); From b107eb232c8ae0ba36f1748baddd16b459bab334 Mon Sep 17 00:00:00 2001 From: o-psi Date: Sat, 14 Oct 2023 14:11:02 -0500 Subject: [PATCH 2/3] Add archived to table. --- categories.php | 190 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 134 insertions(+), 56 deletions(-) diff --git a/categories.php b/categories.php index fd14a4a4..dbade6f1 100644 --- a/categories.php +++ b/categories.php @@ -15,16 +15,28 @@ if (isset($_GET['category'])) { //Rebuild URL $url_query_strings_sort = http_build_query($get_copy); -$sql = mysqli_query( - $mysqli, - "SELECT SQL_CALC_FOUND_ROWS * FROM categories - WHERE category_name LIKE '%$q%' - AND category_type = '$category' - AND category_archived_at IS NULL - ORDER BY $sort $order LIMIT $record_from, $record_to" -); +if (isset($_GET['archived'])) { + $sql = mysqli_query( + $mysqli, + "SELECT SQL_CALC_FOUND_ROWS * FROM categories + WHERE category_name LIKE '%$q%' + AND category_archived_at IS NOT NULL + ORDER BY $sort $order LIMIT $record_from, $record_to" + ); + $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); + $category = "Archived"; +} else { + $sql = mysqli_query( + $mysqli, + "SELECT SQL_CALC_FOUND_ROWS * FROM categories + WHERE category_name LIKE '%$q%' + AND category_type = '$category' + AND category_archived_at IS NULL + ORDER BY $sort $order LIMIT $record_from, $record_to" + ); + $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); +} -$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $colors_used_array = []; @@ -44,46 +56,91 @@ $colors_diff = array_diff($colors_array, $colors_used_array); ?> -
-
-

Categories

-
- -
+
+
+

+ Categories +

+ +
+
-
-
- -
-
-
- -
- -
-
-
-
-
- Expense - Income - Referral - Payment Method + +
+
+ + +
+
+
+ +
+
- -
-
- - "> +
+
+ Expense + Income + Referral + Payment + Method + Archived +
+
+ + +
+
+
+ "> - + - - + + - + @@ -117,20 +195,20 @@ $colors_diff = array_diff($colors_array, $colors_used_array); - -
NameName + Color Action
+ +
@@ -102,13 +162,31 @@ $colors_diff = array_diff($colors_array, $colors_used_array);
- - Edit - -
- - Archive - + + + Unarchive + + + Delete + + + + Edit + + + Archive + +
-
- + +
+
+
Date: Sat, 14 Oct 2023 19:05:39 -0500 Subject: [PATCH 3/3] Updated to use pagination head code. --- categories.php | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/categories.php b/categories.php index dbade6f1..c578068a 100644 --- a/categories.php +++ b/categories.php @@ -15,28 +15,20 @@ if (isset($_GET['category'])) { //Rebuild URL $url_query_strings_sort = http_build_query($get_copy); -if (isset($_GET['archived'])) { - $sql = mysqli_query( - $mysqli, - "SELECT SQL_CALC_FOUND_ROWS * FROM categories - WHERE category_name LIKE '%$q%' - AND category_archived_at IS NOT NULL - ORDER BY $sort $order LIMIT $record_from, $record_to" - ); - $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - $category = "Archived"; -} else { - $sql = mysqli_query( - $mysqli, - "SELECT SQL_CALC_FOUND_ROWS * FROM categories - WHERE category_name LIKE '%$q%' - AND category_type = '$category' - AND category_archived_at IS NULL - ORDER BY $sort $order LIMIT $record_from, $record_to" - ); - $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); -} +$sql = mysqli_query( + $mysqli, + "SELECT SQL_CALC_FOUND_ROWS * FROM categories + WHERE category_name LIKE '%$q%' + AND category_type = '$category' + AND category_$archive_query + ORDER BY $sort $order LIMIT $record_from, $record_to" +); +$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); + +if (isset($_GET['archived'])) { + $category = "Archived"; +} $colors_used_array = []; @@ -45,7 +37,7 @@ $sql_colors_used = mysqli_query( $mysqli, "SELECT category_color FROM categories WHERE category_type = '$category' - AND category_archived_at IS NULL" + AND category_$archive_query" ); while ($color_used_row = mysqli_fetch_array($sql_colors_used)) { @@ -115,7 +107,7 @@ $colors_diff = array_diff($colors_array, $colors_used_array); echo 'btn-default'; } ?>">Payment Method -