diff --git a/admin/database_updates/2.8.6.php b/admin/database_updates/2.8.6.php new file mode 100644 index 000000000..19364a99d --- /dev/null +++ b/admin/database_updates/2.8.6.php @@ -0,0 +1,27 @@ + 0 AND `client_id` IS NULL"); + mysqli_query($mysqli, "UPDATE `tickets` LEFT JOIN `projects` ON `project_id` = `ticket_project_id` SET `ticket_project_id` = 0 WHERE `ticket_project_id` > 0 AND `project_id` IS NULL"); + + // A project template's ticket templates whose template is gone + mysqli_query($mysqli, "DELETE `project_template_ticket_templates` FROM `project_template_ticket_templates` + LEFT JOIN `project_templates` ON `project_templates`.`project_template_id` = `project_template_ticket_templates`.`project_template_id` + LEFT JOIN `ticket_templates` ON `ticket_templates`.`ticket_template_id` = `project_template_ticket_templates`.`ticket_template_id` + WHERE `project_templates`.`project_template_id` IS NULL OR `ticket_templates`.`ticket_template_id` IS NULL"); diff --git a/admin/modals/project_template/project_template_add.php b/admin/modals/project_template/project_template_add.php index f58e2ec0f..cdf0c6fad 100644 --- a/admin/modals/project_template/project_template_add.php +++ b/admin/modals/project_template/project_template_add.php @@ -6,7 +6,7 @@ ob_start(); ?>
-
Creating Project Template
+
New Project Template
@@ -14,21 +14,15 @@ ob_start();
- -
- - -
+ +
-
- -
- - -
+
+ + +
Next, add its ticket templates - one per step of the work.
-
diff --git a/admin/modals/project_template/project_template_edit.php b/admin/modals/project_template/project_template_edit.php index 3eb6c1f3b..80e8564bc 100644 --- a/admin/modals/project_template/project_template_edit.php +++ b/admin/modals/project_template/project_template_edit.php @@ -2,19 +2,20 @@ require_once '../../includes/modal_header.php'; -$project_template_id = intval($_GET['project_template_id']); +$project_template_id = intval($_GET['project_template_id'] ?? 0); -$sql = mysqli_query($mysqli, "SELECT project_template_description, project_template_name FROM project_templates WHERE project_template_id = $project_template_id LIMIT 1"); -$row = mysqli_fetch_assoc($sql); -$project_template_name = escapeHtml($row['project_template_name']); -$project_template_description = escapeHtml($row['project_template_description']); +$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT project_template_description, project_template_name FROM project_templates WHERE project_template_id = $project_template_id LIMIT 1")); +if (!$row) { + echo json_encode(['error' => 'That project template no longer exists.']); + exit; +} ob_start(); ?>
-
Editing Project Template:
+
Edit Project Template
@@ -23,21 +24,14 @@ ob_start();
- -
- - -
+ +
-
- -
- - -
+
+ +
-
diff --git a/admin/modals/project_template/project_template_ticket_template_add.php b/admin/modals/project_template/project_template_ticket_template_add.php index bbb5bd9b8..29b4cf980 100644 --- a/admin/modals/project_template/project_template_ticket_template_add.php +++ b/admin/modals/project_template/project_template_ticket_template_add.php @@ -1,15 +1,32 @@ 'That project template no longer exists.']); + exit; +} + +$sql = mysqli_query($mysqli, "SELECT ticket_template_id, ticket_template_name, ticket_template_subject, + (SELECT COUNT(*) FROM task_templates WHERE task_template_ticket_template_id = ticket_template_id) AS task_count + FROM ticket_templates + WHERE ticket_template_id NOT IN (SELECT ticket_template_id FROM project_template_ticket_templates WHERE project_template_id = $project_template_id) + AND ticket_template_archived_at IS NULL + ORDER BY ticket_template_name ASC"); ob_start(); ?>
-
Adding Ticket Template
+
Add ticket templates
@@ -17,44 +34,19 @@ ob_start();
- -
- -
- - -
-
- -
- -
- - -
-
- + + + +
They go at the end, in the order picked - drag them about on the template afterwards.
+ +
Every ticket template is in it already. Make more under Ticket Templates.
+
diff --git a/admin/post/demo_data_model.php b/admin/post/demo_data_model.php index 9929703d1..ca966f739 100644 --- a/admin/post/demo_data_model.php +++ b/admin/post/demo_data_model.php @@ -1529,7 +1529,7 @@ function demoBuildClient($mysqli, $profile, $index, $context, &$counts) { } // Support and billing - $projects = demoBuildProjects($mysqli, $profile, $index, $client_id, $months, $counts); + $projects = demoBuildProjects($mysqli, $profile, $index, $client_id, $months, $counts, $primary_contact_id); demoBuildTickets($mysqli, $profile, $index, $client_id, $contact_ids, $assets, $primary_location_id, $projects, $vendor_ids, $months, $context, $counts); demoBuildBilling($mysqli, $profile, $index, $client_id, $primary_vendor_id, $months, $context, $counts); @@ -2048,7 +2048,7 @@ function demoBuildNetworkIps($mysqli, $profile, $assets, $network_ids, &$counts) // actually arrives at an MSP, and it is what the per asset onboarding tickets // hang off. A refresh project sits behind them, and some have work running now. // ------------------------------ -function demoBuildProjects($mysqli, $profile, $index, $client_id, $months, &$counts) { +function demoBuildProjects($mysqli, $profile, $index, $client_id, $months, &$counts, $contact_id = 0) { global $config_project_prefix; @@ -2062,8 +2062,11 @@ function demoBuildProjects($mysqli, $profile, $index, $client_id, $months, &$cou 'project_number' => demoNextNumber($mysqli, 'config_project_next_number'), 'project_name' => 'Onboarding - ' . $profile['name'], 'project_description' => 'Take on ' . $profile['name'] . ': document the environment, deploy monitoring and backup, capture credentials, standardise the endpoint build and hand over to the service desk.', + 'project_start' => demoMonthDate($months, 3), 'project_due' => demoMonthDate(max(0, $months - 1), 28), + 'project_budget_hours' => 16 + ($index % 3) * 8, 'project_manager' => $user_id, + 'project_contact_id' => intval($contact_id), 'project_client_id' => $client_id, 'project_created_at' => demoMonthDateTime($months, 3, 9, 30), 'project_completed_at' => demoMonthDateTime(max(0, $months - 1), 26, 16, 0), @@ -2077,8 +2080,11 @@ function demoBuildProjects($mysqli, $profile, $index, $client_id, $months, &$cou 'project_number' => demoNextNumber($mysqli, 'config_project_next_number'), 'project_name' => 'Server and network refresh', 'project_description' => 'Replaced end of life server hardware, rebuilt the switching and brought the site onto the standard build.', + 'project_start' => demoMonthDate(15, 4), 'project_due' => demoMonthDate(13, 20), + 'project_budget_hours' => 40, 'project_manager' => $user_id, + 'project_contact_id' => intval($contact_id), 'project_client_id' => $client_id, 'project_created_at' => demoMonthDateTime(15, 4, 9, 30), 'project_completed_at' => demoMonthDateTime(13, 18, 16, 45), @@ -2086,15 +2092,25 @@ function demoBuildProjects($mysqli, $profile, $index, $client_id, $months, &$cou $counts['projects']++; } - // And whatever is running now + // And whatever is running now - one running late, one due soon, one not + // started yet and one with time in hand, so the projects list has some of each if (!empty($profile['project'])) { + $timing = [ + ['start' => date('Y-m-d', strtotime('-45 days')), 'due' => date('Y-m-d', strtotime('-6 days'))], + ['start' => date('Y-m-d', strtotime('-30 days')), 'due' => date('Y-m-d', strtotime('+9 days'))], + ['start' => date('Y-m-d', strtotime('+14 days')), 'due' => date('Y-m-d', strtotime('+75 days'))], + ['start' => demoMonthDate(1, 8), 'due' => demoMonthDate(-2, 15)], + ][$index % 4]; $projects['active'] = starterInsert($mysqli, 'projects', [ 'project_prefix' => $prefix, 'project_number' => demoNextNumber($mysqli, 'config_project_next_number'), 'project_name' => $profile['project'][0], 'project_description' => $profile['project'][1], - 'project_due' => demoMonthDate(-2, 15), + 'project_start' => $timing['start'], + 'project_due' => $timing['due'], + 'project_budget_hours' => [12, 24, 32, 40][$index % 4], 'project_manager' => $user_id, + 'project_contact_id' => intval($contact_id), 'project_client_id' => $client_id, 'project_created_at' => demoMonthDateTime(1, 8, 10, 0), ]); diff --git a/admin/post/project_template.php b/admin/post/project_template.php index 3ea53124b..f038b6b2a 100644 --- a/admin/post/project_template.php +++ b/admin/post/project_template.php @@ -1,13 +1,34 @@ $name created"); + flashAlert("Project template " . escapeHtml($name_input) . " created - now add its ticket templates"); - redirect(); + redirect("project_template.php?project_template_id=$project_template_id"); } @@ -25,15 +46,22 @@ if (isset($_POST['edit_project_template'])) { validateCSRFToken(); - $project_template_id = intval($_POST['project_template_id']); - $name = escapeSql($_POST['name']); - $description = escapeSql($_POST['description']); + $project_template_id = intval($_POST['project_template_id'] ?? 0); + projectTemplateName($project_template_id); + + $name_input = trim((string) ($_POST['name'] ?? '')); + if ($name_input === '') { + flashAlert('A project template needs a name.', 'error'); + redirect(); + } + $name = escapeSql(mb_substr($name_input, 0, 200)); + $description = escapeSql(trim((string) ($_POST['description'] ?? ''))); mysqli_query($mysqli, "UPDATE project_templates SET project_template_name = '$name', project_template_description = '$description' WHERE project_template_id = $project_template_id"); logAudit("Project Template", "Edit", "$session_name edited project template $name", 0, $project_template_id); - flashAlert("Project Template $name edited"); + flashAlert("Project template " . escapeHtml($name_input) . " saved"); redirect(); @@ -53,19 +81,34 @@ if (isset($_POST['edit_ticket_template_order'])) { } +/** Ticket templates into a project template - at the end, in the order picked. */ if (isset($_POST['add_ticket_template_to_project_template'])) { validateCSRFToken(); - $project_template_id = intval($_POST['project_template_id']); - $ticket_template_id = intval($_POST['ticket_template_id']); - $order = intval($_POST['order']); + $project_template_id = intval($_POST['project_template_id'] ?? 0); + $name = escapeSql(projectTemplateName($project_template_id)); - mysqli_query($mysqli, "INSERT INTO project_template_ticket_templates SET project_template_id = $project_template_id, ticket_template_id = $ticket_template_id, ticket_template_order = $order"); + // ticket_template_id is what the single-pick form posted + $ids = array_map('intval', (array) ($_POST['ticket_template_ids'] ?? [])); + if (isset($_POST['ticket_template_id'])) { + $ids[] = intval($_POST['ticket_template_id']); + } - logAudit("Project Template", "Edit", "$session_name added ticket template to project_template", 0, $project_template_id); + $order = intval(mysqli_fetch_row(mysqli_query($mysqli, "SELECT COALESCE(MAX(ticket_template_order), 0) FROM project_template_ticket_templates WHERE project_template_id = $project_template_id"))[0]); + $added = 0; + foreach (array_unique(array_filter($ids)) as $ticket_template_id) { + if (!mysqli_num_rows(mysqli_query($mysqli, "SELECT 1 FROM ticket_templates WHERE ticket_template_id = $ticket_template_id"))) { + continue; + } + $order++; + mysqli_query($mysqli, "INSERT IGNORE INTO project_template_ticket_templates SET project_template_id = $project_template_id, ticket_template_id = $ticket_template_id, ticket_template_order = $order"); + $added += mysqli_affected_rows($mysqli) > 0 ? 1 : 0; + } - flashAlert("Ticket template added"); + logAudit("Project Template", "Edit", "$session_name added $added ticket template" . ($added === 1 ? '' : 's') . " to project template $name", 0, $project_template_id); + + flashAlert("$added ticket template" . ($added === 1 ? '' : 's') . " added"); redirect(); @@ -75,36 +118,76 @@ if (isset($_POST['remove_ticket_template_from_project_template'])) { validateCSRFToken(); - $ticket_template_id = intval($_POST['ticket_template_id']); - $project_template_id = intval($_POST['project_template_id']); + $ticket_template_id = intval($_POST['ticket_template_id'] ?? 0); + $project_template_id = intval($_POST['project_template_id'] ?? 0); + $name = escapeSql(projectTemplateName($project_template_id)); mysqli_query($mysqli, "DELETE FROM project_template_ticket_templates WHERE project_template_id = $project_template_id AND ticket_template_id = $ticket_template_id"); - logAudit("Project Template", "Edit", "$session_name removed ticket template from project template", 0, $project_template_id); + logAudit("Project Template", "Edit", "$session_name removed a ticket template from project template $name", 0, $project_template_id); - flashAlert("Ticket template removed", 'error'); + flashAlert("Ticket template taken out of the project template", 'error'); redirect(); } +if (isset($_GET['archive_project_template']) || isset($_GET['restore_project_template'])) { + + validateCSRFToken(); + + $archive = isset($_GET['archive_project_template']); + $project_template_id = intval($archive ? $_GET['archive_project_template'] : $_GET['restore_project_template']); + $name = projectTemplateName($project_template_id); + + mysqli_query($mysqli, "UPDATE project_templates SET project_template_archived_at = " . ($archive ? 'NOW()' : 'NULL') . " WHERE project_template_id = $project_template_id"); + + logAudit("Project Template", $archive ? "Archive" : "Restore", "$session_name " . ($archive ? 'archived' : 'restored') . " project template " . escapeSql($name), 0, $project_template_id); + + flashAlert("Project template " . escapeHtml($name) . " " . ($archive ? 'archived - it is no longer offered on New Project' : 'restored'), $archive ? 'error' : 'success'); + + redirect(); + +} + +/** A copy, with the same ticket templates in the same order - for a variation on a plan. */ +if (isset($_GET['duplicate_project_template'])) { + + validateCSRFToken(); + + $project_template_id = intval($_GET['duplicate_project_template']); + $name = projectTemplateName($project_template_id); + $copy_name = escapeSql(mb_substr("$name (copy)", 0, 200)); + + mysqli_query($mysqli, "INSERT INTO project_templates (project_template_name, project_template_description) + SELECT '$copy_name', project_template_description FROM project_templates WHERE project_template_id = $project_template_id"); + $copy_id = mysqli_insert_id($mysqli); + mysqli_query($mysqli, "INSERT INTO project_template_ticket_templates (project_template_id, ticket_template_id, ticket_template_order) + SELECT $copy_id, ticket_template_id, ticket_template_order FROM project_template_ticket_templates WHERE project_template_id = $project_template_id"); + + logAudit("Project Template", "Create", "$session_name duplicated project template " . escapeSql($name), 0, $copy_id); + + flashAlert("Project template " . escapeHtml($name) . " duplicated"); + + redirect("project_template.php?project_template_id=$copy_id"); + +} + if (isset($_GET['delete_project_template'])) { validateCSRFToken(); $project_template_id = intval($_GET['delete_project_template']); - - $project_template_name = escapeSql(getFieldById('project_templates', $project_template_id, 'project_template_name')); + $name = projectTemplateName($project_template_id); mysqli_query($mysqli, "DELETE FROM project_templates WHERE project_template_id = $project_template_id"); - - // Remove Associated Ticket Templates mysqli_query($mysqli, "DELETE FROM project_template_ticket_templates WHERE project_template_id = $project_template_id"); - logAudit("Project Template", "Delete", "$session_name deleted project template $project_template_name and its associated ticket templates and tasks"); + logAudit("Project Template", "Delete", "$session_name deleted project template " . escapeSql($name), 0, $project_template_id); - flashAlert("Project Template $project_template_name and its associated ticket templates and tasks deleted", 'error'); + flashAlert("Project template " . escapeHtml($name) . " deleted - its ticket templates stay", 'error'); - redirect(); + // Its own page is gone + redirect(strpos((string) ($_SERVER['HTTP_REFERER'] ?? ''), 'project_template.php') !== false ? 'project_templates.php' : null); } diff --git a/admin/post/ticket_template.php b/admin/post/ticket_template.php index eac63e6ec..61702d990 100644 --- a/admin/post/ticket_template.php +++ b/admin/post/ticket_template.php @@ -22,8 +22,10 @@ if (isset($_POST['add_ticket_template'])) { $ticket_template_id = mysqli_insert_id($mysqli); - if($project_template_id) { - mysqli_query($mysqli, "INSERT INTO project_template_ticket_templates SET project_template_id = $project_template_id, ticket_template_id = $ticket_template_id"); + // At the end of the project template's tickets + if ($project_template_id && mysqli_num_rows(mysqli_query($mysqli, "SELECT 1 FROM project_templates WHERE project_template_id = $project_template_id"))) { + $order = intval(mysqli_fetch_row(mysqli_query($mysqli, "SELECT COALESCE(MAX(ticket_template_order), 0) + 1 FROM project_template_ticket_templates WHERE project_template_id = $project_template_id"))[0]); + mysqli_query($mysqli, "INSERT INTO project_template_ticket_templates SET project_template_id = $project_template_id, ticket_template_id = $ticket_template_id, ticket_template_order = $order"); } logAudit("Ticket Template", "Create", "$session_name created ticket template $name", 0, $ticket_template_id); diff --git a/admin/project_template.php b/admin/project_template.php index 2a66cb26a..0dded67cd 100644 --- a/admin/project_template.php +++ b/admin/project_template.php @@ -1,248 +1,191 @@ +
+

