From 752cfefeace883b9321186c82aa60bef9eac2473 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Wed, 19 Oct 2022 17:05:47 +0800 Subject: [PATCH] add tt khazanah dalam laporan keluar masuk marhun --- app/Http/Controllers/MarhunController.php | 35 ++++- resources/views/lelong/showlelong.blade.php | 6 +- resources/views/lelong/showlelongpc.blade.php | 4 +- .../views/lelongkhas/showlelongkhas.blade.php | 4 +- .../pdf/cetakkeluarscanbarcode.blade.php | 104 ++++++++----- .../views/pdf/cetakmasukscanbarcode.blade.php | 143 ++++++++++-------- 6 files changed, 187 insertions(+), 109 deletions(-) diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 9aee651a..88666520 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers; +use Illuminate\Support\Facades\Http; use Illuminate\Http\Request; use Spatie\Permission\Models\Role; use Spatie\Permission\Models\Permission; @@ -1718,8 +1719,23 @@ class MarhunController extends Controller ->orderBy('id', 'desc') ->get(); - // return view('pdf.cetakkeluarscanbarcode', compact('lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar', 'senaraiScanMasuk','caw')); - $pdf = PDF::loadView('pdf.cetakkeluarscanbarcode',compact('caw','lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar', 'senaraiScanMasuk' + //get staf cwgn roles harian + $roles_harian_penilai = Http::get('http://zone1.arrahn/api/roles_harian/' . $user->kodcaw ,[ + 'role_harian' => 'penilai' + ])->json(); + + + $roles_harian_khazanah = Http::get('http://zone1.arrahn/api/roles_harian/' . $user->kodcaw ,[ + 'role_harian' => 'khazanah' + ])->json(); + + $roles_harian_pc = Http::get('http://zone1.arrahn/api/roles_harian/' . $user->kodcaw ,[ + 'role_harian' => 'pc' + ])->json(); + // dd($roles_harian_penilai); + + // return view('pdf.cetakkeluarscanbarcode', compact('caw','lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar', 'senaraiScanMasuk','roles_harian_penilai','roles_harian_khazanah','roles_harian_pc')); + $pdf = PDF::loadView('pdf.cetakkeluarscanbarcode',compact('caw','lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar', 'senaraiScanMasuk','roles_harian_penilai','roles_harian_khazanah','roles_harian_pc' ))->setPaper('a4', 'potrait'); return $pdf->download('Senarai Keluar Peti Besi.pdf'); @@ -1746,9 +1762,22 @@ class MarhunController extends Controller ->whereNotNull('scan_masuk') ->orderBy('id', 'desc') ->get(); + + $roles_harian_penilai = Http::get('http://zone1.arrahn/api/roles_harian/' . $user->kodcaw ,[ + 'role_harian' => 'penilai' + ])->json(); + + + $roles_harian_khazanah = Http::get('http://zone1.arrahn/api/roles_harian/' . $user->kodcaw ,[ + 'role_harian' => 'khazanah' + ])->json(); + + $roles_harian_pc = Http::get('http://zone1.arrahn/api/roles_harian/' . $user->kodcaw ,[ + 'role_harian' => 'pc' + ])->json(); // return view('pdf.cetakmasukscanbarcode', compact('lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar', 'senaraiScanMasuk','caw')); - $pdf = PDF::loadView('pdf.cetakmasukscanbarcode',compact('caw','lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar', 'senaraiScanMasuk' + $pdf = PDF::loadView('pdf.cetakmasukscanbarcode',compact('caw','lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar', 'senaraiScanMasuk','roles_harian_penilai','roles_harian_khazanah','roles_harian_pc' ))->setPaper('a4', 'potrait'); return $pdf->download('Senarai Masuk Peti Besi.pdf'); diff --git a/resources/views/lelong/showlelong.blade.php b/resources/views/lelong/showlelong.blade.php index 30a8a017..5e14e83f 100644 --- a/resources/views/lelong/showlelong.blade.php +++ b/resources/views/lelong/showlelong.blade.php @@ -62,10 +62,10 @@ {{-- {{dd($kemaskini)}} --}} @if($kemaskini == $today)
- Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}} /gm + Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}} @else
- Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}} /gm + Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}} @endif @@ -163,7 +163,7 @@ {{$total18K}} {{$total14Kp}} {{$total14K}} - {{$total9K}} + {{-- {{$total9K}} --}} diff --git a/resources/views/lelong/showlelongpc.blade.php b/resources/views/lelong/showlelongpc.blade.php index fa66f4c6..beac85cb 100644 --- a/resources/views/lelong/showlelongpc.blade.php +++ b/resources/views/lelong/showlelongpc.blade.php @@ -62,10 +62,10 @@ {{-- {{dd($kemaskini)}} --}} @if($kemaskini == $today)
- Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}} /gm + Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}} @else
- Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}} /gm + Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}} @endif diff --git a/resources/views/lelongkhas/showlelongkhas.blade.php b/resources/views/lelongkhas/showlelongkhas.blade.php index 29a77633..34cc1c0f 100644 --- a/resources/views/lelongkhas/showlelongkhas.blade.php +++ b/resources/views/lelongkhas/showlelongkhas.blade.php @@ -62,10 +62,10 @@ {{-- {{dd($kemaskini)}} --}} @if($kemaskini == $today)
- Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}} /gm + Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}} @else
- Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}} /gm + Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}} @endif diff --git a/resources/views/pdf/cetakkeluarscanbarcode.blade.php b/resources/views/pdf/cetakkeluarscanbarcode.blade.php index fd5d6675..221ceb0b 100644 --- a/resources/views/pdf/cetakkeluarscanbarcode.blade.php +++ b/resources/views/pdf/cetakkeluarscanbarcode.blade.php @@ -12,10 +12,13 @@ border: 0px solid; padding: 1px; text-align: left; + vertical-align = 'top'; } -#sim tr:nth-child(even){} +#sim tr:nth-child(even){ + vertical-align = 'top'; +} #sim tr:hover {} @@ -27,51 +30,50 @@ font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; } -* { - box-sizing: border-box; -} -.row { - margin-left:-5px; - margin-right:-5px; -} - -.column { - float: left; - width: 100%; - padding: 5px; -} -/* Clearfix (clear floats) */ -.row::after { - content: ""; - clear: both; - display: table; -} -table { - border-collapse: collapse; - border-spacing: 0; - width: 200%; - /* border: 0px solid #ddd; */ -} - -th, td { - text-align: left; - padding: 16px; -} - -tr:nth-child(even) { - /* background-color: #f2f2f2; */ -} + + + +
- + @@ -86,6 +88,7 @@ tr:nth-child(even) {

PERMODALAN KELANTAN BERHAD

PERMODALAN KELANTAN BERHAD


+
@@ -106,7 +109,32 @@ tr:nth-child(even) { @endforeach -
+ +
+ +
+ + + + + + + + + + + + + + + + + + +
Penilai:........................................Khazanah:........................................
{{ $roles_harian_penilai[0]['name'] }}{{ $roles_harian_khazanah[0]['name'] }}
+
+ + diff --git a/resources/views/pdf/cetakmasukscanbarcode.blade.php b/resources/views/pdf/cetakmasukscanbarcode.blade.php index bd979638..b2f4b0c3 100644 --- a/resources/views/pdf/cetakmasukscanbarcode.blade.php +++ b/resources/views/pdf/cetakmasukscanbarcode.blade.php @@ -1,70 +1,69 @@ + @@ -113,6 +112,28 @@ tr:nth-child(even) { @endforeach + +
+ + + + + + + + + + + + + + + + + + +
Penilai:........................................Khazanah:........................................
{{ $roles_harian_penilai[0]['name'] }}{{ $roles_harian_khazanah[0]['name'] }}
+