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

Move reports back and rename them appropriately update broken links

This commit is contained in:
johnnyq 2025-07-31 18:48:33 -04:00
parent 07e2c41eb7
commit 41a8e41463
21 changed files with 50 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
user/includes/inc_all_reports.php Normal file
View File

@ -0,0 +1,19 @@
<?php
require_once "../config.php";
require_once "../functions.php";
require_once "../includes/check_login.php";
require_once "../includes/page_title.php";
// Reporting Perms
enforceUserPermission('module_reporting');
require_once "../includes/header.php";
require_once "../includes/top_nav.php";
require_once "includes/reports_side_nav.php";
require_once "../includes/inc_wrapper.php";
require_once "../includes/inc_alert_feedback.php";
require_once "../includes/filter_header.php";
// Set variable default values
$largest_income_month = 0;
$largest_invoice_month = 0;
$recurring_total = 0;

30
user/reports/includes/side_nav.php → user/includes/reports_side_nav.php
View File

@ -1,7 +1,7 @@
<!-- Main Sidebar Container -->
<aside class="main-sidebar sidebar-dark-primary d-print-none">
<a class="pb-1 mt-1 brand-link" href="../">
<a class="pb-1 mt-1 brand-link" href="index.php">
<p class="h5"><i class="nav-icon fas fa-arrow-left ml-3 mr-2"></i>
<span class="brand-text ">Back | <strong>Reports</strong>
</p>
@ -18,61 +18,61 @@
<li class="nav-header">FINANCIAL</li>
<?php if ($config_module_enable_accounting == 1 && lookupUserPermission("module_financial") >= 1) { ?>
<li class="nav-item">
<a href="income_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "income_summary.php") { echo "active"; } ?>">
<a href="report_income_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_income_summary.php") { echo "active"; } ?>">
<i class="far fa-circle nav-icon"></i>
<p>Income</p>
</a>
</li>
<li class="nav-item">
<a href="income_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "income_by_client.php") { echo "active"; } ?>">
<a href="report_income_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_income_by_client.php") { echo "active"; } ?>">
<i class="far fa-user nav-icon"></i>
<p>Income By Client</p>
</a>
</li>
<li class="nav-item">
<a href="recurring_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "recurring_by_client.php") { echo "active"; } ?>">
<a href="report_recurring_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_recurring_by_client.php") { echo "active"; } ?>">
<i class="fa fa-sync nav-icon"></i>
<p>Recurring Income By Client</p>
</a>
</li>
<li class="nav-item">
<a href="clients_with_balance.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "clients_with_balance.php") { echo "active"; } ?>">
<a href="report_clients_with_balance.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_clients_with_balance.php") { echo "active"; } ?>">
<i class="fa fa-exclamation-triangle nav-icon"></i>
<p>Clients with a Balance</p>
</a>
</li>
<li class="nav-item">
<a href="expense_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "expense_summary.php") { echo "active"; } ?>">
<a href="report_expense_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_expense_summary.php") { echo "active"; } ?>">
<i class="far fa-credit-card nav-icon"></i>
<p>Expense</p>
</a>
</li>
<li class="nav-item">
<a href="expense_by_vendor.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "expense_by_vendor.php") { echo "active"; } ?>">
<a href="report_expense_by_vendor.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_expense_by_vendor.php") { echo "active"; } ?>">
<i class="far fa-building nav-icon"></i>
<p>Expense By Vendor</p>
</a>
</li>
<li class="nav-item">
<a href="budget.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "budget.php") { echo "active"; } ?>">
<a href="report_budget.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_budget.php") { echo "active"; } ?>">
<i class="fas fa-list nav-icon"></i>
<p>Budget</p>
</a>
</li>
<li class="nav-item">
<a href="tax_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "tax_summary.php") { echo "active"; } ?>">
<a href="report_tax_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_tax_summary.php") { echo "active"; } ?>">
<i class="fas fa-percent nav-icon"></i>
<p>Tax Summary</p>
</a>
</li>
<li class="nav-item">
<a href="profit_loss.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "profit_loss.php") { echo "active"; } ?>">
<a href="report_profit_loss.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_profit_loss.php") { echo "active"; } ?>">
<i class="fas fa-file-invoice-dollar nav-icon"></i>
<p>Profit & Loss</p>
</a>
</li>
<li class="nav-item">
<a href="tickets_unbilled.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "tickets_unbilled.php") { echo "active"; } ?>">
<a href="report_tickets_unbilled.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_tickets_unbilled.php") { echo "active"; } ?>">
<i class="nav-icon fas fa-life-ring"></i>
<p>Unbilled Tickets</p>
</a>
@ -84,21 +84,21 @@
<li class="nav-header">TECHNICAL</li>
<?php if ($config_module_enable_ticketing && lookupUserPermission("module_support") >= 1) { ?>
<li class="nav-item">
<a href="ticket_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "ticket_summary.php") { echo "active"; } ?>">
<a href="report_ticket_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_ticket_summary.php") { echo "active"; } ?>">
<i class="nav-icon fas fa-life-ring"></i>
<p>Tickets</p>
</a>
</li>
<li class="nav-item">
<a href="ticket_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "ticket_by_client.php") { echo "active"; } ?>">
<a href="report_ticket_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_ticket_by_client.php") { echo "active"; } ?>">
<i class="nav-icon fas fa-life-ring"></i>
<p>Tickets by Client</p>
</a>
</li>
<li class="nav-item">
<a href="time_by_tech.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "time_by_tech.php") { echo "active"; } ?>">
<a href="report_time_by_tech.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_time_by_tech.php") { echo "active"; } ?>">
<i class="nav-icon fas fa-life-ring"></i>
<p>Time by Technician</p>
</a>
@ -106,7 +106,7 @@
<?php } ?>
<?php if (lookupUserPermission("module_credential") >= 1) { ?>
<li class="nav-item">
<a href="credential_rotation.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "credential_rotation.php") { echo "active"; } ?>">
<a href="report_credential_rotation.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_credential_rotation.php") { echo "active"; } ?>">
<i class="nav-icon fas fa-key"></i>
<p>Credential rotation</p>
</a>