Nothing to see here

+ Project templates +
+

Nothing to see here

Go Back"; - - require_once "../includes/footer.php"; - exit; +// Its ticket templates in order, then all their tasks in one go +$sql = mysqli_query($mysqli, "SELECT ticket_templates.ticket_template_id, ticket_template_name, ticket_template_subject, ticket_template_description, ticket_template_order + FROM project_template_ticket_templates + JOIN ticket_templates ON ticket_templates.ticket_template_id = project_template_ticket_templates.ticket_template_id + WHERE project_template_id = $project_template_id + ORDER BY ticket_template_order ASC, ticket_template_name ASC"); +$ticket_templates = []; +while ($row = mysqli_fetch_assoc($sql)) { + $ticket_templates[intval($row['ticket_template_id'])] = $row + ['tasks' => []]; +} +if ($ticket_templates) { + $sql = mysqli_query($mysqli, "SELECT task_template_ticket_template_id, task_template_name FROM task_templates + WHERE task_template_ticket_template_id IN (" . implode(',', array_keys($ticket_templates)) . ") + ORDER BY task_template_order ASC, task_template_id ASC"); + while ($row = mysqli_fetch_assoc($sql)) { + $ticket_templates[intval($row['task_template_ticket_template_id'])]['tasks'][] = $row['task_template_name']; } - - $row = mysqli_fetch_assoc($sql_project_templates); - - $project_template_name = escapeHtml($row['project_template_name']); - $project_template_description = escapeHtml($row['project_template_description']); - $project_template_created_at = date("Y-m-d", strtotime($row['project_template_created_at'])); - $project_template_updated_at = escapeHtml($row['project_template_updated_at']); - - // Get Associated Ticket Templates - $sql_ticket_templates = mysqli_query($mysqli, "SELECT ticket_template_created_at, ticket_template_description, - project_template_ticket_templates.ticket_template_id, ticket_template_name, - ticket_template_order, ticket_template_subject, ticket_template_updated_at FROM ticket_templates, project_template_ticket_templates - WHERE ticket_templates.ticket_template_id = project_template_ticket_templates.ticket_template_id - AND project_template_ticket_templates.project_template_id = $project_template_id - ORDER BY ticket_template_order ASC, ticket_template_name ASC"); - $ticket_template_count = mysqli_num_rows($sql_ticket_templates); - - // Get All Task Templates - $sql_task_templates = mysqli_query($mysqli, - "SELECT task_template_id, task_template_name FROM ticket_templates, task_templates, project_template_ticket_templates - WHERE ticket_templates.ticket_template_id = project_template_ticket_templates.ticket_template_id - AND project_template_ticket_templates.project_template_id = $project_template_id - AND ticket_templates.ticket_template_id = task_template_ticket_template_id - ORDER BY task_template_created_at ASC" - ); - $task_template_count = mysqli_num_rows($sql_task_templates); +} +$task_count = array_sum(array_map(function ($t) { return count($t['tasks']); }, $ticket_templates)); +$archived = !empty($template['project_template_archived_at']); ?> -
    -
  1. - Admin -
    2. -
  2. - Project Templates -
    3. -
  3. Project Template Details
    4. +
  4. Admin
    5. +
  5. Project Templates
    6. +
- -
-
-
-
- -
-

Template

-
-
+
+
+ +
+

+ + Template + Archived +

+
+ ticket + task +
- -
-
- -
-
Ticket Templates
-

-
-
-
- -
-
- -
-
Task Templates
-

-
-
-
- -
-
- -
- -
- - Edit Template +
+ + +
+ +
+ + Duplicate + +
+ + + Restore - -
- - Archive (not yet implemented) - - - -
- - Delete - - -
+ + + Archive + + + + Delete +
-
-
- - - 0) { ?> -
- -
Project Ticket Templates
-
- - - - - - - - - - - - - - - - - - - - - - -
Template NameDescriptionTicket SubjectAction
- - - - - - - - - - - -
-
+
+
+
+
+

Tickets it raises

+ 1) { ?>Drag to change the order
- -
- -
- - - 0) { ?> -
-
Project Task Templates
- - - - - - -
- - -
+ +
    + $row) { ?> +
  1. +
    +
    + + + task + +
    + +
    Raised as ""
    + + +
      +
      • +
    + +
    + +
    + + + + +
    +
    2. + +
+ +
+ +
No ticket templates in it yet. Add one per step of the work - each brings its own task checklist.
+
+
- - - -
- -
+
+
+
+
+

How it is used

+
+
+

Pick it on New Project, or Add tickets > From a project template on a project, and these tickets are raised on the project in this order, each with its tasks.

+

They go to the project's client contact, and to its manager when asked. The client isn't emailed - it's planned work.

+

[Client], [Project], [Month], [Quarter] and [Year] in a ticket template's subject are filled in. Anything else in brackets is left for the agent.

+
+
+
+
- - diff --git a/admin/project_templates.php b/admin/project_templates.php index b9f73bdc9..2ba849593 100644 --- a/admin/project_templates.php +++ b/admin/project_templates.php @@ -1,136 +1,148 @@ "project_template_name $order", + 'ticket_count' => "ticket_count $order, project_template_name ASC", + 'task_count' => "task_count $order, project_template_name ASC", + 'project_template_updated_at' => "COALESCE(project_template_updated_at, project_template_created_at) $order", +]; +if (!isset($sortable_columns[$sort])) { + $sort = 'project_template_name'; +} + +$search = "(project_template_name LIKE '%$q%' OR project_template_description LIKE '%$q%')"; + +$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS project_templates.project_template_id, project_template_name, project_template_description, + project_template_created_at, project_template_updated_at, project_template_archived_at, + COUNT(DISTINCT ptt.ticket_template_id) AS ticket_count, COUNT(task_template_id) AS task_count + FROM project_templates + LEFT JOIN project_template_ticket_templates ptt ON ptt.project_template_id = project_templates.project_template_id + LEFT JOIN task_templates ON task_template_ticket_template_id = ptt.ticket_template_id + WHERE $search AND project_template_archived_at IS " . ($show_archived ? 'NOT NULL' : 'NULL') . " + GROUP BY project_templates.project_template_id + ORDER BY {$sortable_columns[$sort]} + LIMIT $record_from, $record_to"); $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); +$counts = mysqli_fetch_row(mysqli_query($mysqli, "SELECT COALESCE(SUM(project_template_archived_at IS NULL), 0), COALESCE(SUM(project_template_archived_at IS NOT NULL), 0) FROM project_templates WHERE $search")); + +$sort_link = function ($column, $label) use ($url_query_strings_sort, $sort, $disp, $order_icon) { + return '' + . $label . ($sort === $column ? " $order_icon" : '') . ''; +}; + ?>
-

Project Templates

+

Project Templates

