Update on select all feature

Jumanjigobez · Dec 21, 2024 · 3188cbe · 3188cbe
1 parent a9c302f
commit 3188cbe
Show file tree

Hide file tree

Showing 35 changed files with 2,311 additions and 205 deletions.
diff --git a/PHP/admin/addUser.php b/PHP/admin/addUser.php
@@ -10,9 +10,9 @@
     $terms_agreed = $_POST['TermsAgreed'];
 
     function generateUserID() {
-        $datePart = date("Ymd");
+        // $datePart = date("Ymd");
         $randomPart = generateRandomString(8);
-        return "user_".$randomPart . $datePart;
+        return "user_".$randomPart;
     }
 
     function generateRandomString($length) {
@@ -25,13 +25,13 @@ function generateRandomString($length) {
         return $randomString;
     }
 
-    function getRegDate($userId) {
+    // function getRegDate($userId) {
 
-        $RegDate = substr($userId, -8);
-        if (substr($RegDate, 0, 1) === "2") {
-            return $RegDate; // Outputs: 20240609
-        }
-    }
+    //     $RegDate = substr($userId, -8);
+    //     if (substr($RegDate, 0, 1) === "2") {
+    //         return $RegDate; // Outputs: 20240609
+    //     }
+    // }
 
     if(!empty($username) && !empty($psk) && !empty($email) && !empty($terms_agreed) && !empty($status) && !empty($user_type)){
         $query = $conn->prepare("SELECT * FROM `users` WHERE username = (?) OR email = (?)");
@@ -46,7 +46,8 @@ function getRegDate($userId) {
            echo "Account Exists";
         }else{
             $user_id = generateUserID();
-            $reg_date = getRegDate($user_id);
+            date_default_timezone_set('Africa/Nairobi');
+            $reg_date = date('Y-m-d H:i:s');
             $psk = password_hash($psk,PASSWORD_DEFAULT);//Hashed Password
 
             $query = $conn->prepare("INSERT INTO `users` VALUES((?),(?),(?),(?),(?),(?), (?), (?))");

diff --git a/PHP/admin/deleteMarkedUsers.php b/PHP/admin/deleteMarkedUsers.php
@@ -0,0 +1,20 @@
+<?php 
+
+    include "../config.php";
+
+    $IdsArray = $_GET['checkedIds'];
+
+
+
+    $placeholders = implode(',',array_fill(0, count($IdsArray), '?'));
+    $query = $conn->prepare("DELETE FROM users WHERE user_id IN ($placeholders)");
+    $query->bind_param(str_repeat('s',count($IdsArray)), ...$IdsArray);
+    $query->execute();
+
+    if ($query){
+        echo 1;
+    } else {
+        echo 0;
+    }
+
+?>
diff --git a/PHP/admin/editUser.php b/PHP/admin/editUser.php
@@ -10,12 +10,13 @@
     $user_type = $_POST['UserType'];
     $terms_agreed = $_POST['TermsAgreed'];
 
+    $psk_hashed = password_hash($psk,PASSWORD_DEFAULT);//Hashed Password
 
     $query = $conn->prepare("UPDATE users SET 
     username = (?), email = (?), psk = (?),
     status = (?), user_type = (?), terms_agreed = (?) WHERE user_id = (?)");
 
-    $query->bind_param("sssssss", $username, $email, $psk, $status, $user_type, $terms_agreed, $user_id);
+    $query->bind_param("sssssss", $username, $email, $psk_hashed, $status, $user_type, $terms_agreed, $user_id);
     $query->execute();
 
     if ($query){

diff --git a/PHP/admin/userSearch.php b/PHP/admin/userSearch.php
@@ -14,8 +14,9 @@
         status like '%{$term}%' OR
         user_type like '%{$term}%' OR
         terms_agreed like '%{$term}%' OR
-        reg_date like '%{$term}%'
-    )
+        reg_date like '%{$term}%' 
+
+    ) ORDER BY reg_date DESC
 
     ");
 

diff --git a/PHP/admin/users.php b/PHP/admin/users.php
@@ -2,7 +2,7 @@
 
     include "../config.php";
 
-    $query = $conn->prepare("SELECT * FROM users");
+    $query = $conn->prepare("SELECT * FROM users ORDER BY reg_date DESC");
 
     if($query->execute()){
         $result = $query->get_result();

diff --git a/PHP/appointments/deleteMarkedAppointments.php b/PHP/appointments/deleteMarkedAppointments.php
@@ -0,0 +1,20 @@
+<?php 
+
+    include "../config.php";
+
+    $IdsArray = $_GET['checkedIds'];
+
+
+
+    $placeholders = implode(',',array_fill(0, count($IdsArray), '?'));
+    $query = $conn->prepare("DELETE FROM appointments WHERE id IN ($placeholders)");
+    $query->bind_param(str_repeat('i',count($IdsArray)), ...$IdsArray);
+    $query->execute();
+
+    if ($query){
+        echo 1;
+    } else {
+        echo 0;
+    }
+
+?>
diff --git a/PHP/classTimetable/deleteMarkedClassTimetable.php b/PHP/classTimetable/deleteMarkedClassTimetable.php
@@ -0,0 +1,20 @@
+<?php 
+
+    include "../config.php";
+
+    $IdsArray = $_GET['checkedIds'];
+
+
+
+    $placeholders = implode(',',array_fill(0, count($IdsArray), '?'));
+    $query = $conn->prepare("DELETE FROM class_timetable WHERE id IN ($placeholders)");
+    $query->bind_param(str_repeat('i',count($IdsArray)), ...$IdsArray);
+    $query->execute();
+
+    if ($query){
+        echo 1;
+    } else {
+        echo 0;
+    }
+
+?>
diff --git a/PHP/contacts/deleteMarkedContacts.php b/PHP/contacts/deleteMarkedContacts.php
@@ -0,0 +1,20 @@
+<?php 
+
+    include "../config.php";
+
+    $IdsArray = $_GET['checkedIds'];
+
+
+
+    $placeholders = implode(',',array_fill(0, count($IdsArray), '?'));
+    $query = $conn->prepare("DELETE FROM contacts WHERE id IN ($placeholders)");
+    $query->bind_param(str_repeat('i',count($IdsArray)), ...$IdsArray);
+    $query->execute();
+
+    if ($query){
+        echo 1;
+    } else {
+        echo 0;
+    }
+
+?>
diff --git a/PHP/events/deleteMarkedEvents.php b/PHP/events/deleteMarkedEvents.php
@@ -0,0 +1,20 @@
+<?php 
+
+    include "../config.php";
+
+    $IdsArray = $_GET['checkedIds'];
+
+
+
+    $placeholders = implode(',',array_fill(0, count($IdsArray), '?'));
+    $query = $conn->prepare("DELETE FROM events WHERE id IN ($placeholders)");
+    $query->bind_param(str_repeat('i',count($IdsArray)), ...$IdsArray);
+    $query->execute();
+
+    if ($query){
+        echo 1;
+    } else {
+        echo 0;
+    }
+
+?>
diff --git a/PHP/goals/deleteMarkedGoals.php b/PHP/goals/deleteMarkedGoals.php
@@ -0,0 +1,20 @@
+<?php 
+
+    include "../config.php";
+
+    $IdsArray = $_GET['checkedIds'];
+
+
+
+    $placeholders = implode(',',array_fill(0, count($IdsArray), '?'));
+    $query = $conn->prepare("DELETE FROM goals WHERE id IN ($placeholders)");
+    $query->bind_param(str_repeat('i',count($IdsArray)), ...$IdsArray);
+    $query->execute();
+
+    if ($query){
+        echo 1;
+    } else {
+        echo 0;
+    }
+
+?>
diff --git a/PHP/payments.php b/PHP/payments.php
@@ -11,14 +11,30 @@
 
     $user_id = $_GET['user_id'];
 
+    function formatToLocaleString($value) {
+        // Remove any commas from the string
+        $number = str_replace(',', '', $value);
+
+        // Convert the string to a float
+        $number = (float)$number;
+
+        // Format the number with commas as thousands separators
+        $formattedNumber = number_format($number,2, '.', ',');
+
+        return (string)$formattedNumber;
+    }
+
     if(!empty($TransCode)&&!empty($AccNo)&&!empty($AccName)&&!empty($Amount)&&!empty($Date)&&!empty($Type)){
+
         $DateValue = ($Date !== ' ') ? $Date : null;
+        $formatedAmount = formatToLocaleString($Amount);
+
         $query = $conn->prepare("INSERT INTO payments (
             `Trans. Code`, `Acc. No.`, `Acc. Name`,Amount, Date, Type, user_id
             ) VALUES (?, ?, ?, ?, ?, ?, ?)");
 
         $query->bind_param("sssssss",
-        $TransCode, $AccNo, $AccName, $Amount, $DateValue, $Type, $user_id);
+        $TransCode, $AccNo, $AccName, $formatedAmount, $DateValue, $Type, $user_id);
 
         $query->execute();//Execute the query
 

diff --git a/PHP/payments/deleteMarkedPayments.php b/PHP/payments/deleteMarkedPayments.php
@@ -0,0 +1,20 @@
+<?php 
+
+    include "../config.php";
+
+    $IdsArray = $_GET['checkedIds'];
+
+
+
+    $placeholders = implode(',',array_fill(0, count($IdsArray), '?'));
+    $query = $conn->prepare("DELETE FROM payments WHERE id IN ($placeholders)");
+    $query->bind_param(str_repeat('i',count($IdsArray)), ...$IdsArray);
+    $query->execute();
+
+    if ($query){
+        echo 1;
+    } else {
+        echo 0;
+    }
+
+?>
diff --git a/PHP/payments/editPayments.php b/PHP/payments/editPayments.php
@@ -10,12 +10,27 @@
     $Date = $_POST['Date'];
     $Type = $_POST['Type'];
 
+    function formatToLocaleString($value) {
+        // Remove any commas from the string
+        $number = str_replace(',', '', $value);
+
+        // Convert the string to a float
+        $number = (float)$number;
+
+        // Format the number with commas as thousands separators
+        $formattedNumber = number_format($number,2, '.', ',');
+
+        return (string)$formattedNumber;
+    }
+
+
+    $formatedAmount = formatToLocaleString($Amount);
 
     $query = $conn->prepare("UPDATE payments SET 
     `Trans. Code` = (?), `Acc. No.` = (?), `Acc. Name` = (?),
     Amount = (?), Date = (?), Type = (?) WHERE id = (?)");
 
-    $query->bind_param("sssssss", $TransCode, $AccNo, $AccName, $Amount, $Date, $Type, $id);
+    $query->bind_param("sssssss", $TransCode, $AccNo, $AccName, $formatedAmount, $Date, $Type, $id);
     $query->execute();
 
     if ($query){

diff --git a/PHP/personalTimetable/deleteMarkedPersonalTimetable.php b/PHP/personalTimetable/deleteMarkedPersonalTimetable.php
@@ -0,0 +1,20 @@
+<?php 
+
+    include "../config.php";
+
+    $IdsArray = $_GET['checkedIds'];
+
+
+
+    $placeholders = implode(',',array_fill(0, count($IdsArray), '?'));
+    $query = $conn->prepare("DELETE FROM personal_timetable WHERE id IN ($placeholders)");
+    $query->bind_param(str_repeat('i',count($IdsArray)), ...$IdsArray);
+    $query->execute();
+
+    if ($query){
+        echo 1;
+    } else {
+        echo 0;
+    }
+
+?>
diff --git a/PHP/projects/deleteMarkedProjects.php b/PHP/projects/deleteMarkedProjects.php
@@ -0,0 +1,20 @@
+<?php 
+
+    include "../config.php";
+
+    $IdsArray = $_GET['checkedIds'];
+
+
+
+    $placeholders = implode(',',array_fill(0, count($IdsArray), '?'));
+    $query = $conn->prepare("DELETE FROM projects WHERE id IN ($placeholders)");
+    $query->bind_param(str_repeat('i',count($IdsArray)), ...$IdsArray);
+    $query->execute();
+
+    if ($query){
+        echo 1;
+    } else {
+        echo 0;
+    }
+
+?>
diff --git a/PHP/psk/forgot.php b/PHP/psk/forgot.php
@@ -110,7 +110,7 @@
                     $mail->Host = 'smtp.gmail.com';
                     $mail->SMTPAuth = true;
                     $mail->Username = 'jumagobe3@gmail.com';//your email
-
+                    $mail->Password = '';//your email password
                     $mail->SMTPSecure = PHPMailer::ENCRYPTION_STARTTLS;
                     $mail->Port = '587';
 

diff --git a/PHP/signup.php b/PHP/signup.php
@@ -10,9 +10,9 @@
 
 
     function generateUserID() {
-        $datePart = date("Ymd");
+        // $datePart = date("Ymd");
         $randomPart = generateRandomString(8);
-        return "user_".$randomPart . $datePart;
+        return "user_".$randomPart;
     }
 
     function generateRandomString($length) {
@@ -25,13 +25,13 @@ function generateRandomString($length) {
         return $randomString;
     }
 
-    function getRegDate($userId) {
+    // function getRegDate($userId) {
 
-        $RegDate = substr($userId, -8);
-        if (substr($RegDate, 0, 1) === "2") {
-            return $RegDate; // Outputs: 20240609
-        }
-    }
+    //     $RegDate = substr($userId, -8);
+    //     if (substr($RegDate, 0, 1) === "2") {
+    //         return $RegDate; // Outputs: 20240609
+    //     }
+    // }
 
     if(!empty($username) && !empty($psk) && !empty($email) && $terms_check){
         $query = $conn->prepare("SELECT * FROM `users` WHERE username = (?) OR email = (?)");
@@ -46,7 +46,8 @@ function getRegDate($userId) {
            echo "Account Exists";
         }else{
             $user_id = generateUserID();
-            $reg_date = getRegDate($user_id);
+            date_default_timezone_set('Africa/Nairobi');
+            $reg_date = date('Y-m-d H:i:s');
             $user_type = "normal";
             $status = "offline";
             $terms_check = "Agreed";