AS1024
/
itflow
mirror of https://github.com/itflow-org/itflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #766 from o-psi/categories_archived 

Allow Unarchiving and Deleting Categories.
This commit is contained in:
Johnny 2023-10-14 21:46:28 -04:00 committed by GitHub
parent 592e2a80d2 87b4345b87
commit ee7d2e9dba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 134 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

170
categories.php
View File

@ -15,17 +15,21 @@ if (isset($_GET['category'])) {
//Rebuild URL //Rebuild URL
$url_query_strings_sort = http_build_query($get_copy); $url_query_strings_sort = http_build_query($get_copy);
$sql = mysqli_query( $sql = mysqli_query(
$mysqli, $mysqli,
"SELECT SQL_CALC_FOUND_ROWS * FROM categories "SELECT SQL_CALC_FOUND_ROWS * FROM categories
WHERE category_name LIKE '%$q%' WHERE category_name LIKE '%$q%'
AND category_type = '$category' AND category_type = '$category'
AND category_archived_at IS NULL AND category_$archive_query
ORDER BY $sort $order LIMIT $record_from, $record_to" 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()"));
if (isset($_GET['archived'])) {
$category = "Archived";
}
$colors_used_array = []; $colors_used_array = [];
//Colors Used //Colors Used
@ -33,7 +37,7 @@ $sql_colors_used = mysqli_query(
$mysqli, $mysqli,
"SELECT category_color FROM categories "SELECT category_color FROM categories
WHERE category_type = '$category' WHERE category_type = '$category'
AND category_archived_at IS NULL" AND category_$archive_query"
); );
while ($color_used_row = mysqli_fetch_array($sql_colors_used)) { while ($color_used_row = mysqli_fetch_array($sql_colors_used)) {
@ -44,46 +48,91 @@ $colors_diff = array_diff($colors_array, $colors_used_array);
?> ?>
<div class="card card-dark"> <div class="card card-dark">
<div class="card-header py-2"> <div class="card-header py-2">
<h3 class="card-title mt-2"><i class="fa fa-fw fa-list-ul mr-2"></i><?php echo nullable_htmlentities($category); ?> Categories</h3> <h3 class="card-title mt-2"><i class="fa fa-fw fa-list-ul mr-2"></i>
<div class="card-tools"> <?php echo nullable_htmlentities($category); ?> Categories
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addCategoryModal"><i class="fas fa-plus mr-2"></i>Create</button> </h3>
</div> <?php
if (!isset($_GET['archived'])) {
?>
<div class="card-tools">
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addCategoryModal"><i
class="fas fa-plus mr-2"></i>Create</button>
</div> </div>
<div class="card-body"> <?php
<form autocomplete="off"> }
<input type="hidden" name="category" value="<?php echo nullable_htmlentities($category); ?>"> ?>
<div class="row"> </div>
<div class="col-sm-4 mb-2"> <div class="card-body">
<div class="input-group"> <form autocomplete="off">
<input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search Categories"> <input type="hidden" name="category" value="<?php echo nullable_htmlentities($category); ?>">
<div class="input-group-append"> <div class="row">
<button class="btn btn-primary"><i class="fa fa-search"></i></button> <div class="col-sm-4 mb-2">
</div> <div class="input-group">
</div> <input type="search" class="form-control" name="q"
</div> value="<?php if (isset($q)) {
<div class="col-sm-8"> echo stripslashes(nullable_htmlentities($q));
<div class="btn-group float-right"> } ?>"
<a href="?category=Expense" class="btn <?php if ($category == 'Expense') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>">Expense</a> placeholder="Search Categories">
<a href="?category=Income" class="btn <?php if ($category == 'Income') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>">Income</a> <div class="input-group-append">
<a href="?category=Referral" class="btn <?php if ($category == 'Referral') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>">Referral</a> <button class="btn btn-primary"><i class="fa fa-search"></i></button>
<a href="?category=Payment Method" class="btn <?php if ($category == 'Payment Method') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>">Payment Method</a>
</div> </div>
</div> </div>
</div> </div>
</form> <div class="col-sm-8">
<hr> <div class="btn-group float-right">
<div class="table-responsive-sm"> <a href="?category=Expense"
<table class="table table-striped table-borderless table-hover"> class="btn <?php if ($category == 'Expense') {
<thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>"> echo 'btn-primary';
} else {
echo 'btn-default';
} ?>">Expense</a>
<a href="?category=Income"
class="btn <?php if ($category == 'Income') {
echo 'btn-primary';
} else {
echo 'btn-default';
} ?>">Income</a>
<a href="?category=Referral"
class="btn <?php if ($category == 'Referral') {
echo 'btn-primary';
} else {
echo 'btn-default';
} ?>">Referral</a>
<a href="?category=Payment Method"
class="btn <?php if ($category == 'Payment Method') {
echo 'btn-primary';
} else {
echo 'btn-default';
} ?>">Payment
Method</a>
<a href="?archived=1"
class="btn <?php if (isset($_GET['archived'])) {
echo 'btn-primary';
} else {
echo 'btn-default';
} ?>"><i
class="fas fa-fw fa-archive mr-2"></i>Archived</a>
</div>
</div>
</div>
</form>
<hr>
<div class="table-responsive-sm">
<table class="table table-striped table-borderless table-hover">
<thead class="text-dark <?php if ($num_rows[0] == 0) {
echo "d-none";
} ?>">
<tr> <tr>
<th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=category_name&order=<?php echo $disp; ?>">Name</a></th> <th><a class="text-dark"
href="?<?php echo $url_query_strings_sort; ?>&sort=category_name&order=<?php echo $disp; ?>">Name</a>
</th>
<th>Color</th> <th>Color</th>
<th class="text-center">Action</th> <th class="text-center">Action</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php <?php
while ($row = mysqli_fetch_array($sql)) { while ($row = mysqli_fetch_array($sql)) {
@ -91,10 +140,13 @@ $colors_diff = array_diff($colors_array, $colors_used_array);
$category_name = nullable_htmlentities($row['category_name']); $category_name = nullable_htmlentities($row['category_name']);
$category_color = nullable_htmlentities($row['category_color']); $category_color = nullable_htmlentities($row['category_color']);
//$colors_used_array[] = $row['category_color']; //$colors_used_array[] = $row['category_color'];
?> ?>
<tr> <tr>
<td><a class="text-dark" href="#" data-toggle="modal" data-target="#editCategoryModal<?php echo $category_id; ?>"><?php echo $category_name; ?></a></td> <td><a class="text-dark" href="#" data-toggle="modal"
data-target="#editCategoryModal<?php echo $category_id; ?>">
<?php echo $category_name; ?>
</a></td>
<td><i class="fa fa-3x fa-circle" style="color:<?php echo $category_color; ?>;"></i></td> <td><i class="fa fa-3x fa-circle" style="color:<?php echo $category_color; ?>;"></i></td>
<td> <td>
<div class="dropdown dropleft text-center"> <div class="dropdown dropleft text-center">
@ -102,13 +154,31 @@ $colors_diff = array_diff($colors_array, $colors_used_array);
<i class="fas fa-ellipsis-h"></i> <i class="fas fa-ellipsis-h"></i>
</button> </button>
<div class="dropdown-menu"> <div class="dropdown-menu">
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#editCategoryModal<?php echo $category_id; ?>"> <?php
<i class="fas fa-fw fa-edit mr-2"></i>Edit if ($category == "Archived") {
</a> ?>
<div class="dropdown-divider"></div> <a class="dropdown-item text-success confirm-link"
<a class="dropdown-item text-danger confirm-link" href="post.php?archive_category=<?php echo $category_id; ?>"> href="post.php?unarchive_category=<?php echo $category_id; ?>">
<i class="fas fa-fw fa-archive mr-2"></i>Archive <i class="fas fa-fw fa-archive mr-2"></i>Unarchive
</a> </a>
<a class="dropdown-item text-danger confirm-link"
href="post.php?delete_category=<?php echo $category_id; ?>">
<i class="fas fa-fw fa-trash mr-2"></i>Delete
</a>
<?php
} else {
?>
<a class="dropdown-item" href="#" data-toggle="modal"
data-target="#editCategoryModal<?php echo $category_id; ?>">
<i class="fas fa-fw fa-edit mr-2"></i>Edit
</a>
<a class="dropdown-item text-danger confirm-link"
href="post.php?archive_category=<?php echo $category_id; ?>">
<i class="fas fa-fw fa-archive mr-2"></i>Archive
</a>
<?php
}
?>
</div> </div>
</div> </div>
</td> </td>
@ -117,20 +187,20 @@ $colors_diff = array_diff($colors_array, $colors_used_array);
<?php <?php
//$colors_diff = array_diff($colors_array,$colors_used_array); //$colors_diff = array_diff($colors_array,$colors_used_array);
include("category_edit_modal.php"); include("category_edit_modal.php");
} }
?> ?>
</tbody> </tbody>
</table> </table>
</div>
<?php require_once("pagination.php"); ?>
</div> </div>
<?php require_once("pagination.php"); ?>
</div> </div>
</div>
<?php <?php
require_once("category_add_modal.php"); require_once("category_add_modal.php");
require_once("footer.php"); require_once("footer.php");

14
post/category.php
View File

@ -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'])) { if (isset($_GET['delete_category'])) {
$category_id = intval($_GET['delete_category']); $category_id = intval($_GET['delete_category']);