+
- -
+
- - + +
- -
-
-
+
-
- - "> +
+
+ "> - - - - + + + + + - - - - + + + + - - - +
- - Template - - TicketsTasksAction
- -
- -
-
- -
-
- -
-
-
- - 		-
- -
- - Edit - - -
- - Delete - +
+ +
+ + +
-' ?>-' ?> +
+ +
+ + Edit + + + Duplicate + +
+ + + Restore + + + + Archive + + + + Delete + +
+
+
+ +
+ +
+
+
diff --git a/agent/ajax.php b/agent/ajax.php index 7742d2d36..08cdc0316 100644 --- a/agent/ajax.php +++ b/agent/ajax.php @@ -1209,7 +1209,8 @@ if (isset($_GET['get_client_vendors'])) { } /* - * Returns open projects for a specified client + * Returns the open projects a ticket of this client can go on - the client's + * own, then our internal ones */ if (isset($_GET['get_client_projects'])) { enforceUserPermission('module_client'); @@ -1220,11 +1221,10 @@ if (isset($_GET['get_client_projects'])) { $projects_sql = mysqli_query( $mysqli, - "SELECT project_id, project_name FROM projects - LEFT JOIN clients on project_client_id = client_id - WHERE projects.project_archived_at IS NULL AND projects.project_completed_at IS NULL AND project_client_id = $client_id + "SELECT project_id, project_name, project_prefix, project_number, project_client_id = 0 AS project_internal FROM projects + WHERE projects.project_archived_at IS NULL AND projects.project_completed_at IS NULL AND project_client_id IN (0, $client_id) " . clientScopeSql('project_client_id') . " - ORDER BY project_name ASC" + ORDER BY project_client_id = 0, project_name ASC" ); // Always return the key, so a client with none gives [] rather than null @@ -1443,9 +1443,14 @@ if (isset($_POST['update_project_template_ticket_order'])) { validateCSRFToken(); - enforceUserPermission('module_support', 2); + // Project templates are the admins' - admin/project_template.php + if (empty($session_is_admin)) { + http_response_code(403); + echo json_encode(['status' => 'error', 'message' => 'Only an admin can change a project template.']); + exit; + } - $positions = $_POST['positions']; + $positions = (array) ($_POST['positions'] ?? []); $project_template_id = intval($_POST['project_template_id']); foreach ($positions as $position) { diff --git a/agent/calendar.php b/agent/calendar.php index 507a28e51..f41fec130 100644 --- a/agent/calendar.php +++ b/agent/calendar.php @@ -106,6 +106,10 @@ if (isset($_GET['calendar_id'])) { Tickets (Scheduled)
+
+ Projects (Start and due) +
+
Vendors
@@ -461,6 +465,24 @@ while ($row = mysqli_fetch_assoc($sql)) { echo "{ id: $event_id, title: $event_title, start: $event_start, color: '$event_color', url: 'ticket.php?ticket_id=$event_id$client_url' },"; } + // Open projects - the day they start and the day they are due + if (lookupUserPermission('module_support') >= 1) { + $sql = mysqli_query($mysqli, "SELECT project_id, project_prefix, project_number, project_name, project_start, project_due, project_client_id + FROM projects + WHERE " . PROJECT_OPEN_SQL . " AND (project_due IS NOT NULL OR project_start IS NOT NULL) + " . (isset($_GET['client_id']) ? "AND project_client_id = " . intval($_GET['client_id']) : '') . " " . clientScopeSql('project_client_id')); + while ($row = mysqli_fetch_assoc($sql)) { + $event_url = json_encode(projectUrl($row['project_id'], $row['project_client_id'])); + foreach (['project_start' => 'starts', 'project_due' => 'due'] as $column => $what) { + if ($row[$column]) { + $event_title = json_encode($row['project_prefix'] . $row['project_number'] . " $what - " . $row['project_name']); + $event_start = json_encode($row[$column]); + echo "{ title: $event_title, start: $event_start, allDay: true, color: 'teal', url: $event_url },"; + } + } + } + } + // Vendors Added Created $sql = mysqli_query($mysqli, "SELECT client_id, vendor_created_at, vendor_id, vendor_name FROM clients LEFT JOIN vendors ON client_id = vendor_client_id $client_query " . clientScopeSql('clients.client_id') . ""); while ($row = mysqli_fetch_assoc($sql)) { diff --git a/agent/client_overview.php b/agent/client_overview.php index e3e69d261..34c74f5f1 100644 --- a/agent/client_overview.php +++ b/agent/client_overview.php @@ -21,6 +21,7 @@ $access = clientOverviewAccess(); $renewals = $access['docs'] ? clientOverviewRenewals($client_id) : null; $attention = clientOverviewAttention($client_id, $access, $renewals); $open_tickets = $access['tickets'] ? clientOverviewOpenTickets($client_id) : null; +$open_projects = $access['tickets'] ? clientOverviewProjects($client_id) : null; $overview_contacts = clientOverviewContacts($client_id); $favorites = clientOverviewFavorites($client_id, $access); $upcoming = clientOverviewUpcoming($client_id, $access); @@ -280,7 +281,7 @@ $money_format = function ($amount) use ($currency_format, $client_currency_code, - + @@ -292,6 +293,29 @@ $money_format = function ($amount) use ($currency_format, $client_currency_code,
+ +
+
+
+

Projects

+ View all +
+
+ $project) { + $project_stats = $open_projects['stats'][$project_id]; ?> + + + + + +
+ + +
+
+
+ +
diff --git a/agent/includes/client_actions_menu.php b/agent/includes/client_actions_menu.php index 52b41157b..d9498c582 100644 --- a/agent/includes/client_actions_menu.php +++ b/agent/includes/client_actions_menu.php @@ -1,6 +1,6 @@ " data-modal-size="lg"> New Ticket + + New Project +
{ - projectSelectDropdown[projectSelectDropdown.length] = new Option(project.project_name, project.project_id); + const option = new Option(project.project_name, project.project_id); + option.dataset.icon = 'fas fa-fw fa-project-diagram'; + option.dataset.description = (project.project_prefix || '') + project.project_number + (project.project_internal == '1' ? ' - internal' : ''); + projectSelectDropdown[projectSelectDropdown.length] = option; }); applyPreselection(projectSelectDropdown); diff --git a/agent/modals/asset/asset_bulk_add_ticket.php b/agent/modals/asset/asset_bulk_add_ticket.php index f6597be6a..7bfddd062 100644 --- a/agent/modals/asset/asset_bulk_add_ticket.php +++ b/agent/modals/asset/asset_bulk_add_ticket.php @@ -104,11 +104,18 @@ ob_start(); - + diff --git a/agent/modals/client/client_bulk_add_ticket.php b/agent/modals/client/client_bulk_add_ticket.php index 7c8e9c897..f39e9dbae 100644 --- a/agent/modals/client/client_bulk_add_ticket.php +++ b/agent/modals/client/client_bulk_add_ticket.php @@ -108,11 +108,13 @@ ob_start(); - + diff --git a/agent/modals/project/project.php b/agent/modals/project/project.php new file mode 100644 index 000000000..3522acd04 --- /dev/null +++ b/agent/modals/project/project.php @@ -0,0 +1,113 @@ + + +
+
+
+ + + +
+
+
+ + ·started +
+
+ +
+ +
+ + +
+ + +
+
+
Progress
+ +
+
+
Time 0 ? ' / budget' : '' ?>
+ + +
billable, not invoiced
+ +
+
+ +
+
Manager
+
+ +
Contact
+
+ + +
+ +
+ + +
Start
+ +
Due
-' ?>
+ +
Completed
+ +
+ + +
Scope
+
600 ? mb_substr($description, 0, 600) . '…' : $description)) ?>
+ + +
+ Open tickets count($open_tickets)) { ?> - of +
+ + true]) ?> + +
+ + +
+ +
+ + + + + + + Open project +
+ + $session_user_id]; +if ($form_client_id) { + $form['fixed_client'] = true; +} +$is_new = true; ob_start(); ?>
-
New Project
+
New Project
- - - - -
- -
- - -
-
- - -
- -
- - -
-
- -
- -
- - -
-
- -
- -
- - -
-
- - -
- -
- - -
-
- -
- -
- - -
-
- +
@@ -110,5 +38,7 @@ ob_start();
+ + + +
+
Tickets from a template
+ +
+
+ + +
+
+ + +
Its tickets are raised on this project in the template's order, each with its tasks. The client isn't emailed.
+
+ +
+ + +
+ +
+
+ + +
+
+ + + +
+
Set the due date of project
+ +
+ +
+ + + +
+ + +
Leave it empty to clear the due date. Open projects only, and not one that starts after it.
+
+ +
+ + +
+
+ + + +
+
Set the manager of project
+ +
+ +
+ + + +
+ + +
Open projects only - completed and archived ones keep theirs. The new manager gets a notification.
+
+ +
+ + +
+
+ + 'Project ' . projectReference($form) . ' is archived - restore it to change it.']); + exit; } +$project_id = intval($form['project_id']); +$form_client_id = intval($form['project_client_id']); +$form['fixed_client'] = true; +$is_new = false; ob_start(); ?>
-
- Editing Project: +
+ Edit Project ·
@@ -43,47 +31,7 @@ ob_start();
-
- -
- - -
-
-
- -
- - -
-
-
- -
- - -
-
-
- -
- - -
-
+
+ + + +
+
Export Projects
+ +
+ + + +
+ + + +
+ + + +
+ + +
+ +
+ + +
+ +
+ + +
+ + +
+ + +
+ + + + +
+
+ +
+
+ + + + +
+ + +
+ + + + +
+ + +
+ + +
+ + + +
+ + +
+
+ + +
+
> + + +
Who signs it off at the client. Its template tickets go to them.
+
+
+ +
+
+ + +
+
+ + +
+
+ +
+ + hours +
+
+
+ +
+ + +
diff --git a/agent/modals/project/project_link_closed_ticket.php b/agent/modals/project/project_link_closed_ticket.php deleted file mode 100644 index 00b22ae14..000000000 --- a/agent/modals/project/project_link_closed_ticket.php +++ /dev/null @@ -1,60 +0,0 @@ - - -
-
Link closed ticket to project:
- -
-
- - -
- -
- -
- "; - } else { - echo "
$config_ticket_prefix
"; - } - ?> - -
-
- -
- -
- - -
-
- - 0 + WHERE ticket_project_id <> $project_id AND ticket_archived_at IS NULL $client_sql + AND (" . TICKET_OPEN_SQL . " OR COALESCE(ticket_closed_at, ticket_resolved_at) > NOW() - INTERVAL 90 DAY) + ORDER BY " . TICKET_OPEN_SQL . " DESC, ticket_number DESC + LIMIT 500"); +$open = []; +$done = []; +while ($row = mysqli_fetch_assoc($sql)) { + if (ticketIsOpen($row)) { + $open[] = $row; + } else { + $done[] = $row; + } } -$sql = mysqli_query($mysqli, "SELECT project_name FROM projects WHERE project_id = $project_id LIMIT 1"); +$option = function ($row) use ($project_client_id) { + $description = array_filter([ + $row['ticket_status_name'], + !$project_client_id ? ($row['client_name'] ?? 'Internal') : '', + $row['project_id'] ? 'now on ' . $row['project_prefix'] . $row['project_number'] . ' - ' . $row['project_name'] : '', + ]); + return ''; +}; -$row = mysqli_fetch_assoc($sql); -$project_name = escapeHtml($row['project_name']); - -// Generate the HTML form content using output buffering. ob_start(); ?>
-
Link open ticket(s) to project:
+
Add tickets
@@ -33,33 +56,32 @@ ob_start();
- -
- - + + + + + + + + + + + +
. One on another project moves to this one.
+
- $sql_tickets_select = mysqli_query($mysqli, "SELECT client_abbreviation, ticket_id, ticket_number, ticket_prefix, ticket_subject FROM tickets LEFT JOIN clients on ticket_client_id = client_id WHERE ticket_project_id = 0 AND ticket_closed_at IS NULL $client_ticket_select_query"); - while ($row = mysqli_fetch_assoc($sql_tickets_select)) { - $ticket_id_select = intval($row['ticket_id']); - $ticket_prefix_select = escapeHtml($row['ticket_prefix']); - $ticket_number_select = intval($row['ticket_number']); - $ticket_subject_select = escapeHtml($row['ticket_subject']); - $ticket_client_abbreviation_select = escapeHtml($row['client_abbreviation']) - ?> - - - -
+
+ + +
For older tickets - separate them with commas or spaces.
- +
diff --git a/agent/modals/ticket/ticket.php b/agent/modals/ticket/ticket.php index 471c8a48f..d4ba23191 100644 --- a/agent/modals/ticket/ticket.php +++ b/agent/modals/ticket/ticket.php @@ -18,7 +18,7 @@ $ticket_id = intval($_GET['id'] ?? 0); $ticket = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT tickets.*, client_name, contact_name, contact_email, contact_photo, contact_title, contact_phone, contact_phone_country_code, contact_extension, contact_mobile, contact_mobile_country_code, ticket_status_name, ticket_status_color, ticket_status_pauses_sla, user_name, user_avatar, asset_name, location_name, - vendor_name, category_name, category_color, project_prefix, project_number, project_name, sla_name, + vendor_name, category_name, category_color, project_prefix, project_number, project_name, project_client_id, sla_name, " . ticketLastSpokeSql() . " AS ticket_last_spoke FROM tickets LEFT JOIN clients ON client_id = ticket_client_id @@ -172,7 +172,7 @@ ob_start();
Project
-
+
diff --git a/agent/post/client.php b/agent/post/client.php index 0d6ece667..c3961e4c7 100644 --- a/agent/post/client.php +++ b/agent/post/client.php @@ -271,6 +271,9 @@ if (isset($_GET['delete_client'])) { // Delete Racks (their items go with them) mysqli_query($mysqli, "DELETE FROM racks WHERE rack_client_id = $client_id"); + // Delete Projects - their tickets are the client's, and go below + mysqli_query($mysqli, "DELETE FROM projects WHERE project_client_id = $client_id"); + // Delete Domains and associated records mysqli_query($mysqli, "DELETE FROM domains WHERE domain_client_id = $client_id"); @@ -791,7 +794,10 @@ if (isset($_POST['bulk_add_client_ticket'])) { //Generate a unique URL key for clients to access $url_key = randomString(32); - mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_category = $category_id, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_billable = $billable, ticket_status = $ticket_status, ticket_created_by = $session_user_id, ticket_assigned_to = $assigned_to, ticket_url_key = '$url_key', ticket_client_id = $client_id, ticket_project_id = $project_id"); + // Only a project of this client's, or an internal one + $ticket_project_id = ticketClientOwnedId('project', $project_id, $client_id); + + mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_category = $category_id, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_billable = $billable, ticket_status = $ticket_status, ticket_created_by = $session_user_id, ticket_assigned_to = $assigned_to, ticket_url_key = '$url_key', ticket_client_id = $client_id, ticket_project_id = $ticket_project_id"); $ticket_id = mysqli_insert_id($mysqli); applyTicketSla($ticket_id); diff --git a/agent/post/project.php b/agent/post/project.php index 3bd67ef7e..bde677ef4 100644 --- a/agent/post/project.php +++ b/agent/post/project.php @@ -1,98 +1,92 @@ escapeSql(mb_substr($name, 0, 255)), + 'description' => escapeSql(trim((string) ($_POST['description'] ?? ''))), + 'start' => $start, + 'due' => $due, + 'budget' => $budget === null ? 'NULL' : number_format($budget, 2, '.', ''), + 'manager' => ticketAgentId($_POST['project_manager'] ?? 0), + 'contact' => projectContactId($_POST['contact_id'] ?? 0, $client_id), + ]; +} + +/** The project page, or the list when the project is gone - inside its client when it has one. */ +function projectBackUrl($client_id, $project_id = 0) { + return $project_id ? projectUrl($project_id, $client_id) : 'projects.php' . (intval($client_id) ? '?client_id=' . intval($client_id) : ''); +} + if (isset($_POST['add_project'])) { validateCSRFToken(); enforceUserPermission('module_support', 2); - $project_name = escapeSql($_POST['name']); - $project_description = escapeSql($_POST['description']); - $due_date = escapeSql($_POST['due_date']); - $project_manager = intval($_POST['project_manager']); - $client_id = intval($_POST['client_id']); - $project_template_id = intval($_POST['project_template_id']); - - // Don't Enforce Client Access if Project doesn't have an assigned client + // A client of the agent's, or none - internal work + $client_id = intval($_POST['client_id'] ?? 0); if ($client_id) { + if (!getFieldById('clients', $client_id, 'client_name')) { + flashAlert('That client no longer exists.', 'error'); + redirect(); + } enforceClientAccess(); } - // Sanitize Project Prefix - $config_project_prefix = escapeSql($config_project_prefix); + $p = projectFromPost($client_id); - // Atomically increment and get the new project number - mysqli_query($mysqli, " - UPDATE settings - SET - config_project_next_number = LAST_INSERT_ID(config_project_next_number), - config_project_next_number = config_project_next_number + 1 - WHERE company_id = 1 - "); + $project_template_id = intval($_POST['project_template_id'] ?? 0); + if ($project_template_id && !mysqli_num_rows(mysqli_query($mysqli, "SELECT 1 FROM project_templates WHERE project_template_id = $project_template_id AND project_template_archived_at IS NULL"))) { + $project_template_id = 0; + } - $project_number = mysqli_insert_id($mysqli); + $project_number = projectNextNumber(); + $project_prefix = escapeSql($config_project_prefix); - mysqli_query($mysqli, "INSERT INTO projects SET project_prefix = '$config_project_prefix', project_number = $project_number, project_name = '$project_name', project_description = '$project_description', project_due = '$due_date', project_manager = $project_manager, project_client_id = $client_id"); + mysqli_query($mysqli, "INSERT INTO projects SET project_prefix = '$project_prefix', project_number = $project_number, project_name = '{$p['name']}', + project_description = '{$p['description']}', project_start = {$p['start']}, project_due = {$p['due']}, project_budget_hours = {$p['budget']}, + project_manager = {$p['manager']}, project_contact_id = {$p['contact']}, project_client_id = $client_id"); $project_id = mysqli_insert_id($mysqli); + $row = projectRow($project_id); - // If project template is selected add Ticket Templates and convert them to real tickets - if($project_template_id) { - // Get Associated Ticket Templates - $sql_ticket_templates = mysqli_query($mysqli, "SELECT ticket_template_details, project_template_ticket_templates.ticket_template_id, - ticket_template_order, ticket_template_subject FROM ticket_templates, project_template_ticket_templates - WHERE ticket_templates.ticket_template_id = project_template_ticket_templates.ticket_template_id - AND project_template_ticket_templates.project_template_id = $project_template_id"); - $ticket_template_count = mysqli_num_rows($sql_ticket_templates); + // A template's tickets - to the manager when asked + $raised = $project_template_id ? projectApplyTemplate($row, $project_template_id, intval($_POST['assign_to_manager'] ?? 0) ? $p['manager'] : 0) : 0; - while ($row = mysqli_fetch_assoc($sql_ticket_templates)) { - $ticket_template_id = intval($row['ticket_template_id']); - $ticket_template_order = intval($row['ticket_template_order']); - $ticket_template_subject = escapeSql($row['ticket_template_subject']); - $ticket_template_details = mysqli_escape_string($mysqli, $row['ticket_template_details']); + projectNotifyManager($row, $p['manager']); - // Atomically increment and get the new ticket number - mysqli_query($mysqli, " - UPDATE settings - SET - config_ticket_next_number = LAST_INSERT_ID(config_ticket_next_number), - config_ticket_next_number = config_ticket_next_number + 1 - WHERE company_id = 1 - "); + logAudit("Project", "Create", "$session_name created project " . escapeSql(projectReference($row)) . " - {$p['name']}", $client_id, $project_id); - $ticket_number = mysqli_insert_id($mysqli); + flashAlert("Project " . escapeHtml(projectReference($row) . ' - ' . $row['project_name']) . " created" . ($raised ? " with $raised ticket" . ($raised === 1 ? '' : 's') . " from the template" : '')); - mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_subject = '$ticket_template_subject', ticket_details = '$ticket_template_details', ticket_priority = 'Medium', ticket_status = 1, ticket_created_by = $session_user_id, ticket_client_id = $client_id, ticket_project_id = $project_id"); - - $ticket_id = mysqli_insert_id($mysqli); - applyTicketSla($ticket_id); - - // Task Templates for Ticket template and add the to the ticket - $sql_task_templates = mysqli_query($mysqli, - "SELECT task_template_id, task_template_name, task_template_order FROM task_templates WHERE task_template_ticket_template_id = $ticket_template_id"); - $task_template_count = mysqli_num_rows($sql_task_templates); - - while ($row = mysqli_fetch_assoc($sql_task_templates)) { - $task_template_id = intval($row['task_template_id']); - $task_template_order = intval($row['task_template_order']); - $task_template_name = escapeSql($row['task_template_name']); - - mysqli_query($mysqli,"INSERT INTO tasks SET task_name = '$task_template_name', task_order = $task_template_order, task_ticket_id = $ticket_id"); - } // End task Loop - } // End Ticket Loop - } // End If Project Template - - logAudit("Project", "Create", "$session_name created project $project_name", $client_id, $project_id); - - flashAlert("You created Project $project_name"); - - redirect(); + redirect(projectBackUrl($client_id, $project_id)); } @@ -100,55 +94,65 @@ if (isset($_POST['edit_project'])) { validateCSRFToken(); - enforceUserPermission('module_support', 2); + $row = projectForRequest($_POST['project_id'] ?? 0, 2); + $project_id = intval($row['project_id']); - $project_id = intval($_POST['project_id']); - $project_name = escapeSql($_POST['name']); - $project_description = escapeSql($_POST['description']); - $due_date = escapeSql($_POST['due_date']); - $project_manager = intval($_POST['project_manager']); - - $client_id = intval(getFieldById('projects', $project_id, 'project_client_id')); - - // Don't Enforce Client Access if Project doesn't have an assigned client - if ($client_id) { - enforceClientAccess(); + if (!empty($row['project_archived_at'])) { + flashAlert("Project " . escapeHtml(projectReference($row)) . " is archived - restore it to change it.", 'error'); + redirect(); } - mysqli_query($mysqli, "UPDATE projects SET project_name = '$project_name', project_description = '$project_description', project_due = '$due_date', project_manager = $project_manager WHERE project_id = $project_id"); + $p = projectFromPost($client_id); - logAudit("Project", "Edit", "$session_name edited project $project_name", $client_id, $project_id); + mysqli_query($mysqli, "UPDATE projects SET project_name = '{$p['name']}', project_description = '{$p['description']}', project_start = {$p['start']}, + project_due = {$p['due']}, project_budget_hours = {$p['budget']}, project_manager = {$p['manager']}, project_contact_id = {$p['contact']} + WHERE project_id = $project_id"); - flashAlert("Project $project_name edited"); + if ($p['manager'] !== intval($row['project_manager'])) { + projectNotifyManager($row, $p['manager']); + } + + logAudit("Project", "Edit", "$session_name edited project " . escapeSql(projectReference($row)) . " - {$p['name']}", $client_id, $project_id); + + flashAlert("Project " . escapeHtml(projectReference($row) . ' - ' . stripslashes($p['name'])) . " saved"); redirect(); } -if (isset($_GET['close_project'])) { +// close_project is the old name, from links made before Complete +if (isset($_GET['complete_project']) || isset($_GET['close_project'])) { validateCSRFToken(); - enforceUserPermission('module_support', 2); + $row = projectForRequest($_GET['complete_project'] ?? $_GET['close_project'], 2); - $project_id = intval($_GET['close_project']); - - // Get Project Name and Client ID for logging - $sql = mysqli_query($mysqli, "SELECT project_name, project_client_id FROM projects WHERE project_id = $project_id"); - $row = mysqli_fetch_assoc($sql); - $project_name = escapeSql($row['project_name']); - $client_id = intval($row['project_client_id']); - - // Don't Enforce Client Access if Project doesn't have an assigned client - if ($client_id) { - enforceClientAccess(); + $why_not = projectComplete($row); + if ($why_not !== '') { + flashAlert("Project " . escapeHtml(projectReference($row)) . " can't be completed - " . escapeHtml($why_not) . ".", 'error'); + redirect(); } - mysqli_query($mysqli, "UPDATE projects SET project_completed_at = NOW() WHERE project_id = $project_id"); + flashAlert("Project " . escapeHtml(projectReference($row) . ' - ' . $row['project_name']) . " completed"); - logAudit("Project", "Close", "$session_name closed project $project_name", $client_id, $project_id); + redirect(); - flashAlert("Project $project_name closed"); +} + +if (isset($_GET['reopen_project'])) { + + validateCSRFToken(); + + $row = projectForRequest($_GET['reopen_project'], 2); + + if (empty($row['project_completed_at']) || !empty($row['project_archived_at'])) { + flashAlert("Project " . escapeHtml(projectReference($row)) . " isn't completed" . (!empty($row['project_archived_at']) ? ' - it is archived, restore it first' : '') . ".", 'error'); + redirect(); + } + + projectReopen($row); + + flashAlert("Project " . escapeHtml(projectReference($row) . ' - ' . $row['project_name']) . " reopened"); redirect(); @@ -158,26 +162,11 @@ if (isset($_GET['archive_project'])) { validateCSRFToken(); - enforceUserPermission('module_support', 2); + $row = projectForRequest($_GET['archive_project'], 2); - $project_id = intval($_GET['archive_project']); + projectArchive($row); - // Get Project Name and Client ID for logging - $sql = mysqli_query($mysqli, "SELECT project_name, project_client_id FROM projects WHERE project_id = $project_id"); - $row = mysqli_fetch_assoc($sql); - $project_name = escapeSql($row['project_name']); - $client_id = intval($row['project_client_id']); - - // Don't Enforce Client Access if Project doesn't have an assigned client - if ($client_id) { - enforceClientAccess(); - } - - mysqli_query($mysqli, "UPDATE projects SET project_archived_at = NOW() WHERE project_id = $project_id"); - - logAudit("Project", "Archive", "$session_name archived project $project_name", $client_id, $project_id); - - flashAlert("Project $project_name archived", 'error'); + flashAlert("Project " . escapeHtml(projectReference($row) . ' - ' . $row['project_name']) . " archived", 'error'); redirect(); @@ -187,26 +176,11 @@ if (isset($_GET['restore_project'])) { validateCSRFToken(); - enforceUserPermission('module_support', 2); + $row = projectForRequest($_GET['restore_project'], 2); - $project_id = intval($_GET['restore_project']); + projectRestore($row); - // Get Project Name and Client ID for logging - $sql = mysqli_query($mysqli, "SELECT project_name, project_client_id FROM projects WHERE project_id = $project_id"); - $row = mysqli_fetch_assoc($sql); - $project_name = escapeSql($row['project_name']); - $client_id = escapeSql($row['project_client_id']); - - // Don't Enforce Client Access if Project doesn't have an assigned client - if ($client_id) { - enforceClientAccess(); - } - - mysqli_query($mysqli, "UPDATE projects SET project_archived_at = NULL WHERE project_id = $project_id"); - - logAudit("Project", "Restore", "$session_name restored project $project_name", $client_id, $project_id); - - flashAlert("Project $project_name restored"); + flashAlert("Project " . escapeHtml(projectReference($row) . ' - ' . $row['project_name']) . " restored"); redirect(); @@ -216,119 +190,397 @@ if (isset($_GET['delete_project'])) { validateCSRFToken(); - enforceUserPermission('module_support', 3); + $row = projectForRequest($_GET['delete_project'], 3); - $project_id = intval($_GET['delete_project']); + projectDelete($row); - // Get Project Name and Client ID for logging - $sql = mysqli_query($mysqli, "SELECT project_name, project_client_id FROM projects WHERE project_id = $project_id"); - $row = mysqli_fetch_assoc($sql); - $project_name = escapeSql($row['project_name']); - $client_id = intval($row['project_client_id']); + flashAlert("Project " . escapeHtml(projectReference($row) . ' - ' . $row['project_name']) . " deleted - its tickets stay", 'error'); - // Don't Enforce Client Access if Project doesn't have an assigned client - if ($client_id) { - enforceClientAccess(); + // From its own page, back to the list - the page is gone + $referer = (string) ($_SERVER['HTTP_REFERER'] ?? ''); + if (preg_match('#/project\.php#', $referer)) { + redirect(projectBackUrl(strpos($referer, 'client_id=') !== false ? $row['project_client_id'] : 0)); } - - mysqli_query($mysqli, "DELETE FROM projects WHERE project_id = $project_id"); - - logAudit("Project", "Delete", "$session_name deleted project $project_name", $client_id, $project_id); - - flashAlert("Project $project_name Deleted", 'error'); - redirect(); } +/* + * Tickets onto a project - picked from its client's tickets, or typed by + * number for older ones. Moving a ticket off another project is fine; one + * the agent can't reach, or another client's, is skipped. + */ if (isset($_POST['link_ticket_to_project'])) { validateCSRFToken(); - enforceUserPermission('module_support', 2); + $row = projectForRequest($_POST['project_id'] ?? 0, 2); - $project_id = intval($_POST['project_id']); - - // Get Project Name and Client ID for logging - $sql = mysqli_query($mysqli, "SELECT project_client_id, project_name FROM projects WHERE project_id = $project_id"); - $row = mysqli_fetch_assoc($sql); - $client_id = intval($row['project_client_id']); - $project_name = escapeSql($row['project_name']); - - // Don't Enforce Client Access if Project doesn't have an assigned client - if ($client_id) { - enforceClientAccess(); + if (!projectIsOpen($row)) { + flashAlert("Project " . escapeHtml(projectReference($row)) . " isn't open - reopen it to add tickets.", 'error'); + redirect(); } - // Add Tickets - if (isset($_POST['tickets'])) { - - // Get Selected Count - $count = count($_POST['tickets']); - - foreach ($_POST['tickets'] as $ticket) { - $ticket_id = intval($ticket); - - // Get Ticket Info - $sql = mysqli_query($mysqli, "SELECT ticket_prefix, ticket_number, ticket_subject FROM tickets WHERE ticket_id = $ticket_id"); - $row = mysqli_fetch_assoc($sql); - $ticket_prefix = escapeSql($row['ticket_prefix']); - $ticket_number = intval($row['ticket_number']); - $ticket_subject = escapeSql($row['ticket_subject']); - - mysqli_query($mysqli, "UPDATE tickets SET ticket_project_id = $project_id WHERE ticket_id = $ticket_id"); - - logAudit("Project", "Edit", "$session_name added ticket $ticket_prefix$ticket_number - $ticket_subject to project $project_name", $client_id, $project_id); + $ticket_ids = array_map('intval', (array) ($_POST['tickets'] ?? [])); + // Numbers typed in, with or without the prefix + $not_found = []; + foreach (preg_split('/[\s,;]+/', (string) ($_POST['ticket_numbers'] ?? ''), -1, PREG_SPLIT_NO_EMPTY) as $typed) { + $number = intval(preg_replace('/^\D+/', '', $typed)); + $found = $number ? mysqli_fetch_row(mysqli_query($mysqli, "SELECT ticket_id FROM tickets WHERE ticket_number = $number ORDER BY ticket_id DESC LIMIT 1")) : null; + if ($found) { + $ticket_ids[] = intval($found[0]); + } else { + $not_found[] = escapeHtml($typed); } - - logAudit("Project", "Bulk Edit", "$session_name added $count ticket(s) to project $project_name", $client_id, $project_id); - - flashAlert("$count Ticket(s) added to $project_name"); } + $added = 0; + $skipped = []; + foreach (array_unique(array_filter($ticket_ids)) as $ticket_id) { + $ticket = ticketRow($ticket_id); + if (!$ticket) { + continue; + } + if (intval($ticket['ticket_project_id']) === intval($row['project_id'])) { + continue; + } + $why_not = projectAddTicket($row, $ticket); + if ($why_not === '') { + $added++; + } else { + $skipped[] = escapeHtml(ticketReference($ticket)) . " ($why_not)"; + } + } + + if ($added) { + logAudit("Project", "Edit", "$session_name added $added ticket" . ($added === 1 ? '' : 's') . " to project " . escapeSql(projectReference($row) . ' - ' . $row['project_name']), $client_id, intval($row['project_id'])); + } + + // One message - a second flashAlert() would replace the first + $message = array_filter([ + $added ? "$added ticket" . ($added === 1 ? '' : 's') . " added to " . escapeHtml($row['project_name']) . "" : '', + $skipped ? 'Skipped ' . implode(', ', $skipped) : '', + $not_found ? 'No ticket numbered ' . implode(', ', $not_found) : '', + ]); + flashAlert($message ? implode('. ', $message) : 'Nothing to add - those tickets are on the project already.', $added ? 'success' : 'error'); + redirect(); } -if (isset($_POST['link_closed_ticket_to_project'])) { +/** Tickets off a project - from its page, ticked. Only ones on this project, and the agent may reach. */ +if (isset($_POST['remove_tickets_from_project'])) { validateCSRFToken(); - enforceUserPermission('module_support', 2); + $row = projectForRequest($_POST['project_id'] ?? 0, 2); + $project_id = intval($row['project_id']); - $project_id = intval($_POST['project_id']); - $ticket_number = intval($_POST['ticket_number']); - - // Get Project Name and Client ID for logging - $sql = mysqli_query($mysqli, "SELECT project_client_id, project_name FROM projects WHERE project_id = $project_id"); - $row = mysqli_fetch_assoc($sql); - $client_id = intval($row['project_client_id']); - $project_name = escapeSql($row['project_name']); - - // Don't Enforce Client Access if Project doesn't have an assigned client - if ($client_id) { - enforceClientAccess(); + $removed = 0; + foreach (ticketsForBulk(2) as $ticket) { + if (intval($ticket['ticket_project_id']) !== $project_id) { + continue; + } + projectRemoveTicket($ticket); + $removed++; } - // Get ticket details - $sql = mysqli_query($mysqli, "SELECT ticket_id, ticket_prefix, ticket_number, ticket_subject, ticket_updated_at FROM tickets WHERE ticket_number = $ticket_number"); - if (mysqli_num_rows($sql) == 0) { - flashAlert("Cannot merge into that ticket.", 'error'); - redirect(); + if ($removed) { + logAudit("Project", "Edit", "$session_name took $removed ticket" . ($removed === 1 ? '' : 's') . " out of project " . escapeSql(projectReference($row) . ' - ' . $row['project_name']), intval($row['project_client_id']), $project_id); } - $row = mysqli_fetch_assoc($sql); - $ticket_id = intval($row['ticket_id']); - $ticket_prefix = escapeSql($row['ticket_prefix']); - $ticket_number = intval($row['ticket_number']); - $ticket_subject = escapeSql($row['ticket_subject']); - $ticket_updated = escapeSql($row['ticket_updated_at']); // So we don't mess with the last response - mysqli_query($mysqli, "UPDATE tickets SET ticket_project_id = $project_id, ticket_updated_at = '$ticket_updated' WHERE ticket_id = $ticket_id"); - - logAudit("Project", "Edit", "$session_name added ticket $ticket_prefix$ticket_number - $ticket_subject to project $project_name", $client_id, $project_id); - - flashAlert("Ticket added to $project_name"); + flashAlert("$removed ticket" . ($removed === 1 ? '' : 's') . " taken out of " . escapeHtml($row['project_name']) . "", 'error'); + + redirect(); + +} + +/** A project template's tickets onto a project that already exists. */ +if (isset($_POST['apply_project_template'])) { + + validateCSRFToken(); + + $row = projectForRequest($_POST['project_id'] ?? 0, 2); + + if (!projectIsOpen($row)) { + flashAlert("Project " . escapeHtml(projectReference($row)) . " isn't open.", 'error'); + redirect(); + } + + $project_template_id = intval($_POST['project_template_id'] ?? 0); + if (!mysqli_num_rows(mysqli_query($mysqli, "SELECT 1 FROM project_templates WHERE project_template_id = $project_template_id AND project_template_archived_at IS NULL"))) { + flashAlert('Pick a project template.', 'error'); + redirect(); + } + + $raised = projectApplyTemplate($row, $project_template_id, intval($_POST['assign_to_manager'] ?? 0) ? $row['project_manager'] : 0); + + logAudit("Project", "Edit", "$session_name added $raised ticket" . ($raised === 1 ? '' : 's') . " from a template to project " . escapeSql(projectReference($row) . ' - ' . $row['project_name']), intval($row['project_client_id']), intval($row['project_id'])); + + flashAlert("$raised ticket" . ($raised === 1 ? '' : 's') . " added from the template"); + + redirect(); + +} + +/* + * ---------- bulk, from the projects list ---------- + */ + +if (isset($_POST['bulk_complete_projects'])) { + + validateCSRFToken(); + + $done = 0; + $refused = []; + foreach (projectsForBulk(2) as $row) { + if (!projectIsOpen($row)) { + continue; + } + $why_not = projectComplete($row); + if ($why_not === '') { + $done++; + } else { + $refused[] = escapeHtml(projectReference($row)); + } + } + + flashAlert("$done project" . ($done === 1 ? '' : 's') . " completed" + . ($refused ? ". Still open tickets on " . implode(', ', $refused) . " - left as they were" : ''), $refused && !$done ? 'error' : 'success'); + + redirect(); + +} + +if (isset($_POST['bulk_reopen_projects'])) { + + validateCSRFToken(); + + $done = 0; + foreach (projectsForBulk(2) as $row) { + if (empty($row['project_completed_at']) || !empty($row['project_archived_at'])) { + continue; + } + projectReopen($row); + $done++; + } + + flashAlert("$done project" . ($done === 1 ? '' : 's') . " reopened"); + + redirect(); + +} + +if (isset($_POST['bulk_archive_projects'])) { + + validateCSRFToken(); + + $done = 0; + foreach (projectsForBulk(2) as $row) { + if (!empty($row['project_archived_at'])) { + continue; + } + projectArchive($row); + $done++; + } + + flashAlert("$done project" . ($done === 1 ? '' : 's') . " archived", 'error'); + + redirect(); + +} + +if (isset($_POST['bulk_restore_projects'])) { + + validateCSRFToken(); + + $done = 0; + foreach (projectsForBulk(2) as $row) { + if (empty($row['project_archived_at'])) { + continue; + } + projectRestore($row); + $done++; + } + + flashAlert("$done project" . ($done === 1 ? '' : 's') . " restored"); + + redirect(); + +} + +if (isset($_POST['bulk_delete_projects'])) { + + validateCSRFToken(); + + $done = 0; + foreach (projectsForBulk(3) as $row) { + projectDelete($row); + $done++; + } + + flashAlert("$done project" . ($done === 1 ? '' : 's') . " deleted - their tickets stay", 'error'); + + redirect(); + +} + +if (isset($_POST['bulk_edit_project_manager'])) { + + validateCSRFToken(); + + $manager_id = ticketAgentId($_POST['project_manager'] ?? 0); + $manager_name = $manager_id ? escapeSql((string) getFieldById('users', $manager_id, 'user_name')) : 'No One'; + + $done = 0; + foreach (projectsForBulk(2) as $row) { + if (!projectIsOpen($row) || intval($row['project_manager']) === $manager_id) { + continue; + } + mysqli_query($mysqli, "UPDATE projects SET project_manager = $manager_id WHERE project_id = " . intval($row['project_id'])); + projectNotifyManager($row, $manager_id); + logAudit("Project", "Edit", "$session_name set the manager of project " . escapeSql(projectReference($row) . ' - ' . $row['project_name']) . " to $manager_name", intval($row['project_client_id']), intval($row['project_id'])); + $done++; + } + + flashAlert("Manager of $done project" . ($done === 1 ? '' : 's') . " set to " . escapeHtml(stripslashes($manager_name)) . ""); + + redirect(); + +} + +if (isset($_POST['bulk_edit_project_due'])) { + + validateCSRFToken(); + + $due = projectDateSql($_POST['due_date'] ?? ''); + + $done = 0; + $skipped = 0; + foreach (projectsForBulk(2) as $row) { + if (!projectIsOpen($row)) { + continue; + } + // Not before it starts + if ($due !== 'NULL' && !empty($row['project_start']) && trim($due, "'") < $row['project_start']) { + $skipped++; + continue; + } + mysqli_query($mysqli, "UPDATE projects SET project_due = $due WHERE project_id = " . intval($row['project_id'])); + logAudit("Project", "Edit", "$session_name set the due date of project " . escapeSql(projectReference($row) . ' - ' . $row['project_name']) . " to " . ($due === 'NULL' ? 'none' : trim($due, "'")), intval($row['project_client_id']), intval($row['project_id'])); + $done++; + } + + flashAlert("Due date of $done project" . ($done === 1 ? '' : 's') . ($due === 'NULL' ? ' cleared' : ' set to ' . escapeHtml(date('M j, Y', strtotime(trim($due, "'")))) . '') + . ($skipped ? ", $skipped skipped - they start after it" : '')); + + redirect(); + +} + +/* + * Export - the projects list's filters and view, as CSV or PDF, with each + * project's progress and hours. + */ +if (isExportRequest('export_projects')) { + + validateCSRFToken(); + + enforceUserPermission('module_support'); + + $format = resolveExportFormat($_POST['export_projects']); + $filter_summary = []; + + $client_id = intval($_POST['client_id'] ?? 0); + $where = [clientScopeSql('project_client_id')]; + if ($client_id) { + enforceClientAccess(); + $where[] = "AND project_client_id = $client_id"; + $file_name_prepend = getFieldById('clients', $client_id, 'client_name') . '-'; + $filter_summary['Client'] = getFieldById('clients', $client_id, 'client_name'); + } else { + $file_name_prepend = "$session_company_name-"; + $client_filter = (string) ($_POST['client'] ?? ''); + if ($client_filter === 'internal') { + $where[] = 'AND project_client_id = 0'; + $filter_summary['Client'] = 'Internal'; + } elseif (intval($client_filter)) { + $where[] = 'AND project_client_id = ' . intval($client_filter); + $filter_summary['Client'] = getFieldById('clients', intval($client_filter), 'client_name'); + } + } + + $views = projectViews(); + $show = (string) ($_POST['show'] ?? ''); + if (!isset($views[$show])) { + $show = ''; + } + if ($views[$show]['where'] !== '') { + $where[] = 'AND ' . $views[$show]['where']; + } + $filter_summary['Showing'] = $views[$show]['label']; + + $manager = (string) ($_POST['manager'] ?? ''); + if ($manager === 'none') { + $where[] = 'AND project_manager = 0'; + $filter_summary['Manager'] = 'None'; + } elseif (intval($manager)) { + $where[] = 'AND project_manager = ' . intval($manager); + $filter_summary['Manager'] = getFieldById('users', intval($manager), 'user_name'); + } + + $q = escapeSql($_POST['q'] ?? ''); + if ($q !== '') { + $filter_summary['Search'] = $_POST['q']; + } + + $sql = mysqli_query($mysqli, "SELECT projects.*, client_name, user_name, contact_name + FROM projects + LEFT JOIN clients ON client_id = project_client_id + LEFT JOIN users ON user_id = project_manager + LEFT JOIN contacts ON contact_id = project_contact_id AND project_contact_id > 0 + WHERE (CONCAT(project_prefix, project_number) LIKE '%$q%' OR project_name LIKE '%$q%' OR project_description LIKE '%$q%' + OR client_name LIKE '%$q%' OR user_name LIKE '%$q%' OR contact_name LIKE '%$q%') + " . implode(' ', $where) . " + ORDER BY project_client_id = 0, client_name ASC, project_due IS NULL, project_due ASC, project_name ASC"); + + $rows = []; + while ($row = mysqli_fetch_assoc($sql)) { + $rows[intval($row['project_id'])] = $row; + } + $num_rows = count($rows); + + if ($num_rows > 0) { + + guardExportPdfRowCount($format, $num_rows); + + $stats = projectStats(array_keys($rows)); + $export = beginExport('projects', $format, $file_name_prepend . 'Projects', 'Projects', summarizeExportFilters($filter_summary)); + + foreach ($rows as $project_id => $row) { + $s = $stats[$project_id]; + $row['project_reference'] = projectReference($row); + $row['client_name'] = intval($row['project_client_id']) ? $row['client_name'] : 'Internal'; + $row['project_state'] = ucfirst(projectState($row)); + $row['project_completed'] = $row['project_completed_at'] ? substr($row['project_completed_at'], 0, 10) : ''; + $row['tickets_done'] = $s['done']; + $row['tickets_total'] = $s['tickets']; + $row['tasks_done'] = $s['tasks_done']; + $row['tasks_total'] = $s['tasks']; + $row['hours_logged'] = round($s['seconds'] / 3600, 2); + $row['hours_unbilled'] = round($s['unbilled_seconds'] / 3600, 2); + addExportRow($export, $row); + } + + finishExport($export); + + logAudit("Project", "Export", "$session_name exported $num_rows project(s) to a " . strtoupper($format) . " file", $client_id); + + exit; + } + + flashAlert('No projects match - nothing to export.', 'error'); redirect(); diff --git a/agent/project.php b/agent/project.php index ac9448e66..b6fd7ea3f 100644 --- a/agent/project.php +++ b/agent/project.php @@ -1,480 +1,693 @@

Nothing to see here

Go Back"; +$not_here = !$project + || (intval($project['project_client_id']) && !hasClientAccess($project['project_client_id'])) + || ($client_url && intval($project['project_client_id']) !== $page_client_id); - include_once "../includes/footer.php"; - exit; +if ($not_here) { ?> +
+

Nothing to see here

+ + + Open + + ">Projects +
+ $client_name
"; - } else { - $client_name_display = ""; +// Every task on those tickets, by ticket +$tasks_by_ticket = []; +if ($ticket_ids) { + $sql = mysqli_query($mysqli, "SELECT task_id, task_name, task_ticket_id, task_completed_at, user_name AS completed_by + FROM tasks LEFT JOIN users ON user_id = task_completed_by + WHERE task_ticket_id IN (" . implode(',', $ticket_ids) . ") + ORDER BY task_order ASC, task_id ASC"); + while ($row = mysqli_fetch_assoc($sql)) { + $tasks_by_ticket[intval($row['task_ticket_id'])][] = $row; } +} - $project_manager = intval($row['user_id']); - $project_manager_display = formatAssignee($project_manager, $row['user_name'], $row['user_avatar'], false, 'No manager'); - if (lookupUserPermission('module_support') >= 2 && !$project_completed_at && !$project_archived_at) { - $project_manager_display = quickPick('project_manager', $project_id, $project_manager, $project_manager_display); - } - $project_manager_display = "
$project_manager_display
"; +$activity = projectActivity($project_id, 25); +$team = projectTeam($project_id); - if ($project_completed_at) { - $project_status_display = "Closed"; - $project_completed_date_display = "
" . date('Y-m-d', strtotime($project_completed_at)) . "
"; - } else { - $project_status_display = "Open"; - $project_completed_date_display = ""; - } +// Templates to add tickets from +$has_templates = $can_edit && $is_open && mysqli_num_rows(mysqli_query($mysqli, "SELECT 1 FROM project_templates WHERE project_template_archived_at IS NULL LIMIT 1")); - // Override Tab Title // No Sanitizing needed as this var will only be used in the tab title - $tab_title = "{$row['project_prefix']}{$row['project_number']}"; - $page_title = $row['project_name']; +$project_tabs = [ + 'tickets' => ['label' => 'Tickets', 'icon' => 'fa-life-ring', 'count' => count($tickets), 'badge' => $stats['open']], + 'tasks' => ['label' => 'Tasks', 'icon' => 'fa-tasks', 'count' => $stats['tasks']], + 'activity' => ['label' => 'Activity', 'icon' => 'fa-comments', 'count' => count($activity)], +]; - // Tickets on the project - the ones this agent may reach (an internal project can hold any client's) - $ticket_scope = clientScopeSql('ticket_client_id'); - $project_ticket_sorts = [ - 'ticket_number' => "ticket_number $order", - 'ticket_priority' => "CASE ticket_priority WHEN 'Urgent' THEN 0 WHEN 'High' THEN 1 WHEN 'Medium' THEN 2 WHEN 'Low' THEN 3 ELSE 4 END $order", - 'ticket_status' => "ticket_status_order $order", - 'user_name' => "ticket_assigned_to = 0 $order, user_name $order", - 'ticket_updated_at' => "COALESCE(ticket_updated_at, ticket_created_at) $order", - 'client_name' => "client_name $order", - ]; - if (!isset($project_ticket_sorts[$sort])) { - $sort = 'ticket_number'; - } - $sql_tickets = mysqli_query($mysqli, "SELECT tickets.ticket_id, ticket_prefix, ticket_number, ticket_subject, ticket_priority, ticket_status, - ticket_assigned_to, ticket_billable, ticket_created_at, ticket_updated_at, ticket_resolved_at, ticket_closed_at, ticket_client_id, - ticket_status_name, ticket_status_color, client_name, user_name, user_avatar - FROM tickets - LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id - LEFT JOIN clients ON ticket_client_id = client_id - LEFT JOIN users ON ticket_assigned_to = user_id - WHERE ticket_project_id = $project_id $ticket_scope - ORDER BY {$project_ticket_sorts[$sort]}, ticket_number DESC" - ); - $project_tickets = []; - while ($ticket_row = mysqli_fetch_assoc($sql_tickets)) { - $project_tickets[intval($ticket_row['ticket_id'])] = $ticket_row; - } - $project_ticket_replies = ticketLastReplies(array_keys($project_tickets)); - $ticket_count = count($project_tickets); - $closed_ticket_count = count(array_filter(array_column($project_tickets, 'ticket_closed_at'))); - $resolved_ticket_count = count(array_filter(array_column($project_tickets, 'ticket_resolved_at'))); +$new_ticket_url = "modals/ticket/ticket_add.php?" . ($project_client_id ? "client_id=$project_client_id&" : '') . "project_id=$project_id"; +$contact_archived = !empty($project['contact_archived_at']); - $tickets_closed_percent = 100; //Default - if ($ticket_count) { - $tickets_closed_percent = round(($closed_ticket_count / $ticket_count) * 100); - } +?> - $tickets_resolved_percent = 100; //Default - if ($ticket_count) { - $tickets_resolved_percent = round(($resolved_ticket_count / $ticket_count) * 100); - } - - // Get All Tasks - $sql_tasks = mysqli_query($mysqli, - "SELECT task_completed_at, task_id, task_name FROM tickets, tasks - WHERE ticket_id = task_ticket_id - AND ticket_project_id = $project_id $ticket_scope - ORDER BY task_created_at ASC" - ); - $task_count = mysqli_num_rows($sql_tasks); - - // Get Completed Task Count - $sql_tasks_completed = mysqli_query($mysqli, - "SELECT 1 FROM tickets, tasks - WHERE ticket_id = task_ticket_id - AND ticket_project_id = $project_id $ticket_scope - 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); - } - - //Get Total Ticket Time - $sql_ticket_total_reply_time = mysqli_query($mysqli, "SELECT SEC_TO_TIME(SUM(TIME_TO_SEC(ticket_reply_time_worked))) AS ticket_total_reply_time FROM ticket_replies - LEFT JOIN tickets ON ticket_id = ticket_reply_ticket_id - WHERE ticket_reply_archived_at IS NULL AND ticket_project_id = $project_id"); - $row = mysqli_fetch_assoc($sql_ticket_total_reply_time); - $ticket_total_reply_time = escapeHtml($row['ticket_total_reply_time']); - - // Get all Assigned ticket Users as a comma-separated string - $sql_project_collaborators = mysqli_query($mysqli, " - SELECT GROUP_CONCAT(DISTINCT user_name SEPARATOR ', ') AS user_names - FROM users - LEFT JOIN ticket_replies ON user_id = ticket_reply_by - LEFT JOIN tickets ON ticket_id = ticket_reply_ticket_id - WHERE ticket_reply_archived_at IS NULL AND ticket_project_id = $project_id - "); - - // Fetch the result - $row = mysqli_fetch_assoc($sql_project_collaborators); - - // The user names in a comma-separated string - $ticket_collaborators = escapeHtml($row['user_names']); - - ?> - -
    -
  1. - Projects -
    2. -
  2. Project Details
    3. + +
    4. + +
  4. ">Projects
    5. +
