From 0e83ad554d0d167ed0c7fd6c2eb2b89ba2e0d79f Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Sun, 19 Dec 2021 16:41:35 +0800 Subject: [PATCH] update --- app/Http/Controllers/PenggunaController.php | 2 +- app/Http/Controllers/SimulasiController.php | 149 ++++++++++++++++-- .../views/pengurusanpengguna/index.blade.php | 1 + .../views/pengurusanpengguna/roles.blade.php | 1 + .../views/pengurusanpengguna/taraf.blade.php | 1 + .../views/simulasi/showsimulasi.blade.php | 117 +++++++++++--- routes/web.php | 3 +- 7 files changed, 238 insertions(+), 36 deletions(-) diff --git a/app/Http/Controllers/PenggunaController.php b/app/Http/Controllers/PenggunaController.php index e629e6fa..817b3686 100644 --- a/app/Http/Controllers/PenggunaController.php +++ b/app/Http/Controllers/PenggunaController.php @@ -195,7 +195,7 @@ class PenggunaController extends Controller $model_name = '\\App\\Models\\'.$request->type; } - dd($request->checkboxdata); + // dd($request->checkboxdata); if($request->checkboxdata) { if($request->type == 'User') diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index e236bcc3..7314fcc3 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -189,11 +189,37 @@ class SimulasiController extends Controller public function showsimulasi($id) { + $simulasi_id = $id; $simulasi = Simulasi::where('id','=',$id)->first(); $cawangansim = CawanganSimulasi::where('simulasi_id','=',$id)->get(); + $simkarat = SimKarat::where('simulasi_id','=',$id)->get(); $arraydata = []; $arraycaw = []; + $data = []; + + $total_marhun = 0; + $total_berat = 0; + $total_nmarhun = 0; + $total_pinjaman = 0; + $total_upah = 0; + $total_hargaasas = 0; + $total_cazlelong = 0; + $total_rugilelong = 0; + $total_bakilelong = 0; + + $total24Kgb = 0; + $total24K = 0; + $total23k = 0; + $total22K = 0; + $total21K = 0; + $total20K = 0; + $total18Kp = 0; + $total18K = 0; + $total14Kp = 0; + $total14K = 0; + $total9K = 0; + foreach($cawangansim as $cawsim) { $cawangan = Cawangan::where('id','=',$cawsim->caw_id)->first(); @@ -212,39 +238,132 @@ class SimulasiController extends Controller foreach($databid as $bid) { $marhun = SimulasiBidMarhun::where('simulasibid_id','=',$bid->id)->get(); - $packet = $packet + count($marhun); $berat = $berat + $bid->berat; $nilai_marhun = $nilai_marhun + ($marhun->sum('n_marhun')); $pinjaman =$pinjaman + $bid->pinjaman; - // $upah = $upah + $bid->upah; + $upah = $upah + $bid->upah; $hargaasas = $hargaasas + $bid->hargaasas; $cajlelong = $cajlelong + $bid->cajlelong; - // $rugilelong = $berat + $bid->berat; - $bakilelong = $bakilelong + $bid->baki; - } + + + if($bid->baki > 0) + { + $bakilelong = $bakilelong + $bid->baki; + } + else + { + $rugilelong = $rugilelong - $bid->baki; + } + + + $total24Kgb += SimulasiBidMarhun::where('simulasibid_id','=',$bid->id) + ->where('karat','=','24.0Kgb') + ->sum('berat'); - + $total24K += SimulasiBidMarhun::where('simulasibid_id','=',$bid->id) + ->where('karat','=','24.0K') + ->sum('berat'); + + $total23k += SimulasiBidMarhun::where('simulasibid_id','=',$bid->id) + ->where('karat','=','23.0K') + ->sum('berat'); + + $total22K += SimulasiBidMarhun::where('simulasibid_id','=',$bid->id) + ->where('karat','=','22.0K') + ->sum('berat'); + + $total21K += SimulasiBidMarhun::where('simulasibid_id','=',$bid->id) + ->where('karat','=','21.0K') + ->sum('berat'); + + $total20K += SimulasiBidMarhun::where('simulasibid_id','=',$bid->id) + ->where('karat','=','20.0K') + ->sum('berat'); + + $total18Kp += SimulasiBidMarhun::where('simulasibid_id','=',$bid->id) + ->where('karat','=','18.0Kp') + ->sum('berat'); + + $total18K += SimulasiBidMarhun::where('simulasibid_id','=',$bid->id) + ->where('karat','=','18.0K') + ->sum('berat'); + + $total14Kp += SimulasiBidMarhun::where('simulasibid_id','=',$bid->id) + ->where('karat','=','14.0Kp') + ->sum('berat'); + + $total14K += SimulasiBidMarhun::where('simulasibid_id','=',$bid->id) + ->where('karat','=','14.0K') + ->sum('berat'); + + $total9K += SimulasiBidMarhun::where('simulasibid_id','=',$bid->id) + ->where('karat','=','9.0K') + ->sum('berat'); + + + + } array_push($arraycaw,[ 'cawangan'=>$cawangan->caw_name, 't_lelong'=>$simulasi->tarikh_lelong, - 'bil_marhun'=>$packet, + 'bil_marhun'=>sizeof($databid), 'berat'=>$berat, 'n_marhun'=>$nilai_marhun, 'pinjaman'=>$pinjaman, 'upah'=>0, 'hargaasas'=>$hargaasas, 'cajlelong'=>$cajlelong, - 'rugilelong'=>0, + 'rugilelong'=>$rugilelong, 'bakilelong'=>$bakilelong, ]); - // dd($arraycaw); - // array_push($arraydata, $arraycaw); - } - - // dd($arraycaw); - // ->where('id','=',$id)- - return view('simulasi.showsimulasi',compact('arraycaw')); + $total_marhun = $total_marhun + sizeof($databid); + $total_berat = $total_berat + $berat; + $total_nmarhun = $total_nmarhun + $nilai_marhun; + $total_pinjaman = $total_pinjaman + $pinjaman; + $total_upah = $total_upah + 0; + $total_hargaasas = $total_hargaasas + $hargaasas; + $total_cazlelong = $total_cazlelong + $cajlelong; + $total_rugilelong = $total_rugilelong + $rugilelong; + $total_bakilelong = $total_bakilelong + $bakilelong; + } + + + + return view('simulasi.showsimulasi',compact( + 'arraycaw', + 'total_marhun', + 'total_berat', + 'total_nmarhun', + 'total_pinjaman', + 'total_upah', + 'total_hargaasas', + 'total_cazlelong', + 'total_rugilelong', + 'total_bakilelong', + 'total24Kgb', + 'total24K', + 'total23k', + 'total22K', + 'total21K', + 'total20K', + 'total18Kp', + 'total18K', + 'total14Kp', + 'total14K', + 'total9K', + 'simkarat', + 'simulasi_id')); + } + + public function createlelong($id) + { + $simulasi = Simulasi::where('id','=',$id)->first(); + $cawangansim = CawanganSimulasi::where('simulasi_id','=',$id)->get(); + + return redirect()->route('analisa.senaraisimulasi') + ->with('success','Create Lelong Berjaya'); + } public function deletesim($id) diff --git a/resources/views/pengurusanpengguna/index.blade.php b/resources/views/pengurusanpengguna/index.blade.php index 700468d2..77fa6c27 100644 --- a/resources/views/pengurusanpengguna/index.blade.php +++ b/resources/views/pengurusanpengguna/index.blade.php @@ -14,6 +14,7 @@ $totaluser = count($alluser); ?>
+ @csrf diff --git a/resources/views/pengurusanpengguna/roles.blade.php b/resources/views/pengurusanpengguna/roles.blade.php index b1df4e33..a55955fa 100644 --- a/resources/views/pengurusanpengguna/roles.blade.php +++ b/resources/views/pengurusanpengguna/roles.blade.php @@ -10,6 +10,7 @@ @endif + @csrf
diff --git a/resources/views/pengurusanpengguna/taraf.blade.php b/resources/views/pengurusanpengguna/taraf.blade.php index 2699230a..fc2eb51f 100644 --- a/resources/views/pengurusanpengguna/taraf.blade.php +++ b/resources/views/pengurusanpengguna/taraf.blade.php @@ -10,6 +10,7 @@ @endif + @csrf
diff --git a/resources/views/simulasi/showsimulasi.blade.php b/resources/views/simulasi/showsimulasi.blade.php index 62714756..574ba163 100644 --- a/resources/views/simulasi/showsimulasi.blade.php +++ b/resources/views/simulasi/showsimulasi.blade.php @@ -10,12 +10,47 @@

