From 7bdda806c3310ed301bc324c51ced491885075a2 Mon Sep 17 00:00:00 2001 From: Amirah22 <94591077+Amirah22@users.noreply.github.com> Date: Sat, 18 Jun 2022 20:45:22 +0800 Subject: [PATCH] update 2 --- .../Controllers/ReportCawanganController.php | 55 +++++++++++++++---- .../lelong/indexbrgleldetailscaw.blade.php | 21 ++++--- .../lelong/indexbrglelpembidacaw.blade.php | 21 ++++--- .../views/lelong/indexlelfullcaw.blade.php | 21 ++++--- .../lelong/indexnamapembidacaw.blade.php | 17 ++++-- .../views/lelong/laporancawindex.blade.php | 21 ++++--- resources/views/pdf/brglelcaw.blade.php | 7 ++- .../pdf/laporanbrgleldetailscaw.blade.php | 49 +++++++++++++---- .../pdf/laporanbrglelpembidacaw.blade.php | 8 ++- .../views/pdf/laporanlelfullcaw.blade.php | 8 ++- .../views/pdf/laporannamapembidacaw.blade.php | 7 ++- 11 files changed, 176 insertions(+), 59 deletions(-) diff --git a/app/Http/Controllers/ReportCawanganController.php b/app/Http/Controllers/ReportCawanganController.php index 3e07526b..bf128f48 100644 --- a/app/Http/Controllers/ReportCawanganController.php +++ b/app/Http/Controllers/ReportCawanganController.php @@ -62,7 +62,11 @@ class ReportCawanganController extends Controller ->where('cawangan.caw_code','=',$user->kodcaw) ->get(); - return view('lelong.laporancawindex',compact('lelongid')); + $cawname = Cawangan::where('caw_code','=',$user->kodcaw) + ->get(); + + + return view('lelong.laporancawindex',compact('lelongid','cawname')); } public function laporanbrglelcaw($lelong_id){ @@ -92,7 +96,7 @@ class ReportCawanganController extends Controller ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') ->where('cawangan_lelong.lelong_id','=',$lelong_id) ->where('cawangan.caw_code','=',$user['kodcaw']) - ->select('lelong_id','tarikh_lelong','caw_name') + ->select('lelong_id','tarikh_lelong','caw_name','fasa') ->groupBy('lelong_id','caw_name') ->get()->toArray(); @@ -114,7 +118,10 @@ class ReportCawanganController extends Controller ->where('cawangan.caw_code','=',$user->kodcaw) ->get(); - return view('lelong.indexbrgleldetailscaw',compact('lelongid')); + $cawname = Cawangan::where('caw_code','=',$user->kodcaw) + ->get(); + + return view('lelong.indexbrgleldetailscaw',compact('lelongid','cawname')); } public function laporanbrgleldetailscaw($lelong_id){ @@ -141,6 +148,25 @@ class ReportCawanganController extends Controller $total_hargaasas = 0; $hargaasas = 0; + $arrayinfo = []; + + + $lelongid = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') + ->where('cawangan_lelong.lelong_id','=',$lelong_id) + ->select('lelong_id','tarikh_lelong','fasa') + ->groupBy('lelong_id') + ->get()->toArray(); + + foreach($lelongid as $laporan) + { + $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$laporan['lelong_id']) + ->where('cawangan.caw_code','=',$user['kodcaw']) + ->get() + ->toArray(); + array_push($arrayinfo,['laporan' => $laporan,'details' => $details]); + } + foreach($lelongs as $index1=>$lelong){ $marhun= LelongBidMarhun::where('lelongbid_id','=',$lelong['id']) @@ -167,7 +193,7 @@ class ReportCawanganController extends Controller - $pdf = PDF::loadView('pdf.laporanbrgleldetailscaw',compact('lelongs','arraycaw','total_nmarhun','total_berat','total_harga','total_hargaasas' + $pdf = PDF::loadView('pdf.laporanbrgleldetailscaw',compact('lelongs','arraycaw','total_nmarhun','total_berat','total_harga','total_hargaasas','arrayinfo' ))->setPaper('a4', 'potrait'); return $pdf->download('Senarai Lelong Details.pdf'); @@ -184,7 +210,10 @@ class ReportCawanganController extends Controller ->where('cawangan.caw_code','=',$user->kodcaw) ->get(); - return view('lelong.indexnamapembidacaw',compact('lelongid')); + $cawname = Cawangan::where('caw_code','=',$user->kodcaw) + ->get(); + + return view('lelong.indexnamapembidacaw',compact('lelongid','cawname')); } @@ -203,7 +232,7 @@ class ReportCawanganController extends Controller ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') ->where('cawangan_lelong.lelong_id','=',$lelong_id) ->where('cawangan.caw_code','=',$user['kodcaw']) - ->select('lelong_id','tarikh_lelong') + ->select('lelong_id','tarikh_lelong','fasa') ->groupBy('lelong_id') ->get(); @@ -254,7 +283,10 @@ class ReportCawanganController extends Controller ->where('cawangan.caw_code','=',$user->kodcaw) ->get(); - return view('lelong.indexlelfullcaw',compact('lelongid')); + $cawname = Cawangan::where('caw_code','=',$user->kodcaw) + ->get(); + + return view('lelong.indexlelfullcaw',compact('lelongid','cawname')); } @@ -277,7 +309,7 @@ class ReportCawanganController extends Controller ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') ->where('cawangan.caw_code','=',$user['kodcaw']) ->where('cawangan_lelong.lelong_id','=',$lelong_id) - ->select('lelong_id','tarikh_lelong') + ->select('lelong_id','tarikh_lelong','fasa') ->groupBy('lelong_id') ->get(); @@ -331,7 +363,10 @@ class ReportCawanganController extends Controller ->where('cawangan.caw_code','=',$user->kodcaw) ->get(); - return view('lelong.indexbrglelpembidacaw',compact('lelongid')); + $cawname = Cawangan::where('caw_code','=',$user->kodcaw) + ->get(); + + return view('lelong.indexbrglelpembidacaw',compact('lelongid','cawname')); } @@ -351,7 +386,7 @@ class ReportCawanganController extends Controller ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') ->where('cawangan_lelong.lelong_id','=',$lelong_id) ->where('cawangan.caw_code','=',$user['kodcaw']) - ->select('lelong_id','tarikh_lelong') + ->select('lelong_id','tarikh_lelong','fasa') ->groupBy('lelong_id') ->get(); diff --git a/resources/views/lelong/indexbrgleldetailscaw.blade.php b/resources/views/lelong/indexbrgleldetailscaw.blade.php index dc5e440d..53633c49 100644 --- a/resources/views/lelong/indexbrgleldetailscaw.blade.php +++ b/resources/views/lelong/indexbrgleldetailscaw.blade.php @@ -4,13 +4,13 @@
- @foreach ($lelongid as $bid) -