- +
-
-
- - -
-
-
- -
- -
- - Ticket - -
-
-
- -
- - Open Ticket - -
- - Closed Ticket - -
-
+
+ + +
+

+ + + +

+
+ + + + + Internal - - - Close + + + + + $contact_archived]) ?> + +
+
+ +
+ + +
+ +
+ + Tickets already raised + + + + From a project template + + +
+
+ + + + + + + + + + Mark complete -
-
- - - Edit + project=&show=all"> + Its tickets on the ticket list + +
+ + + Restore - - = 2)) { ?> - + + Archive - = 3)) { ?> -
- + + Delete
+ +
+
+
+ + +
+ + + + Mark complete + +
+ + + +
+
+
+
+
Tickets done
+
/
+
+
+
+
+ + · past due +
+
+
+
+
+
+
+
Tasks done
+
/
+
+
+
+
+
+
+
+
+
+
+
Time logged
+ 0 ? $stats['seconds'] / ($budget_hours * 3600) : 0; + $budget_tone = $used > 1 ? 'bg-danger' : ($used >= .8 ? 'bg-warning' : 'bg-info'); + ?> +
+ 0) { ?> / +
+ 0) { ?> +
+
+
+
+ 1 ? projectHoursText($stats['seconds'] - $budget_hours * 3600) . ' over budget' : projectHoursText($budget_hours * 3600 - $stats['seconds']) . ' left of the budget' ?> +
+ +
No budget set
+ + +
billable' . projectHoursText($stats['unbilled_seconds']) . ' not invoiced' : '' ?>
+ +
+
+
+
+
+
+
+ +
+
+ +
+ +
+
+ +
+ +
No due date
+ + +
+
-
-
-
-
-
-
-
-
-
-
- - -
- Total time worked: +
+ + +
+
+
+
    + $tab) { ?> + + +
- -
+
-
- -
- -
/
-
- - -
- -
/
-
- - -
- -
- -
-
- -
-
- - - -
-
- -
Project Tickets
- -
- = 2) { ?> - - -
- -
-
- -
- - - - - - - - - - - - - - $ticket_row) { - $ticket_is_open = ticketIsOpen($ticket_row); - $ticket_url = escapeHtml(ticketUrl($ticket_id, $ticket_row['ticket_client_id'])); - ?> - - + $row) { + $ticket_open = ticketIsOpen($row); + $ticket_closed = !empty($row['ticket_closed_at']); + $ticket_url = escapeHtml(ticketUrl($ticket_id, $row['ticket_client_id'])); + $move = ticketWhoseMove($row); + $sla = ticketSlaState($row); + $ticket_due = ticketDueState($row); + $attention = $ticket_open ? ticketAttention($sla, $ticket_due) : ''; + $assignee = formatAssignee($row['ticket_assigned_to'], $row['user_name'], $row['user_avatar'], $ticket_open); + $due_html = trim(ticketDuePill($ticket_due) . ' ' . ticketSlaPill($sla)); + ?> + "> + + + + + + + + + + + + + + + +
-
- -
- 		- - Ticket - - - - Priority - - - - Status - - - - Assigned - - - - Activity - - - - Client - -
- + + + + +
+ + + + + - - - - - + + + + + + + + + - - - - -
- +
- - - 		- -
- 		Internal' ?>TicketClientStatusAssignedDueTimeActivity
+ +
+
+ +
+ 		+
+ > +
+ +
+ + + + + + + + +
+
+
+ 		Internal' ?> + + + + + + +
With client
+ + 		+ + + ' . $due_html . '' : '-' ?> + -' ?>
+
+
+ +
+ +
Raise its tickets here, or add ones already raised.
+ +
+ + + + +
+
- +
+ + +
+ +
+ $row) { + if (empty($tasks_by_ticket[$ticket_id])) { + continue; + } + $ticket_open = ticketIsOpen($row); + $ticket_closed = !empty($row['ticket_closed_at']); + $ticket_tasks = $tasks_by_ticket[$ticket_id]; + $ticket_done = count(array_filter(array_column($ticket_tasks, 'task_completed_at'))); ?> +
+
+ + / done +
+
    + +
  • + + + + + + + + + + + +
    • + +
+
+ +
+ +
+ +
No tasks on its tickets. Tasks added to a ticket, or brought in by a template, show up here.
+
+ +
+ + +
+ +
+ ['fa-reply text-warning', 'The client replied'], 'Public' => ['fa-paper-plane text-primary', 'Reply'], 'Internal' => ['fa-sticky-note text-body-secondary', 'Internal note']][$type] ?? ['fa-sticky-note text-body-secondary', 'Note']; + $time = $reply['ticket_reply_time_worked'] && $reply['ticket_reply_time_worked'] !== '00:00:00' ? $reply['ticket_reply_time_worked'] : ''; ?> +
+ +
+
+ + + + + + +
+
+
+
+ +
+ +
+ +
Nothing said on its tickets yet.
+
+ +
+
- +
-
- - - 0) { ?> -
-
-
All Tasks
-
-
- - - - - - -
- - - - - - - - -
-
+ +
+
+
+

Scope

- - +
+ + + + No description + +
+
-
+
+
+

Details

+
+
+
+
Client
+
' . escapeHtml($project['client_name']) . '' : 'Internal - our own work' ?>
+ +
Contact
+
+ + $contact_archived]) ?> +
+ +
+ + +
+ + Nobody named + +
+ +
Manager
+
+ +
Start
+ +
Due
-' ?>
+
Budget
0 ? projectHoursText($budget_hours * 3600) : '-' ?>
+
Created
+ +
Completed
+ +
+
+
-
+
+
+

