diff --git a/client_document_add_modal.php b/client_document_add_modal.php index 93c8186c..33437a7b 100644 --- a/client_document_add_modal.php +++ b/client_document_add_modal.php @@ -51,8 +51,35 @@
+ +
+
+
+ +
+ +
+
+ +
+
+
+ +
+ +
+
+ +
diff --git a/client_document_edit_modal.php b/client_document_edit_modal.php index 8fc1043e..7678b8c4 100644 --- a/client_document_edit_modal.php +++ b/client_document_edit_modal.php @@ -49,6 +49,32 @@
+ +
+
+
+ +
+ +
+
+ +
+
+
+ +
+ +
+
+
diff --git a/client_documents.php b/client_documents.php index f73b14d1..bbe50682 100644 --- a/client_documents.php +++ b/client_documents.php @@ -55,12 +55,14 @@ $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o $sql_no_tag = "SELECT SQL_CALC_FOUND_ROWS * FROM documents WHERE document_client_id = $client_id AND documents.company_id = $session_company_id + AND document_template = 0 AND (document_name LIKE '%$q%' OR document_content LIKE '%$q%') ORDER BY $sb $o LIMIT $record_from, $record_to"; $sql_with_tag = "SELECT SQL_CALC_FOUND_ROWS * FROM documents LEFT JOIN documents_tagged ON documents.document_id = documents_tagged.document_id WHERE document_client_id = $client_id + AND document_template = 0 AND documents.company_id = $session_company_id AND (document_name LIKE '%$q%' OR document_content LIKE '%$q%') AND documents_tagged.tag_id LIKE '%$tag%' @@ -81,9 +83,20 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));

Documents

- - + +
+ +
+ New Document + From Template +
+ Tags +
+
+
+ +
diff --git a/db.sql b/db.sql index 4461d9d1..ff766382 100644 --- a/db.sql +++ b/db.sql @@ -398,26 +398,6 @@ CREATE TABLE `document_tags` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; --- --- Table structure for table `document_templates` --- - -DROP TABLE IF EXISTS `document_templates`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `document_templates` ( - `document_template_id` int(11) NOT NULL AUTO_INCREMENT, - `document_template_name` varchar(200) NOT NULL, - `document_template_content` longtext NOT NULL, - `document_template_created_at` datetime NOT NULL, - `document_template_updated_at` datetime DEFAULT NULL, - `document_template_archived_at` datetime DEFAULT NULL, - `document_template_category_id` int(11) DEFAULT NULL, - `company_id` int(11) NOT NULL, - PRIMARY KEY (`document_template_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -/*!40101 SET character_set_client = @saved_cs_client */; - -- -- Table structure for table `documents` -- @@ -432,6 +412,7 @@ CREATE TABLE `documents` ( `document_created_at` datetime NOT NULL, `document_updated_at` datetime DEFAULT NULL, `document_archived_at` datetime DEFAULT NULL, + `document_template` tinyint(1) NOT NULL, `document_folder_id` int(11) DEFAULT NULL, `document_client_id` int(11) NOT NULL, `company_id` int(11) NOT NULL, @@ -1139,7 +1120,7 @@ CREATE TABLE `settings` ( DROP TABLE IF EXISTS `shared_items`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; -CREATE TABLE IF NOT EXISTS `shared_items` ( +CREATE TABLE `shared_items` ( `item_id` int(11) NOT NULL AUTO_INCREMENT, `item_active` int(1) NOT NULL, `item_key` varchar(255) NOT NULL, @@ -1464,4 +1445,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2022-02-18 18:02:48 +-- Dump completed on 2022-02-20 17:01:28 diff --git a/get_settings.php b/get_settings.php index 379df69a..7764dd54 100644 --- a/get_settings.php +++ b/get_settings.php @@ -894,4 +894,10 @@ $license_types_array = array( 'User' ); +$document_types_array = array( + '0'=>'Document', + '1'=>'Template', + '2'=>'Global Template' +); + ?> \ No newline at end of file diff --git a/post.php b/post.php index 2449ccc7..a2154706 100644 --- a/post.php +++ b/post.php @@ -6065,17 +6065,19 @@ if(isset($_POST['add_document'])){ $name = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['name']))); $tags_ids = $_POST['tags_ids']; $content = trim(mysqli_real_escape_string($mysqli,$purifier->purify(html_entity_decode($_POST['content'])))); + $template = intval($_POST['template']); + $folder = intval($_POST['folder']); // Document add query - $add_document = mysqli_query($mysqli,"INSERT INTO documents SET document_name = '$name', document_content = '$content', document_created_at = NOW(), document_client_id = $client_id, company_id = $session_company_id"); + $add_document = mysqli_query($mysqli,"INSERT INTO documents SET document_name = '$name', document_content = '$content', document_created_at = NOW(), document_template = $template, document_folder_id = $folder, document_client_id = $client_id, company_id = $session_company_id"); $document_id = $mysqli->insert_id; // Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Document', log_action = 'Created', log_description = '$details', log_created_at = NOW(), company_id = $session_company_id, log_user_id = $session_user_id"); // Add tags - foreach($tags_ids as $tag_id) { - if (intval($tag_id)) { + foreach($tags_ids as $tag_id){ + if(intval($tag_id)){ mysqli_query($mysqli, "INSERT INTO documents_tagged SET document_id = '$document_id', tag_id = '$tag_id'"); } } @@ -6097,9 +6099,11 @@ if(isset($_POST['edit_document'])){ $name = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['name']))); $tags_ids = $_POST['tags_ids']; $content = trim(mysqli_real_escape_string($mysqli,$purifier->purify(html_entity_decode($_POST['content'])))); + $template = intval($_POST['template']); + $folder = intval($_POST['folder']); // Document edit query - mysqli_query($mysqli,"UPDATE documents SET document_name = '$name', document_content = '$content', document_updated_at = NOW() WHERE document_id = $document_id AND company_id = $session_company_id"); + mysqli_query($mysqli,"UPDATE documents SET document_name = '$name', document_content = '$content', document_updated_at = NOW(), document_template = $template, document_folder_id = $folder WHERE document_id = $document_id AND company_id = $session_company_id"); //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Note', log_action = 'Modified', log_description = '$name', log_created_at = NOW(), company_id = $session_company_id, log_user_id = $session_user_id");