diff --git a/app/Controllers/EventController.php b/app/Controllers/EventController.php
index 59b1d650bbb9029bb65bb3a092ad54bbc1ee8853..2f2001e2c1e0072afd08ab6fc26e6cf81daac9f1 100644
--- a/app/Controllers/EventController.php
+++ b/app/Controllers/EventController.php
@@ -34,9 +34,9 @@ class EventController {
         return $success;
     }
 
-    // public function getEvent($eventId) {
-    //     return $this->eventModel->getEvent($eventId);
-    // }
+    public function getEvent($eventId) {
+        return $this->eventModel->getEvent($eventId);
+    }
 
     public function updateEvent($eventId, $event_name, $event_price, $event_date, $event_location, $gambar, $vid){
         $eventModel = new EventModel();
diff --git a/app/Models/Event.php b/app/Models/Event.php
index 5d075c661316c9ec51127e6219671f1d78777066..1cd39c45f169ba400c782fcd6363f4a20937f3d0 100644
--- a/app/Models/Event.php
+++ b/app/Models/Event.php
@@ -63,7 +63,7 @@ class EventModel {
         echo "Updating Event with ID: $event_id, Name: $event_name, Price: $event_price, Date: $event_date, Location: $event_location";
         
         if ($gambar !== null && isset($gambar['name']) && isset($gambar['tmp_name'])) {
-            $imageFilePath = 'assets/images/' . $gambar['name'];
+            $imageFilePath = '../assets/images/' . $gambar['name'];
     
             // Move the uploaded file to the desired directory
             if (move_uploaded_file($gambar['tmp_name'], $imageFilePath)) {
@@ -78,7 +78,7 @@ class EventModel {
         }
 
         if ($vid !== null && isset($vid['name']) && isset($vid['tmp_name'])) {
-            $vidFilePath = 'assets/videos/' . $vid['name'];
+            $vidFilePath = '../assets/videos/' . $vid['name'];
     
             // Move the uploaded file to the desired directory
             if (move_uploaded_file($vid['tmp_name'], $vidFilePath)) {
@@ -91,15 +91,17 @@ class EventModel {
             echo "No video uploaded<br>";
             $vidFilePath = null; // Set to null if no file is uploaded
         }
-
-        // Check whether a new image is provided
-        // if ($gambar !== null) {
-        //     $sql = "UPDATE events SET event_name = '$event_name', event_stock = '$event_stock', event_date = '$event_date', event_details = '$details', gambar = '$gambar', event_location = '$event_location', vid = '$vid' WHERE event_id = $event_id";
-        // } else {
-        //     $sql = "UPDATE events SET event_name = '$event_name', event_stock = '$event_stock', event_date = '$event_date', event_details = '$details', event_location = '$event_location', vid = '$vid' WHERE event_id = $event_id";
-        // }
-
-        $sql = "UPDATE events SET event_name = '$event_name', event_price = '$event_price', event_date = '$event_date', event_location = '$event_location', gambar = '$imageFilePath', vid = '$vidFilePath' WHERE event_id = $event_id";
+        
+        // chek wheter image or video is null or not
+        if ($imageFilePath === null && $vidFilePath === null) {
+            $sql = "UPDATE events SET event_name = '$event_name', event_price = '$event_price', event_date = '$event_date', event_location = '$event_location' WHERE event_id = $event_id";
+        } elseif ($imageFilePath === null) {
+            $sql = "UPDATE events SET event_name = '$event_name', event_price = '$event_price', event_date = '$event_date', event_location = '$event_location', vid = '$vidFilePath' WHERE event_id = $event_id";
+        } elseif ($vidFilePath === null) {
+            $sql = "UPDATE events SET event_name = '$event_name', event_price = '$event_price', event_date = '$event_date', event_location = '$event_location', gambar = '$imageFilePath' WHERE event_id = $event_id";
+        } else {
+            $sql = "UPDATE events SET event_name = '$event_name', event_price = '$event_price', event_date = '$event_date', event_location = '$event_location', gambar = '$imageFilePath', vid = '$vidFilePath' WHERE event_id = $event_id";
+        }
     
         $rowCount = $db->exec($sql);
     
@@ -146,6 +148,13 @@ class EventModel {
         return $stmt->fetchAll(PDO::FETCH_ASSOC);
     }
 
+    public function getEvent($eventId) {
+        global $db;
+        $stmt = $db->prepare("SELECT * FROM events WHERE event_id = ?");
+        $stmt->execute([$eventId]);
+        return $stmt->fetch(PDO::FETCH_ASSOC);
+    }
+
     public function getLastEventId() {
         global $db;
         $stmt = $db->prepare("SELECT event_id FROM events ORDER BY event_id DESC LIMIT 1");