diff --git a/app/Http/Controllers/KuesionerController.php b/app/Http/Controllers/KuesionerController.php index 8b372d6..0b2736d 100644 --- a/app/Http/Controllers/KuesionerController.php +++ b/app/Http/Controllers/KuesionerController.php @@ -79,6 +79,12 @@ class KuesionerController extends Controller }); } + if(@request()->progress){ + $kuesioner->whereHas('kuesionerLog',function($query){ + $query->where('step',request()->progress); + }); + } + foreach ($kuesioner->get() as $key => $row) { diff --git a/app/Http/Controllers/Modules/Usulan/CSAKController.php b/app/Http/Controllers/Modules/Usulan/CSAKController.php index 54a66dd..6447cc5 100644 --- a/app/Http/Controllers/Modules/Usulan/CSAKController.php +++ b/app/Http/Controllers/Modules/Usulan/CSAKController.php @@ -108,6 +108,12 @@ class CSAKController extends Controller }); } + if(@request()->progress){ + $kuesioner->whereHas('kuesionerLog',function($query){ + $query->where('step',request()->progress); + }); + } + foreach ($kuesioner->get() as $key => $row) { $action = ''; diff --git a/app/Http/Controllers/Modules/Usulan/CSAPController.php b/app/Http/Controllers/Modules/Usulan/CSAPController.php index 3a95bd2..6afe552 100644 --- a/app/Http/Controllers/Modules/Usulan/CSAPController.php +++ b/app/Http/Controllers/Modules/Usulan/CSAPController.php @@ -114,6 +114,12 @@ class CSAPController extends Controller }); } + if(@request()->progress){ + $kuesioner->whereHas('kuesionerLog',function($query){ + $query->where('step',request()->progress); + }); + } + foreach ($kuesioner->get() as $key => $row) { $action = ''; diff --git a/app/Models/Kuesioner.php b/app/Models/Kuesioner.php index d166e43..e2bd74c 100644 --- a/app/Models/Kuesioner.php +++ b/app/Models/Kuesioner.php @@ -27,4 +27,9 @@ class Kuesioner extends Model { return $this->belongsTo(\App\Models\DokumenAdministrasi::class,'KuesionerId','kuesioner_id'); } + + public function kuesionerLog() + { + return $this->hasOne(\App\Models\KuesionerLog::class,'kuesioner_id')->latestOfMany('created_at'); + } }