From 8c817ac2f3b51cf83542e6ac0439ee852bb32e4f Mon Sep 17 00:00:00 2001
From: Wahyu Ramadhan <ssjrama@gmail.com>
Date: Tue, 1 Aug 2023 15:28:20 +0700
Subject: [PATCH 1/2] Fix handling default value

---
 app/Http/Controllers/ActivityController.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php
index 708b3a5..978276d 100644
--- a/app/Http/Controllers/ActivityController.php
+++ b/app/Http/Controllers/ActivityController.php
@@ -462,8 +462,12 @@ class ActivityController extends Controller
 					do {
 						array_pop($activityStack);
 						$lastStack = end($activityStack);
-						if ($activity->level > $lastStack->level)
+						if ($lastStack) {
+							if ($activity->level > $lastStack->level)
+								$lastStackIsNotRight = false;
+						} else {
 							$lastStackIsNotRight = false;
+						}
 					} while ($lastStackIsNotRight);
 				}
 

From af788c2d49b9e4599bbf04b5c17df1bc805c7c3b Mon Sep 17 00:00:00 2001
From: Wahyu Ramadhan <ssjrama@gmail.com>
Date: Wed, 2 Aug 2023 10:49:41 +0700
Subject: [PATCH 2/2] Fix default column showed

---
 app/Http/Controllers/ShowHideColumnController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/ShowHideColumnController.php b/app/Http/Controllers/ShowHideColumnController.php
index a2db693..be5292f 100644
--- a/app/Http/Controllers/ShowHideColumnController.php
+++ b/app/Http/Controllers/ShowHideColumnController.php
@@ -45,12 +45,12 @@ class ShowHideColumnController extends Controller
 
         $success = 0;
 
-        foreach ($columns as $column) {
+        foreach ($columns as $key => $column) {
             $dataAdd = array(
                 'version_gantt_id'=>$request->version_gantt_id,
                 'user_id'=>$this->currentId,
-                'column_name'=>$column,
-                'show'=>true,
+                'column_name'=>$key,
+                'show'=>$column,
                 'created_by'=>$this->currentName
             );