Laporan Barang Lelong Details: {{$bid->caw_name}}

- + @foreach($cawname as $cawname) +

Laporan Barang Lelong Details: {{$cawname->caw_name}}

+ @endforeach @if ($message = Session::get('success')) -
-

{{ $message }}

-
+
+

{{ $message }}

+
@endif
@@ -20,15 +20,22 @@ Bil Lelong ID Tarikh Lelong + Fasa Muat Turun + @foreach ($lelongid as $bid) {{$loop->iteration}} {{ $bid->lelong_id}} - {{ $bid->tarikh_lelong }} + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $bid->tarikh_lelong ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp + {{ $bid->fasa }} diff --git a/resources/views/lelong/indexbrglelpembidacaw.blade.php b/resources/views/lelong/indexbrglelpembidacaw.blade.php index c4b24ff1..997924fe 100644 --- a/resources/views/lelong/indexbrglelpembidacaw.blade.php +++ b/resources/views/lelong/indexbrglelpembidacaw.blade.php @@ -4,13 +4,13 @@
- @foreach ($lelongid as $bid) -

Laporan Barang Lelong Pembida: {{$bid->caw_name}}

- + @foreach($cawname as $cawname) +

Laporan Barang Lelong Pembida: {{$cawname->caw_name}}

+ @endforeach @if ($message = Session::get('success')) -
-

