From e2733fecb745b75ff8a792251bfee66e8920ff81 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 25 Mar 2024 16:43:56 -0400 Subject: [PATCH 01/19] Some initial beginnings of task management in tickets, currently you can create and delete them more to come --- post.php | 4 ++-- post/tasks.php | 55 +++++++++++++++++++++++++++++++++++++++++++++ task_add_modal.php | 45 +++++++++++++++++++++++++++++++++++++ task_edit_modal.php | 45 +++++++++++++++++++++++++++++++++++++ ticket.php | 36 +++++++++++++++++++++++++++++ 5 files changed, 183 insertions(+), 2 deletions(-) create mode 100644 post/tasks.php create mode 100644 task_add_modal.php create mode 100644 task_edit_modal.php diff --git a/post.php b/post.php index 40a878d0..6ec69559 100644 --- a/post.php +++ b/post.php @@ -71,6 +71,8 @@ require_once "post/tax.php"; require_once "post/ticket.php"; +require_once "post/tasks.php"; + require_once "post/transfer.php"; require_once "post/trip.php"; @@ -85,5 +87,3 @@ require_once "post/ai.php"; require_once "post/misc.php"; - -?> diff --git a/post/tasks.php b/post/tasks.php new file mode 100644 index 00000000..4346d405 --- /dev/null +++ b/post/tasks.php @@ -0,0 +1,55 @@ +$name"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} + + +if (isset($_GET['delete_task'])) { + + validateTechRole(); + + $task_id = intval($_GET['delete_task']); + + // Get Client ID, task name from tasks and tickets using the task_id + $sql = mysqli_query($mysqli, "SELECT * FROM tasks LEFT JOIN tickets ON ticket_id = task_ticket_id"); + $row = mysqli_fetch_array($sql); + $client_id = intval($row['ticket_client_id']); + $task_name = sanitizeInput($row['task_name']); + + mysqli_query($mysqli, "DELETE FROM tasks WHERE task_id = $task_id"); + + // Logging + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Task', log_action = 'Delete', log_description = '$session_name deleted task $task_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $task_id"); + + $_SESSION['alert_type'] = "error"; + $_SESSION['alert_message'] = "You created Task $task_name"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} \ No newline at end of file diff --git a/task_add_modal.php b/task_add_modal.php new file mode 100644 index 00000000..4f0b3317 --- /dev/null +++ b/task_add_modal.php @@ -0,0 +1,45 @@ + diff --git a/task_edit_modal.php b/task_edit_modal.php new file mode 100644 index 00000000..96a6a711 --- /dev/null +++ b/task_edit_modal.php @@ -0,0 +1,45 @@ + diff --git a/ticket.php b/ticket.php index 2b030fd7..da8f92ab 100644 --- a/ticket.php +++ b/ticket.php @@ -237,6 +237,10 @@ if (isset($_GET['ticket_id'])) { AND ticket_attachment_ticket_id = $ticket_id" ); + + // Get Tasks + $sql_tasks = mysqli_query( $mysqli, "SELECT * FROM tasks WHERE task_ticket_id = $ticket_id ORDER BY task_created_at ASC"); + ?> @@ -264,6 +268,9 @@ if (isset($_GET['ticket_id'])) { Edit + + Create Task + Merge @@ -933,6 +940,33 @@ if (isset($_GET['ticket_id'])) { + + + 0) { ?> +
+
Tasks
+ + +
+ + + + + + +
+ + +
+ + + @@ -956,6 +990,8 @@ if (isset($_GET['ticket_id'])) { require_once "ticket_merge_modal.php"; + require_once "task_add_modal.php"; + if ($config_module_enable_accounting) { require_once "ticket_edit_billable_modal.php"; require_once "ticket_invoice_add_modal.php"; From c40c204ce1ca3df6ec9c942e99d16476abbe87d3 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 25 Mar 2024 16:45:34 -0400 Subject: [PATCH 02/19] Use full name in vars --- post/tasks.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/post/tasks.php b/post/tasks.php index 4346d405..fbab75f2 100644 --- a/post/tasks.php +++ b/post/tasks.php @@ -9,8 +9,8 @@ if (isset($_POST['add_task'])) { validateTechRole(); $ticket_id = intval($_POST['ticket_id']); - $name = sanitizeInput($_POST['name']); - $description = sanitizeInput($_POST['description']); + $task_name = sanitizeInput($_POST['name']); + $task_description = sanitizeInput($_POST['description']); // Get Client ID from tickets using the ticket_id $sql = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_id = $ticket_id"); @@ -18,14 +18,14 @@ if (isset($_POST['add_task'])) { $client_id = intval($row['ticket_client_id']); - mysqli_query($mysqli, "INSERT INTO tasks SET task_name = '$name', task_description = '$description', task_ticket_id = $ticket_id"); + mysqli_query($mysqli, "INSERT INTO tasks SET task_name = '$task_name', task_description = '$task_description', task_ticket_id = $ticket_id"); $task_id = mysqli_insert_id($mysqli); // Logging - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Task', log_action = 'Create', log_description = '$session_name created task $name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $task_id"); + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Task', log_action = 'Create', log_description = '$session_name created task $task_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $task_id"); - $_SESSION['alert_message'] = "You created Task $name"; + $_SESSION['alert_message'] = "You created Task $task_name"; header("Location: " . $_SERVER["HTTP_REFERER"]); } From 31184dab625c6890a25592cb47f11f0822f71e59 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Tue, 26 Mar 2024 14:06:32 -0400 Subject: [PATCH 03/19] Moved Tasks Card under Details, Added tje ability to Edit and mark a task complete --- post/tasks.php | 50 +++++++++++++++++++++++++++++++++-- ticket.php | 72 +++++++++++++++++++++++++++++--------------------- 2 files changed, 90 insertions(+), 32 deletions(-) diff --git a/post/tasks.php b/post/tasks.php index fbab75f2..0dd09069 100644 --- a/post/tasks.php +++ b/post/tasks.php @@ -30,6 +30,29 @@ if (isset($_POST['add_task'])) { header("Location: " . $_SERVER["HTTP_REFERER"]); } +if (isset($_POST['edit_task'])) { + + validateTechRole(); + + $task_id = intval($_POST['task_id']); + $task_name = sanitizeInput($_POST['name']); + $task_description = sanitizeInput($_POST['description']); + + // Get Client ID + $sql = mysqli_query($mysqli, "SELECT * FROM tasks LEFT JOIN tickets ON ticket_id = task_ticket_id WHERE task_id = $task_id"); + $row = mysqli_fetch_array($sql); + $client_id = intval($row['ticket_client_id']); + + mysqli_query($mysqli, "UPDATE tasks SET task_name = '$task_name', task_description = '$task_description' WHERE task_id = $task_id"); + + // Logging + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Task', log_action = 'Edit', log_description = '$session_name edited task $task_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $task_id"); + + $_SESSION['alert_message'] = "You edited Task $task_name"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} + if (isset($_GET['delete_task'])) { @@ -38,7 +61,7 @@ if (isset($_GET['delete_task'])) { $task_id = intval($_GET['delete_task']); // Get Client ID, task name from tasks and tickets using the task_id - $sql = mysqli_query($mysqli, "SELECT * FROM tasks LEFT JOIN tickets ON ticket_id = task_ticket_id"); + $sql = mysqli_query($mysqli, "SELECT * FROM tasks LEFT JOIN tickets ON ticket_id = task_ticket_id WHERE task_id = $task_id"); $row = mysqli_fetch_array($sql); $client_id = intval($row['ticket_client_id']); $task_name = sanitizeInput($row['task_name']); @@ -49,7 +72,30 @@ if (isset($_GET['delete_task'])) { mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Task', log_action = 'Delete', log_description = '$session_name deleted task $task_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $task_id"); $_SESSION['alert_type'] = "error"; - $_SESSION['alert_message'] = "You created Task $task_name"; + $_SESSION['alert_message'] = "You Deleted Task $task_name"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} + +if (isset($_GET['complete_task'])) { + + validateTechRole(); + + $task_id = intval($_GET['complete_task']); + + // Get Client ID + $sql = mysqli_query($mysqli, "SELECT * FROM tasks LEFT JOIN tickets ON ticket_id = task_ticket_id WHERE task_id = $task_id"); + $row = mysqli_fetch_array($sql); + $client_id = intval($row['ticket_client_id']); + $task_name = sanitizeInput($row['task_name']); + $ticket_id = intval($row['ticket_id']); + + mysqli_query($mysqli, "UPDATE tasks SET task_completed_at = NOW(), task_completed_by = $session_user_id WHERE task_id = $task_id"); + + // Logging + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Task', log_action = 'Edit', log_description = '$session_name completed task $task_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $task_id"); + + $_SESSION['alert_message'] = "You completed Task $task_name"; header("Location: " . $_SERVER["HTTP_REFERER"]); } \ No newline at end of file diff --git a/ticket.php b/ticket.php index da8f92ab..1ce1996b 100644 --- a/ticket.php +++ b/ticket.php @@ -638,6 +638,47 @@ if (isset($_GET['ticket_id'])) { + + 0) { ?> +
+
Tasks
+ + + + +
+ +
+ +
+ + +
+ + + + + + +
+ +
+ + + + +
+ + + +
- +
@@ -940,33 +979,6 @@ if (isset($_GET['ticket_id'])) { - - - 0) { ?> -
-
Tasks
- - -
- - - - - - -
- - -
- - - From 038e7e4a529650edeed72f99faa0649ebb0563b5 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Tue, 26 Mar 2024 14:10:14 -0400 Subject: [PATCH 04/19] Add Task Completion Date and Time Stamp --- ticket.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ticket.php b/ticket.php index 1ce1996b..5fb31649 100644 --- a/ticket.php +++ b/ticket.php @@ -654,7 +654,7 @@ if (isset($_GET['ticket_id'])) {
- +
From cdc87562c97ff3afe9e410667114d58fdbd78532 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Tue, 26 Mar 2024 15:11:57 -0400 Subject: [PATCH 05/19] Ticket Details UI Enhancements, Dont display entity cards if no data, Moved Add Entities to the Top Bar along with Invoice and Close Ticket. Combine the Client Details and Assign Card into one card, and Tidy Work --- ticket.php | 400 +++++++++++++++++++++++++---------------------------- 1 file changed, 187 insertions(+), 213 deletions(-) diff --git a/ticket.php b/ticket.php index 5fb31649..89175b86 100644 --- a/ticket.php +++ b/ticket.php @@ -229,6 +229,10 @@ if (isset($_GET['ticket_id'])) { ); + // Get Watchers + $sql_ticket_watchers = mysqli_query($mysqli, "SELECT * FROM ticket_watchers WHERE watcher_ticket_id = $ticket_id ORDER BY watcher_email DESC"); + + // Get Ticket Attachments $sql_ticket_attachments = mysqli_query( $mysqli, @@ -255,34 +259,71 @@ if (isset($_GET['ticket_id'])) {
-
+

Ticket

-
-
- -
- - Edit +
+ +
+ + + + Invoice Ticket - - Create Task + + + Close Ticket - - Merge - - - Change Client - - -
- - Delete + + +
+ +
+ + Create Task - +
+ + Add Contact + + + Add Asset + + + Add Vendor + + + Add Watcher + +
+
+ +
+ +
+ + Edit + + + Merge + + + Change Client + + +
+ + Delete + + +
@@ -467,13 +508,12 @@ if (isset($_GET['ticket_id'])) { ?> -
mb-3"> +
mb-3">

@@ -550,22 +590,93 @@ if (isset($_GET['ticket_id'])) {
- -
-
+ +
+

+
+ +
+
+ +
+
+ Updated: +
+ + + if ($ticket_status == "Closed") { + $sql_closed_by = mysqli_query($mysqli, "SELECT * FROM tickets, users WHERE ticket_closed_by = user_id"); + $row = mysqli_fetch_array($sql_closed_by); + $ticket_closed_by_display = nullable_htmlentities($row['user_name']); + ?>
- + Closed by: +
+
+ Feedback:
+ -
+ // Ticket scheduling + if ($ticket_status !== "Closed") { ?> +
+ Scheduled: +
+ +
+ Total time worked: +
+ +
+ Billable: + + $"; + } else { + echo "X"; + } + ?> + +
+
+ +
+ + +
+
+ +
+ +
+ +
+
+
+
- + +
@@ -582,25 +693,25 @@ if (isset($_GET['ticket_id'])) { if (!empty($location_name)) { ?>
- +
- +
- +
- +
@@ -620,11 +731,11 @@ if (isset($_GET['ticket_id'])) {
- Previous ticket: + Previous ticket:
- Status: + Status:
@@ -680,31 +791,22 @@ if (isset($_GET['ticket_id'])) { - 0) { ?> + 0) { ?>
Watchers
- -
- Add a Watcher -
- -
- + - - + +
@@ -715,118 +817,47 @@ if (isset($_GET['ticket_id'])) { - -
-
Details
-
- -
-
- Created: -
-
- Updated: -
- - - -
- Closed by: -
-
- Feedback: -
- - - - -
- Scheduled: -
- -
- Total time worked: -
- -
- Billable: - - $"; - } else { - echo "X"; - } - ?> - -
- -
- - - -
-
Asset
- - - -
- Add an Asset -
- - - + +
+
Asset
- +
- +
- +
- Model: + Model:
- Service Tag: + Service Tag:
- Warranty expires: + Warranty expires:
- + Access
- - - - -
+ +
+ -
-
Vendor
- -
- Add a Vendor -
- + +
+
Vendor
+
- +
- +
- +
- +
- +
- +
- - -
- - - - -
- - -
- -
-
- -
- -
- -
-
+
-
- - - - -
- - - Invoice Ticket - - - - Close Ticket - - -
+ +
From c052850465cf87f3468a14966dfd9df0b685de66 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Tue, 26 Mar 2024 15:41:16 -0400 Subject: [PATCH 06/19] Automatic submit when Assign Tech is selected --- ticket.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/ticket.php b/ticket.php index 89175b86..fca476eb 100644 --- a/ticket.php +++ b/ticket.php @@ -654,23 +654,20 @@ if (isset($_GET['ticket_id'])) {
+
- > -
- -
@@ -685,7 +682,7 @@ if (isset($_GET['ticket_id'])) { From 0931f607647ede536090db01044e3498f9141cb8 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Tue, 26 Mar 2024 16:08:32 -0400 Subject: [PATCH 07/19] Ticket Details Tidy Buttons and Ticket Details --- ticket.php | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/ticket.php b/ticket.php index fca476eb..31c713de 100644 --- a/ticket.php +++ b/ticket.php @@ -267,18 +267,6 @@ if (isset($_GET['ticket_id'])) {
- - - Invoice Ticket - - - - Close Ticket - - -
-
+ + + Invoice + + + + Close + + + +
@@ -591,8 +591,8 @@ if (isset($_GET['ticket_id'])) {
-
-

+
+
From 6ff740e61978eceb179f37eeb53577a1e1fa5db8 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Tue, 26 Mar 2024 16:31:24 -0400 Subject: [PATCH 08/19] Fix Missing Asset Buttons when selected --- client_assets.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/client_assets.php b/client_assets.php index 5600bf7e..21322ee0 100644 --- a/client_assets.php +++ b/client_assets.php @@ -6,8 +6,6 @@ $order = "ASC"; require_once "inc_all_client.php"; - - //Asset Type from GET if (isset($_GET['type']) && ($_GET['type']) == 'workstation') { $type_query = "asset_type = 'desktop' OR asset_type = 'laptop'"; @@ -49,7 +47,6 @@ $row = mysqli_fetch_assoc(mysqli_query($mysqli, " WHERE asset_client_id = $client_id AND asset_$archive_query AND (asset_name LIKE '%$q%' OR asset_description LIKE '%$q%' OR asset_type LIKE '%$q%' OR asset_ip LIKE '%$q%' OR asset_make LIKE '%$q%' OR asset_model LIKE '%$q%' OR asset_serial LIKE '%$q%' OR asset_os LIKE '%$q%' OR contact_name LIKE '%$q%' OR location_name LIKE '%$q%') - AND ($type_query) $location_query ) AS filtered_assets; ")); From 26dc3172e79e636dc1ce25ad7ab81588862ec394 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 27 Mar 2024 00:26:53 -0400 Subject: [PATCH 09/19] Initial Project work on the UI started --- post.php | 2 + post/project.php | 68 +++++++++++++++++ project_add_modal.php | 44 +++++++++++ project_edit_modal.php | 43 +++++++++++ projects.php | 169 +++++++++++++++++++++++++++++++++++++++++ side_nav.php | 7 ++ 6 files changed, 333 insertions(+) create mode 100644 post/project.php create mode 100644 project_add_modal.php create mode 100644 project_edit_modal.php create mode 100644 projects.php diff --git a/post.php b/post.php index 6ec69559..0d87caf0 100644 --- a/post.php +++ b/post.php @@ -55,6 +55,8 @@ require_once "post/product.php"; require_once "post/profile.php"; +require_once "post/project.php"; + require_once "post/quote.php"; require_once "post/revenue.php"; diff --git a/post/project.php b/post/project.php new file mode 100644 index 00000000..e6118aba --- /dev/null +++ b/post/project.php @@ -0,0 +1,68 @@ +$project_name"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} + +if (isset($_POST['edit_project'])) { + + validateTechRole(); + + $project_id = intval($_POST['project_id']); + $project_name = sanitizeInput($_POST['name']); + $project_description = sanitizeInput($_POST['description']); + $client_id = intval($_POST['client_id']); + + mysqli_query($mysqli, "UPDATE projects SET project_name = '$project_name', project_description = '$project_description' WHERE project_id = $project_id"); + + // Logging + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Project', log_action = 'Edit', log_description = '$session_name edited project $project_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $project_id"); + + $_SESSION['alert_message'] = "You edited Project $project_name"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} + + +if (isset($_GET['delete_project'])) { + + validateTechRole(); + + $project_id = intval($_GET['delete_project']); + + // Get Client ID + $sql = mysqli_query($mysqli, "SELECT * FROM projects WHERE project_id = $project_id"); + $row = mysqli_fetch_array($sql); + $client_id = intval($row['project_client_id']); + $project_name = sanitizeInput($row['project_name']); + + mysqli_query($mysqli, "DELETE FROM projects WHERE project_id = $project_id"); + + // Logging + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Projects', log_action = 'Delete', log_description = '$session_name deleted project $project_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $project_id"); + + $_SESSION['alert_type'] = "error"; + $_SESSION['alert_message'] = "You Deleted Project $project_name"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} diff --git a/project_add_modal.php b/project_add_modal.php new file mode 100644 index 00000000..9a754a85 --- /dev/null +++ b/project_add_modal.php @@ -0,0 +1,44 @@ + diff --git a/project_edit_modal.php b/project_edit_modal.php new file mode 100644 index 00000000..5599efa0 --- /dev/null +++ b/project_edit_modal.php @@ -0,0 +1,43 @@ + diff --git a/projects.php b/projects.php new file mode 100644 index 00000000..39cc571a --- /dev/null +++ b/projects.php @@ -0,0 +1,169 @@ + + +
+
+

Projects

+
+ +
+
+ +
+
+
+
+
+ +
+ + +
+
+
+
+
" id="advancedFilter"> +
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+
+ + "> + + + + + + + + + + + + + + + + + + + + + + + + + + +
ProjectDescriptionTicketsTasksDueCreatedAction
+ + +
+
1 / 2
+
+ 		+
+
7 / 10
+
+ 		Next Week +
+ +
+ + Edit + +
+ + Delete + +
+
+
+
+ +
+
+ + +
  • + "> + +

    Projects

    +     +
    • +
  • From 720a4af44ecdc72485e29ffb75828d636cf97690 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 27 Mar 2024 11:02:45 -0400 Subject: [PATCH 10/19] Fixed Missing Invoice Button when ticket is closed --- ticket.php | 119 +++++++++++++++++++++++++++-------------------------- 1 file changed, 60 insertions(+), 59 deletions(-) diff --git a/ticket.php b/ticket.php index 31c713de..5fd5dc3e 100644 --- a/ticket.php +++ b/ticket.php @@ -262,72 +262,73 @@ if (isset($_GET['ticket_id'])) {

    Ticket

    - -
    + +
    -
    +
    -
    - -
    - - Create Task - -
    - - Add Contact - - - Add Asset - - - Add Vendor - - - Add Watcher - -
    -
    - - - - Invoice + +
    + +
    + + Create Task - - - Close +
    +     + Add Contact + + + Add Asset + + + Add Vendor + + + Add Watcher - - -
    - -
    - - Edit - - - Merge - - - Change Client - - -
    - - Delete - - -
    + + + + + Invoice + + + + Close + + +
    + +
    + + Edit + + + Merge + + + Change Client + + +
    + + Delete + + +
    +
    +
    - +
    From 8addc4f55c035da5d3dc93d58938b5743bf59667 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 27 Mar 2024 14:19:32 -0400 Subject: [PATCH 11/19] Feature: Added Subnet Mask and primary and secondary DNS change the wording for network to IP / Network in case a single IP needs to be used for example an Internet Connection, Added more newe tabs to the Add/Edit Network so everything fits and is organized --- client_network_add_modal.php | 122 ++++++++++++++------- client_network_edit_modal.php | 196 +++++++++++++++++++++++----------- client_networks.php | 25 +++-- database_updates.php | 14 ++- database_version.php | 2 +- js/network_edit_modal.js | 3 + post/network.php | 14 ++- 7 files changed, 257 insertions(+), 119 deletions(-) diff --git a/client_network_add_modal.php b/client_network_add_modal.php index cef6383a..5f35b82f 100644 --- a/client_network_add_modal.php +++ b/client_network_add_modal.php @@ -15,6 +15,12 @@
  • Details
    • +
  • + Network +
    • +
  • + DNS +
  • Notes
    • @@ -46,46 +52,6 @@
    -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    -
    @@ -111,6 +77,82 @@
    + +
    +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    +
    +
    diff --git a/client_network_edit_modal.php b/client_network_edit_modal.php index 12ee0c52..452cde19 100644 --- a/client_network_edit_modal.php +++ b/client_network_edit_modal.php @@ -12,81 +12,147 @@
    -
    - -
    -
    - -
    - -
    -
    + -
    - -
    -
    - -
    - -
    -
    +
    -
    - -
    -
    - -
    - -
    -
    +
    -
    - -
    -
    - -
    - -
    -
    +
    -
    - -
    -
    - +
    + +
    +
    + +
    + +
    - -
    -
    -
    - -
    -
    - +
    + +
    +
    + +
    + +
    - -
    -
    -
    - - -
    - -
    - -
    -
    - +
    + +
    +
    + +
    + +
    - +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    + +
    +
    diff --git a/client_networks.php b/client_networks.php index c8a0cc91..63717dc2 100644 --- a/client_networks.php +++ b/client_networks.php @@ -16,7 +16,7 @@ $sql = mysqli_query( LEFT JOIN locations ON location_id = network_location_id WHERE network_client_id = $client_id AND network_archived_at IS NULL - AND (network_name LIKE '%$q%' OR network_description LIKE '%$q%' OR network_vlan LIKE '%$q%' OR network LIKE '%$q%' OR network_gateway LIKE '%$q%' OR network_dhcp_range LIKE '%$q%' OR location_name LIKE '%$q%') + AND (network_name LIKE '%$q%' OR network_description LIKE '%$q%' OR network_vlan LIKE '%$q%' OR network LIKE '%$q%' OR network_gateway LIKE '%$q%' OR network_subnet LIKE '%$q%' OR network_primary_dns LIKE '%$q%' OR network_secondary_dns LIKE '%$q%' OR network_dhcp_range LIKE '%$q%' OR location_name LIKE '%$q%') ORDER BY $sort $order LIMIT $record_from, $record_to" ); @@ -88,8 +88,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Name vLAN - Network + IP / Network Gateway + DNS DHCP Range Location Action @@ -103,13 +104,21 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $network_name = nullable_htmlentities($row['network_name']); $network_description = nullable_htmlentities($row['network_description']); $network_vlan = intval($row['network_vlan']); - if (empty($network_vlan)) { - $network_vlan_display = "-"; - } else { + if ($network_vlan) { $network_vlan_display = $network_vlan; + } else { + $network_vlan_display = "-"; } $network = nullable_htmlentities($row['network']); + $network_subnet = nullable_htmlentities($row['network_subnet']); $network_gateway = nullable_htmlentities($row['network_gateway']); + $network_primary_dns = nullable_htmlentities($row['network_primary_dns']); + $network_secondary_dns = nullable_htmlentities($row['network_secondary_dns']); + if ($network_primary_dns && $network_secondary_dns) { + $network_dns_display = "$network_primary_dns
    $network_secondary_dns
    "; + } else { + $network_dns_display = "-"; + } $network_dhcp_range = nullable_htmlentities($row['network_dhcp_range']); if (empty($network_dhcp_range)) { $network_dhcp_range_display = "-"; @@ -144,8 +153,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - + + +
    + + diff --git a/database_updates.php b/database_updates.php index 3bd5a3ed..eb4102db 100644 --- a/database_updates.php +++ b/database_updates.php @@ -1687,10 +1687,18 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.1.3'"); } - // if (CURRENT_DATABASE_VERSION == '1.1.3') { - // // Insert queries here required to update to DB version 1.1.4 + if (CURRENT_DATABASE_VERSION == '1.1.3') { + + mysqli_query($mysqli, "ALTER TABLE `networks` ADD `network_subnet` VARCHAR(200) DEFAULT NULL AFTER `network`"); + mysqli_query($mysqli, "ALTER TABLE `networks` ADD `network_primary_dns` VARCHAR(200) DEFAULT NULL AFTER `network_gateway`"); + mysqli_query($mysqli, "ALTER TABLE `networks` ADD `network_secondary_dns` VARCHAR(200) DEFAULT NULL AFTER `network_primary_dns`"); + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.1.4'"); + } + + // if (CURRENT_DATABASE_VERSION == '1.1.4') { + // // Insert queries here required to update to DB version 1.1.5 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.1.4'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.1.5'"); // } } else { diff --git a/database_version.php b/database_version.php index 1760e835..62e7c706 100644 --- a/database_version.php +++ b/database_version.php @@ -5,5 +5,5 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "1.1.3"); +DEFINE("LATEST_DATABASE_VERSION", "1.1.4"); diff --git a/js/network_edit_modal.js b/js/network_edit_modal.js index f2ba62ca..217cc350 100644 --- a/js/network_edit_modal.js +++ b/js/network_edit_modal.js @@ -20,7 +20,10 @@ function populateNetworkEditModal(client_id, network_id) { document.getElementById("editNetworkDescription").value = network.network_description; document.getElementById("editNetworkVlan").value = network.network_vlan; document.getElementById("editNetworkCidr").value = network.network; + document.getElementById("editNetworkSubnet").value = network.network_subnet; document.getElementById("editNetworkGw").value = network.network_gateway; + document.getElementById("editNetworkPrimaryDNS").value = network.network_primary_dns; + document.getElementById("editNetworkSecondaryDNS").value = network.network_secondary_dns; document.getElementById("editNetworkDhcp").value = network.network_dhcp_range; document.getElementById("editNetworkNotes").value = network.network_notes; diff --git a/post/network.php b/post/network.php index 36bcbca7..338fc706 100644 --- a/post/network.php +++ b/post/network.php @@ -13,12 +13,15 @@ if (isset($_POST['add_network'])) { $description = sanitizeInput($_POST['description']); $vlan = intval($_POST['vlan']); $network = sanitizeInput($_POST['network']); + $subnet = sanitizeInput($_POST['subnet']); $gateway = sanitizeInput($_POST['gateway']); + $primary_dns = sanitizeInput($_POST['primary_dns']); + $secondary_dns = sanitizeInput($_POST['secondary_dns']); $dhcp_range = sanitizeInput($_POST['dhcp_range']); $notes = sanitizeInput($_POST['notes']); $location_id = intval($_POST['location']); - mysqli_query($mysqli,"INSERT INTO networks SET network_name = '$name', network_description = '$description', network_vlan = $vlan, network = '$network', network_gateway = '$gateway', network_dhcp_range = '$dhcp_range', network_notes = '$notes', network_location_id = $location_id, network_client_id = $client_id"); + mysqli_query($mysqli,"INSERT INTO networks SET network_name = '$name', network_description = '$description', network_vlan = $vlan, network = '$network', network_subnet = '$subnet', network_gateway = '$gateway', network_primary_dns = '$primary_dns', network_secondary_dns = '$secondary_dns', network_dhcp_range = '$dhcp_range', network_notes = '$notes', network_location_id = $location_id, network_client_id = $client_id"); $network_id = mysqli_insert_id($mysqli); @@ -40,13 +43,16 @@ if (isset($_POST['edit_network'])) { $description = sanitizeInput($_POST['description']); $vlan = intval($_POST['vlan']); $network = sanitizeInput($_POST['network']); + $subnet = sanitizeInput($_POST['subnet']); $gateway = sanitizeInput($_POST['gateway']); + $primary_dns = sanitizeInput($_POST['primary_dns']); + $secondary_dns = sanitizeInput($_POST['secondary_dns']); $dhcp_range = sanitizeInput($_POST['dhcp_range']); $notes = sanitizeInput($_POST['notes']); $location_id = intval($_POST['location']); $client_id = intval($_POST['client_id']); - mysqli_query($mysqli,"UPDATE networks SET network_name = '$name', network_description = '$description', network_vlan = $vlan, network = '$network', network_gateway = '$gateway', network_dhcp_range = '$dhcp_range', network_notes = '$notes', network_location_id = $location_id WHERE network_id = $network_id"); + mysqli_query($mysqli,"UPDATE networks SET network_name = '$name', network_description = '$description', network_vlan = $vlan, network = '$network', network_subnet = '$subnet', network_gateway = '$gateway', network_primary_dns = '$primary_dns', network_secondary_dns = '$secondary_dns', network_dhcp_range = '$dhcp_range', network_notes = '$notes', network_location_id = $location_id WHERE network_id = $network_id"); //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Network', log_action = 'Modify', log_description = '$session_name modified network $name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $network_id"); @@ -158,12 +164,12 @@ if (isset($_POST['export_client_networks_csv'])) { $f = fopen('php://memory', 'w'); //set column headers - $fields = array('Name', 'Description', 'vLAN', 'Network', 'Gateway', 'DHCP Range'); + $fields = array('Name', 'Description', 'vLAN', 'IP/Network', 'Subnet Mask', 'Gateway', 'Primary DNS', 'Secondary DNS', 'DHCP Range'); fputcsv($f, $fields, $delimiter); //output each row of the data, format line as csv and write to file pointer while($row = $sql->fetch_assoc()) { - $lineData = array($row['network_name'], $row['network_description'], $row['network_vlan'], $row['network'], $row['network_gateway'], $row['network_dhcp_range']); + $lineData = array($row['network_name'], $row['network_description'], $row['network_vlan'], $row['network'], $row['network_subnet'], $row['network_gateway'], $row['network_primary_dns'], $row['network_secondary_dns'], $row['network_dhcp_range']); fputcsv($f, $lineData, $delimiter); } From 2012a80fe5cf431718bec8c72e9a33095c6a785e Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 27 Mar 2024 14:21:18 -0400 Subject: [PATCH 12/19] DB Duimp for the new network fields --- db.sql | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/db.sql b/db.sql index efe7b6e8..a03e1806 100644 --- a/db.sql +++ b/db.sql @@ -848,7 +848,10 @@ CREATE TABLE `networks` ( `network_description` text DEFAULT NULL, `network_vlan` int(11) DEFAULT NULL, `network` varchar(200) NOT NULL, + `network_subnet` varchar(200) DEFAULT NULL, `network_gateway` varchar(200) NOT NULL, + `network_primary_dns` varchar(200) DEFAULT NULL, + `network_secondary_dns` varchar(200) DEFAULT NULL, `network_dhcp_range` varchar(200) DEFAULT NULL, `network_notes` text DEFAULT NULL, `network_created_at` datetime NOT NULL DEFAULT current_timestamp(), @@ -1803,4 +1806,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2024-03-19 17:11:58 +-- Dump completed on 2024-03-27 14:21:02 From 76cce6ac2320fc72dd42e37ff0a9de79997709b6 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 27 Mar 2024 14:53:15 -0400 Subject: [PATCH 13/19] Updated Edit Domain and Certificates to match the tabing in the add modal --- client_certificate_add_modal.php | 52 ++++++---- client_certificate_edit_modal.php | 163 ++++++++++++++++++------------ client_domain_edit_modal.php | 14 ++- 3 files changed, 135 insertions(+), 94 deletions(-) diff --git a/client_certificate_add_modal.php b/client_certificate_add_modal.php index 6eb92133..b25b058d 100644 --- a/client_certificate_add_modal.php +++ b/client_certificate_add_modal.php @@ -15,10 +15,12 @@
  • Details
    • +
  • + Certificate +
  • Notes
    • -
    @@ -47,6 +49,32 @@
    + + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    @@ -86,30 +114,10 @@
    - +
    -
    - -
    -
    - -
    - -
    -
    -
    diff --git a/client_certificate_edit_modal.php b/client_certificate_edit_modal.php index f6884fcb..19208e19 100644 --- a/client_certificate_edit_modal.php +++ b/client_certificate_edit_modal.php @@ -12,83 +12,112 @@
    -
    - -
    -
    - -
    - -
    -
    + -
    - -
    -
    - -
    - -
    -
    +
    -
    - -
    -
    -  https:// -
    - -
    - -
    -
    -
    +
    -
    - -
    -
    - -
    - -
    -
    +
    -
    - -
    -
    - +
    + +
    +
    + +
    + +
    - -
    -
    -
    - -
    -
    - +
    + +
    +
    + +
    + +
    - -
    -
    -
    - - -
    - -
    - -
    -
    - +
    + +
    +
    + +
    + +
    - +
    + +
    + +
    + +
    +
    +  https:// +
    + +
    + +
    +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    + +
    +
    diff --git a/client_domain_edit_modal.php b/client_domain_edit_modal.php index 4f3c371e..57a4a3a1 100644 --- a/client_domain_edit_modal.php +++ b/client_domain_edit_modal.php @@ -19,6 +19,9 @@
  • Records
    • +
  • + Notes +
    • @@ -79,11 +82,6 @@
    -
    - - -
    -
    @@ -140,6 +138,12 @@
    +
    +
    + +
    +
    +
    From c9724bea0d213a84a2a16fa3ce404dd2254a198f Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 27 Mar 2024 19:16:44 -0400 Subject: [PATCH 14/19] DB Update task, ticket and project templates added --- database_updates.php | 58 +++++++++++++++++++++++++++++++++++-- database_version.php | 3 +- db.sql | 68 ++++++++++++++++++++++++++++++++++++++++---- tickets.php | 2 +- 4 files changed, 119 insertions(+), 12 deletions(-) diff --git a/database_updates.php b/database_updates.php index eb4102db..3a9c3d4c 100644 --- a/database_updates.php +++ b/database_updates.php @@ -1695,10 +1695,62 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.1.4'"); } - // if (CURRENT_DATABASE_VERSION == '1.1.4') { - // // Insert queries here required to update to DB version 1.1.5 + if (CURRENT_DATABASE_VERSION == '1.1.4') { + + // Add Project Templates + mysqli_query($mysqli, "CREATE TABLE `project_templates` ( + `project_template_id` INT(11) NOT NULL AUTO_INCREMENT, + `project_template_name` VARCHAR(200) NOT NULL, + `project_template_description` TEXT DEFAULT NULL, + `project_template_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP(), + `project_template_updated_at` DATETIME DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, + `project_template_archived_at` DATETIME DEFAULT NULL, + PRIMARY KEY (`project_template_id`) + )"); + + // Add Ticket Templates + mysqli_query($mysqli, "CREATE TABLE `ticket_templates` ( + `ticket_template_id` INT(11) NOT NULL AUTO_INCREMENT, + `ticket_template_name` VARCHAR(200) NOT NULL, + `ticket_template_description` TEXT DEFAULT NULL, + `ticket_template_subject` VARCHAR(200) DEFAULT NULL, + `ticket_template_details` LONGTEXT DEFAULT NULL, + `ticket_template_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP(), + `ticket_template_updated_at` DATETIME DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, + `ticket_template_archived_at` DATETIME DEFAULT NULL, + `ticket_template_project_template_id` INT(11) NOT NULL DEFAULT 0, + PRIMARY KEY (`ticket_template_id`) + )"); + + // Add Task Templates + mysqli_query($mysqli, "CREATE TABLE `task_templates` ( + `task_template_id` INT(11) NOT NULL AUTO_INCREMENT, + `task_template_name` VARCHAR(200) NOT NULL, + `task_template_description` TEXT DEFAULT NULL, + `task_template_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP(), + `task_template_updated_at` DATETIME DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, + `task_template_archived_at` DATETIME DEFAULT NULL, + `task_template_ticket_template_id` INT(11) NOT NULL, + PRIMARY KEY (`task_template_id`) + )"); + + mysqli_query($mysqli, "ALTER TABLE `projects` ADD `project_completed_at` DATETIME DEFAULT NULL AFTER `project_updated_at`"); + + mysqli_query($mysqli, "ALTER TABLE `tickets` ADD `ticket_project_id` INT(11) NOT NULL DEFAULT 0 AFTER `ticket_invoice_id`"); + + mysqli_query($mysqli, "ALTER TABLE `tasks` DROP `task_template`"); + mysqli_query($mysqli, "ALTER TABLE `tasks` DROP `task_finish_date`"); + mysqli_query($mysqli, "ALTER TABLE `tasks` DROP `task_project_id`"); + + mysqli_query($mysqli, "ALTER TABLE `projects` DROP `project_template`"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.1.5'"); + } + + // if (CURRENT_DATABASE_VERSION == '1.1.5') { + // // Insert queries here required to update to DB version 1.1.6 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.1.5'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.1.6'"); // } } else { diff --git a/database_version.php b/database_version.php index 62e7c706..cd83a8e7 100644 --- a/database_version.php +++ b/database_version.php @@ -5,5 +5,4 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "1.1.4"); - +DEFINE("LATEST_DATABASE_VERSION", "1.1.5"); diff --git a/db.sql b/db.sql index a03e1806..f6edc4b1 100644 --- a/db.sql +++ b/db.sql @@ -931,6 +931,24 @@ CREATE TABLE `products` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `project_templates` +-- + +DROP TABLE IF EXISTS `project_templates`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `project_templates` ( + `project_template_id` int(11) NOT NULL AUTO_INCREMENT, + `project_template_name` varchar(200) NOT NULL, + `project_template_description` text DEFAULT NULL, + `project_template_created_at` datetime NOT NULL DEFAULT current_timestamp(), + `project_template_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), + `project_template_archived_at` datetime DEFAULT NULL, + PRIMARY KEY (`project_template_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `projects` -- @@ -940,11 +958,11 @@ DROP TABLE IF EXISTS `projects`; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `projects` ( `project_id` int(11) NOT NULL AUTO_INCREMENT, - `project_template` tinyint(1) NOT NULL DEFAULT 0, `project_name` varchar(255) NOT NULL, `project_description` text DEFAULT NULL, `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, `project_archived_at` datetime DEFAULT NULL, `project_client_id` int(11) NOT NULL DEFAULT 0, PRIMARY KEY (`project_id`) @@ -1482,6 +1500,25 @@ CREATE TABLE `tags` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `task_templates` +-- + +DROP TABLE IF EXISTS `task_templates`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `task_templates` ( + `task_template_id` int(11) NOT NULL AUTO_INCREMENT, + `task_template_name` varchar(200) NOT NULL, + `task_template_description` text DEFAULT NULL, + `task_template_created_at` datetime NOT NULL DEFAULT current_timestamp(), + `task_template_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), + `task_template_archived_at` datetime DEFAULT NULL, + `task_template_ticket_template_id` int(11) NOT NULL, + PRIMARY KEY (`task_template_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `tasks` -- @@ -1491,17 +1528,14 @@ DROP TABLE IF EXISTS `tasks`; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `tasks` ( `task_id` int(11) NOT NULL AUTO_INCREMENT, - `task_template` tinyint(1) NOT NULL DEFAULT 0, `task_name` varchar(255) NOT NULL, `task_description` text DEFAULT NULL, - `task_finish_date` date DEFAULT NULL, `task_status` varchar(255) DEFAULT NULL, `task_completed_at` datetime DEFAULT NULL, `task_completed_by` int(11) DEFAULT NULL, `task_created_at` datetime NOT NULL DEFAULT current_timestamp(), `task_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), `task_ticket_id` int(11) DEFAULT NULL, - `task_project_id` int(11) DEFAULT NULL, PRIMARY KEY (`task_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -1563,6 +1597,27 @@ CREATE TABLE `ticket_replies` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `ticket_templates` +-- + +DROP TABLE IF EXISTS `ticket_templates`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `ticket_templates` ( + `ticket_template_id` int(11) NOT NULL AUTO_INCREMENT, + `ticket_template_name` varchar(200) NOT NULL, + `ticket_template_description` text DEFAULT NULL, + `ticket_template_subject` varchar(200) DEFAULT NULL, + `ticket_template_details` longtext DEFAULT NULL, + `ticket_template_created_at` datetime NOT NULL DEFAULT current_timestamp(), + `ticket_template_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), + `ticket_template_archived_at` datetime DEFAULT NULL, + `ticket_template_project_template_id` int(11) NOT NULL DEFAULT 0, + PRIMARY KEY (`ticket_template_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `ticket_views` -- @@ -1606,7 +1661,7 @@ CREATE TABLE `tickets` ( `ticket_id` int(11) NOT NULL AUTO_INCREMENT, `ticket_prefix` varchar(200) DEFAULT NULL, `ticket_number` int(11) NOT NULL, - `ticket_source` varchar(255) DEFAULT NULL, + `ticket_source` varchar(255) DEFAULT NULL COMMENT 'Where the Ticket Came from\r\nEmail, Client Portal, In-App, Project Template', `ticket_category` varchar(200) DEFAULT NULL, `ticket_subject` varchar(200) NOT NULL, `ticket_details` longtext NOT NULL, @@ -1630,6 +1685,7 @@ CREATE TABLE `tickets` ( `ticket_location_id` int(11) NOT NULL DEFAULT 0, `ticket_asset_id` int(11) NOT NULL DEFAULT 0, `ticket_invoice_id` int(11) NOT NULL DEFAULT 0, + `ticket_project_id` int(11) NOT NULL DEFAULT 0, PRIMARY KEY (`ticket_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -1806,4 +1862,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2024-03-27 14:21:02 +-- Dump completed on 2024-03-27 19:16:15 diff --git a/tickets.php b/tickets.php index ee713383..9766c06f 100644 --- a/tickets.php +++ b/tickets.php @@ -384,12 +384,12 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']); if ($row) { $ticket_reply_type = nullable_htmlentities($row['ticket_reply_type']); - if ($ticket_reply_type == "Client") { $ticket_reply_by_display = nullable_htmlentities($row['contact_name']); } else { $ticket_reply_by_display = nullable_htmlentities($row['user_name']); } + $ticket_reply_created_at = nullable_htmlentities($row['ticket_reply_created_at']); } ?> From e42c5bc2f5c5ca59e05e58347a7b1163a4d82e95 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 27 Mar 2024 22:27:56 -0400 Subject: [PATCH 15/19] Major UI Updates to projects, created project details which display project stats tickets and tasks, tickets can be linked to a project, soon will add all users who contributed to a project and some more stats along with a nice timeline from created to deadline --- client_tickets.php | 3 + post/ticket.php | 6 +- project_add_modal.php | 25 +++ project_details.php | 345 ++++++++++++++++++++++++++++++++++++++++++ projects.php | 79 +++++++--- ticket.php | 2 + ticket_add_modal.php | 28 ++++ ticket_edit_modal.php | 28 ++++ tickets.php | 1 + 9 files changed, 496 insertions(+), 21 deletions(-) create mode 100644 project_details.php diff --git a/client_tickets.php b/client_tickets.php index a10de9c5..b5d6bbce 100644 --- a/client_tickets.php +++ b/client_tickets.php @@ -181,6 +181,9 @@ $total_scheduled_tickets = intval($row['total_scheduled_tickets']); } else { $ticket_assigned_to_display = nullable_htmlentities($row['user_name']); } + + $project_id = intval($row['ticket_project_id']); + $contact_name = nullable_htmlentities($row['contact_name']); $contact_email = nullable_htmlentities($row['contact_email']); $contact_archived_at = nullable_htmlentities($row['contact_archived_at']); diff --git a/post/ticket.php b/post/ticket.php index 1ac2f621..d0ea42d4 100644 --- a/post/ticket.php +++ b/post/ticket.php @@ -23,6 +23,7 @@ if (isset($_POST['add_ticket'])) { $vendor_id = intval($_POST['vendor']); $asset_id = intval($_POST['asset']); $location_id = intval($_POST['location']); + $project_id = intval($_POST['project']); $use_primary_contact = intval($_POST['use_primary_contact']); @@ -51,7 +52,7 @@ if (isset($_POST['add_ticket'])) { mysqli_query($mysqli, "UPDATE settings SET config_ticket_next_number = $new_config_ticket_next_number WHERE company_id = 1"); - mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_billable = '$billable', ticket_status = '$ticket_status', ticket_vendor_ticket_number = '$vendor_ticket_number', ticket_vendor_id = $vendor_id, ticket_location_id = $location_id, ticket_asset_id = $asset_id, ticket_created_by = $session_user_id, ticket_assigned_to = $assigned_to, ticket_contact_id = $contact, ticket_client_id = $client_id, ticket_invoice_id = 0"); + mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_billable = '$billable', ticket_status = '$ticket_status', ticket_vendor_ticket_number = '$vendor_ticket_number', ticket_vendor_id = $vendor_id, ticket_location_id = $location_id, ticket_asset_id = $asset_id, ticket_created_by = $session_user_id, ticket_assigned_to = $assigned_to, ticket_contact_id = $contact, ticket_client_id = $client_id, ticket_invoice_id = 0, ticket_project_id = $project_id"); $ticket_id = mysqli_insert_id($mysqli); @@ -153,10 +154,11 @@ if (isset($_POST['edit_ticket'])) { $vendor_id = intval($_POST['vendor']); $asset_id = intval($_POST['asset']); $location_id = intval($_POST['location']); + $project_id = intval($_POST['project']); $client_id = intval($_POST['client_id']); $ticket_number = intval($_POST['ticket_number']); - mysqli_query($mysqli, "UPDATE tickets SET ticket_subject = '$subject', ticket_priority = '$priority', ticket_billable = $billable, ticket_details = '$details', ticket_vendor_ticket_number = '$vendor_ticket_number', ticket_contact_id = $contact_id, ticket_vendor_id = $vendor_id, ticket_location_id = $location_id, ticket_asset_id = $asset_id WHERE ticket_id = $ticket_id"); + mysqli_query($mysqli, "UPDATE tickets SET ticket_subject = '$subject', ticket_priority = '$priority', ticket_billable = $billable, ticket_details = '$details', ticket_vendor_ticket_number = '$vendor_ticket_number', ticket_contact_id = $contact_id, ticket_vendor_id = $vendor_id, ticket_location_id = $location_id, ticket_asset_id = $asset_id, ticket_project_id = $project_id WHERE ticket_id = $ticket_id"); //Logging mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Ticket', log_action = 'Modify', log_description = '$session_name modified ticket $ticket_number - $subject', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $ticket_id"); diff --git a/project_add_modal.php b/project_add_modal.php index 9a754a85..b3a52cab 100644 --- a/project_add_modal.php +++ b/project_add_modal.php @@ -33,6 +33,31 @@
    + + +
    + +
    +
    + +
    + +
    +
    + + +
    diff --git a/project_details.php b/project_details.php new file mode 100644 index 00000000..579557f3 --- /dev/null +++ b/project_details.php @@ -0,0 +1,345 @@ +

    Nothing to see here

    Go Back"; + + include_once "footer.php"; + exit; + } + + $row = mysqli_fetch_array($sql_project); + + $project_id = intval($row['project_id']); + $project_name = nullable_htmlentities($row['project_name']); + $project_description = nullable_htmlentities($row['project_description']); + $project_created_at = date("Y-m-d", strtotime($row['project_created_at'])); + $project_updated_at = nullable_htmlentities($row['project_updated_at']); + + $client_id = intval($row['client_id']); + $client_name = nullable_htmlentities($row['client_name']); + + // Get Tickets + $sql_tickets = mysqli_query($mysqli, "SELECT * FROM tickets LEFT JOIN users ON ticket_assigned_to = user_id WHERE ticket_project_id = $project_id ORDER BY ticket_number DESC"); + $ticket_count = mysqli_num_rows($sql_tickets); + + // Get Closed Ticket Count + $sql_closed_tickets = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_project_id = $project_id AND ticket_status = 'Closed'"); + + $closed_ticket_count = mysqli_num_rows($sql_closed_tickets); + + // Ticket Closed Percent + $tickets_closed_percent = ($closed_ticket_count / $ticket_count) * 100; + + // Get All Tasks + $sql_tasks = mysqli_query($mysqli, + "SELECT * FROM tickets, tasks + WHERE ticket_id = task_ticket_id + AND ticket_project_id = $project_id + ORDER BY task_created_at ASC" + ); + $task_count = mysqli_num_rows($sql_tasks); + + // Get Completed Task Count + $sql_tasks_completed = mysqli_query($mysqli, + "SELECT * FROM tickets, tasks + WHERE ticket_id = task_ticket_id + AND ticket_project_id = $project_id + AND task_completed_at IS NOT NULL" + ); + $completed_task_count = mysqli_num_rows($sql_tasks_completed); + + // Tasks Completed Percent + $tasks_completed_percent = ($completed_task_count / $task_count) * 100; +?> + + +
      +
    1. + Projects +
      2. +
    2. Project Details
      3. +
    + + +
    +
    +
    +
    + +
    +

    +
    +
    +
    +
    +
    +
    + +
    +

    +
    +
    +
    +
    + +
    +
    + +
    /
    +
    +
    + +
    /
    +
    +
    + +
    +
    +
    + +
    + + Edit + + + Add Ticket + + +
    + + Archive + + + +
    + + Delete + + +
    +
    +
    +
    +
    +
    + +
    +
    + + + 0) { ?> +
    + +
    Tickets
    +
    + + + + + + + + + + + + + Never

    "; + } else { + $ticket_updated_at_display = "

    Never

    "; + } + } else { + $ticket_updated_at_display = "$ticket_updated_at_time_ago
    $ticket_updated_at"; + } + $ticket_closed_at = nullable_htmlentities($row['ticket_closed_at']); + + $ticket_status_color = getTicketStatusColor($ticket_status); + + if ($ticket_priority == "High") { + $ticket_priority_display = "$ticket_priority"; + } elseif ($ticket_priority == "Medium") { + $ticket_priority_display = "$ticket_priority"; + } elseif ($ticket_priority == "Low") { + $ticket_priority_display = "$ticket_priority"; + } else{ + $ticket_priority_display = "-"; + } + + $ticket_assigned_to = intval($row['ticket_assigned_to']); + if (empty($ticket_assigned_to)) { + if ($ticket_status == "Closed") { + $ticket_assigned_to_display = "

    Not Assigned

    "; + } else { + $ticket_assigned_to_display = "

    Not Assigned

    "; + } + } else { + $ticket_assigned_to_display = nullable_htmlentities($row['user_name']); + } + + $project_id = intval($row['ticket_project_id']); + + $contact_name = nullable_htmlentities($row['contact_name']); + $contact_email = nullable_htmlentities($row['contact_email']); + $contact_archived_at = nullable_htmlentities($row['contact_archived_at']); + if (empty($contact_archived_at)) { + $contact_archived_display = ""; + } else { + $contact_archived_display = "Archived - "; + } + if (empty($contact_name)) { + $contact_display = "-"; + } else { + $contact_display = "$contact_archived_display$contact_name
    $contact_email"; + } + + // Get who last updated the ticket - to be shown in the last Response column + $ticket_reply_type = "Client"; // Default to client for unreplied tickets + $ticket_reply_by_display = ""; // Default none + $sql_ticket_reply = mysqli_query($mysqli, "SELECT ticket_reply_type, contact_name, user_name FROM ticket_replies + LEFT JOIN users ON ticket_reply_by = user_id + LEFT JOIN contacts ON ticket_reply_by = contact_id + WHERE ticket_reply_ticket_id = $ticket_id + AND ticket_reply_archived_at IS NULL + ORDER BY ticket_reply_id DESC LIMIT 1" + ); + $row = mysqli_fetch_array($sql_ticket_reply); + + if ($row) { + $ticket_reply_type = nullable_htmlentities($row['ticket_reply_type']); + if ($ticket_reply_type == "Client") { + $ticket_reply_by_display = nullable_htmlentities($row['contact_name']); + } else { + $ticket_reply_by_display = nullable_htmlentities($row['user_name']); + } + } + + ?> + + + + + + + + + + + + + + + + + + + + + + + + + + +
    NumberSubjectPriorityStatusAssignedLast Response
    + + + + + + +
    +
    +
    +
    +
    + +
    + +
    + + + 0) { ?> +
    +
    Tasks
    + + + + +
    + +
    + +
    + + +
    + + + + + + +
    + +
    + + + + +
    + + + +
    + +
    + + + + diff --git a/projects.php b/projects.php index 39cc571a..dff831ee 100644 --- a/projects.php +++ b/projects.php @@ -14,8 +14,7 @@ $sql = mysqli_query( $mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM projects LEFT JOIN clients ON client_id = project_client_id - WHERE project_template = 0 - AND DATE(project_created_at) BETWEEN '$dtf' AND '$dtt' + WHERE DATE(project_created_at) BETWEEN '$dtf' AND '$dtt' AND (project_name LIKE '%$q%' OR project_description LIKE '%$q%') AND project_archived_at IS NULL ORDER BY $sort $order LIMIT $record_from, $record_to" @@ -85,10 +84,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); "> Project - Description - Tickets - Tasks + Tickets / Tasks Due + Client Created Action @@ -100,33 +98,76 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $project_id = intval($row['project_id']); $project_name = nullable_htmlentities($row['project_name']); $project_description = nullable_htmlentities($row['project_description']); - if ($project_description) { - $project_description_display = $project_description; - } else { - - $project_description_display = "-"; - } $project_created_at = date("Y-m-d", strtotime($row['project_created_at'])); $project_updated_at = nullable_htmlentities($row['project_updated_at']); + $client_id = intval($row['client_id']); + $client_name = nullable_htmlentities($row['client_name']); + + // Get Tasks and Tickets Stats + // Get Tickets + $sql_tickets = mysqli_query($mysqli, "SELECT * FROM tickets LEFT JOIN users ON ticket_assigned_to = user_id WHERE ticket_project_id = $project_id ORDER BY ticket_number DESC"); + $ticket_count = mysqli_num_rows($sql_tickets); + + // Get Closed Ticket Count + $sql_closed_tickets = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_project_id = $project_id AND ticket_status = 'Closed'"); + + $closed_ticket_count = mysqli_num_rows($sql_closed_tickets); + + // Ticket Closed Percent + $tickets_closed_percent = ($closed_ticket_count / $ticket_count) * 100; + + // Get All Tasks + $sql_tasks = mysqli_query($mysqli, + "SELECT * FROM tickets, tasks + WHERE ticket_id = task_ticket_id + AND ticket_project_id = $project_id + ORDER BY task_created_at ASC" + ); + $task_count = mysqli_num_rows($sql_tasks); + + // Get Completed Task Count + $sql_tasks_completed = mysqli_query($mysqli, + "SELECT * FROM tickets, tasks + WHERE ticket_id = task_ticket_id + AND ticket_project_id = $project_id + AND task_completed_at IS NOT NULL" + ); + $completed_task_count = mysqli_num_rows($sql_tasks_completed); + + // Tasks Completed Percent + $tasks_completed_percent = ($completed_task_count / $task_count) * 100; + ?> - - - - -
    -
    1 / 2
    -
    + +
    + +
    +
    +
    +
    +
    +
    -
    7 / 10
    + +
    /
    +
    +
    + +
    /
    Next Week + + + + +
    diff --git a/ticket.php b/ticket.php index 5fd5dc3e..0e753ac6 100644 --- a/ticket.php +++ b/ticket.php @@ -92,6 +92,8 @@ if (isset($_GET['ticket_id'])) { $ticket_assigned_to_display = nullable_htmlentities($row['user_name']); } + $project_id = intval($row['ticket_project_id']); + $contact_id = intval($row['contact_id']); $contact_name = nullable_htmlentities($row['contact_name']); $contact_title = nullable_htmlentities($row['contact_title']); diff --git a/ticket_add_modal.php b/ticket_add_modal.php index f5bac066..23a415aa 100644 --- a/ticket_add_modal.php +++ b/ticket_add_modal.php @@ -27,6 +27,9 @@
  • Vendor
    • +
  • + Project +
    • @@ -291,6 +294,31 @@
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    diff --git a/ticket_edit_modal.php b/ticket_edit_modal.php index 19104829..6404661c 100644 --- a/ticket_edit_modal.php +++ b/ticket_edit_modal.php @@ -29,6 +29,9 @@
  • Vendor
    • +
  • + Project +
    • @@ -222,6 +225,31 @@
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    diff --git a/tickets.php b/tickets.php index 9766c06f..957baa8e 100644 --- a/tickets.php +++ b/tickets.php @@ -328,6 +328,7 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']); $ticket_updated_at_display = "$ticket_updated_at_time_ago
    $ticket_updated_at"; } $ticket_closed_at = nullable_htmlentities($row['ticket_closed_at']); + $project_id = intval($row['ticket_project_id']); $client_id = intval($row['ticket_client_id']); $client_name = nullable_htmlentities($row['client_name']); $contact_name = nullable_htmlentities($row['contact_name']); From ee308453dbc0bc8ce8749041314e2edb6f34662b Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 27 Mar 2024 22:51:20 -0400 Subject: [PATCH 16/19] Dont break when division of 0 occurs --- project_details.php | 13 ++++++++++--- projects.php | 22 ++++++++++++++-------- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/project_details.php b/project_details.php index 579557f3..5adf390c 100644 --- a/project_details.php +++ b/project_details.php @@ -40,8 +40,9 @@ if (isset($_GET['project_id'])) { $closed_ticket_count = mysqli_num_rows($sql_closed_tickets); - // Ticket Closed Percent - $tickets_closed_percent = ($closed_ticket_count / $ticket_count) * 100; + if($ticket_count) { + $tickets_closed_percent = ($closed_ticket_count / $ticket_count) * 100; + } // Get All Tasks $sql_tasks = mysqli_query($mysqli, @@ -62,7 +63,9 @@ if (isset($_GET['project_id'])) { $completed_task_count = mysqli_num_rows($sql_tasks_completed); // Tasks Completed Percent - $tasks_completed_percent = ($completed_task_count / $task_count) * 100; + if($task_count) { + $tasks_completed_percent = ($completed_task_count / $task_count) * 100; + } ?> @@ -96,14 +99,18 @@ if (isset($_GET['project_id'])) {
    +
    /
    + +
    /
    +
    diff --git a/projects.php b/projects.php index dff831ee..c56772a9 100644 --- a/projects.php +++ b/projects.php @@ -10,7 +10,7 @@ require_once "inc_all.php"; //Rebuild URL $url_query_strings_sort = http_build_query($get_copy); -$sql = mysqli_query( +$sql_projects = mysqli_query( $mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM projects LEFT JOIN clients ON client_id = project_client_id @@ -94,7 +94,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -153,14 +155,18 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); +
    /
    + +
    /
    + Next Week From 08fc72ded75ab976e4cc3a28974cbd582bfb40e3 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 27 Mar 2024 23:12:17 -0400 Subject: [PATCH 17/19] Fix Last Reponse Column under tickets and client tickets use the ticket_reply_created_at instead of ticket_updated_at --- client_tickets.php | 8 +++++--- tickets.php | 9 +++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/client_tickets.php b/client_tickets.php index b5d6bbce..4c2d1340 100644 --- a/client_tickets.php +++ b/client_tickets.php @@ -201,7 +201,7 @@ $total_scheduled_tickets = intval($row['total_scheduled_tickets']); // Get who last updated the ticket - to be shown in the last Response column $ticket_reply_type = "Client"; // Default to client for unreplied tickets $ticket_reply_by_display = ""; // Default none - $sql_ticket_reply = mysqli_query($mysqli, "SELECT ticket_reply_type, contact_name, user_name FROM ticket_replies + $sql_ticket_reply = mysqli_query($mysqli, "SELECT ticket_reply_type, ticket_reply_created_at, contact_name, user_name FROM ticket_replies LEFT JOIN users ON ticket_reply_by = user_id LEFT JOIN contacts ON ticket_reply_by = contact_id WHERE ticket_reply_ticket_id = $ticket_id @@ -217,11 +217,13 @@ $total_scheduled_tickets = intval($row['total_scheduled_tickets']); } else { $ticket_reply_by_display = nullable_htmlentities($row['user_name']); } + $ticket_reply_created_at = nullable_htmlentities($row['ticket_reply_created_at']); + $ticket_reply_created_at_time_ago = timeAgo($ticket_reply_created_at); } ?> - "> + "> @@ -269,7 +271,7 @@ $total_scheduled_tickets = intval($row['total_scheduled_tickets']); -
    +
    diff --git a/tickets.php b/tickets.php index 957baa8e..310c942d 100644 --- a/tickets.php +++ b/tickets.php @@ -374,7 +374,7 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']); // Get who last updated the ticket - to be shown in the last Response column $ticket_reply_type = "Client"; // Default to client for unreplied tickets $ticket_reply_by_display = ""; // Default none - $sql_ticket_reply = mysqli_query($mysqli, "SELECT ticket_reply_type, contact_name, user_name FROM ticket_replies + $sql_ticket_reply = mysqli_query($mysqli, "SELECT ticket_reply_type, ticket_reply_created_at, contact_name, user_name FROM ticket_replies LEFT JOIN users ON ticket_reply_by = user_id LEFT JOIN contacts ON ticket_reply_by = contact_id WHERE ticket_reply_ticket_id = $ticket_id @@ -391,11 +391,12 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']); $ticket_reply_by_display = nullable_htmlentities($row['user_name']); } $ticket_reply_created_at = nullable_htmlentities($row['ticket_reply_created_at']); + $ticket_reply_created_at_time_ago = timeAgo($ticket_reply_created_at); } ?> - "> + "> @@ -456,13 +457,13 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']); -
    +
    - +
    From 89a1c5d2d8d43c43683745d0a46e0a7963804950 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 28 Mar 2024 21:09:32 -0400 Subject: [PATCH 18/19] Added Ticket Templates and the ability to add Tasks to the template, reworked the ticket details tasks and adding tasks --- admin_side_nav.php | 106 +++++---------------- admin_ticket_template_add_modal.php | 135 +++++++++++++++++++++++++++ admin_ticket_template_details.php | 125 +++++++++++++++++++++++++ admin_ticket_template_edit_modal.php | 117 +++++++++++++++++++++++ admin_ticket_templates.php | 128 +++++++++++++++++++++++++ post.php | 3 + post/admin.php | 125 +++++++++++++++++++++++++ post/ticket.php | 11 +++ ticket.php | 86 ++++++++++------- ticket_add_modal.php | 21 ++++- 10 files changed, 742 insertions(+), 115 deletions(-) create mode 100644 admin_ticket_template_add_modal.php create mode 100644 admin_ticket_template_details.php create mode 100644 admin_ticket_template_edit_modal.php create mode 100644 admin_ticket_templates.php create mode 100644 post/admin.php diff --git a/admin_side_nav.php b/admin_side_nav.php index 96f53c6e..6231838f 100644 --- a/admin_side_nav.php +++ b/admin_side_nav.php @@ -1,177 +1,119 @@ \ No newline at end of file + diff --git a/admin_ticket_template_add_modal.php b/admin_ticket_template_add_modal.php new file mode 100644 index 00000000..f9859a6d --- /dev/null +++ b/admin_ticket_template_add_modal.php @@ -0,0 +1,135 @@ + diff --git a/admin_ticket_template_details.php b/admin_ticket_template_details.php new file mode 100644 index 00000000..d4c451b2 --- /dev/null +++ b/admin_ticket_template_details.php @@ -0,0 +1,125 @@ +set('URI.AllowedSchemes', ['data' => true, 'src' => true, 'http' => true, 'https' => true]); +$purifier = new HTMLPurifier($purifier_config); + +if (isset($_GET['ticket_template_id'])) { + $ticket_template_id = intval($_GET['ticket_template_id']); +} + +$sql_ticket_templates = mysqli_query($mysqli, "SELECT * FROM ticket_templates WHERE ticket_template_id = $ticket_template_id"); + +$row = mysqli_fetch_array($sql_ticket_templates); + +$ticket_template_name = nullable_htmlentities($row['ticket_template_name']); +$ticket_template_description = nullable_htmlentities($row['ticket_template_description']); +$ticket_template_subject = nullable_htmlentities($row['ticket_template_subject']); +$ticket_template_details = $purifier->purify($row['ticket_template_details']); +$ticket_template_created_at = nullable_htmlentities($row['ticket_template_created_at']); +$ticket_template_updated_at = nullable_htmlentities($row['ticket_template_updated_at']); + +// Get Task Templates +$sql_task_templates = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE task_template_ticket_template_id = $ticket_template_id"); + +?> + +
      +
    1. + Home +
      2. +
    2. + Admin +
      3. +
    3. + Ticket Templates +
      4. +
      5. +
    + +
    +
    + +
    +
    +

    +
    + +
    +

    +
    +
    +
    +

    +
    + +
    +
    +
    +
    + +
    +
    + +
    + +
    + +
    +
    +
    Tasks
    +
    +
    +
    + +
    +
    +
    + +
    + +
    + +
    +
    +
    +
    + + + + + + + + +
    + + + +
    +
    +
    + +
    + +
    + + + + +
    +
    +
    +
    Editing Ticket Template:
    + +
    +
    + +
    + + +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + + +
    + +
    + +
    + + +
    + +
    + +
    + + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + + +
    +
    +
    +
    +
    diff --git a/admin_ticket_templates.php b/admin_ticket_templates.php new file mode 100644 index 00000000..489fce83 --- /dev/null +++ b/admin_ticket_templates.php @@ -0,0 +1,128 @@ + + +
    +
    +

    Ticket Templates

    +
    + +
    +
    +
    +
    +
    + +
    +
    + +
    + +
    +
    +
    + +
    +
    + +
    +
    +
    +
    + + "> + + + + + + + + + + + + + + + + + +
    TemplateTasksAction
    + +
    + +
    + +
    +
    +
    + +     		0 +
    + +
    + + Edit + + +
    + + Delete + + +
    +
    +
    +
    + +
    +
    + +$name"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if (isset($_POST['edit_ticket_template'])) { + + validateTechRole(); + $ticket_template_id = intval($_POST['ticket_template_id']); + $name = sanitizeInput($_POST['name']); + $description = sanitizeInput($_POST['description']); + $subject = sanitizeInput($_POST['subject']); + $details = mysqli_real_escape_string($mysqli, $_POST['details']); + $project_template_id = intval($_POST['project_template']); + + mysqli_query($mysqli, "UPDATE ticket_templates SET ticket_template_name = '$name', ticket_template_description = '$description', ticket_template_subject = '$subject', ticket_template_details = '$details', ticket_template_project_template_id = $project_template_id WHERE ticket_template_id = $ticket_template_id"); + + $ticket_template_id = mysqli_insert_id($mysqli); + + // Logging + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Ticket Template', log_action = 'Edit', log_description = '$session_name edited ticket template $name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, log_entity_id = $ticket_template_id"); + + $_SESSION['alert_message'] = "You edited Ticket Template $name"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} + +if (isset($_GET['delete_ticket_template'])) { + + validateTechRole(); + + $ticket_template_id = intval($_GET['delete_ticket_template']); + + // Get ticket template name + $sql = mysqli_query($mysqli, "SELECT * FROM ticket_templates WHERE ticket_template_id = $ticket_template_id"); + $row = mysqli_fetch_array($sql); + $ticket_template_name = sanitizeInput($row['ticket_template_name']); + + mysqli_query($mysqli, "DELETE FROM ticket_templates WHERE ticket_template_id = $ticket_template_id"); + + // Delete Associated Tasks + mysqli_query($mysqli, "DELETE FROM task_templates WHERE task_template_ticket_template_id = $ticket_template_id"); + + // Logging + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Ticket Template', log_action = 'Delete', log_description = '$session_name deleted ticket template $ticket_template_name and its tasks', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, log_entity_id = $ticket_template_id"); + + $_SESSION['alert_type'] = "error"; + $_SESSION['alert_message'] = "You Deleted Ticket Template $ticket_template_name and its associated tasks"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} + +if (isset($_POST['add_ticket_template_task'])) { + + validateTechRole(); + $ticket_template_id = intval($_POST['ticket_template_id']); + $task_name = sanitizeInput($_POST['task_name']); + + mysqli_query($mysqli, "INSERT INTO task_templates SET task_template_name = '$task_name', task_template_ticket_template_id = $ticket_template_id"); + + $task_template_id = mysqli_insert_id($mysqli); + + // Logging + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Task Template', log_action = 'Create', log_description = '$session_name created task template $task_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, log_entity_id = $ticket_template_id"); + + $_SESSION['alert_message'] = "You created Task Template $task_name"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if (isset($_GET['delete_task_template'])) { + + validateTechRole(); + + $task_template_id = intval($_GET['delete_task_template']); + + // Get task template name + $sql = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE task_template_id = $task_template_id"); + $row = mysqli_fetch_array($sql); + $task_template_name = sanitizeInput($row['task_template_name']); + + mysqli_query($mysqli, "DELETE FROM task_templates WHERE task_template_id = $task_template_id"); + + // Logging + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Task Template', log_action = 'Delete', log_description = '$session_name deleted task template $task_template_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, log_entity_id = $task_template_id"); + + $_SESSION['alert_type'] = "error"; + $_SESSION['alert_message'] = "You Deleted Task Template $task_template_name"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} diff --git a/post/ticket.php b/post/ticket.php index d0ea42d4..26e628d7 100644 --- a/post/ticket.php +++ b/post/ticket.php @@ -56,6 +56,17 @@ if (isset($_POST['add_ticket'])) { $ticket_id = mysqli_insert_id($mysqli); + // Add Tasks + if (!empty($_POST['tasks'])) { + foreach ($_POST['tasks'] as $task) { + $task_name = sanitizeInput($task); + // Check that task_name is not-empty (For some reason the !empty on the array doesnt work here like in watchers) + if (!empty($task_name)) { + mysqli_query($mysqli,"INSERT INTO tasks SET task_name = '$task_name', task_ticket_id = $ticket_id"); + } + } + } + // Add Watchers if (!empty($_POST['watchers'])) { foreach ($_POST['watchers'] as $watcher) { diff --git a/ticket.php b/ticket.php index 0e753ac6..0fbe5dc9 100644 --- a/ticket.php +++ b/ticket.php @@ -749,45 +749,67 @@ if (isset($_GET['ticket_id'])) { - - 0) { ?> -
    -
    Tasks
    - + +
    +
    Tasks
    +
    + +
    +
    +
    + +
    + +
    + +
    +
    +
    +
    + - - -
    - -
    - -
    - - -
    - - - - - - -
    + ?> +
    + + + + - - - +
    + + + + + + - - - - + +
    +
    + +
    + + Edit + +
    + + Delete + +
    +
    +
    +
    +
    + diff --git a/ticket_add_modal.php b/ticket_add_modal.php index 23a415aa..0ee8c3b0 100644 --- a/ticket_add_modal.php +++ b/ticket_add_modal.php @@ -27,6 +27,9 @@
  • Vendor
    • +
  • + Tasks +
  • Project
    • @@ -191,7 +194,7 @@
    +
    + +
    +
    +
    + +
    +
    From 78e92ea8d6dd8e392fc6ba03babc31b812fdba1a Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 28 Mar 2024 22:03:57 -0400 Subject: [PATCH 19/19] Add Project Templates Listing, edit and add, more to come --- admin_project_template_add_modal.php | 41 +++++++++ admin_project_template_edit_modal.php | 44 +++++++++ admin_project_templates.php | 128 ++++++++++++++++++++++++++ admin_side_nav.php | 4 + post/admin.php | 71 ++++++++++++++ project_add_modal.php | 116 +++++++++++------------ 6 files changed, 343 insertions(+), 61 deletions(-) create mode 100644 admin_project_template_add_modal.php create mode 100644 admin_project_template_edit_modal.php create mode 100644 admin_project_templates.php diff --git a/admin_project_template_add_modal.php b/admin_project_template_add_modal.php new file mode 100644 index 00000000..bf881aee --- /dev/null +++ b/admin_project_template_add_modal.php @@ -0,0 +1,41 @@ + diff --git a/admin_project_template_edit_modal.php b/admin_project_template_edit_modal.php new file mode 100644 index 00000000..149f1294 --- /dev/null +++ b/admin_project_template_edit_modal.php @@ -0,0 +1,44 @@ + diff --git a/admin_project_templates.php b/admin_project_templates.php new file mode 100644 index 00000000..3ef1ed3f --- /dev/null +++ b/admin_project_templates.php @@ -0,0 +1,128 @@ + + +
    +
    +

    Project Templates

    +
    + +
    +
    +
    +
    +
    + +
    +
    + +
    + +
    +
    +
    + +
    +
    + +
    +
    +
    +
    + + "> + + + + + + + + + + + + + + + + + + + +
    TemplateTicketsTasksAction
    + +
    + +
    + +
    +
    +
    + +     		00 +
    + +
    + + Edit + + +
    + + Delete + + +
    +
    +
    +
    + +
    +
    + +
  • TEMPLATES
  • + "> + +

    Project Templates

    +     ">

    Ticket Templates

    diff --git a/post/admin.php b/post/admin.php index 6b85c292..66929fe2 100644 --- a/post/admin.php +++ b/post/admin.php @@ -4,6 +4,77 @@ * ITFlow - GET/POST request handler for admin */ +if (isset($_POST['add_project_template'])) { + + validateTechRole(); + $name = sanitizeInput($_POST['name']); + $description = sanitizeInput($_POST['description']); + + mysqli_query($mysqli, "INSERT INTO project_templates SET project_template_name = '$name', project_template_description = '$description'"); + + $project_template_id = mysqli_insert_id($mysqli); + + // Logging + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Project Template', log_action = 'Create', log_description = '$session_name created project template $name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, log_entity_id = $project_template_id"); + + $_SESSION['alert_message'] = "You created Project Template $name"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if (isset($_POST['edit_project_template'])) { + + validateTechRole(); + $project_template_id = intval($_POST['project_template_id']); + $name = sanitizeInput($_POST['name']); + $description = sanitizeInput($_POST['description']); + + mysqli_query($mysqli, "UPDATE project_templates SET project_template_name = '$name', project_template_description = '$description' WHERE project_template_id = $project_template_id"); + + $ticket_template_id = mysqli_insert_id($mysqli); + + // Logging + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Project Template', log_action = 'Edit', log_description = '$session_name edited Project template $name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, log_entity_id = $project_template_id"); + + $_SESSION['alert_message'] = "You edited Project Template $name"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} + +if (isset($_GET['delete_project_template'])) { + + validateTechRole(); + + $project_template_id = intval($_GET['delete_project_template']); + + // Get project template name + $sql = mysqli_query($mysqli, "SELECT * FROM project_templates WHERE project_template_id = $project_template_id"); + $row = mysqli_fetch_array($sql); + $project_template_name = sanitizeInput($row['project_template_name']); + + mysqli_query($mysqli, "DELETE FROM project_templates WHERE project_template_id = $project_template_id"); + + // Delete Associated Ticket Tasks + // First we need to get ticket_template_id Get ticket Templates + $sql_ticket_templates = mysqli_query($mysqli, "SELECT * FROM ticket_templates WHERE ticket_template_project_template_id = $project_template_id"); + while($row = mysqli_fetch_array($sql_ticket_templates)) { + $ticket_template_id = intval($row['ticket_template_id']); + mysqli_query($mysqli, "DELETE FROM task_templates WHERE task_template_ticket_template_id = $ticket_template_id"); + } + + // Then Delete Associated Ticket Templates + mysqli_query($mysqli, "DELETE FROM ticket_templates WHERE ticket_template_project_template_id = $project_template_id"); + + // Logging + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Project Template', log_action = 'Delete', log_description = '$session_name deleted ticket template $project_template_name and its associated ticket templates and its tasks', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, log_entity_id = $project_template_id"); + + $_SESSION['alert_type'] = "error"; + $_SESSION['alert_message'] = "You Deleted Project Template $project_template_name and its associated ticket templates and tasks"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} + if (isset($_POST['add_ticket_template'])) { validateTechRole(); diff --git a/project_add_modal.php b/project_add_modal.php index b3a52cab..6cbb25ba 100644 --- a/project_add_modal.php +++ b/project_add_modal.php @@ -1,69 +1,63 @@