From a724807782e5dfc39421ee7af00608109c5ad880 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Tue, 22 Feb 2022 13:14:17 -0500 Subject: [PATCH] DB Structure Update - Added Extension to contact on export PDF, finished contact departments --- client.php | 3 ++ client_contact_add_modal.php | 24 +++++++++ client_contact_edit_modal.php | 24 +++++++++ client_contacts.php | 3 +- client_department_add_modal.php | 32 ++++++++++++ client_department_edit_modal.php | 33 +++++++++++++ client_routes.php | 3 ++ client_side_nav.php | 13 +++++ db.sql | 3 +- post.php | 84 +++++++++++++++++++++++++++++--- 10 files changed, 213 insertions(+), 9 deletions(-) create mode 100644 client_department_add_modal.php create mode 100644 client_department_edit_modal.php diff --git a/client.php b/client.php index befb52ce..effd4e66 100644 --- a/client.php +++ b/client.php @@ -93,6 +93,9 @@ if(isset($_GET['client_id'])){ $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('location_id') AS num FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id")); $num_locations = $row['num']; + + $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('department_id') AS num FROM departments WHERE department_archived_at IS NULL AND department_client_id = $client_id")); + $num_departments = $row['num']; $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('asset_id') AS num FROM assets WHERE asset_archived_at IS NULL AND asset_client_id = $client_id")); $num_assets = $row['num']; diff --git a/client_contact_add_modal.php b/client_contact_add_modal.php index 190c207d..8b9c2ec2 100644 --- a/client_contact_add_modal.php +++ b/client_contact_add_modal.php @@ -53,6 +53,30 @@ + +
+ +
+
+ +
+ +
+
diff --git a/client_contact_edit_modal.php b/client_contact_edit_modal.php index 7ca465c3..f4e99283 100644 --- a/client_contact_edit_modal.php +++ b/client_contact_edit_modal.php @@ -56,6 +56,30 @@
+
+ +
+
+ +
+ +
+
+
diff --git a/client_contacts.php b/client_contacts.php index 0963ec38..4683459c 100644 --- a/client_contacts.php +++ b/client_contacts.php @@ -147,7 +147,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); $location_name_display = "-"; }else{ $location_name_display = $location_name; - } + } + $department_id = $row['department_id']; ?> diff --git a/client_department_add_modal.php b/client_department_add_modal.php new file mode 100644 index 00000000..f7f0ac11 --- /dev/null +++ b/client_department_add_modal.php @@ -0,0 +1,32 @@ + \ No newline at end of file diff --git a/client_department_edit_modal.php b/client_department_edit_modal.php new file mode 100644 index 00000000..021bb681 --- /dev/null +++ b/client_department_edit_modal.php @@ -0,0 +1,33 @@ + \ No newline at end of file diff --git a/client_routes.php b/client_routes.php index 4d32e387..8a328af9 100644 --- a/client_routes.php +++ b/client_routes.php @@ -7,6 +7,9 @@ if(isset($_GET['tab'])){ elseif($_GET['tab'] == "locations"){ include("client_locations.php"); } + if($_GET['tab'] == "departments"){ + include("client_departments.php"); + } elseif($_GET['tab'] == "assets"){ include("client_assets.php"); } diff --git a/client_side_nav.php b/client_side_nav.php index eaa9446f..2734b5d2 100644 --- a/client_side_nav.php +++ b/client_side_nav.php @@ -46,6 +46,19 @@ +
  • + "> + +

    + Departments + 0){ ?> + + +

    +     +
    • +
  • ASSETS
  • diff --git a/db.sql b/db.sql index c2f2a717..29473e06 100644 --- a/db.sql +++ b/db.sql @@ -361,6 +361,7 @@ CREATE TABLE `departments` ( `department_updated_at` datetime DEFAULT NULL, `department_archived_at` datetime DEFAULT NULL, `department_client_id` int(11) NOT NULL, + `company_id` int(11) NOT NULL, PRIMARY KEY (`department_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; @@ -1449,4 +1450,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2022-02-22 1:49:48 +-- Dump completed on 2022-02-22 13:13:37 diff --git a/post.php b/post.php index 0fdfff4e..4e6ba1c0 100644 --- a/post.php +++ b/post.php @@ -3958,6 +3958,7 @@ if(isset($_POST['add_contact'])){ $client_id = intval($_POST['client_id']); $name = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['name']))); $title = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['title']))); + $department = intval($_POST['department']); $phone = preg_replace("/[^0-9]/", '',$_POST['phone']); $extension = preg_replace("/[^0-9]/", '',$_POST['extension']); $mobile = preg_replace("/[^0-9]/", '',$_POST['mobile']); @@ -3970,7 +3971,7 @@ if(isset($_POST['add_contact'])){ mkdir("uploads/clients/$session_company_id/$client_id"); } - mysqli_query($mysqli,"INSERT INTO contacts SET contact_name = '$name', contact_title = '$title', contact_phone = '$phone', contact_extension = '$extension', contact_mobile = '$mobile', contact_email = '$email', contact_notes = '$notes', contact_created_at = NOW(), contact_location_id = $location_id, contact_client_id = $client_id, company_id = $session_company_id"); + mysqli_query($mysqli,"INSERT INTO contacts SET contact_name = '$name', contact_title = '$title', contact_phone = '$phone', contact_extension = '$extension', contact_mobile = '$mobile', contact_email = '$email', contact_notes = '$notes', contact_created_at = NOW(), contact_department_id = $department, contact_location_id = $location_id, contact_client_id = $client_id, company_id = $session_company_id"); $contact_id = mysqli_insert_id($mysqli); @@ -4036,6 +4037,7 @@ if(isset($_POST['edit_contact'])){ $client_id = intval($_POST['client_id']); $name = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['name']))); $title = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['title']))); + $department = intval($_POST['department']); $phone = preg_replace("/[^0-9]/", '',$_POST['phone']); $extension = preg_replace("/[^0-9]/", '',$_POST['extension']); $mobile = preg_replace("/[^0-9]/", '',$_POST['mobile']); @@ -4050,7 +4052,7 @@ if(isset($_POST['edit_contact'])){ mkdir("uploads/clients/$session_company_id/$client_id"); } - mysqli_query($mysqli,"UPDATE contacts SET contact_name = '$name', contact_title = '$title', contact_phone = '$phone', contact_extension = '$extension', contact_mobile = '$mobile', contact_email = '$email', contact_notes = '$notes', contact_location_id = $location_id, contact_updated_at = NOW() WHERE contact_id = $contact_id AND company_id = $session_company_id"); + mysqli_query($mysqli,"UPDATE contacts SET contact_name = '$name', contact_title = '$title', contact_phone = '$phone', contact_extension = '$extension', contact_mobile = '$mobile', contact_email = '$email', contact_notes = '$notes', contact_department_id = $department, contact_location_id = $location_id, contact_updated_at = NOW() WHERE contact_id = $contact_id AND company_id = $session_company_id"); //Update Primay contact in clients if primary contact is checked if($primary_contact > 0){ @@ -4157,12 +4159,12 @@ if(isset($_GET['export_client_contacts_csv'])){ $f = fopen('php://memory', 'w'); //set column headers - $fields = array('Name', 'Title', 'Department', 'Email', 'Phone', 'Mobile', 'Notes'); + $fields = array('Name', 'Title', 'Department', 'Email', 'Phone', 'Ext', 'Mobile', 'Notes'); 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['contact_name'], $row['contact_title'], $row['department_name'], $row['contact_email'], $row['contact_phone'], $row['contact_mobile'], $row['contact_notes']); + $lineData = array($row['contact_name'], $row['contact_title'], $row['department_name'], $row['contact_email'], formatPhoneNumber($row['contact_phone']), $row['contact_extension'], formatPhoneNumber($row['contact_mobile']), $row['contact_notes']); fputcsv($f, $lineData, $delimiter); } @@ -4398,6 +4400,70 @@ if(isset($_GET['export_client_locations_csv'])){ } +// Client Departments +if(isset($_POST['add_department'])){ + + $client_id = intval($_POST['client_id']); + $department_name = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['department_name']))); + + mysqli_query($mysqli,"INSERT INTO departments SET department_name = '$department_name', department_created_at = NOW(), department_client_id = $client_id, company_id = $session_company_id"); + + $contact_id = mysqli_insert_id($mysqli); + + //Logging + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Department', log_action = 'Create', log_description = '$department_name', log_created_at = NOW(), company_id = $session_company_id, log_client_id = $client_id, log_user_id = $session_user_id"); + + $_SESSION['alert_message'] .= "Department added"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if(isset($_POST['edit_department'])){ + + $department_id = intval($_POST['department_id']); + $client_id = intval($_POST['client_id']); + $department_name = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['department_name']))); + + mysqli_query($mysqli,"UPDATE departments SET department_name = '$department_name', department_updated_at = NOW() WHERE department_id = $department_id AND company_id = $session_company_id"); + + //Logging + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Department', log_action = 'Modify', log_description = '$department_name', log_created_at = NOW(), log_client_id = $client_id, log_user_id = $session_user_id, company_id = $session_company_id"); + + $_SESSION['alert_message'] .= "Department updated"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if(isset($_GET['archive_department'])){ + $department_id = intval($_GET['archive_department']); + + mysqli_query($mysqli,"UPDATE departments SET department_archived_at = NOW() WHERE department_id = $department_id"); + + //logging + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Department', log_action = 'Archive', log_description = '$department_id', log_created_at = NOW(), log_user_id = $session_user_id, company_id = $session_company_id"); + + $_SESSION['alert_message'] = "Department Archived!"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if(isset($_GET['delete_department'])){ + $department_id = intval($_GET['delete_department']); + + mysqli_query($mysqli,"DELETE FROM departments WHERE department_id = $department_id AND company_id = $session_company_id"); + + //Logging + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Contact', log_action = 'Delete', log_description = '$department_id', log_created_at = NOW(), company_id = $session_company_id, log_user_id = $session_user_id"); + + $_SESSION['alert_message'] = "Department deleted"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + if(isset($_POST['add_asset'])){ $client_id = intval($_POST['client_id']); @@ -6717,7 +6783,11 @@ if(isset($_GET['export_client_pdf'])){ { text: 'Title', style: 'itemHeader' - }, + }, + { + text: 'Department', + style: 'itemHeader' + }, { text: 'Email', style: 'itemHeader' @@ -6725,7 +6795,7 @@ if(isset($_GET['export_client_pdf'])){ { text: 'Phone', style: 'itemHeader' - }, + }, { text: 'Mobile', style: 'itemHeader' @@ -6764,7 +6834,7 @@ if(isset($_GET['export_client_pdf'])){ style: 'item' }, { - text: , + text: , style: 'item' }, {