{{ $message }}

-
+
+

{{ $message }}

+
@endif @@ -20,15 +20,22 @@ Bil Lelong ID Tarikh Lelong + Fasa Muat Turun + @foreach ($lelongid as $bid) {{$loop->iteration}} {{ $bid->lelong_id}} - {{ $bid->tarikh_lelong }} + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $bid->tarikh_lelong ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp + {{ $bid->fasa }} diff --git a/resources/views/lelong/indexlelfullcaw.blade.php b/resources/views/lelong/indexlelfullcaw.blade.php index 08bf93cf..82900337 100644 --- a/resources/views/lelong/indexlelfullcaw.blade.php +++ b/resources/views/lelong/indexlelfullcaw.blade.php @@ -4,13 +4,13 @@
- @foreach ($lelongid as $bid) -

Laporan Lelong Keseluruhan: {{$bid->caw_name}}

- + @foreach($cawname as $cawname) +

Laporan Lelong Keseluruhan: {{$cawname->caw_name}}

+ @endforeach @if ($message = Session::get('success')) -
-

{{ $message }}

-
+
+

{{ $message }}

+
@endif @@ -20,15 +20,22 @@ Bil Lelong ID Tarikh Lelong + Fasa Muat Turun + @foreach ($lelongid as $bid) {{$loop->iteration}} {{ $bid->lelong_id}} - {{ $bid->tarikh_lelong }} + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $bid->tarikh_lelong ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp + {{ $bid->fasa }} diff --git a/resources/views/lelong/indexnamapembidacaw.blade.php b/resources/views/lelong/indexnamapembidacaw.blade.php index 9af9ef1c..639c4f82 100644 --- a/resources/views/lelong/indexnamapembidacaw.blade.php +++ b/resources/views/lelong/indexnamapembidacaw.blade.php @@ -4,11 +4,11 @@
- @foreach ($lelongid as $bid) -

Laporan Nama Pembida: {{$bid->caw_name}}

- + @foreach($cawname as $cawname) +

Laporan Nama Pembida: {{$cawname->caw_name}}

+ @endforeach @if ($message = Session::get('success')) -
+

{{ $message }}

@endif @@ -20,15 +20,22 @@ Bil Lelong ID Tarikh Lelong + Fasa Muat Turun + @foreach ($lelongid as $bid) {{$loop->iteration}} {{ $bid->lelong_id}} - {{ $bid->tarikh_lelong }} + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $bid->tarikh_lelong ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp + {{ $bid->fasa }} diff --git a/resources/views/lelong/laporancawindex.blade.php b/resources/views/lelong/laporancawindex.blade.php index 25807814..8d23443a 100644 --- a/resources/views/lelong/laporancawindex.blade.php +++ b/resources/views/lelong/laporancawindex.blade.php @@ -4,13 +4,13 @@
- @foreach ($lelongid as $bid) -

Laporan Barang Lelong: {{$bid->caw_name}}

- + @foreach($cawname as $cawname) +

Laporan Barang Lelong: {{$cawname['caw_name']}}

+ @endforeach @if ($message = Session::get('success')) -
-

{{ $message }}

-
+
+

{{ $message }}

