From ad7dade91355846f1f6dd79f20bb873625920994 Mon Sep 17 00:00:00 2001
From: Amirah22 <94591077+Amirah22@users.noreply.github.com>
Date: Wed, 25 Jan 2023 10:55:43 +0800
Subject: [PATCH 1/3] laporan ubah marhun pdf
---
app/Http/Controllers/ReportController.php | 47 ++++
.../views/marhun/ubahmarhuncaw.blade.php | 1 +
.../views/pdf/laporanubahmarhun.blade.php | 201 ++++++++++++++++++
routes/web.php | 2 +
4 files changed, 251 insertions(+)
create mode 100644 resources/views/pdf/laporanubahmarhun.blade.php
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index 2e3ffd9e..e3a1861a 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -144,6 +144,8 @@ class ReportController extends Controller
return view('lelong.brgleldetails', compact('arraydetails'));
}
+
+
public function senaraibrglelongdetails ($lelong_id, $kodcaw){
$lelongs= LelongBid::where('lelong_id','=',$lelong_id)
@@ -1011,6 +1013,51 @@ class ReportController extends Controller
return view('marhun.ubahmarhun', compact('cawangan','lelong_id','getpengesahan'));
}
+ public function lapubahmarhunlelongindexpdf ($lelong_id, $kodcaw, $t_lelong){
+
+ $cawangan = Pengesahan::where('pengesahan.lelong_id', $lelong_id)
+ ->where('pengesahan.status', 1)
+ ->where('pengesahan.norujukan', 'LIKE', '%'.$kodcaw.'%')
+ ->whereNotNull('pengesahan.disahkan_oleh')
+ ->select('pengesahan.lelongbid_id','pengesahan.diminta_oleh','pengesahan.disahkan_oleh', 'pengesahan.disahkan_pada', 'pengesahan.norujukan', 'pengesahan.lelong_id')
+ ->orderBy('pengesahan.lelongbid_id')
+ ->distinct()
+ ->get();
+
+ foreach($cawangan as $index1=>$caw)
+ {
+
+ $getpengesahan = Cawangan::where('caw_code', $kodcaw)->first();
+
+ $getdisahkanoleh = User::where('id', $caw['disahkan_oleh'])->first();
+ $getdimintaoleh = User::where('id', $caw['diminta_oleh'])->first();
+
+ $status = Pengesahan::where('lelongbid_id', $caw['lelongbid_id'])
+ ->select('id as sahid','status_ubah', 'request_karat', 'request_berat', 'request_marhun')
+ ->get();
+
+
+ $marhuns = LelongBidMarhun::where('lelongbid_id', $caw['lelongbid_id'])
+ ->get()
+ ->toArray();
+ $cawangan[$index1]['namacaw'] = $getpengesahan['caw_name'];
+ $cawangan[$index1]['disahkan_oleh'] = $getdisahkanoleh['name'];
+ $cawangan[$index1]['diminta_oleh'] = $getdimintaoleh['name'];
+ $cawangan[$index1]['detailmarhun']=$status;
+ $cawangan[$index1]['detail']=$marhuns;
+ }
+
+ $getpengesahan = Cawangan::where('caw_code', $kodcaw)->first();
+
+
+ // return view('marhun.ubahmarhun', compact('cawangan','lelong_id','getpengesahan'));
+
+ $pdf = PDF::loadView('pdf.laporanubahmarhun',compact('cawangan','lelong_id','getpengesahan','t_lelong'))
+ ->setPaper('a4', 'potrait');
+
+ return $pdf->download('Senarai Ubah Marhun.pdf');
+ }
+
public function exportubahmarhun (){
$arraydetails = [];
diff --git a/resources/views/marhun/ubahmarhuncaw.blade.php b/resources/views/marhun/ubahmarhuncaw.blade.php
index b345b9d6..3f04f301 100644
--- a/resources/views/marhun/ubahmarhuncaw.blade.php
+++ b/resources/views/marhun/ubahmarhuncaw.blade.php
@@ -44,6 +44,7 @@
| {{ $laporan['brg']['fasa']}} |
@foreach($laporan['detailsbrg'] as $details)
+
{{ $details['caw_name']}}
@endforeach
diff --git a/resources/views/pdf/laporanubahmarhun.blade.php b/resources/views/pdf/laporanubahmarhun.blade.php
new file mode 100644
index 00000000..4b287bb4
--- /dev/null
+++ b/resources/views/pdf/laporanubahmarhun.blade.php
@@ -0,0 +1,201 @@
+
+
+
+
+
+
+
+
+
+ PERMODALAN KELANTAN BERHAD |
+
+
+
+ | Laporan Ubah Marhun |
+
+
+
+
+
+
+
+
+ | Batch Lelong: {{$lelong_id}} |
+ Cawangan : {{$getpengesahan['caw_name']}}
+ |
+ | Tarikh Lelong : {{$t_lelong}} |
+
+
+
+
+
+
+
+
+
+
+
+
+ | Bil |
+ No Rujukan |
+ Perubahan |
+ Marhun Asal |
+ Marhun Baru |
+ Mutu Asal |
+ Mutu Baru |
+ Berat Asal (gm) |
+ Berat Baru (gm) |
+ Diminta Oleh |
+ Disahkan Oleh |
+ {{-- Status | --}}
+
+
+
+ @forelse($cawangan as $marhun)
+
+ | {{ $loop->iteration }} |
+ {{ $marhun['norujukan'] }} |
+ @foreach ($marhun['detailmarhun'] as $item)
+ @if($item['status_ubah'] == 1)
+ Mutu
+ @elseif($item['status_ubah'] == 2)
+ Pertambahan Marhun
+ @elseif($item['status_ubah'] == 3)
+ Hapus Marhun
+ @elseif($item['status_ubah'] == 4)
+ Berat
+ @elseif($item['status_ubah'] == 5)
+ Mutu & Berat
+ @elseif($item['status_ubah'] == 7)
+ Marhun
+ @elseif($item['status_ubah'] == 8)
+ Mutu, Berat & Marhun
+ @elseif($item['status_ubah'] == 9)
+ Mutu & Marhun
+ @elseif($item['status_ubah'] == 10)
+ Berat & Marhun
+ @endif
+
+ @endforeach |
+ @foreach ($marhun['detail'] as $item)
+ {{$item['old_marhun']}}
+ @endforeach |
+ @foreach ($marhun['detailmarhun'] as $item)
+ @if($item['request_marhun'] == null)
+ @else
+
+ @endif {{$item['request_marhun']}}
+ @endforeach |
+ @foreach ($marhun['detail'] as $item)
+ {{$item['old_karat']}}
+ @endforeach |
+ @foreach ($marhun['detailmarhun'] as $item)
+ @if($item['request_karat'] == null)
+ @else
+
+ @endif{{$item['request_karat']}}
+ @endforeach |
+ @foreach ($marhun['detail'] as $item)
+ {{$item['old_berat']}}
+ @endforeach |
+ @foreach ($marhun['detailmarhun'] as $item)
+ @if($item['request_berat'] == null)
+ @else
+
+ @endif{{$item['request_berat']}}
+ @endforeach |
+
+ {{ $marhun['diminta_oleh'] }} |
+ {{ $marhun['disahkan_oleh'] }} |
+ {{-- | --}}
+
+
+ @empty
+
+ | No Data |
+
+
+ @endforelse
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/routes/web.php b/routes/web.php
index 89d932c3..b9cce05a 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -533,6 +533,8 @@ Route::get('/lelongreport/{lelongid}/{cawid}',['as'=>'report.lelongreport','uses
Route::get('/lapubahmarhunlelong',['as'=>'report.lapubahmarhunlelong','uses'=>'ReportController@lapubahmarhunlelong']);
Route::get('/lapubahmarhunlelongindex/{lelong_id}/{kodcaw}',['as'=>'report.lapubahmarhunlelongindex','uses'=>'ReportController@lapubahmarhunlelongindex']);
+Route::get('/lapubahmarhunlelongindexpdf/{lelong_id}/{kodcaw}/{t_lelong}',['as'=>'report.lapubahmarhunlelongindexpdf','uses'=>'ReportController@lapubahmarhunlelongindexpdf']);
+
Route::post('/export',['as'=>'report.exportubahmarhun','uses'=>'ReportController@exportubahmarhun']);
From 5a0631921b5c0a5ae218fdf83926b5a338384af6 Mon Sep 17 00:00:00 2001
From: Amirah22 <94591077+Amirah22@users.noreply.github.com>
Date: Wed, 25 Jan 2023 12:47:45 +0800
Subject: [PATCH 2/3] laporan ubah marhun pdf (operasi)
---
app/Http/Controllers/ReportController.php | 2 +-
.../views/pdf/laporanubahmarhun.blade.php | 88 ++++++++++---------
2 files changed, 48 insertions(+), 42 deletions(-)
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index e3a1861a..e3d522bc 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -1050,7 +1050,7 @@ class ReportController extends Controller
$getpengesahan = Cawangan::where('caw_code', $kodcaw)->first();
- // return view('marhun.ubahmarhun', compact('cawangan','lelong_id','getpengesahan'));
+ // return view('pdf.laporanubahmarhun', compact('cawangan','lelong_id','getpengesahan','t_lelong'));
$pdf = PDF::loadView('pdf.laporanubahmarhun',compact('cawangan','lelong_id','getpengesahan','t_lelong'))
->setPaper('a4', 'potrait');
diff --git a/resources/views/pdf/laporanubahmarhun.blade.php b/resources/views/pdf/laporanubahmarhun.blade.php
index 4b287bb4..0bc01e8e 100644
--- a/resources/views/pdf/laporanubahmarhun.blade.php
+++ b/resources/views/pdf/laporanubahmarhun.blade.php
@@ -71,42 +71,52 @@ tr:nth-child(even) {
/* background-color: #f2f2f2; */
}
-
-
+
-
-
- PERMODALAN KELANTAN BERHAD |
-
-
- | Laporan Ubah Marhun |
+.table th,
+.table td {
+ padding: 0.75rem;
+ vertical-align: top;
+ border-top: 1px solid #dee2e6;
+}
-
-
+
-
-
-
-
- | Batch Lelong: {{$lelong_id}} |
- Cawangan : {{$getpengesahan['caw_name']}}
+
+
+ PERMODALAN KELANTAN BERHAD |
+
+
+
+ | Laporan Ubah Marhun |
+
+
+
+
+
+
+
+
+ | Batch Lelong: {{$lelong_id}} |
+ Cawangan : {{$getpengesahan['caw_name']}}
+ |
+ | Tarikh Lelong : {{$t_lelong}} |
+
+
+
+
+
+
+
+
+
+
+
+
- | Tarikh Lelong : {{$t_lelong}} |
-
-
-
-
-
-
-
-
-
-
-
-
| Bil |
No Rujukan |
Perubahan |
@@ -119,9 +129,10 @@ tr:nth-child(even) {
Diminta Oleh |
Disahkan Oleh |
{{-- Status | --}}
-
-
-
+
+
+
+
@forelse($cawangan as $marhun)
| {{ $loop->iteration }} |
@@ -187,15 +198,10 @@ tr:nth-child(even) {
@endforelse
-
-
-
-
+
+ |
-
-
-
-
-
+
+{{-- @endsection --}}
From 2062db8c4201d8df390800bfbeaf6f485fc38f1d Mon Sep 17 00:00:00 2001
From: Amirah22 <94591077+Amirah22@users.noreply.github.com>
Date: Wed, 25 Jan 2023 13:48:44 +0800
Subject: [PATCH 3/3] laporan ubah marhun pdf (pc)
---
.../Controllers/ReportCawanganController.php | 39 ++++++++++++++++++-
resources/views/includes/sidebar.blade.php | 5 +++
routes/web.php | 2 +
3 files changed, 45 insertions(+), 1 deletion(-)
diff --git a/app/Http/Controllers/ReportCawanganController.php b/app/Http/Controllers/ReportCawanganController.php
index 3f36b454..722bbeb2 100644
--- a/app/Http/Controllers/ReportCawanganController.php
+++ b/app/Http/Controllers/ReportCawanganController.php
@@ -903,9 +903,46 @@ class ReportCawanganController extends Controller
return $pdf->download('Laporan Tuntut/Belum Baki Lelong.pdf');
-
}
+ public function indexubahmarhun (){
+
+ $arraydetails = [];
+
+ $user = Auth::user();
+ $caw = Cawangan::where('caw_code','=',$user->kodcaw)
+ ->first();
+ // dd($caw);
+
+ $laporan= Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
+ ->join('pengesahan','lelong.id','=','pengesahan.lelong_id')
+ ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+ ->where('cawangan.caw_code','=',$user['kodcaw'])
+ ->select('cawangan_lelong.lelong_id','tarikh_lelong','lelong.fasa')
+ ->distinct()
+ ->orderBy('cawangan_lelong.lelong_id')
+ ->get()
+ ->toArray();
+ // dd($laporan);
+
+
+ foreach($laporan as $brg)
+ {
+ $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+ ->where('lelong_id', $brg['lelong_id'])
+ ->where('cawangan.caw_code','=',$user['kodcaw'])
+ ->distinct()
+ ->orderBy('lelong_id')
+ ->get()
+ ->toArray();
+ array_push($arraydetails,['brg' => $brg, 'detailsbrg' => $details ]);
+ }
+
+
+ return view('marhun.ubahmarhuncaw', compact('arraydetails'));
+
+}
+
diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php
index 490bc474..d2acb0b5 100644
--- a/resources/views/includes/sidebar.blade.php
+++ b/resources/views/includes/sidebar.blade.php
@@ -176,6 +176,11 @@
Barang Lelong Pembida
+
diff --git a/routes/web.php b/routes/web.php
index b9cce05a..1b579295 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -585,6 +585,8 @@ Route::get('laporanlelfullcaw/{lelong_id}',['as'=>'reportcaw.laporanlelfullcaw',
Route::get('indexbrglelpembidacaw',['as'=>'reportcaw.indexbrglelpembidacaw','uses'=>'ReportCawanganController@indexbrglelpembidacaw']);
Route::get('laporanbrglelpembidacaw/{lelong_id}',['as'=>'reportcaw.laporanbrglelpembidacaw','uses'=>'ReportCawanganController@laporanbrglelpembidacaw']);
+Route::get('indexubahmarhun',['as'=>'reportcaw.indexubahmarhun','uses'=>'ReportCawanganController@indexubahmarhun']);
+
});
//Report by cawangan KHAS
|