Team

+
+ +
    + $member) { ?> +
  • + + manager + + + + +
    • + +
+ +
Agents who work its tickets show up here, with their time.
+ +
+
- -} - -require_once "../includes/footer.php"; - -?> + - + + 0"; + +// The views - Over budget only once someone uses budgets +$budgets_in_use = (bool) mysqli_num_rows(mysqli_query($mysqli, "SELECT 1 FROM projects WHERE project_budget_hours > 0 LIMIT 1")); +$shows = projectViews($budgets_in_use); +$show = isset($shows[$_GET['show'] ?? '']) ? ($_GET['show'] ?? '') : ''; +$show_query = $shows[$show]['where'] ? 'AND ' . $shows[$show]['where'] : ''; + +// Only these sort - an unknown column would take the page down. Completed ones, newest done first. +if (!isset($_GET['sort']) && in_array($show, ['completed', 'archived'], true)) { + $sort = 'project_completed_at'; + $order = 'DESC'; + $disp = 'ASC'; + $order_icon = ""; +} +$sortable_columns = [ + 'project_due' => "projects.project_due IS NULL, projects.project_due $order, project_name ASC", + 'project_name' => "project_name $order", + 'project_number' => "project_number $order", + 'client_name' => "project_client_id = 0 $order, client_name $order, project_name ASC", + 'user_name' => "project_manager = 0 $order, user_name $order, project_name ASC", + 'project_created_at' => "project_created_at $order", + 'project_completed_at' => "project_completed_at IS NULL, project_completed_at $order", + 'activity' => "COALESCE(project_last_activity, project_created_at) $order", +]; +if (!isset($sortable_columns[$sort])) { + $sort = 'project_due'; +} + +$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS projects.*, client_name, user_name, user_avatar, contact_name, contact_photo, + " . projectLastActivitySql() . " AS project_last_activity + FROM projects $joins + WHERE $filters $show_query + ORDER BY {$sortable_columns[$sort]}, project_id DESC + LIMIT $record_from, $record_to"); $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); +$projects = []; +while ($row = mysqli_fetch_assoc($sql)) { + $projects[intval($row['project_id'])] = $row; +} +$stats = projectStats(array_keys($projects)); + +// How many of each, for the pills - over what the filters leave +$count_sql = []; +foreach ($shows as $key => $s) { + $count_sql[] = $s['where'] === '' ? 'COUNT(*)' : "COALESCE(SUM({$s['where']}), 0)"; +} +$row = mysqli_fetch_row(mysqli_query($mysqli, "SELECT " . implode(', ', $count_sql) . " FROM projects $joins WHERE $filters")); +$counts = []; +foreach (array_keys($shows) as $i => $key) { + $counts[$key] = intval($row[$i]); +} + +$filter_url = function ($changes) { + $params = array_merge($_GET, $changes); + unset($params['page']); + return '?' . http_build_query(array_filter($params, function ($v) { return $v !== '' && $v !== null; })); +}; + +$sort_link = function ($column, $label) use ($url_query_strings_sort, $sort, $disp, $order_icon) { + return '' + . $label . ($sort === $column ? " $order_icon" : '') . ''; +}; + +$hidden_filter_count = $date_filter_active ? 1 : 0; + ?>

Projects