+
@endif @@ -20,15 +20,22 @@ Bil Lelong ID Tarikh Lelong + Fasa Muat Turun + @foreach ($lelongid as $bid) {{$loop->iteration}} {{ $bid->lelong_id}} - {{ $bid->tarikh_lelong }} + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $bid->tarikh_lelong ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp + {{ $bid->fasa }} diff --git a/resources/views/pdf/brglelcaw.blade.php b/resources/views/pdf/brglelcaw.blade.php index bc055942..948f0115 100644 --- a/resources/views/pdf/brglelcaw.blade.php +++ b/resources/views/pdf/brglelcaw.blade.php @@ -92,7 +92,12 @@ tr:nth-child(even) { @foreach ($info as $info) Lelong ID : {{$info['lelong_id']}} - Tarikh Lelong : {{$info['tarikh_lelong']}} + Tarikh Lelong : @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $info['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp + Fasa: {{$info['fasa']}} Nama Cawangan : {{$info['caw_name']}} @endforeach diff --git a/resources/views/pdf/laporanbrgleldetailscaw.blade.php b/resources/views/pdf/laporanbrgleldetailscaw.blade.php index 45f7d9a0..520157fe 100644 --- a/resources/views/pdf/laporanbrgleldetailscaw.blade.php +++ b/resources/views/pdf/laporanbrgleldetailscaw.blade.php @@ -56,30 +56,59 @@ table { border: 0px solid #ddd; } -th, td { +td { text-align: left; padding: 16px; } +th{ + text-align: left; + padding: 16px; + background-color:gainsboro; +} + tr:nth-child(even) { background-color: #f2f2f2; } + - - - - +

PERMODALAN KELANTAN BERHAD

+ + + - - - -

PERMODALAN KELANTAN BERHAD

LAPORAN SIMULASI SEMUA CAWANGAN
+ + LAPORAN BARANG LELONG DETAILS -

+ + + + + +
+ + @foreach ($arrayinfo as $laporan) + + + + + @foreach ($laporan['details'] as $details) + + +
Lelong ID : {{$laporan['laporan']['lelong_id']}}Tarikh Lelong : @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphpFasa : {{$laporan['laporan']['fasa']}}Cawangan : {{$details['caw_name']}} + @endforeach + @endforeach +
+ +
diff --git a/resources/views/pdf/laporanbrglelpembidacaw.blade.php b/resources/views/pdf/laporanbrglelpembidacaw.blade.php index 9eff44a0..3fbb7190 100644 --- a/resources/views/pdf/laporanbrglelpembidacaw.blade.php +++ b/resources/views/pdf/laporanbrglelpembidacaw.blade.php @@ -93,8 +93,12 @@ tr:nth-child(even) { @foreach ($info as $info) - - + + @foreach ($info as $info) - - + + @foreach ($lelongid as $info) - + +
Lelong ID: {{$lelong_id}}Tarikh Lelong:{{ $info->tarikh_lelong}}Tarikh Lelong : @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $info['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphpFasa: {{$info['fasa']}} @endforeach @foreach ($arrayinfocaw as $laporancaw) @foreach ($laporancaw['cawangan'] as $details) diff --git a/resources/views/pdf/laporanlelfullcaw.blade.php b/resources/views/pdf/laporanlelfullcaw.blade.php index d32c4337..034954d5 100644 --- a/resources/views/pdf/laporanlelfullcaw.blade.php +++ b/resources/views/pdf/laporanlelfullcaw.blade.php @@ -93,8 +93,12 @@ tr:nth-child(even) { Lelong ID: {{$lelong_id}}Tarikh Lelong:{{ $info->tarikh_lelong}}Tarikh Lelong : @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $info['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphpFasa: {{$info['fasa']}} @endforeach @foreach ($arrayinfocaw as $laporancaw) @foreach ($laporancaw['cawangan'] as $details) diff --git a/resources/views/pdf/laporannamapembidacaw.blade.php b/resources/views/pdf/laporannamapembidacaw.blade.php index f6b401bc..76dc0263 100644 --- a/resources/views/pdf/laporannamapembidacaw.blade.php +++ b/resources/views/pdf/laporannamapembidacaw.blade.php @@ -92,7 +92,12 @@ tr:nth-child(even) {
Lelong ID: {{$lelong_id}}Tarikh Lelong:{{ $info->tarikh_lelong}}Tarikh Lelong : @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $info['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphpFasa: {{$info['fasa']}} @endforeach @foreach ($arrayinfocaw as $laporancaw) @foreach ($laporancaw['cawangan'] as $details)