From 1a3f8b164dbd2e27efdfe9f924b8337b634a3df5 Mon Sep 17 00:00:00 2001 From: Amir Date: Wed, 16 Nov 2022 05:16:24 +0800 Subject: [PATCH] Fix senarai lelong --- app/Http/Controllers/LelongController.php | 133 +--- .../views/lelong/senarailelong.blade.php | 613 +++++------------- 2 files changed, 196 insertions(+), 550 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 2e246a1f..8fc5a926 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -44,7 +44,7 @@ use App\Models\Payment; use App\Models\TangguhLelong; use App\Models\Tetapan; use App\Models\TransaksiKeuntungan; - +use DateTime; class LelongController extends Controller { @@ -669,117 +669,36 @@ class LelongController extends Controller public function senarailelong() { - - $arraydetails = []; - $arraydetails2 = []; - $arraydetails3 = []; - $arraydetails4 = []; - $arraydetails5 = []; - - $currentdate = Carbon::now(); - $currentdate2 = $currentdate->toDateString(); + $arraydetails0 = []; + $arraydetails1 = []; + $arraydetails2 = []; + $arraydetails3 = []; - - $lelong = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id') - ->select('lelong_id','tarikh_lelong','lelong.fasa','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong','lelong.created_at') - ->groupBy('lelong_id') - ->where('lelong.created_at', 'like', '%' . $currentdate2 . '%') - ->where('sts_lelong',0) - ->get()->toArray(); + $lelongAll = Lelong::with('cawangan')->get(); - foreach($lelong as $laporan) - { - $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->where('lelong_id',$laporan['lelong_id']) - - ->get() - ->toArray(); + foreach ($lelongAll as $lelong) { - array_push($arraydetails,['laporan' => $laporan,'details' => $details]); + $lelong->tarikh_lelong = DateTime::createFromFormat('Y-m-d', $lelong->tarikh_lelong); + $lelong->tarikh_lelong = $lelong->tarikh_lelong->format('d-m-Y'); + + if ($lelong->sts_lelong == 0) { + array_push($arraydetails0, $lelong); + } elseif ($lelong->sts_lelong == 1) { + array_push($arraydetails1, $lelong); + } elseif ($lelong->sts_lelong == 2) { + array_push($arraydetails2, $lelong); + } elseif ($lelong->sts_lelong == 3) { + array_push($arraydetails3, $lelong); + } } - - - - - -///////////// lelong belum mula - - $lelong2 = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id') - ->select('lelong_id','tarikh_lelong','lelong.fasa','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong','lelong.created_at') - ->groupBy('lelong_id') - ->where('lelong.sts_lelong',0) - - ->get()->toArray(); - - foreach($lelong2 as $laporan2) - { - $details2 = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->where('lelong_id',$laporan2['lelong_id']) - ->get() - ->toArray(); - array_push($arraydetails2,['laporan2' => $laporan2,'details2' => $details2]); - } - -////////// lelong selesai - - - $lelong3 = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id') - ->select('lelong_id','tarikh_lelong','lelong.fasa','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong','lelong.created_at') - ->groupBy('lelong_id') - ->where('lelong.sts_lelong',3) - ->get()->toArray(); - - foreach($lelong3 as $laporan3) - { - $details3 = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->where('lelong_id',$laporan3['lelong_id']) - ->get() - ->toArray(); - array_push($arraydetails3,['laporan3' => $laporan3,'details3' => $details3]); - } - -////////// lelong sedang dijalankan - - - $lelong4 = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id') - ->select('lelong_id','tarikh_lelong','lelong.fasa','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong','lelong.created_at') - ->groupBy('lelong_id') - ->where('lelong.sts_lelong',1) - ->get()->toArray(); - - foreach($lelong4 as $laporan4) - { - $details4 = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->where('lelong_id',$laporan4['lelong_id']) - ->get() - ->toArray(); - array_push($arraydetails4,['laporan4' => $laporan4,'details4' => $details4]); - } - -/////////////// lelong jana pemenang - - - $lelong5 = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id') - ->select('lelong_id','tarikh_lelong','lelong.fasa','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong','lelong.created_at') - ->groupBy('lelong_id') - ->where('lelong.sts_lelong',2) - ->get()->toArray(); - - foreach($lelong5 as $laporan5) - { - $details5 = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->where('lelong_id',$laporan5['lelong_id']) - ->get() - ->toArray(); - array_push($arraydetails5,['laporan5' => $laporan5,'details5' => $details5]); - } - - return view('lelong.senarailelong',compact('lelong', 'arraydetails', - 'lelong2','arraydetails2', - 'lelong3','arraydetails3', - 'lelong4','arraydetails4', - 'lelong5','arraydetails5')); + return view('lelong.senarailelong', compact( + 'lelongAll', + 'arraydetails0', + 'arraydetails1', + 'arraydetails2', + 'arraydetails3' + )); } diff --git a/resources/views/lelong/senarailelong.blade.php b/resources/views/lelong/senarailelong.blade.php index 9921debe..006698f1 100644 --- a/resources/views/lelong/senarailelong.blade.php +++ b/resources/views/lelong/senarailelong.blade.php @@ -23,26 +23,31 @@ -
-
- +
+
+
@@ -50,94 +55,46 @@ - - + - @foreach($arraydetails as $data) + @foreach($arraydetails0 as $lelong) - - - - + + + - - - - - - - + + + + @endforeach
BilTarikh Lelong Fasa CawanganMasa Tamat Lelong Harga Emas Asas Tempoh Caj Lelong StatusTindakanTindakan
{{$loop->iteration}}{{ $data['laporan']['lelong_id'] }}@php - $myDateTime = DateTime::createFromFormat('Y-m-d', $data['laporan']['tarikh_lelong'] ); - $t_lelong = $myDateTime->format('d-m-Y'); - echo($t_lelong); - @endphp{{$data['laporan']['fasa']}} - @foreach($data['details'] as $details) - {{$details['caw_name']}}
+ 		{{$lelong->id}}{{$lelong->tarikh_lelong}}{{$lelong->fasa}} + @foreach($lelong->cawangan as $cawangan) +
+ {{$cawangan->caw_name}} +
@endforeach 		@if($data['laporan']['masatamat_lelong'] == 0) - {{$data['laporan']['masatamat_lelong']}} - @else - @php - $myDateTime = DateTime::createFromFormat('H:i:s', $data['laporan']['masatamat_lelong'] ); - $masa_lelong = $myDateTime->format('h:i: a'); - echo($masa_lelong); - - @endphp - - @endif - {{$data['laporan']['harga_emas_asas']}}{{$data['laporan']['jbg']}}{{$data['laporan']['cajlelong']}} - @hasrole('jurulelong') - - @endhasrole - @hasrole('operasi') - - @if($data['laporan']['sts_lelong'] == 0) - - @elseif($data['laporan']['sts_lelong'] == 1) - - @elseif($data['laporan']['sts_lelong'] == 2) - - @elseif($data['laporan']['sts_lelong'] == 3) - - - @endif - @endhasrole - - @hasrole('jurulelong') - - @endhasrole - @hasrole('operasi') - - @if($data['laporan']['sts_lelong'] == 0) - - - {{-- --}} - - @elseif($data['laporan']['sts_lelong'] == 1) - {{-- --}} - @elseif($data['laporan']['sts_lelong'] == 2) - {{-- --}} - @elseif($data['laporan']['sts_lelong'] == 3) - {{-- --}} - - - Export - @endif - @endhasrole + {{$lelong->harga_emas_asas}}{{$lelong->jbg}}{{$lelong->cajlelong}}LELONG BELUM MULA +
+ + + +
+
- +
@@ -145,87 +102,34 @@ + - - @foreach($arraydetails4 as $data) + @foreach($arraydetails1 as $lelong) - - - - + + + - - - - - - - + + + + + + @endforeach @@ -233,8 +137,8 @@ -
-
BilTarikh Lelong Fasa CawanganMasa Mula Lelong Masa Tamat Lelong Harga Emas Asas Tempoh Caj Lelong StatusTindakan
{{$loop->iteration}}{{ $data['laporan4']['lelong_id'] }}@php - $myDateTime = DateTime::createFromFormat('Y-m-d', $data['laporan4']['tarikh_lelong'] ); - $t_lelong = $myDateTime->format('d-m-Y'); - echo($t_lelong); - @endphp{{$data['laporan4']['fasa']}} - @foreach($data['details4'] as $details) - {{$details['caw_name']}}
+ 		{{$lelong->id}}{{$lelong->tarikh_lelong}}{{$lelong->fasa}} + @foreach($lelong->cawangan as $cawangan) +
+ {{$cawangan->caw_name}} +
@endforeach 		@if($data['laporan4']['masatamat_lelong'] == 0) - {{$data['laporan4']['masatamat_lelong']}} - @else - @php - $myDateTime = DateTime::createFromFormat('H:i:s', $data['laporan4']['masatamat_lelong'] ); - $masa_lelong = $myDateTime->format('h:i: a'); - echo($masa_lelong); - - @endphp - - @endif - {{$data['laporan4']['harga_emas_asas']}}{{$data['laporan4']['jbg']}}{{$data['laporan4']['cajlelong']}} - @hasrole('jurulelong') - - @endhasrole - @hasrole('operasi') - - @if($data['laporan4']['sts_lelong'] == 0) - - @elseif($data['laporan4']['sts_lelong'] == 1) - - @elseif($data['laporan4']['sts_lelong'] == 2) - - @elseif($data['laporan4']['sts_lelong'] == 3) - - - @endif - @endhasrole - - @hasrole('jurulelong') - - @endhasrole - @hasrole('operasi') - - @if($data['laporan4']['sts_lelong'] == 0) - - - {{-- --}} - - @elseif($data['laporan4']['sts_lelong'] == 1) - {{-- --}} - @elseif($data['laporan4']['sts_lelong'] == 2) - {{-- --}} - @elseif($data['laporan4']['sts_lelong'] == 3) - {{-- --}} - - - Export - @endif - @endhasrole - {{$lelong->masamula_lelong}}{{$lelong->masatamat_lelong}}{{$lelong->harga_emas_asas}}{{$lelong->jbg}}{{$lelong->cajlelong}}LELONG SEDANG DIJANLANKAN
+
+
@@ -247,90 +151,34 @@ - @foreach($arraydetails2 as $data) - - - - + + + - - - - - - - + + + + + @endforeach
BilTempoh Caj Lelong StatusTindakan
{{$loop->iteration}}{{ $data['laporan2']['lelong_id'] }}@php - $myDateTime = DateTime::createFromFormat('Y-m-d', $data['laporan2']['tarikh_lelong'] ); - $t_lelong = $myDateTime->format('d-m-Y'); - echo($t_lelong); - @endphp{{$data['laporan2']['fasa']}} - @foreach($data['details2'] as $details) - {{$details['caw_name']}}
+ 		{{$lelong->id}}{{$lelong->tarikh_lelong}}{{$lelong->fasa}} + @foreach($lelong->cawangan as $cawangan) +
+ {{$cawangan->caw_name}} +
@endforeach 		@if($data['laporan2']['masatamat_lelong'] == 0) - {{$data['laporan2']['masatamat_lelong']}} - @else - @php - $myDateTime = DateTime::createFromFormat('H:i:s', $data['laporan2']['masatamat_lelong'] ); - $masa_lelong = $myDateTime->format('h:i: a'); - echo($masa_lelong); - - @endphp - - @endif - {{$data['laporan2']['harga_emas_asas']}}{{$data['laporan2']['jbg']}}{{$data['laporan2']['cajlelong']}} - @hasrole('jurulelong') - - @endhasrole - @hasrole('operasi') - - @if($data['laporan2']['sts_lelong'] == 0) - - @elseif($data['laporan2']['sts_lelong'] == 1) - - @elseif($data['laporan2']['sts_lelong'] == 2) - - @elseif($data['laporan2']['sts_lelong'] == 3) - - - @endif - @endhasrole - - @hasrole('jurulelong') - - @endhasrole - @hasrole('operasi') - - @if($data['laporan2']['sts_lelong'] == 0) - - - {{-- --}} - - @elseif($data['laporan2']['sts_lelong'] == 1) - {{-- --}} - @elseif($data['laporan2']['sts_lelong'] == 2) - {{-- --}} - @elseif($data['laporan2']['sts_lelong'] == 3) - {{-- --}} - - - Export - @endif - @endhasrole - {{$lelong->masatamat_lelong}}{{$lelong->harga_emas_asas}}{{$lelong->jbg}}{{$lelong->cajlelong}}LELONG JANA PEMENANGAN
-
- +
@@ -338,188 +186,44 @@ + - + - @foreach($arraydetails3 as $data) + @foreach($arraydetails3 as $lelong) - - - - + + + - - - - - - - + + + + + + @endforeach
BilTarikh Lelong Fasa CawanganMasa Mula Lelong Masa Tamat Lelong Harga Emas Asas Tempoh Caj Lelong StatusTindakanTindakan
{{$loop->iteration}}{{ $data['laporan3']['lelong_id'] }}@php - $myDateTime = DateTime::createFromFormat('Y-m-d', $data['laporan3']['tarikh_lelong'] ); - $t_lelong = $myDateTime->format('d-m-Y'); - echo($t_lelong); - @endphp{{$data['laporan3']['fasa']}} - @foreach($data['details3'] as $details) - {{$details['caw_name']}}
+ 		{{$lelong->id}}{{$lelong->tarikh_lelong}}{{$lelong->fasa}} + @foreach($lelong->cawangan as $cawangan) +
+ {{$cawangan->caw_name}} +
@endforeach 		@if($data['laporan3']['masatamat_lelong'] == 0) - {{$data['laporan3']['masatamat_lelong']}} - @else - @php - $myDateTime = DateTime::createFromFormat('H:i:s', $data['laporan3']['masatamat_lelong'] ); - $masa_lelong = $myDateTime->format('h:i: a'); - echo($masa_lelong); - - @endphp - - @endif - {{$data['laporan3']['harga_emas_asas']}}{{$data['laporan3']['jbg']}}{{$data['laporan3']['cajlelong']}} - @hasrole('jurulelong') - - @endhasrole - @hasrole('operasi') - - @if($data['laporan3']['sts_lelong'] == 0) - - @elseif($data['laporan3']['sts_lelong'] == 1) - - @elseif($data['laporan3']['sts_lelong'] == 2) - - @elseif($data['laporan3']['sts_lelong'] == 3) - - - @endif - @endhasrole - - @hasrole('jurulelong') - - @endhasrole - @hasrole('operasi') - - @if($data['laporan3']['sts_lelong'] == 0) - - - {{-- --}} - - @elseif($data['laporan3']['sts_lelong'] == 1) - {{-- --}} - @elseif($data['laporan3']['sts_lelong'] == 2) - {{-- --}} - @elseif($data['laporan3']['sts_lelong'] == 3) - {{-- --}} - - - Export - @endif - @endhasrole + {{$lelong->masamula_lelong}}{{$lelong->masatamat_lelong}}{{$lelong->harga_emas_asas}}{{$lelong->jbg}}{{$lelong->cajlelong}}LELONG SELESAI + + +
- -
-
- - - - - - - - - - - - - - - - - - @foreach($arraydetails5 as $data) - - - - - - - - - - - - - - - @endforeach - -
BilID LelongTarikh LelongFasaCawanganMasa Tamat LelongHarga Emas AsasTempohCaj LelongStatusTindakan
{{$loop->iteration}}{{ $data['laporan5']['lelong_id'] }}@php - $myDateTime = DateTime::createFromFormat('Y-m-d', $data['laporan5']['tarikh_lelong'] ); - $t_lelong = $myDateTime->format('d-m-Y'); - echo($t_lelong); - @endphp{{$data['laporan5']['fasa']}} - @foreach($data['details5'] as $details) - {{$details['caw_name']}}
- @endforeach - 		@if($data['laporan5']['masatamat_lelong'] == 0) - {{$data['laporan5']['masatamat_lelong']}} - @else - @php - $myDateTime = DateTime::createFromFormat('H:i:s', $data['laporan5']['masatamat_lelong'] ); - $masa_lelong = $myDateTime->format('h:i: a'); - echo($masa_lelong); - - @endphp - - @endif - {{$data['laporan5']['harga_emas_asas']}}{{$data['laporan5']['jbg']}}{{$data['laporan5']['cajlelong']}} - @hasrole('jurulelong') - - @endhasrole - @hasrole('operasi') - - @if($data['laporan5']['sts_lelong'] == 0) - - @elseif($data['laporan5']['sts_lelong'] == 1) - - @elseif($data['laporan5']['sts_lelong'] == 2) - - @elseif($data['laporan5']['sts_lelong'] == 3) - - - @endif - @endhasrole - - @hasrole('jurulelong') - - @endhasrole - @hasrole('operasi') - - @if($data['laporan5']['sts_lelong'] == 0) - - - {{-- --}} - - @elseif($data['laporan5']['sts_lelong'] == 1) - {{-- --}} - @elseif($data['laporan5']['sts_lelong'] == 2) - {{-- --}} - @elseif($data['laporan5']['sts_lelong'] == 3) - {{-- --}} - - - Export - @endif - @endhasrole -
-
@@ -533,60 +237,66 @@ $(function() { $('[data-toggle="tooltip"]').tooltip() }) + $('a.confirmdel').confirm({ - title: 'Confirmation', - content: 'Anda pasti?', - type: 'orange', + title: 'Padam Simulasi', + content: 'Adakah anda pasti? Tindakan ini tidak dapat dikembalikan.', + icon: 'fa fa-exclamation-triangle', + type: 'red', + boxWidth: '500px', + useBootstrap: false, typeAnimated: true, buttons: { - Hapus: { - btnClass: 'btn-warning', - action: function() { - location.href = this.$target.attr('href'); - } - }, + Batal: { btnClass: 'btn-default', action: function() {} - } + }, + Padam: { + btnClass: 'btn-red', + action: function() { + location.href = this.$target.attr('href'); + $.dialog({ + icon: 'fa fa-spinner fa-spin', + title: 'Dalam Proses !', + content: 'Halaman akan dikemaskini selepas proses selesai.', + closeIcon: false, + boxWidth: '500px', + useBootstrap: false, + }); + } + }, } }); + $('a.confirmrefresh').confirm({ + title: 'Kemaskini Simulasi', + content: 'Adakah anda pasti? Tindakan ini tidak dapat dikembalikan.', + icon: 'fa fa-exclamation-triangle', + type: 'orange', + boxWidth: '500px', + useBootstrap: false, + typeAnimated: true, + buttons: { + Batal: { + btnClass: 'btn-default', + action: function() {} - var tablesimulasi = $('#simulasi').DataTable({ - "columnDefs": [{ - "targets": 0, - "orderable": false }, - { - "targets": 4, - "orderable": false - } - ], - // "ordering": false, - "info": false, - "lengthChange": false, - "pageLength": 15, - dom: 'Bfrtip', - // buttons: [ - // // 'copy', 'excel', 'pdf' - // // { text: 'copy', className: 'btn btn-primary' }, - // { - // className: 'btn btn-outline-success pl-4 pr-4 btn-sm addsim', - // text: '', - // titleAttr: 'Tambah Simulasi', - // action: function ( e, dt, node, config ) { - // alert( 'Button activated' ); - // } - // }, - // { - // className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export', - // titleAttr: 'Export to CSV', - // text: '', - // action: function ( e, dt, node, config ) { - // $("#exportform").submit(); - // } - // } - // ] + Kemaskini: { + btnClass: 'btn-orange', + action: function() { + location.href = this.$target.attr('href'); + $.dialog({ + icon: 'fa fa-spinner fa-spin', + title: 'Dalam Proses !', + content: 'Halaman akan dikemaskini selepas proses selesai.', + closeIcon: false, + boxWidth: '500px', + useBootstrap: false, + }); + } + }, + } }); $('.addsim').tooltip(); @@ -595,19 +305,36 @@ $('.addsim').removeClass('dt-button'); $('.export').removeClass('dt-button'); - - function selectall(cb) { - tablesimulasi.rows().nodes().to$().find('input[type="checkbox"]').each(function() { - $(this).prop('checked', cb.checked); - }) - } - - - @endsection \ No newline at end of file