diff --git a/app/Http/Controllers/ReportAllController.php b/app/Http/Controllers/ReportAllController.php index cf00644b..d9a6e091 100644 --- a/app/Http/Controllers/ReportAllController.php +++ b/app/Http/Controllers/ReportAllController.php @@ -99,10 +99,15 @@ class ReportAllController extends Controller foreach($cawanganlel as $cawlel) { $cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first(); - $brglel = LelongBid::join('cawangan_lelong','cawangan_lelong.caw_id','=','lelongbid.caw_id') + //$brglel = LelongBid::join('cawangan_lelong','cawangan_lelong.caw_id','=','lelongbid.caw_id') + $brglel = LelongBid:: join('cawangan_lelong', function ($join) { + $join->on('cawangan_lelong.caw_id', '=', 'lelongbid.caw_id') + ->on('cawangan_lelong.lelong_id', '=', 'lelongbid.lelong_id'); + }) ->select('lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.hargaasas') ->where('cawangan_lelong.caw_id','=',$cawlel->caw_id) ->where('cawangan_lelong.lelong_id','=',$cawlel->lelong_id) + ->where('cawangan_lelong.kali','=',$kali) ->get(); // dd($cawlel); diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php index 1a74e809..1d194064 100644 --- a/app/Http/Controllers/TangguhLelongController.php +++ b/app/Http/Controllers/TangguhLelongController.php @@ -711,47 +711,54 @@ class TangguhLelongController extends Controller public function sentangguh() { $user = Auth::user(); + //baru mohon@belum dilulus + $tangguh = TangguhLelong::join('lelongbid', 'tangguhlelong.lelongbid_id', '=', 'lelongbid.id') + ->where('tangguhlelong.kodcaw', $user->kodcaw) + ->where(function($query){ + $query->whereNotNull('tangguhlelong.status') + ->orWhere('tangguhlelong.status','!=', 4); + }) + ->get(); - // // $tangguh = TangguhLelong::join('lelongbid','tangguhlelong.lelongbid_id','=','lelongbid.id') - // ->where('tangguhlelong.kodcaw', $user->kodcaw) - // ->get(); - - // foreach($tangguh as $index1=>$t) - // { - - // $lelongbid = LelongBid::where('id', $t->lelongbid_id) - // ->where('norujukan', $t->norujukan) - // ->get(); - - // $tangguh[$index1]['tdet'] = $lelongbid; - // } - // $tangguh = TangguhLelong::join('lelongbid','tangguhlelong.lelongbid_id','=','lelongbid.id') - - $tangguh = TangguhLelong::where('tangguhlelong.kodcaw', $user->kodcaw) - ->get(); - // dd($tangguh); - - foreach($tangguh as $index1=>$t) - { - if($t['status'] == 4) - { - $lelongbid = Lelong::where('id', $t->lelong_id) - ->get(); - - $tangguh[$index1]['tdet'] = $lelongbid; - } else - { - $lelongbid = LelongBid::where('id', $t->lelongbid_id) - ->where('norujukan', $t->norujukan) - ->get(); - + foreach ($tangguh as $index1 => $t) { + + $lelongbid = LelongBid::join('tangguhlelong', 'tangguhlelong.lelongbid_id', '=', 'lelongbid.id') + ->where('lelongbid.id', $t->lelongbid_id) + ->where('lelongbid.lelong_id', $t->lelong_id) + ->where('lelongbid.norujukan', $t->norujukan) + ->get(); + $tangguh[$index1]['tdet'] = $lelongbid; } + + //telah dilulus + $tlhtangguh = TangguhLelong::where('tangguhlelong.kodcaw', $user->kodcaw) + ->where('tangguhlelong.status','=', 4) + ->get(); - - } + foreach ($tlhtangguh as $index1 => $l) { + $lelong = Lelong::join('tangguhlelong','tangguhlelong.lelong_id','=','lelong.id') + ->where('lelong.id', $l->lelong_id) + ->where('tangguhlelong.kodcaw',$user->kodcaw) + ->get(); - return view('tangguhlelong.senaraimohontangguh',compact('user','tangguh')); + $tlhtangguh[$index1]['tlh'] = $lelong; + } + + //ditangguh terus dari operasi/ bukan permohonan cwgn + $oprtangguh = TangguhLelong::where('tangguhlelong.kodcaw', $user->kodcaw) + ->whereNull('tangguhlelong.status') + ->get(); + + foreach ($oprtangguh as $index1 => $o) { + $lelong = Lelong::join('tangguhlelong','tangguhlelong.lelong_id','=','lelong.id') + ->where('lelong.id', $o->lelong_id) + ->where('tangguhlelong.kodcaw',$user->kodcaw) + ->get(); + + $oprtangguh[$index1]['opr'] = $lelong; + } + return view('tangguhlelong.senaraimohontangguh', compact('user', 'tangguh', 'tlhtangguh', 'oprtangguh')); } public function uploadborang(Request $request) diff --git a/resources/views/pdf/pdfsenarailapbidaanall.blade.php b/resources/views/pdf/pdfsenarailapbidaanall.blade.php index 0c64667f..b6c06cab 100644 --- a/resources/views/pdf/pdfsenarailapbidaanall.blade.php +++ b/resources/views/pdf/pdfsenarailapbidaanall.blade.php @@ -81,7 +81,7 @@ tr:nth-child(even) {
{{ $message }}
-{{ $message }}
+