From cf047024a1641f03327d6c01bdddfeb15cf9f7fb Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 20 Mar 2025 18:17:26 -0400 Subject: [PATCH] Add Projects to client side nav and seperated the logic between client and global view of projects --- includes/client_side_nav.php | 12 + includes/inc_all_client.php | 4 + modals/project_link_ticket_modal.php | 2 +- project_details.php | 13 +- projects.php | 513 ++++++++++++++------------- 5 files changed, 301 insertions(+), 243 deletions(-) diff --git a/includes/client_side_nav.php b/includes/client_side_nav.php index 8f5113aa..8d83168c 100644 --- a/includes/client_side_nav.php +++ b/includes/client_side_nav.php @@ -82,6 +82,18 @@ +
  • + "> + +

    + Projects + + + +

    +     +
    • +
  • diff --git a/includes/inc_all_client.php b/includes/inc_all_client.php index 49a589d7..e7e7103d 100644 --- a/includes/inc_all_client.php +++ b/includes/inc_all_client.php @@ -148,6 +148,10 @@ if (isset($_GET['client_id'])) { $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_ticket_id') AS num FROM recurring_tickets WHERE recurring_ticket_client_id = $client_id")); $num_recurring_tickets = $row['num']; + // Active Project Count + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('project_id') AS num FROM projects WHERE project_archived_at IS NULL AND project_completed_at IS NULL AND project_client_id = $client_id")); + $num_active_projects = $row['num']; + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('service_id') AS num FROM services WHERE service_client_id = $client_id")); $num_services = $row['num']; diff --git a/modals/project_link_ticket_modal.php b/modals/project_link_ticket_modal.php index a79fee21..c50e287c 100644 --- a/modals/project_link_ticket_modal.php +++ b/modals/project_link_ticket_modal.php @@ -21,7 +21,7 @@ -
    -
    -

    Projects

    -
    - -
    +
    +
    +

    Projects

    +
    +
    +
    -
    -
    - +
    + + + + + +
    +
    +
    + +
    + + +
    +
    +
    +
    +
    +
    + ">Open + ">Closed +
    + +
    + "> + Archived + +
    + +
    +
    +
    +
    " id="advancedFilter">
    -
    -
    - -
    - - -
    +
    +
    + +
    -
    -
    -
    - ">Open - ">Closed -
    - -
    - "> - Archived - -
    - +
    +
    + + +
    +
    +
    +
    + +
    -
    " id="advancedFilter"> -
    -
    -
    - - -
    -
    -
    -
    - - -
    -
    -
    -
    - - -
    -
    -
    -
    - -
    -
    - - "> - - - - - - - - - - - - - - - - + +
    +
    +
    - - Number - - - - Project - - Tickets / Tasks - - Due - - CompletedManagerClientCreatedAction
    + "> + + + + + + + + + + + + + + + + + + $client_name"; - } else { - $client_name_display = "-"; - } + $client_id = intval($row['client_id']); + $client_name = nullable_htmlentities($row['client_name']); + if ($client_name) { + $client_name_display = "$client_name"; + } else { + $client_name_display = "-"; + } - $project_manager = intval($row['user_id']); - if ($project_manager) { - $project_manager_display = nullable_htmlentities($row['user_name']); - } else { - $project_manager_display = "-"; - } + $project_manager = intval($row['user_id']); + if ($project_manager) { + $project_manager_display = nullable_htmlentities($row['user_name']); + } else { + $project_manager_display = "-"; + } - // Get Tasks and Tickets Stats - // Get Tickets - $sql_tickets = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_project_id = $project_id"); - $ticket_count = mysqli_num_rows($sql_tickets); + // Get Tasks and Tickets Stats + // Get Tickets + $sql_tickets = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_project_id = $project_id"); + $ticket_count = mysqli_num_rows($sql_tickets); - // Get Closed Ticket Count - $sql_closed_tickets = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_project_id = $project_id AND ticket_closed_at IS NOT NULL"); + // Get Closed Ticket Count + $sql_closed_tickets = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_project_id = $project_id AND ticket_closed_at IS NOT NULL"); - $closed_ticket_count = mysqli_num_rows($sql_closed_tickets); - - // Ticket Closed Percent - if($ticket_count) { - $tickets_closed_percent = round(($closed_ticket_count / $ticket_count) * 100); - } - // Get All Tasks - $sql_tasks = mysqli_query($mysqli, - "SELECT * FROM tickets, tasks - WHERE ticket_id = task_ticket_id - AND ticket_project_id = $project_id" - ); - $task_count = mysqli_num_rows($sql_tasks); + $closed_ticket_count = mysqli_num_rows($sql_closed_tickets); + + // Ticket Closed Percent + if($ticket_count) { + $tickets_closed_percent = round(($closed_ticket_count / $ticket_count) * 100); + } + // Get All Tasks + $sql_tasks = mysqli_query($mysqli, + "SELECT * FROM tickets, tasks + WHERE ticket_id = task_ticket_id + AND ticket_project_id = $project_id" + ); + $task_count = mysqli_num_rows($sql_tasks); - // Get Completed Task Count - $sql_tasks_completed = mysqli_query($mysqli, - "SELECT * FROM tickets, tasks - WHERE ticket_id = task_ticket_id - AND ticket_project_id = $project_id - AND task_completed_at IS NOT NULL" - ); - $completed_task_count = mysqli_num_rows($sql_tasks_completed); - - // Tasks Completed Percent - if($task_count) { - $tasks_completed_percent = round(($completed_task_count / $task_count) * 100); - } - - ?> - - - - - - - - - - - - - - - - - -
    + + Number + + + + Project + + Tickets / Tasks + + Due + + + + Completed + + + + Manager + + + + Created + + + + Client + + Action
    - - - - - -
    - -
    -
    -
    -
    -
    -     -     		- -
    - -
    /
    -
    - -"; } ?> - -
    - -
    /
    -
    - -     		-
    - -
    - - - Edit - - - = 2)) { ?> -
    - - - Archive - - - - Unarchive - - = 3)) { ?> -
    - - Delete - - - - -
    -
    -
    -
    - + + + + + + + + +
    + +
    +
    +
    +
    +
    +     + + + +
    + +
    /
    +
    + -
    "; } ?> + +
    + +
    /
    +
    + + + + + + + + + + + + +
    + +
    + + + Edit + + + = 2)) { ?> +
    + + + Archive + + + + Unarchive + + = 3)) { ?> +
    + + Delete + + + + +
    +
    + + + + + + +
    +
    +