2
user/includes/side_nav.php
View File

@ -194,7 +194,7 @@
<?php if (lookupUserPermission("module_reporting") >= 1) { ?>
<li class="nav-item mt-3">
<a href="reports" class="nav-link">
<a href="report_overview.php" class="nav-link">
<i class="fas fa-chart-line nav-icon"></i>
<p>Reports</p>
<i class="fas fa-angle-right nav-icon float-right"></i>

2
user/reports/budget.php → user/report_budget.php
View File

@ -103,5 +103,5 @@ $monthlyTotals = array_fill(1, 12, 0); // Initialize monthly totals for each mo
</div>
</div>
<?php require_once "includes/footer.php";
<?php require_once "../includes/footer.php";
?>

2
user/reports/clients_with_balance.php → user/report_clients_with_balance.php
View File

@ -81,5 +81,5 @@ enforceUserPermission('module_financial');
</div>
<?php
require_once "includes/footer.php";
require_once "../includes/footer.php";

2
user/reports/credential_rotation.php → user/report_credential_rotation.php
View File

@ -71,5 +71,5 @@ $passwords_not_rotated_sql = mysqli_query($mysqli,
</div>
<?php
require_once "includes/footer.php";
require_once "../includes/footer.php";

2
user/reports/expense_by_vendor.php → user/report_expense_by_vendor.php
View File

@ -93,5 +93,5 @@ $sql_vendor_expenses = mysqli_query($mysqli, "
</div>
</div>
<?php require_once "includes/footer.php";
<?php require_once "../includes/footer.php";
?>

2
user/reports/expense_summary.php → user/report_expense_summary.php
View File

@ -115,7 +115,7 @@ $sql_categories = mysqli_query($mysqli, "SELECT * FROM categories WHERE category
</div>
</div>
<?php require_once "includes/footer.php";
<?php require_once "../includes/footer.php";
?>
<script>

2
user/reports/income_by_client.php → user/report_income_by_client.php
View File

@ -91,5 +91,5 @@ $sql_payment_years = mysqli_query($mysqli, "SELECT DISTINCT YEAR(payment_date) A
</div>
<?php
require_once "includes/footer.php";
require_once "../includes/footer.php";

2
user/reports/income_summary.php → user/report_income_summary.php
View File

@ -147,7 +147,7 @@ $sql_categories = mysqli_query($mysqli, "SELECT * FROM categories WHERE category
</div>
</div>
<?php require_once "includes/footer.php"; ?>
<?php require_once "../includes/footer.php"; ?>
<script>
// Set new default font family and font color to mimic Bootstrap's default styling

2
user/reports/index.php → user/report_overview.php
View File

@ -16,5 +16,5 @@ require_once "includes/inc_all_reports.php";
</div>
</div>
<?php require_once "includes/footer.php"; ?>
<?php require_once "../includes/footer.php"; ?>

2
user/reports/profit_loss.php → user/report_profit_loss.php
View File

@ -433,5 +433,5 @@ $sql_categories_expense = mysqli_query($mysqli, "SELECT * FROM categories WHERE
</div>
</div>
<?php require_once "includes/footer.php";
<?php require_once "../includes/footer.php";

2
user/reports/recurring_by_client.php → user/report_recurring_by_client.php
View File

@ -63,5 +63,5 @@ $sql = mysqli_query($mysqli, "
</div>
</div>
<?php require_once "includes/footer.php";
<?php require_once "../includes/footer.php";
?>

2
user/reports/tax_summary.php → user/report_tax_summary.php
View File

@ -117,5 +117,5 @@ $sql_tax = mysqli_query($mysqli, "SELECT `tax_name` FROM `taxes`");
</div>
</div>
<?php require_once "includes/footer.php";
<?php require_once "../includes/footer.php";

2
user/reports/ticket_by_client.php → user/report_ticket_by_client.php
View File

@ -296,5 +296,5 @@ $sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients
</div>
<?php
require_once "includes/footer.php";
require_once "../includes/footer.php";

2
user/reports/ticket_summary.php → user/report_ticket_summary.php
View File

@ -83,7 +83,7 @@ $sql_tickets = mysqli_query($mysqli, "SELECT ticket_id FROM tickets");
</div>
</div>
<?php require_once "includes/footer.php";
<?php require_once "../includes/footer.php";
?>
<script>

2
user/reports/tickets_unbilled.php → user/report_tickets_unbilled.php
View File

@ -178,5 +178,5 @@ $rows = 0;
</div>
<?php
require_once "includes/footer.php";
require_once "../includes/footer.php";

2
user/reports/time_by_tech.php → user/report_time_by_tech.php
View File

@ -177,5 +177,5 @@ $sql_users = mysqli_query($mysqli, "
</div>
<?php
require_once "includes/footer.php";
require_once "../includes/footer.php";

19
user/reports/includes/inc_all_reports.php
View File

@ -1,19 +0,0 @@
<?php
require_once "../../config.php";
require_once "../../functions.php";
require_once "../../includes/check_login.php";
require_once "../../includes/page_title.php";
// Reporting Perms
enforceUserPermission('module_reporting');
require_once "../../includes/header.php";
require_once "../../includes/top_nav.php";
require_once "includes/side_nav.php";
require_once "../../includes/inc_wrapper.php";
require_once "../../includes/inc_alert_feedback.php";
require_once "../../includes/filter_header.php";
// Set variable default values
$largest_income_month = 0;
$largest_invoice_month = 0;
$recurring_total = 0;

9
user/reports/includes/modal_footer.php
View File

@ -1,9 +0,0 @@
<script src="js/app.js"></script>
<script src="plugins/Show-Hide-Passwords-Bootstrap-4/bootstrap-show-password.min.js"></script>
<?php
$content = ob_get_clean();
// Return the title and content as a JSON response
echo json_encode(['content' => $content]);
?>

13
user/reports/includes/modal_header.php
View File

@ -1,13 +0,0 @@
<?php
require_once "../../../config.php";
require_once "../../../functions.php";
require_once "../../../includes/check_login.php";
header('Content-Type: application/json');
// Check for the 'id' parameter
//if (!isset($_GET['id'])) {
// echo json_encode(['error' => 'ID missing.']);
// exit;
//}