{{ $message }}

@endif - {{$arraycaw[0]->cawangan }} + {{-- {{$cawangan[0] }} --}} +
+
+
+ + + + + + + + + + + + +
Bilangan Lelong : {{$total_marhun}}
Nilai Marhun Keseluruhan : RM{{ number_format($total_nmarhun, 2, '.', ',') }}
Pinjaman Keseluruhan : RM{{ number_format($total_pinjaman, 2, '.', ',') }}
Upah Keseluruhan : RM{{ number_format($total_upah, 2, '.', ',') }}
+ +
+
+ + + + + + + + + + +
Rugi Lelong Keseluruhan : -RM{{ number_format($total_rugilelong, 2, '.', ',') }}
Baki Lelong Keseluruhan : RM{{ number_format($total_bakilelong, 2, '.', ',') }}
Caj Lelong Keseluruhan : RM{{ number_format($total_cazlelong, 2, '.', ',') }}
+
+ + + - + + @@ -25,31 +60,79 @@ - + - @foreach ($arraycaw as $caw) + @foreach ($arraycaw as $index=>$caw) - - - - - - - - - - - + + + + + + + + + + + + @endforeach + + + + + + + + + + + + + + + +
No Cawangan Tarikh Lelong Bil Marhun (Paket)Upah (RM) Harga Asas (RM) Caj Lelong (RM)Rugi Lelong (RM) Baki Lelong (RM)Rugi Lelong (RM)
{{ $caw->cawangan }}{{ $caw->t_lelong }}{{ $caw->bil_marhun }}{{ $caw->berat }}{{ $caw->n_marhun }}{{ $caw->pinjaman }}{{ $caw->upah }}{{ $caw->hargaasas }}{{ $caw->cajlelong }}{{ $caw->rugilelong }}{{ $caw->bakilelong }}{{$index+1}}{{ $caw['cawangan'] }}{{ $caw['t_lelong'] }}{{ $caw['bil_marhun'] }}{{ number_format($caw['berat'], 2, '.', ',') }}{{ number_format($caw['n_marhun'], 2, '.', ',') }}{{ number_format($caw['pinjaman'], 2, '.', ',') }}{{ number_format($caw['upah'], 2, '.', ',') }}{{ number_format($caw['hargaasas'], 2, '.', ',') }}{{ number_format($caw['cajlelong'], 2, '.', ',') }}{{ number_format($caw['bakilelong'], 2, '.', ',') }}({{ number_format($caw['rugilelong'], 2, '.', ',') }})
JUMLAH KESELURUHAN{{ $total_marhun }}{{ number_format($total_berat, 2, '.', ',') }}{{ number_format($total_nmarhun, 2, '.', ',') }}{{ number_format($total_pinjaman, 2, '.', ',') }}{{ number_format($total_upah, 2, '.', ',') }}{{ number_format($total_hargaasas, 2, '.', ',') }}{{ number_format($total_cazlelong, 2, '.', ',') }}{{ number_format($total_bakilelong, 2, '.', ',') }}({{ number_format($total_rugilelong, 2, '.', ',') }})
+ + + + + + + + + + + @foreach ($simkarat as $index=>$karat) + + @endforeach + + + + + + + + + + + + + + + + +
JUMLAH BERAT MENGIKUT MUTU (KESELURUHAN)
MUTU{{$karat->karat}}
BERAT (gm){{$total24Kgb}}{{$total24K}}{{$total23k}}{{$total22K}}{{$total21K}}{{$total20K}}{{$total18Kp}}{{$total18K}}{{$total14Kp}}{{$total14K}}{{$total9K}}
+ Create Lelong @@ -79,10 +162,6 @@ { "targets": 0, "orderable": false - }, - { - "targets": 5, - "orderable": false } ], order: [[1, 'asc']], diff --git a/routes/web.php b/routes/web.php index b95ffd87..87942131 100644 --- a/routes/web.php +++ b/routes/web.php @@ -51,7 +51,8 @@ Route::group(['middleware' => ['permission:analisa'],'prefix'=>'analisa'], funct Route::post('/janadata',['as'=>'analisa.janadata','uses'=>'SimulasiController@janadata']); Route::get('/senaraisimulasi',['as'=>'analisa.senaraisimulasi','uses'=>'SimulasiController@senaraisimulasi']); Route::get('/showsimulasi/{id}',['as'=>'analisa.showsimulasi','uses'=>'SimulasiController@showsimulasi']); - Route::get('/deletesimulasi/{id}',['as'=>'analisa.deletesimulasi','uses'=>'SimulasiController@deletesim']); + Route::get('/deletesimulasi/{id}',['as'=>'analisa.deletesimulasi','uses'=>'SimulasiController@deletesim']); + Route::get('/createlelong/{id}',['as'=>'analisa.createlelong','uses'=>'SimulasiController@createlelong']); }); Route::group(['middleware' => ['permission:sistem'],'prefix'=>'sistem'], function () {