- = 2) { ?> -
- +
+
+ + + + +
+ + Export + + + + Project templates + + +
- +
@@ -64,241 +175,315 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - - -
-
+ +
+
- - - + + +
-
-
-
- ">Open - ">Closed -
- -
- "> - Archived - -
- +
+ +
+ +
+ +
+ +
+
+ + +
-
" id="advancedFilter"> -
-
-
- - - - - -
+ +
+
+
+ + + + +
+ + + + + +
+ + Created: + + +
+
-
- - text-nowrap"> - - - - - - - - - - - - - - - - - - $client_name"; - } else { - $client_name_display = "-"; - } - - $project_manager = intval($row['user_id']); - $project_manager_display = formatAssignee($project_manager, $row['user_name'], $row['user_avatar'], false, 'No manager'); - if (lookupUserPermission('module_support') >= 2 && !$project_completed_at && !$project_archived_at) { - $project_manager_display = quickPick('project_manager', $project_id, $project_manager, $project_manager_display); - } - - - // Get Tasks and Tickets Stats - // Get Tickets - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS count FROM tickets WHERE ticket_project_id = $project_id")); - $ticket_count = $row['count']; - - // Get Closed Ticket Count - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS count FROM tickets WHERE ticket_project_id = $project_id AND ticket_closed_at IS NOT NULL")); - $closed_ticket_count = $row['count']; - - // Ticket Closed Percent - if($ticket_count) { - $tickets_closed_percent = round(($closed_ticket_count / $ticket_count) * 100); - } - // Get All Tasks - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('task_id') AS count FROM tickets, tasks WHERE ticket_id = task_ticket_id AND ticket_project_id = $project_id")); - $task_count = $row['count']; - - // Get Completed Task Count - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('task_id') AS count 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 = $row['count']; - - // 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
+ text-nowrap table-light"> - - + + + + + + + + + + + $row) { + $row_client_id = intval($row['project_client_id']); + $s = $stats[$project_id]; + $is_open = projectIsOpen($row); + $state = projectState($row); + $flags = projectFlags($row, $s); + $flag_keys = array_column($flags, 'key'); + $edge = array_intersect($flag_keys, ['overdue', 'over_budget']) ? 'danger' : (array_intersect($flag_keys, ['stalled', 'soon']) ? 'warning' : ''); + $url = escapeHtml(projectUrl($project_id, $client_url ? $client_id : $row_client_id)); + $reference = escapeHtml(projectReference($row)); + $manager = formatAssignee($row['project_manager'], $row['user_name'], $row['user_avatar'], false, 'No manager'); + $description = trim(strtok((string) $row['project_description'], "\n")); + $last = $row['project_last_activity']; + ?> + "> + + - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - -
- - - - - -
- -
-
-
-
+ +
+
+
- - - 		- -
- -
/
-
- -"; } ?> - -
- -
/
-
+ + + 		Progress
+
+ +
+ 		-
- -
- - - Edit - + + +
+ +
+ + + + Ready to close - = 2)) { ?> -
- - - Archive - - - - Restore - - = 3)) { ?> -
- - Delete + + Stalled + +
+ +
+ + +
+ + / tickets done + +
+ 		+ + + + +
Internal
+ + + +
+ + - + + 		+ + +
unbilled
+ + 		+ -' ?> + +
Starts
+ +
Was due
+ + 		+ + + + +
open
+ + No tickets yet + + 		+
+ +
+ + Quick look + + + Open in a new tab + + + + project_id="> + New ticket + + + + + Edit + + +
+ + + Mark complete ( open) + + + Mark complete + + + + + Reopen + + + + + Restore + + + + Archive + + + + + Delete - +
- -
-
+ + + + + +
+ + +
+ +
+
+
+ +
Project
-
- +
+ +
+ +
+
(manager)
diff --git a/agent/ticket_list.php b/agent/ticket_list.php index 0d11c315a..f0ad2a830 100644 --- a/agent/ticket_list.php +++ b/agent/ticket_list.php @@ -157,7 +157,7 @@ $sort_link = function ($column, $label, $class = '') use ($url_query_strings_sor - + diff --git a/css/itflow_custom.css b/css/itflow_custom.css index c3b40069d..7fc7ff55f 100644 --- a/css/itflow_custom.css +++ b/css/itflow_custom.css @@ -4874,3 +4874,67 @@ img.itflow-contact-avatar { .itflow-ticket-glance-text p:last-child { margin-bottom: 0; } + +/* Projects - agent/projects.php, agent/project.php and the project quick look + (functions/project.php). Progress and time are a slim bar with the figure + beside it; the project page leads with four stat cards. */ +.itflow-project-progress { + display: flex; + align-items: center; + gap: .5rem; +} +.itflow-project-progress .progress { + flex: 0 0 3.5rem; + height: .4rem; +} +.itflow-project-progress-cell { + min-width: 7.5rem; +} +.itflow-project-main { + max-width: 20rem; +} +.itflow-project-list .itflow-ticket-who-cell > * { + max-width: 10.5rem; +} +@media (max-width: 1399.98px) { + .itflow-project-main { + max-width: 17rem; + } +} +.itflow-project-desc { + max-width: 20rem; +} +.itflow-project-icon { + --itflow-asset-tone: #5a61c9; +} +.itflow-project-icon.is-done { + --itflow-asset-tone: #2f8a57; +} +[data-bs-theme="dark"] .itflow-project-icon { + --itflow-asset-tone: #9ba1f2; +} +[data-bs-theme="dark"] .itflow-project-icon.is-done { + --itflow-asset-tone: #6fcf97; +} +.itflow-project-stat-label { + font-size: .75rem; + font-weight: 600; + letter-spacing: .02em; + text-transform: uppercase; + color: var(--bs-secondary-color); +} +.itflow-project-stat-value { + margin-top: .25rem; + font-size: 1.5rem; + font-weight: 600; + line-height: 1.2; +} +.itflow-project-stat .progress { + height: .45rem; +} +.itflow-project-scope { + overflow-wrap: anywhere; +} +.itflow-project-tasks li { + padding: .2rem 0; +} diff --git a/db.sql b/db.sql index 38a2145b8..812a04199 100644 --- a/db.sql +++ b/db.sql @@ -1823,8 +1823,11 @@ CREATE TABLE `projects` ( `project_number` int(11) NOT NULL DEFAULT 1, `project_name` varchar(255) NOT NULL, `project_description` mediumtext DEFAULT NULL, + `project_start` date DEFAULT NULL, `project_due` date DEFAULT NULL, + `project_budget_hours` decimal(8,2) DEFAULT NULL, `project_manager` int(11) NOT NULL DEFAULT 0, + `project_contact_id` int(11) NOT NULL DEFAULT 0, `project_created_at` datetime NOT NULL DEFAULT current_timestamp(), `project_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), `project_completed_at` datetime DEFAULT NULL, @@ -3045,7 +3048,8 @@ CREATE TABLE `tickets` ( PRIMARY KEY (`ticket_id`), KEY `ticket_response_due_at` (`ticket_response_due_at`), KEY `ticket_resolution_due_at` (`ticket_resolution_due_at`), - KEY `ticket_client_id` (`ticket_client_id`,`ticket_archived_at`) + KEY `ticket_client_id` (`ticket_client_id`,`ticket_archived_at`), + KEY `ticket_project_id` (`ticket_project_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; diff --git a/functions.php b/functions.php index d40d0a056..0bac64189 100644 --- a/functions.php +++ b/functions.php @@ -43,3 +43,4 @@ require_once __DIR__ . '/functions/client_overview.php'; require_once __DIR__ . '/functions/tags.php'; require_once __DIR__ . '/functions/ticket_fields.php'; require_once __DIR__ . '/functions/ticket.php'; +require_once __DIR__ . '/functions/project.php'; diff --git a/functions/client_overview.php b/functions/client_overview.php index 870cc76e9..4439f1435 100644 --- a/functions/client_overview.php +++ b/functions/client_overview.php @@ -58,6 +58,12 @@ function clientOverviewAttention($client_id, $access, $renewals) { 'label' => 'No update in 7 days', 'icon' => 'hourglass-half', 'tone' => 'warning', 'url' => "/agent/tickets.php?client_id=$client_id&sort=ticket_updated_at&order=ASC", ]; + // The same rule as projects.php?show=overdue + $items[] = [ + 'count' => dashboardCount("SELECT COUNT(project_id) FROM projects WHERE project_client_id = $client_id AND " . projectViews()['overdue']['where']), + 'label' => 'Overdue projects', 'icon' => 'project-diagram', 'tone' => 'danger', + 'url' => "/agent/projects.php?client_id=$client_id&show=overdue", + ]; } if ($access['sales']) { @@ -212,10 +218,27 @@ function clientOverviewFavorites($client_id, $access) { return $favorites; } +/** + * The client's open projects, the ones needing a look first (overdue, then + * soonest due), with their numbers - [rows, stats, total]. + */ +function clientOverviewProjects($client_id, $limit = 5) { + global $mysqli; + $client_id = intval($client_id); + $where = "project_client_id = $client_id AND " . PROJECT_OPEN_SQL; + $sql = mysqli_query($mysqli, "SELECT projects.*, user_name, user_avatar FROM projects LEFT JOIN users ON user_id = project_manager + WHERE $where ORDER BY project_due IS NULL, project_due ASC, project_id DESC LIMIT " . intval($limit)); + $rows = []; + while ($row = mysqli_fetch_assoc($sql)) { + $rows[intval($row['project_id'])] = $row; + } + return ['projects' => $rows, 'stats' => projectStats(array_keys($rows)), 'total' => dashboardCount("SELECT COUNT(project_id) FROM projects WHERE $where")]; +} + /** * The next $days days for this client: scheduled tickets, calendar events - * (repeating ones expanded the way the calendar does it) and recurring - * tickets due to be raised. Soonest first. + * (repeating ones expanded the way the calendar does it), recurring + * tickets due to be raised, and projects starting or due. Soonest first. */ function clientOverviewUpcoming($client_id, $access, $days = 14) { global $mysqli; @@ -238,6 +261,24 @@ function clientOverviewUpcoming($client_id, $access, $days = 14) { ]; } + // Projects starting or due - all day + $sql = mysqli_query($mysqli, "SELECT project_id, project_prefix, project_number, project_name, project_start, project_due + FROM projects + WHERE project_client_id = $client_id AND " . PROJECT_OPEN_SQL . " + AND (project_due BETWEEN '" . substr($from, 0, 10) . "' AND '" . substr($to, 0, 10) . "' OR project_start BETWEEN '" . substr($from, 0, 10) . "' AND '" . substr($to, 0, 10) . "')"); + while ($row = mysqli_fetch_assoc($sql)) { + foreach (['project_start' => 'Project starts', 'project_due' => 'Project due'] as $column => $what) { + if ($row[$column] && $row[$column] >= substr($from, 0, 10) && $row[$column] <= substr($to, 0, 10)) { + $items[] = [ + 'when' => $row[$column] . ' 00:00:00', 'all_day' => true, 'kind' => 'project', + 'title' => $row['project_name'], 'ref' => $row['project_prefix'] . $row['project_number'], + 'detail' => $what, + 'url' => '/agent/' . projectUrl($row['project_id'], $client_id), + ]; + } + } + } + $sql = mysqli_query($mysqli, "SELECT recurring_ticket_id, recurring_ticket_subject, recurring_ticket_next_run, recurring_ticket_frequency FROM recurring_tickets WHERE recurring_ticket_client_id = $client_id AND recurring_ticket_next_run BETWEEN '" . substr($from, 0, 10) . "' AND '" . substr($to, 0, 10) . "'"); diff --git a/functions/dashboard.php b/functions/dashboard.php index 6292051be..cbf8ba6d0 100644 --- a/functions/dashboard.php +++ b/functions/dashboard.php @@ -238,6 +238,12 @@ function dashboardAttention($access) { 'label' => 'Unassigned tickets', 'icon' => 'user-slash', 'tone' => 'warning', 'url' => '/agent/tickets.php?assigned=unassigned', ]; + // The same rule as projects.php?show=overdue + $items[] = [ + 'count' => dashboardCount("SELECT COUNT(project_id) FROM projects WHERE " . projectViews()['overdue']['where'] . ' ' . clientScopeSql('project_client_id')), + 'label' => 'Overdue projects', 'icon' => 'project-diagram', 'tone' => 'danger', + 'url' => '/agent/projects.php?show=overdue', + ]; } if ($access['sales']) { @@ -333,7 +339,8 @@ function dashboardMyTickets($limit = 8) { } /** - * The next 7 days for me: open tickets scheduled with me, and calendar events. + * The next 7 days for me: open tickets scheduled with me, the projects I + * manage starting or due, and calendar events. * The calendar is shared, so every event shows; repeating events are expanded * the way the calendar page does it. Soonest first, all-day items at the top * of their day. @@ -370,6 +377,32 @@ function dashboardSchedule($days = 7, $limit = 30) { ]; } + // Projects I manage, starting or due - all day + $sql = mysqli_query($mysqli, " + SELECT project_id, project_prefix, project_number, project_name, project_start, project_due, project_client_id, client_name + FROM projects + LEFT JOIN clients ON project_client_id = client_id + WHERE project_manager = $user_id AND " . PROJECT_OPEN_SQL . " + AND (project_due BETWEEN '" . substr($from, 0, 10) . "' AND '" . substr($to, 0, 10) . "' OR project_start BETWEEN '" . substr($from, 0, 10) . "' AND '" . substr($to, 0, 10) . "') " . clientScopeSql('project_client_id') + ); + while ($row = mysqli_fetch_assoc($sql)) { + foreach (['project_start' => 'Project starts', 'project_due' => 'Project due'] as $column => $what) { + if ($row[$column] && $row[$column] >= substr($from, 0, 10) && $row[$column] <= substr($to, 0, 10)) { + $items[] = [ + 'when' => $row[$column] . ' 00:00:00', + 'all_day' => true, + 'ongoing' => false, + 'title' => $row['project_name'], + 'ref' => $row['project_prefix'] . $row['project_number'], + 'detail' => $what . ($row['client_name'] ? ' - ' . $row['client_name'] : ''), + 'onsite' => false, + 'color' => null, + 'url' => '/agent/' . projectUrl($row['project_id'], $row['project_client_id']), + ]; + } + } + } + $sql = mysqli_query($mysqli, " SELECT event_id, event_title, event_start, event_end, event_all_day, event_repeat, event_location, client_name, calendar_color FROM calendar_events diff --git a/functions/export.php b/functions/export.php index 31568dd33..8e2d70c92 100644 --- a/functions/export.php +++ b/functions/export.php @@ -262,6 +262,27 @@ function getExportColumns($export_type) { 'ticket_billable' => ['label' => 'Billable', 'default' => false], ], + // Projects - the handler adds the state, progress and hours (projectStats()) + 'projects' => [ + 'project_reference' => ['label' => 'Number'], + 'project_name' => ['label' => 'Project', 'weight' => 3], + 'client_name' => ['label' => 'Client', 'weight' => 2], + 'project_state' => ['label' => 'State'], + 'user_name' => ['label' => 'Manager'], + 'contact_name' => ['label' => 'Client Contact', 'default' => false], + 'project_start' => ['label' => 'Start', 'default' => false], + 'project_due' => ['label' => 'Due'], + 'project_completed' => ['label' => 'Completed'], + 'tickets_done' => ['label' => 'Tickets Done', 'format' => 'number'], + 'tickets_total' => ['label' => 'Tickets', 'format' => 'number'], + 'tasks_done' => ['label' => 'Tasks Done', 'format' => 'number', 'default' => false], + 'tasks_total' => ['label' => 'Tasks', 'format' => 'number', 'default' => false], + 'hours_logged' => ['label' => 'Hours Logged', 'format' => 'number'], + 'project_budget_hours' => ['label' => 'Budget Hours', 'format' => 'number'], + 'hours_unbilled' => ['label' => 'Hours Not Invoiced', 'format' => 'number', 'default' => false], + 'project_description' => ['label' => 'Scope', 'weight' => 3, 'default' => false], + ], + // invoice_number_display is prefix . number, built by the handler 'invoices' => [ 'invoice_number_display' => ['label' => 'Invoice Number'], diff --git a/functions/notifications.php b/functions/notifications.php index 09eb1d46a..d8317a535 100644 --- a/functions/notifications.php +++ b/functions/notifications.php @@ -31,7 +31,7 @@ function notificationTypeModules() { ], 'module_financial' => ['Expense', 'Expense Created'], 'module_support' => [ - 'Ticket', 'Ticket SLA', 'Pending Tickets', 'Feedback', 'Recurring Ticket', + 'Ticket', 'Ticket SLA', 'Pending Tickets', 'Feedback', 'Recurring Ticket', 'Project', 'Domain Expiring', 'Certificate Expiring', 'Asset Warranty Expiring', ], 'module_client' => ['Share Viewed'], @@ -75,6 +75,7 @@ function notificationTypeStyle($type) { [['invoice', 'recurring sent', 'recurring generated'], 'file-invoice-dollar', 'primary'], [['expense'], 'receipt', 'secondary'], [['ticket'], 'life-ring', 'primary'], + [['project'], 'project-diagram', 'primary'], [['mail'], 'envelope', 'danger'], [['backup'], 'database', 'secondary'], [['master key'], 'key', 'warning'], diff --git a/functions/project.php b/functions/project.php new file mode 100644 index 000000000..e14887639 --- /dev/null +++ b/functions/project.php @@ -0,0 +1,661 @@ += $level; +} + +/** One project by id, with its client, manager and client contact - raw, or null. */ +function projectRow($project_id) { + global $mysqli; + $project_id = intval($project_id); + if (!$project_id) { + return null; + } + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT projects.*, client_name, user_name, user_avatar, + contact_name, contact_title, contact_email, contact_phone, contact_phone_country_code, contact_extension, + contact_mobile, contact_mobile_country_code, contact_photo, contact_archived_at + FROM projects + LEFT JOIN clients ON client_id = project_client_id + LEFT JOIN users ON user_id = project_manager + LEFT JOIN contacts ON contact_id = project_contact_id AND project_contact_id > 0 + WHERE project_id = $project_id LIMIT 1")); + return $row ?: null; +} + +/** + * For post handlers: the project a request names, after the module and + * client checks (a project with no client is internal work any agent may + * reach) - or back with an error if it is gone. Sets the global $client_id. + */ +function projectForRequest($project_id, $level) { + global $client_id; + enforceUserPermission('module_support', $level); + $row = projectRow($project_id); + if (!$row) { + flashAlert('That project no longer exists.', 'error'); + redirect(); + } + $client_id = intval($row['project_client_id']); + if ($client_id) { + enforceClientAccess(); + } + return $row; +} + +/** + * For modals: the project a modal is opened for, after the same checks - or + * the modal's error, and nothing more. $open_only refuses one that is + * completed or archived. Sets the global $client_id. + */ +function projectForModal($project_id, $level = 2, $open_only = false) { + global $client_id; + enforceUserPermission('module_support', $level); + $row = projectRow($project_id); + if (!$row) { + echo json_encode(['error' => 'That project no longer exists.']); + exit; + } + $client_id = intval($row['project_client_id']); + if ($client_id) { + enforceClientAccess(); + } + if ($open_only && !projectIsOpen($row)) { + echo json_encode(['error' => 'Project ' . projectReference($row) . ' is ' . (!empty($row['project_archived_at']) ? 'archived' : 'completed') . ' - reopen it first.']); + exit; + } + return $row; +} + +/** For post handlers: the projects a bulk action names (project_ids[]) that this agent may act on - [id => row]. */ +function projectsForBulk($level) { + global $client_id; + enforceUserPermission('module_support', $level); + $rows = []; + foreach (array_unique(array_map('intval', (array) ($_POST['project_ids'] ?? []))) as $project_id) { + $row = projectRow($project_id); + if (!$row) { + continue; + } + $client_id = intval($row['project_client_id']); + if ($client_id) { + enforceClientAccess(); + } + $rows[$project_id] = $row; + } + return $rows; +} + +/** Its reference - PRJ-12. */ +function projectReference($row) { + return ($row['project_prefix'] ?? '') . intval($row['project_number'] ?? 0); +} + +/** Still being worked - neither completed nor archived? */ +function projectIsOpen($row) { + return empty($row['project_completed_at']) && empty($row['project_archived_at']); +} + +/** Where the project page is - inside its client when it has one. */ +function projectUrl($project_id, $client_id = 0) { + $client_id = intval($client_id); + return 'project.php?' . ($client_id ? "client_id=$client_id&" : '') . 'project_id=' . intval($project_id); +} + +/** A project wherever a page mentions one: its name opening it, its reference beside it. */ +function projectLink($row, $options = []) { + $url = escapeHtml(projectUrl($row['project_id'], $row['project_client_id'] ?? 0)); + $html = '' . escapeHtml($row['project_name']) . ''; + if ($options['reference'] ?? true) { + $html .= ' ' . escapeHtml(projectReference($row)) . ''; + } + return $html; +} + +/** Where it stands: archived, completed, upcoming (starts after today) or active. */ +function projectState($row) { + if (!empty($row['project_archived_at'])) { + return 'archived'; + } + if (!empty($row['project_completed_at'])) { + return 'completed'; + } + if (!empty($row['project_start']) && $row['project_start'] > date('Y-m-d')) { + return 'upcoming'; + } + return 'active'; +} + +function projectStatePill($row) { + switch (projectState($row)) { + case 'archived': + return 'Archived'; + case 'completed': + return 'Completed'; + case 'upcoming': + return 'Not started'; + } + return 'Active'; +} + +/** Whole days from today to a date: negative is past. */ +function projectDaysFromToday($date) { + $today = new DateTime(date('Y-m-d')); + $then = new DateTime(substr((string) $date, 0, 10)); + return intval($today->diff($then)->format('%r%a')); +} + +/** "today", "tomorrow", "in 3 days", "yesterday", "3 days ago". */ +function projectDaysText($days) { + $days = intval($days); + if ($days === 0) { + return 'today'; + } + if ($days === 1) { + return 'tomorrow'; + } + if ($days === -1) { + return 'yesterday'; + } + return $days > 0 ? "in $days days" : abs($days) . ' days ago'; +} + +/** + * The due date for the list and the page: ['key' => overdue | soon | later + * | done | none, 'days', 'date', 'late' (completed after its due date)]. + */ +function projectDueState($row) { + $due = $row['project_due'] ?? null; + if (!empty($row['project_completed_at'])) { + $late = $due && substr($row['project_completed_at'], 0, 10) > $due; + return ['key' => 'done', 'date' => $row['project_completed_at'], 'late' => $late, + 'days_late' => $late ? -projectDaysFromToday($due) + projectDaysFromToday($row['project_completed_at']) : 0]; + } + if (!$due) { + return ['key' => 'none']; + } + $days = projectDaysFromToday($due); + if ($days < 0) { + return ['key' => 'overdue', 'days' => $days, 'date' => $due]; + } + return ['key' => $days <= PROJECT_SOON_DAYS ? 'soon' : 'later', 'days' => $days, 'date' => $due]; +} + +/** The due date as a pill - '' when there is none. */ +function projectDuePill($row) { + $due = projectDueState($row); + switch ($due['key']) { + case 'overdue': + $late = abs($due['days']); + return '' . $late . ' day' . ($late === 1 ? '' : 's') . ' overdue'; + case 'soon': + return 'Due ' . projectDaysText($due['days']) . ''; + case 'later': + return 'Due ' . escapeHtml(date('M j', strtotime($due['date']))) . ''; + case 'done': + $when = escapeHtml(date('M j, Y', strtotime($due['date']))); + return $due['late'] + ? 'Done ' . $when . ' (late)' + : 'Done ' . $when . ''; + } + return ''; +} + +/** Hours for people: "45m", "3h", "12.5h". */ +function projectHoursText($seconds) { + $seconds = max(0, intval($seconds)); + if ($seconds < 3600) { + return round($seconds / 60) . 'm'; + } + return rtrim(rtrim(number_format($seconds / 3600, 1, '.', ''), '0'), '.') . 'h'; +} + +/** A budget in hours as posted - a positive number up to 999999, or null for none. */ +function projectBudgetHours($input) { + $input = str_replace(',', '.', trim((string) $input)); + if ($input === '' || !is_numeric($input) || floatval($input) <= 0) { + return null; + } + return min(999999.0, round(floatval($input), 2)); +} + +/** A date as posted (YYYY-MM-DD) as SQL - quoted, or NULL. */ +function projectDateSql($input) { + $input = trim((string) $input); + $date = DateTime::createFromFormat('!Y-m-d', $input); + return ($date && $date->format('Y-m-d') === $input) ? "'$input'" : 'NULL'; +} + +/* + * ---------- progress, time and activity ---------- + */ + +/** SQL: when its tickets last moved - the latest ticket update, or NULL with none. Correlated on projects. */ +function projectLastActivitySql() { + return "(SELECT MAX(COALESCE(pt.ticket_updated_at, pt.ticket_created_at)) FROM tickets pt WHERE pt.ticket_project_id = projects.project_id AND pt.ticket_archived_at IS NULL)"; +} + +/** SQL: seconds logged on its tickets. Correlated on projects. */ +function projectSecondsSql() { + return "(SELECT COALESCE(SUM(TIME_TO_SEC(pr.ticket_reply_time_worked)), 0) FROM ticket_replies pr JOIN tickets pt ON pt.ticket_id = pr.ticket_reply_ticket_id + WHERE pt.ticket_project_id = projects.project_id AND pr.ticket_reply_archived_at IS NULL)"; +} + +/** + * The list's views - [key => label, icon, title, where, alarm]. Over + * projects; 'mine' needs the agent. Over budget only shows when a budget + * is set on any project. + */ +function projectViews($with_budget = true) { + global $session_user_id; + $open = PROJECT_OPEN_SQL; + $started = "(projects.project_start IS NULL OR projects.project_start <= CURDATE())"; + $has_tickets = "EXISTS (SELECT 1 FROM tickets rt WHERE rt.ticket_project_id = projects.project_id AND rt.ticket_archived_at IS NULL)"; + $has_open = "EXISTS (SELECT 1 FROM tickets rt WHERE rt.ticket_project_id = projects.project_id AND rt.ticket_archived_at IS NULL AND rt.ticket_resolved_at IS NULL AND rt.ticket_closed_at IS NULL)"; + $views = [ + '' => ['label' => 'Active', 'icon' => 'fa-project-diagram', 'where' => $open, 'title' => 'Not completed or archived'], + 'mine' => ['label' => 'Mine', 'icon' => 'fa-user-tie', 'where' => "$open AND projects.project_manager = " . intval($session_user_id), 'title' => 'Active projects you manage'], + 'overdue' => ['label' => 'Overdue', 'icon' => 'fa-calendar-times', 'where' => "$open AND projects.project_due < CURDATE()", + 'title' => 'Past their due date', 'alarm' => 'danger'], + 'soon' => ['label' => 'Due soon', 'icon' => 'fa-calendar-day', 'where' => "$open AND projects.project_due BETWEEN CURDATE() AND CURDATE() + INTERVAL " . PROJECT_SOON_DAYS . " DAY", + 'title' => 'Due in the next ' . PROJECT_SOON_DAYS . ' days', 'alarm' => 'warning'], + 'stalled' => ['label' => 'Stalled', 'icon' => 'fa-hourglass-half', 'where' => "$open AND $started AND (NOT $has_tickets OR $has_open) + AND COALESCE(" . projectLastActivitySql() . ", projects.project_created_at) < NOW() - INTERVAL " . PROJECT_STALLED_DAYS . " DAY", + 'title' => 'Started, and none of their tickets has moved in ' . PROJECT_STALLED_DAYS . ' days', 'alarm' => 'warning'], + 'over_budget' => ['label' => 'Over budget', 'icon' => 'fa-hourglass-end', 'where' => "$open AND projects.project_budget_hours > 0 AND " . projectSecondsSql() . " > projects.project_budget_hours * 3600", + 'title' => 'More time logged than the hours budgeted', 'alarm' => 'danger'], + 'ready' => ['label' => 'Ready to close', 'icon' => 'fa-flag-checkered', 'where' => "$open AND $has_tickets AND NOT $has_open", + 'title' => 'Every ticket resolved or closed - mark them complete', 'alarm' => 'success'], + 'completed' => ['label' => 'Completed', 'icon' => 'fa-check', 'where' => 'projects.project_completed_at IS NOT NULL AND projects.project_archived_at IS NULL'], + 'archived' => ['label' => 'Archived', 'icon' => 'fa-archive', 'where' => 'projects.project_archived_at IS NOT NULL'], + 'all' => ['label' => 'All', 'where' => ''], + ]; + if (!$with_budget) { + unset($views['over_budget']); + } + return $views; +} + +/** + * The numbers for each of these projects, in four queries - [project id => + * tickets, open, done, overdue (open tickets past their due date), tasks, + * tasks_done, seconds, billable_seconds, unbilled_seconds, last_activity]. + * Over all its tickets, whoever's they are - it is the project's progress. + */ +function projectStats(array $project_ids) { + global $mysqli; + $ids = implode(',', array_filter(array_map('intval', $project_ids))); + $stats = []; + foreach (array_filter(array_map('intval', $project_ids)) as $id) { + $stats[$id] = ['tickets' => 0, 'open' => 0, 'done' => 0, 'overdue' => 0, 'tasks' => 0, 'tasks_done' => 0, + 'seconds' => 0, 'billable_seconds' => 0, 'unbilled_seconds' => 0, 'last_activity' => null]; + } + if ($ids === '') { + return $stats; + } + + $sql = mysqli_query($mysqli, "SELECT ticket_project_id, COUNT(*) AS ticket_count, + SUM(ticket_resolved_at IS NULL AND ticket_closed_at IS NULL) AS open_count, + SUM(ticket_resolved_at IS NULL AND ticket_closed_at IS NULL AND ticket_due_at IS NOT NULL AND ticket_due_at < NOW()) AS overdue_count, + MAX(COALESCE(ticket_updated_at, ticket_created_at)) AS last_activity + FROM tickets WHERE ticket_project_id IN ($ids) AND ticket_archived_at IS NULL GROUP BY ticket_project_id"); + while ($row = mysqli_fetch_assoc($sql)) { + $id = intval($row['ticket_project_id']); + $stats[$id]['tickets'] = intval($row['ticket_count']); + $stats[$id]['open'] = intval($row['open_count']); + $stats[$id]['done'] = intval($row['ticket_count']) - intval($row['open_count']); + $stats[$id]['overdue'] = intval($row['overdue_count']); + $stats[$id]['last_activity'] = $row['last_activity']; + } + + $sql = mysqli_query($mysqli, "SELECT ticket_project_id, COUNT(task_id) AS task_count, SUM(task_completed_at IS NOT NULL) AS done_count + FROM tasks JOIN tickets ON ticket_id = task_ticket_id + WHERE ticket_project_id IN ($ids) AND ticket_archived_at IS NULL GROUP BY ticket_project_id"); + while ($row = mysqli_fetch_assoc($sql)) { + $id = intval($row['ticket_project_id']); + $stats[$id]['tasks'] = intval($row['task_count']); + $stats[$id]['tasks_done'] = intval($row['done_count']); + } + + $sql = mysqli_query($mysqli, "SELECT ticket_project_id, SUM(TIME_TO_SEC(ticket_reply_time_worked)) AS seconds, + SUM(IF(ticket_billable = 1, TIME_TO_SEC(ticket_reply_time_worked), 0)) AS billable_seconds, + SUM(IF(ticket_billable = 1 AND ticket_invoice_id = 0, TIME_TO_SEC(ticket_reply_time_worked), 0)) AS unbilled_seconds + FROM ticket_replies JOIN tickets ON ticket_id = ticket_reply_ticket_id + WHERE ticket_project_id IN ($ids) AND ticket_reply_archived_at IS NULL GROUP BY ticket_project_id"); + while ($row = mysqli_fetch_assoc($sql)) { + $id = intval($row['ticket_project_id']); + $stats[$id]['seconds'] = intval($row['seconds']); + $stats[$id]['billable_seconds'] = intval($row['billable_seconds']); + $stats[$id]['unbilled_seconds'] = intval($row['unbilled_seconds']); + } + + return $stats; +} + +/** + * What wants a look, worst first: overdue, over budget, ready to close + * (every ticket done), stalled, due soon. Each [key, tone, text]. + */ +function projectFlags($row, $stats) { + if (!projectIsOpen($row)) { + return []; + } + $flags = []; + $due = projectDueState($row); + if ($due['key'] === 'overdue') { + $late = abs($due['days']); + $flags[] = ['key' => 'overdue', 'tone' => 'danger', 'text' => "$late day" . ($late === 1 ? '' : 's') . ' past its due date']; + } + $budget = floatval($row['project_budget_hours'] ?? 0); + if ($budget > 0 && $stats['seconds'] > $budget * 3600) { + $flags[] = ['key' => 'over_budget', 'tone' => 'danger', 'text' => projectHoursText($stats['seconds'] - $budget * 3600) . ' over its ' . projectHoursText($budget * 3600) . ' budget']; + } + if ($stats['tickets'] && !$stats['open']) { + $flags[] = ['key' => 'ready', 'tone' => 'success', 'text' => 'Every ticket is resolved or closed - ready to mark complete']; + } + $started = empty($row['project_start']) || $row['project_start'] <= date('Y-m-d'); + $last = $stats['last_activity'] ?: $row['project_created_at']; + if ($started && $stats['open'] && strtotime($last) < time() - PROJECT_STALLED_DAYS * 86400) { + $flags[] = ['key' => 'stalled', 'tone' => 'warning', 'text' => 'No ticket has moved since ' . date('M j', strtotime($last))]; + } elseif ($started && !$stats['tickets'] && strtotime($row['project_created_at']) < time() - PROJECT_STALLED_DAYS * 86400) { + $flags[] = ['key' => 'stalled', 'tone' => 'warning', 'text' => 'No tickets yet, ' . PROJECT_STALLED_DAYS . '+ days in']; + } + if ($due['key'] === 'soon') { + $flags[] = ['key' => 'soon', 'tone' => 'warning', 'text' => 'Due ' . projectDaysText($due['days'])]; + } + return $flags; +} + +/** How far along it is - a bar of tickets done, and tasks under it. */ +function projectProgressHtml($stats, $compact = false) { + if (!$stats['tickets']) { + return 'No tickets yet'; + } + $percent = round($stats['done'] / $stats['tickets'] * 100); + $tone = $stats['done'] === $stats['tickets'] ? 'bg-success' : 'bg-primary'; + $html = '
' + . '
' + . '' . $stats['done'] . '/' . $stats['tickets'] . ($compact ? '' : ' tickets') . '
'; + if ($stats['tasks']) { + $html .= '
' . $stats['tasks_done'] . '/' . $stats['tasks'] . ' tasks
'; + } + return $html; +} + +/** Time logged, against the budget when there is one. */ +function projectTimeHtml($row, $stats) { + $budget = floatval($row['project_budget_hours'] ?? 0); + $worked = projectHoursText($stats['seconds']); + if ($budget <= 0) { + return $stats['seconds'] ? '' . $worked . '' : '-'; + } + $used = $stats['seconds'] / ($budget * 3600); + $percent = min(100, round($used * 100)); + $tone = $used > 1 ? 'bg-danger' : ($used >= .8 ? 'bg-warning' : 'bg-info'); + return '
' + . '
' + . '' . $worked . ' / ' . projectHoursText($budget * 3600) . '
'; +} + +/** + * Who has worked on it: the agents who logged time or wrote on its tickets, + * and those with its open tickets - [user id => user_name, user_avatar, + * seconds, open (tickets of its they have open)]. Most time first. + */ +function projectTeam($project_id) { + global $mysqli; + $project_id = intval($project_id); + $team = []; + $sql = mysqli_query($mysqli, "SELECT user_id, user_name, user_avatar, SUM(TIME_TO_SEC(ticket_reply_time_worked)) AS seconds + FROM ticket_replies + JOIN tickets ON ticket_id = ticket_reply_ticket_id + JOIN users ON user_id = ticket_reply_by AND ticket_reply_type <> 'Client' + WHERE ticket_project_id = $project_id AND ticket_reply_archived_at IS NULL AND user_type = 1 + GROUP BY user_id"); + while ($row = mysqli_fetch_assoc($sql)) { + $team[intval($row['user_id'])] = ['user_name' => $row['user_name'], 'user_avatar' => $row['user_avatar'], 'seconds' => intval($row['seconds']), 'open' => 0]; + } + $sql = mysqli_query($mysqli, "SELECT user_id, user_name, user_avatar, COUNT(*) AS open_count + FROM tickets JOIN users ON user_id = ticket_assigned_to + WHERE ticket_project_id = $project_id AND ticket_archived_at IS NULL AND ticket_resolved_at IS NULL AND ticket_closed_at IS NULL + GROUP BY user_id"); + while ($row = mysqli_fetch_assoc($sql)) { + $id = intval($row['user_id']); + $team[$id] = ($team[$id] ?? ['user_name' => $row['user_name'], 'user_avatar' => $row['user_avatar'], 'seconds' => 0, 'open' => 0]); + $team[$id]['open'] = intval($row['open_count']); + } + uasort($team, function ($a, $b) { + return [$b['seconds'], $b['open']] <=> [$a['seconds'], $a['open']]; + }); + return $team; +} + +/** + * The latest replies and notes across its tickets - the ones this agent may + * reach - newest first, each with its ticket and who wrote it. + */ +function projectActivity($project_id, $limit = 20) { + global $mysqli; + $project_id = intval($project_id); + $sql = mysqli_query($mysqli, "SELECT ticket_reply_id, ticket_reply, ticket_reply_type, ticket_reply_time_worked, ticket_reply_created_at, + ticket_id, ticket_prefix, ticket_number, ticket_subject, ticket_client_id, ticket_resolved_at, ticket_closed_at, + user_name, user_avatar, contact_name + FROM ticket_replies + JOIN tickets ON ticket_id = ticket_reply_ticket_id + LEFT JOIN users ON ticket_reply_type <> 'Client' AND user_id = ticket_reply_by + LEFT JOIN contacts ON ticket_reply_type = 'Client' AND contact_id = ticket_reply_by + WHERE ticket_project_id = $project_id AND ticket_reply_archived_at IS NULL AND ticket_archived_at IS NULL " . clientScopeSql('ticket_client_id') . " + ORDER BY ticket_reply_id DESC LIMIT " . intval($limit)); + $rows = []; + while ($row = mysqli_fetch_assoc($sql)) { + $rows[] = $row; + } + return $rows; +} + +/** The first words of a reply, as plain text. */ +function projectReplySnippet($html, $length = 180) { + $text = trim(preg_replace('/\s+/u', ' ', html_entity_decode(strip_tags(str_replace(['
', '
', '
', '

', '
'], ' ', (string) $html)), ENT_QUOTES, 'UTF-8'))); + return mb_strlen($text) > $length ? mb_substr($text, 0, $length - 1) . '…' : $text; +} + +/* + * ---------- changing projects ---------- + */ + +/** The next project number, taken atomically. */ +function projectNextNumber() { + global $mysqli; + mysqli_query($mysqli, "UPDATE settings SET config_project_next_number = LAST_INSERT_ID(config_project_next_number), config_project_next_number = config_project_next_number + 1 WHERE company_id = 1"); + return intval(mysqli_insert_id($mysqli)); +} + +/** A client contact a project of this client may name, else 0. Internal projects have none. */ +function projectContactId($contact_id, $client_id) { + return intval($client_id) ? assetClientOwnedId('contact', $contact_id, $client_id) : 0; +} + +/** + * Raise the tickets of a project template on a project, in the template's + * order, each with the template's tasks. They go to the project's client + * contact, and to its manager when $assign_to is given (an agent id). + * The client is not emailed - a project's tickets are planned work, not a + * request. [Client] and the like in a subject are filled in + * (projectTemplateSubject()). How many tickets were raised. + */ +function projectApplyTemplate($project, $project_template_id, $assign_to = 0) { + global $mysqli, $session_user_id, $session_name, $config_ticket_prefix, $config_ticket_default_billable; + $project_template_id = intval($project_template_id); + $project_id = intval($project['project_id']); + $client_id = intval($project['project_client_id']); + $contact_id = projectContactId($project['project_contact_id'] ?? 0, $client_id); + $assign_to = ticketAgentId($assign_to); + $status = $assign_to ? TICKET_STATUS_OPEN : TICKET_STATUS_NEW; + $billable = intval($config_ticket_default_billable) === 1 ? 1 : 0; + $prefix = escapeSql($config_ticket_prefix); + $template_name = escapeSql((string) getFieldById('project_templates', $project_template_id, 'project_template_name')); + + $sql = mysqli_query($mysqli, "SELECT ticket_templates.ticket_template_id, ticket_template_subject, ticket_template_name, ticket_template_details + FROM project_template_ticket_templates + JOIN ticket_templates ON ticket_templates.ticket_template_id = project_template_ticket_templates.ticket_template_id + WHERE project_template_ticket_templates.project_template_id = $project_template_id + ORDER BY ticket_template_order ASC, ticket_template_name ASC"); + $raised = 0; + while ($row = mysqli_fetch_assoc($sql)) { + $subject = trim((string) $row['ticket_template_subject']) !== '' ? $row['ticket_template_subject'] : $row['ticket_template_name']; + $subject = escapeSql(mb_substr(projectTemplateSubject($subject, $project), 0, 500)); + $details = mysqli_real_escape_string($mysqli, (string) $row['ticket_template_details']); + mysqli_query($mysqli, "UPDATE settings SET config_ticket_next_number = LAST_INSERT_ID(config_ticket_next_number), config_ticket_next_number = config_ticket_next_number + 1 WHERE company_id = 1"); + $ticket_number = intval(mysqli_insert_id($mysqli)); + $url_key = randomString(32); + mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$prefix', ticket_number = $ticket_number, ticket_source = 'Project', + ticket_subject = '$subject', ticket_details = '$details', ticket_priority = 'Medium', ticket_billable = $billable, ticket_status = $status, + ticket_created_by = " . intval($session_user_id) . ", ticket_assigned_to = $assign_to, ticket_contact_id = $contact_id, ticket_url_key = '$url_key', + ticket_client_id = $client_id, ticket_invoice_id = 0, ticket_project_id = $project_id"); + $ticket_id = mysqli_insert_id($mysqli); + applyTicketSla($ticket_id); + addTasksFromTicketTemplate($ticket_id, $row['ticket_template_id']); + logTicketHistory($ticket_id, "$session_name raised the ticket from project template $template_name"); + triggerCustomAction('ticket_create', $ticket_id); + $raised++; + } + return $raised; +} + +/** + * A template ticket's subject with what is known filled in: [Client], [Project], + * [Month], [Quarter] and [Year]. Anything else in brackets ([User], [Server + * Name]) is the agent's to fill in, and stays. + */ +function projectTemplateSubject($subject, $project) { + $month = intval(date('n')); + $known = [ + 'project' => (string) $project['project_name'], + 'month' => date('F Y'), + 'quarter' => 'Q' . intval(ceil($month / 3)) . ' ' . date('Y'), + 'year' => date('Y'), + ]; + if (intval($project['project_client_id']) && !empty($project['client_name'])) { + $known['client'] = (string) $project['client_name']; + } + return preg_replace_callback('/\[(client|project|month|quarter|year)\]/i', function ($match) use ($known) { + return $known[strtolower($match[1])] ?? $match[0]; + }, (string) $subject); +} + +/** + * Put a ticket on a project, when it may go there: the agent may reach it, + * and it is the project's client's (an internal project takes any). '' when + * done (or it was on it already), else why not. + */ +function projectAddTicket($project, $ticket) { + global $mysqli, $session_name; + $ticket_id = intval($ticket['ticket_id']); + $ticket_client_id = intval($ticket['ticket_client_id']); + $project_client_id = intval($project['project_client_id']); + if ($ticket_client_id && !hasClientAccess($ticket_client_id)) { + return 'not yours to reach'; + } + if ($project_client_id && $ticket_client_id !== $project_client_id) { + return "another client's"; + } + if (intval($ticket['ticket_project_id']) === intval($project['project_id'])) { + return ''; + } + mysqli_query($mysqli, "UPDATE tickets SET ticket_project_id = " . intval($project['project_id']) . ", ticket_updated_at = ticket_updated_at WHERE ticket_id = $ticket_id"); + logTicketHistory($ticket_id, "$session_name added the ticket to project " . escapeSql(projectReference($project) . ' - ' . $project['project_name'])); + return ''; +} + +/** Take a ticket off its project. */ +function projectRemoveTicket($ticket) { + global $mysqli, $session_name; + $ticket_id = intval($ticket['ticket_id']); + mysqli_query($mysqli, "UPDATE tickets SET ticket_project_id = 0, ticket_updated_at = ticket_updated_at WHERE ticket_id = $ticket_id"); + logTicketHistory($ticket_id, "$session_name took the ticket out of its project"); +} + +/** Mark it complete - only once none of its tickets is open. '' when done, else why not. */ +function projectComplete($row) { + global $mysqli, $session_name; + $project_id = intval($row['project_id']); + if (!projectIsOpen($row)) { + return 'it is not open'; + } + $open = intval(mysqli_fetch_row(mysqli_query($mysqli, "SELECT COUNT(*) FROM tickets WHERE ticket_project_id = $project_id AND ticket_archived_at IS NULL AND ticket_resolved_at IS NULL AND ticket_closed_at IS NULL"))[0]); + if ($open) { + return "$open of its tickets " . ($open === 1 ? 'is' : 'are') . ' still open'; + } + mysqli_query($mysqli, "UPDATE projects SET project_completed_at = NOW() WHERE project_id = $project_id"); + logAudit("Project", "Close", "$session_name completed project " . escapeSql(projectReference($row) . ' - ' . $row['project_name']), intval($row['project_client_id']), $project_id); + return ''; +} + +/** Bring a completed (not archived) project back to active. */ +function projectReopen($row) { + global $mysqli, $session_name; + $project_id = intval($row['project_id']); + mysqli_query($mysqli, "UPDATE projects SET project_completed_at = NULL WHERE project_id = $project_id"); + logAudit("Project", "Reopen", "$session_name reopened project " . escapeSql(projectReference($row) . ' - ' . $row['project_name']), intval($row['project_client_id']), $project_id); +} + +function projectArchive($row) { + global $mysqli, $session_name; + $project_id = intval($row['project_id']); + mysqli_query($mysqli, "UPDATE projects SET project_archived_at = NOW() WHERE project_id = $project_id"); + logAudit("Project", "Archive", "$session_name archived project " . escapeSql(projectReference($row) . ' - ' . $row['project_name']), intval($row['project_client_id']), $project_id); +} + +function projectRestore($row) { + global $mysqli, $session_name; + $project_id = intval($row['project_id']); + mysqli_query($mysqli, "UPDATE projects SET project_archived_at = NULL WHERE project_id = $project_id"); + logAudit("Project", "Restore", "$session_name restored project " . escapeSql(projectReference($row) . ' - ' . $row['project_name']), intval($row['project_client_id']), $project_id); +} + +/** Delete it for good. Its tickets stay - just no longer part of a project. */ +function projectDelete($row) { + global $mysqli, $session_name; + $project_id = intval($row['project_id']); + $name = escapeSql(projectReference($row) . ' - ' . $row['project_name']); + $sql = mysqli_query($mysqli, "SELECT ticket_id FROM tickets WHERE ticket_project_id = $project_id"); + while ($ticket = mysqli_fetch_row($sql)) { + logTicketHistory(intval($ticket[0]), "$session_name deleted project $name, which the ticket was part of"); + } + mysqli_query($mysqli, "UPDATE tickets SET ticket_project_id = 0, ticket_updated_at = ticket_updated_at WHERE ticket_project_id = $project_id"); + mysqli_query($mysqli, "DELETE FROM projects WHERE project_id = $project_id"); + logAudit("Project", "Delete", "$session_name deleted project $name", intval($row['project_client_id']), $project_id); +} + +/** Tell the new manager - an app notification linking to the project. Not themselves, not nobody. */ +function projectNotifyManager($row, $manager_id) { + global $mysqli, $session_user_id, $session_name; + $manager_id = intval($manager_id); + if (!$manager_id || $manager_id === intval($session_user_id)) { + return; + } + $client_id = intval($row['project_client_id']); + $text = escapeSql("$session_name made you the manager of project " . projectReference($row) . ' - ' . $row['project_name']); + $action = escapeSql('/agent/' . projectUrl($row['project_id'], $client_id)); + mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Project', notification = '$text', notification_action = '$action', notification_client_id = $client_id, notification_user_id = $manager_id"); +} diff --git a/functions/search.php b/functions/search.php index f8e2a5a15..7cd959e41 100644 --- a/functions/search.php +++ b/functions/search.php @@ -98,7 +98,7 @@ function globalSearchClientUrl($page, $client_id, $params = []) { * user cannot read, or whose feature is switched off, is left out entirely. */ function globalSearchGroups($terms, $deep) { - global $config_ticket_prefix, $config_invoice_prefix, $config_quote_prefix; + global $config_ticket_prefix, $config_invoice_prefix, $config_quote_prefix, $config_project_prefix; global $config_module_enable_ticketing, $config_module_enable_accounting; $eq = $terms['eq']; @@ -156,6 +156,30 @@ function globalSearchGroups($terms, $deep) { }, ]; + $project_number = globalSearchNumber($q, $config_project_prefix); + $project_number_match = $project_number !== null ? "OR project_number = $project_number" : ''; + $project_deep_match = $deep ? "OR project_description LIKE '%$like%'" : ''; + $groups[] = [ + 'key' => 'projects', 'label' => 'Projects', 'icon' => 'project-diagram', 'module' => 'module_support', 'enabled' => $ticketing, + 'select' => 'project_id, project_prefix, project_number, project_name, project_client_id, project_completed_at, project_archived_at, client_name', + 'from' => 'projects LEFT JOIN clients ON project_client_id = client_id', + 'where' => "(project_name LIKE '%$like%' OR CONCAT(project_prefix, project_number) LIKE '%$like%' $project_number_match $project_deep_match)", + 'scope' => 'project_client_id', + 'order' => ($project_number !== null ? "(project_number = $project_number) DESC, " : '') . "(project_completed_at IS NULL AND project_archived_at IS NULL) DESC, project_id DESC", + 'exact' => $project_number !== null ? "project_number = $project_number" : null, + 'list_url' => '/agent/projects.php?' . http_build_query(['show' => 'all', 'q' => $q]), + 'item' => function ($row) { + $state = $row['project_archived_at'] ? 'Archived' : ($row['project_completed_at'] ? 'Completed' : 'Active'); + return [ + 'ref' => $row['project_prefix'] . $row['project_number'], + 'title' => $row['project_name'], + 'context' => intval($row['project_client_id']) ? $row['client_name'] : 'Internal', + 'badge' => ['text' => $state, 'variant' => ['Active' => 'primary', 'Completed' => 'success', 'Archived' => 'secondary'][$state]], + 'url' => '/agent/' . projectUrl($row['project_id'], $row['project_client_id']), + ]; + }, + ]; + // Stored numbers may or may not carry punctuation, so compare digits to digits $contact_phone_match = $phone ? "OR REGEXP_REPLACE(contact_phone, '[^0-9]', '') LIKE '%$phone%' OR REGEXP_REPLACE(contact_mobile, '[^0-9]', '') LIKE '%$phone%'" diff --git a/functions/ticket_fields.php b/functions/ticket_fields.php index d45082ce2..4bcc1e83d 100644 --- a/functions/ticket_fields.php +++ b/functions/ticket_fields.php @@ -330,7 +330,7 @@ function projectChangeManager($project_id, $manager_id) { $project_id = intval($project_id); $manager_id = intval($manager_id); - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT project_prefix, project_number, project_name, project_client_id FROM projects WHERE project_id = $project_id")); + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT project_id, project_prefix, project_number, project_name, project_client_id, project_manager FROM projects WHERE project_id = $project_id")); if (!$row) { return [false, 'Invalid project!']; } @@ -350,6 +350,11 @@ function projectChangeManager($project_id, $manager_id) { logAudit("Project", "Edit", "$session_name set the manager of project $project to $manager_name", intval($row['project_client_id']), $project_id); + // The new manager hears about it + if ($manager_id !== intval($row['project_manager'])) { + projectNotifyManager($row, $manager_id); + } + return [true, $manager_id ? "Project manager set to $manager_name" : 'Project manager removed']; }