From d60f5a9f8682d8ad9098eb597eb88a2ae16d38ec Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 30 Oct 2024 16:55:19 -0400 Subject: [PATCH] FEATURE: Nested folders in Files --- client_document_bulk_move_modal.php | 106 +++++++++++---------- client_file_bulk_move_modal.php | 71 ++++++++++++-- client_file_move_modal.php | 67 +++++++++++-- client_file_rename_modal.php | 7 +- client_file_upload_modal.php | 35 +++++-- client_files.php | 141 +++++++++++++++++++--------- 6 files changed, 306 insertions(+), 121 deletions(-) diff --git a/client_document_bulk_move_modal.php b/client_document_bulk_move_modal.php index 2fe8a524..79b37561 100644 --- a/client_document_bulk_move_modal.php +++ b/client_document_bulk_move_modal.php @@ -17,61 +17,67 @@ diff --git a/client_file_bulk_move_modal.php b/client_file_bulk_move_modal.php index 702d08cb..7a814a40 100644 --- a/client_file_bulk_move_modal.php +++ b/client_file_bulk_move_modal.php @@ -15,18 +15,69 @@
- - - + // Fetch all folders for the client + $sql_all_folders = mysqli_query($mysqli, "SELECT folder_id, folder_name, parent_folder FROM folders WHERE folder_location = 1 AND folder_client_id = $client_id ORDER BY folder_name ASC"); + $folders = array(); + + // Build an associative array of folders indexed by folder_id + while ($row = mysqli_fetch_assoc($sql_all_folders)) { + $folders[$row['folder_id']] = array( + 'folder_id' => intval($row['folder_id']), + 'folder_name' => nullable_htmlentities($row['folder_name']), + 'parent_folder' => intval($row['parent_folder']), + 'children' => array() + ); + } + + // Build the folder hierarchy + foreach ($folders as $id => &$folder) { + if ($folder['parent_folder'] != 0 && isset($folders[$folder['parent_folder']])) { + $folders[$folder['parent_folder']]['children'][] = &$folder; + } + } + unset($folder); // Break the reference + + // Prepare a list of root folders + $root_folders = array(); + foreach ($folders as $id => $folder) { + if ($folder['parent_folder'] == 0) { + $root_folders[] = $folder; + } + } + + // Display the folder options iteratively + $stack = array(); + foreach (array_reverse($root_folders) as $folder) { + $stack[] = array('folder' => $folder, 'level' => 0); + } + + while (!empty($stack)) { + $node = array_pop($stack); + $folder = $node['folder']; + $level = $node['level']; + + // Indentation for subfolders + $indentation = str_repeat(' ', $level * 4); + + // Check if this folder is selected + $selected = ''; + if ($folder['folder_id'] == $get_folder_id) { + $selected = 'selected'; + } + + echo ""; + + // Add children to the stack + if (!empty($folder['children'])) { + foreach (array_reverse($folder['children']) as $child_folder) { + $stack[] = array('folder' => $child_folder, 'level' => $level + 1); + } + } + } + ?> diff --git a/client_file_move_modal.php b/client_file_move_modal.php index e07dff64..bbfbeb13 100644 --- a/client_file_move_modal.php +++ b/client_file_move_modal.php @@ -18,16 +18,67 @@
- - - intval($row['folder_id']), + 'folder_name' => nullable_htmlentities($row['folder_name']), + 'parent_folder' => intval($row['parent_folder']), + 'children' => array() + ); + } + + // Build the folder hierarchy + foreach ($folders as $id => &$folder) { + if ($folder['parent_folder'] != 0 && isset($folders[$folder['parent_folder']])) { + $folders[$folder['parent_folder']]['children'][] = &$folder; + } + } + unset($folder); // Break the reference + + // Prepare a list of root folders + $root_folders = array(); + foreach ($folders as $id => $folder) { + if ($folder['parent_folder'] == 0) { + $root_folders[] = $folder; + } + } + + // Display the folder options iteratively + $stack = array(); + foreach (array_reverse($root_folders) as $folder) { + $stack[] = array('folder' => $folder, 'level' => 0); + } + + while (!empty($stack)) { + $node = array_pop($stack); + $folder = $node['folder']; + $level = $node['level']; + + // Indentation for subfolders + $indentation = str_repeat(' ', $level * 4); + + // Check if this folder is selected + $selected = ''; + if ($folder['folder_id'] == $file_folder_id) { + $selected = 'selected'; + } + + echo ""; + + // Add children to the stack + if (!empty($folder['children'])) { + foreach (array_reverse($folder['children']) as $child_folder) { + $stack[] = array('folder' => $child_folder, 'level' => $level + 1); + } + } } ?> diff --git a/client_file_rename_modal.php b/client_file_rename_modal.php index 57c24568..1f20c804 100644 --- a/client_file_rename_modal.php +++ b/client_file_rename_modal.php @@ -13,14 +13,17 @@
- +
- +
+ +
+
diff --git a/client_file_upload_modal.php b/client_file_upload_modal.php index 3fcb869a..10b8967f 100644 --- a/client_file_upload_modal.php +++ b/client_file_upload_modal.php @@ -28,20 +28,37 @@
- - - $indentation$folder_name"; + + // Recursively display subfolders + display_folder_options($folder_id, $client_id, $indent + 1); + } } - ?> + // Start displaying folder options from the root (parent_folder = 0) + display_folder_options(0, $client_id); + ?>
diff --git a/client_files.php b/client_files.php index 3125a55b..588aa7f0 100644 --- a/client_files.php +++ b/client_files.php @@ -99,62 +99,118 @@ $num_of_files = mysqli_num_rows($sql); " href="?client_id=&folder_id=0">/ + // Get the parent folder of the current folder + $result = mysqli_query($mysqli, "SELECT parent_folder FROM folders WHERE folder_id = $current_folder_id AND folder_client_id = $client_id"); + if ($row = mysqli_fetch_assoc($result)) { + $parent_folder_id = intval($row['parent_folder']); + // Recursive call to check the parent folder + return is_ancestor_folder($folder_id, $parent_folder_id, $client_id); + } else { + // Folder not found + return false; + } + } -
  • -
    -
    - " href="?client_id=&folder_id=&view="> - - - - - + // Recursive function to display folders and subfolders + function display_folders($parent_folder_id, $client_id, $indent = 0) { + global $mysqli, $get_folder_id, $session_user_role; - 0) { echo "$num_files"; } ?> + $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE parent_folder = $parent_folder_id AND folder_location = 1 AND folder_client_id = $client_id ORDER BY folder_name ASC"); + while ($row = mysqli_fetch_array($sql_folders)) { + $folder_id = intval($row['folder_id']); + $folder_name = nullable_htmlentities($row['folder_name']); + + // Get the number of files in the folder + $row2 = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('file_id') AS num FROM files WHERE file_folder_id = $folder_id AND file_archived_at IS NULL")); + $num_files = intval($row2['num']); + + // Get the number of subfolders + $subfolder_result = mysqli_query($mysqli, "SELECT COUNT(*) AS count FROM folders WHERE parent_folder = $folder_id AND folder_client_id = $client_id"); + $subfolder_count = intval(mysqli_fetch_assoc($subfolder_result)['count']); + + echo '
  • '; + echo '
    '; + echo '
    '; + echo ''; + + // Indentation for subfolders + echo str_repeat(' ', $indent * 4); + + // Determine if the folder is open + if ($get_folder_id == $folder_id || is_ancestor_folder($folder_id, $get_folder_id, $client_id)) { + echo ''; + } else { + echo ''; + } + + echo ' ' . $folder_name; + + if ($num_files > 0) { + echo "$num_files"; + } + + echo ''; + echo '
    '; + echo '
    '; + ?> +
    + +
    + + Rename -
    -
    -
    - -
    - - Rename - - -
    - - Delete - - -
    -
    + +
    + + Delete + +
    -
    • + '; + echo '
    '; - 0) { + // Display subfolders + echo ''; + } + echo ''; + } } + + // Start displaying folders from the root (parent_folder = 0) + display_folders(0, $client_id); ?> - +
    +
    @@ -164,7 +220,7 @@ $num_of_files = mysqli_num_rows($sql);
    - + ">
    @@ -303,6 +359,7 @@ $num_of_files = mysqli_num_rows($sql); $file_icon = "file"; } $file_created_at = nullable_htmlentities($row['file_created_at']); + $file_folder_id = intval($row['file_folder_id']); // Check if shared $sql_shared = mysqli_query(