From a2a2906771b76b45878d29bbdcf2d119647885b0 Mon Sep 17 00:00:00 2001 From: nathaniacalista01 <nathania.calista01@gmail.com> Date: Mon, 9 Oct 2023 11:46:41 +0700 Subject: [PATCH] fix few things --- api/admin/user/delete.php | 5 +++ app/views/courses/detailCourse.php | 56 +++++++++++++----------------- public/js/detailsCourse.js | 1 + 3 files changed, 30 insertions(+), 32 deletions(-) diff --git a/api/admin/user/delete.php b/api/admin/user/delete.php index 94377cf..f228888 100644 --- a/api/admin/user/delete.php +++ b/api/admin/user/delete.php @@ -13,8 +13,13 @@ if(isset($_POST["id"])){ if(isset($_SESSION["user_id"])){ $admin = new Admin(); + $old_user = $admin->getUserById($_POST["id"]); $rows = $admin->deleteUserById($_POST["id"]); if($rows){ + if(isset($old_user["image_path"]) && $old_user["image_path"] !== ""){ + $rm = 'rm ../../..'.$old_user["image_path"]; + exec($rm); + } http_response_code(200); $_SESSION["success"] = "User has been deleted!"; echo json_encode(array("status" => "success")); diff --git a/app/views/courses/detailCourse.php b/app/views/courses/detailCourse.php index 2825427..490d33e 100644 --- a/app/views/courses/detailCourse.php +++ b/app/views/courses/detailCourse.php @@ -26,6 +26,8 @@ if($user["user_role"] === 'TEACHER'){ $display = true; } + $course = $data["course"]; + ?> <?php include __DIR__ . '/../navbar/navbar.php' ?> @@ -35,37 +37,27 @@ <div class='popup-overlay'></div> <div class='popup-box'> <?php - if(isset($_SESSION["user_id"])){ - $user_modal = new User(); - $user_id = $_SESSION["user_id"]; - $user = $user_modal->getUserById($_SESSION["user_id"]); - if($display){ - // Add Module Form - $course = $data["course"]; - echo " - <form class='addForm' action='javascript:'> - <div class='addForm-header'> - Add Module - </div> - <div class='addForm-element'> - <label for='moduleName'>Module Name (Max 100 char)</label> - <textarea class='name-area' id='moduleName' maxlength='100' onkeyup='check_area(\"confirm-save\", \"moduleName\", \"moduleDescription\")'></textarea> - </div> - <div class='addForm-element'> - <label for='moduleDescription'>Description (Max 256 char)</label> - <textarea class='desc-area' id='moduleDescription' maxlength='256' onkeyup='check_area(\"confirm-save\", \"moduleName\", \"moduleDescription\")'></textarea> - </div> - <div class='addForm-element'> - <div class='popup-buttons'> - <button type='button' class='cancel-save' id='cancel-save'>Cancel</button> - <button type='submit' class='confirm-save' id='confirm-save' disabled onclick='handleAddModule($course[course_id])'>Add</button> - </div> + echo " + <form class='addForm' action='javascript:'> + <div class='addForm-header'> + Add Module + </div> + <div class='addForm-element'> + <label for='moduleName'>Module Name (Max 100 char)</label> + <textarea class='name-area' id='moduleName' maxlength='100' onkeyup='check_area(\"confirm-save\", \"moduleName\", \"moduleDescription\")'></textarea> + </div> + <div class='addForm-element'> + <label for='moduleDescription'>Description (Max 256 char)</label> + <textarea class='desc-area' id='moduleDescription' maxlength='256' onkeyup='check_area(\"confirm-save\", \"moduleName\", \"moduleDescription\")'></textarea> + </div> + <div class='addForm-element'> + <div class='popup-buttons'> + <button type='button' class='cancel-save' id='cancel-save'>Cancel</button> + <button type='submit' class='confirm-save' id='confirm-save' disabled onclick='handleAddModule($course[course_id])'>Add</button> </div> - </form> - "; - } - } - + </div> + </form> + "; ?> </div> </section> @@ -119,9 +111,9 @@ </div> <?php if($display){ - echo " + echo " <div class='actions'> - <i onclick='openFormEditModule(\"$course[course_id]\", \"$module[module_id]\", \"$module[title]\", \"$module[description]\")'> + <i onclick='openFormEditModule(\"$module[module_id]\", \"$module[title]\", \"$module[description]\")'> <svg xmlns='http://www.w3.org/2000/svg' width='18' height='18' viewBox='0 0 24 24' style='fill: rgba(0, 0, 0, 1);'> <path fill='#564C95' d='m18.988 2.012 3 3L19.701 7.3l-3-3zM8 16h3l7.287-7.287-3-3L8 13z'></path> <path fill='#564C95' d='M19 19H8.158c-.026 0-.053.01-.079.01-.033 0-.066-.009-.1-.01H5V5h6.847l2-2H5c-1.103 0-2 .896-2 2v14c0 1.104.897 2 2 2h14a2 2 0 0 0 2-2v-8.668l-2 2V19z'></path> diff --git a/public/js/detailsCourse.js b/public/js/detailsCourse.js index 7975849..7792aa0 100644 --- a/public/js/detailsCourse.js +++ b/public/js/detailsCourse.js @@ -53,6 +53,7 @@ function openFormAddModule() { }; const openFormEditModule = (course_id, module_id, title, description) => { + console.log("Edit module") var test = document.querySelector('.addForm-header'); test.textContent = 'Edit Module'; document.querySelector('#confirm-save').textContent = 'Edit'; -- GitLab