From 0b482085254f459718919d13e72bcc3a6dfffe92 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Wed, 29 Jun 2022 15:10:30 +0800 Subject: [PATCH] add function kali --- app/Http/Controllers/SimulasiController.php | 35 +++++++-- app/Http/Controllers/TetapanController.php | 56 +++++++++++++++ app/Models/Tetapan.php | 21 ++++++ ...21_12_14_041545_create_simulasis_table.php | 1 + ...2021_12_14_041557_create_lelongs_table.php | 12 ++++ database/seeders/RolesSeeder.php | 5 ++ resources/views/includes/sidebar.blade.php | 3 + .../views/simulasi/janasimulasi.blade.php | 12 +++- .../simulasi/senaraitempsimulasi.blade.php | 3 +- resources/views/tetapan/parameter.blade.php | 71 +++++++++++++++++++ routes/web.php | 5 ++ 11 files changed, 214 insertions(+), 10 deletions(-) create mode 100644 app/Http/Controllers/TetapanController.php create mode 100644 app/Models/Tetapan.php create mode 100644 resources/views/tetapan/parameter.blade.php diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index 219ed235..b4f859f0 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -28,7 +28,7 @@ use App\Models\LelongBidMarhun; use App\Models\LelKarat; use App\Models\LogUser; use App\Models\LelongTebus; - +use App\Models\Tetapan; @@ -54,7 +54,8 @@ class SimulasiController extends Controller public function index() { $caw = Cawangan::all(); - return view('simulasi.janasimulasi',compact('caw')); + $tetapan = Tetapan::where('id','=',1)->first(); + return view('simulasi.janasimulasi',compact('caw','tetapan')); } public function janadata(Request $request) @@ -64,6 +65,7 @@ class SimulasiController extends Controller $bulan = (int)round($request->jbg); $fasa = $request->fasa; $jbg = $request->jbg; + $kali = $request->kali; // dd($fasa); // dd($fasa); //create simulasi @@ -73,6 +75,7 @@ class SimulasiController extends Controller $simulasi->jbg = $request->jbg; $simulasi->cajlelong = $request->cajlelong; $simulasi->fasa = $request->fasa; + $simulasi->kali = $request->kali; $simulasi->save(); $simulasi_id = $simulasi->id; $jbgadai = ($t_lelong->subMonths($bulan))->toDateString(); @@ -136,8 +139,13 @@ class SimulasiController extends Controller $caw_simulasi->online = 'Online'; $caw_simulasi->lokasi = $cawsimulasi->lokasi; $caw_simulasi->fasa = $request->fasa; + $caw_simulasi->kali = $request->kali; $caw_simulasi->save(); // dd($caw_simulasi); + + // $cawangan = Cawangan::whereIn('caw_code',$request->caw)->get(); + // $cawangan->kali = $request->kali; + // $cawangan->update(); $suratcaw = $surat->where('kodcaw','=',$cawsimulasi->caw_code)->all(); @@ -871,10 +879,13 @@ class SimulasiController extends Controller $fasa = $request->fasa; $jbg = $request->jbg; $cajlelong = $request->cajlelong; + $kali = $request->kali; + // dd($kali); $jbgadai = ($t_lelong->subMonths($bulan))->toDateString(); $t_lelongdisplay = $t_lelong->format('d-m-Y'); // $t_lelongdisplay = $t_lelong->format('d-m-Y'); //dd($fasa); + $tetapan = Tetapan::where('id','=',1)->first(); if($t_lelong != null) { if($request->fasa == '1'){ @@ -901,7 +912,7 @@ class SimulasiController extends Controller // $t_gadaisehingga = Carbon::parse($t_gadais); // $t_gadaisdisplay = $t_gadaisehingga->format('d/m/Y'); - + $senarai = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code') ->orderBy('cawangan.caw_name') ->where('gadai.t_gadai', '<=', $jbgadai) @@ -910,6 +921,13 @@ class SimulasiController extends Controller ->where('gadai.taglel', '=', 0) ->where('gadai.tagpalsu', '=', 0) ->where('gadai.tagpalsu2', '=', 0) + // ->where('cawangan_simulasi.kali', '!=', $kali) + ->whereNotIn('cawangan.id', function($query) use ($kali) { + $query->select('caw_id') + ->from('cawangan_simulasi') + ->where('kali', '=' ,$kali); + }) + ->whereNotNull('gadai.upah12') ->groupBy('gadai.kodcaw','cawangan.caw_name') ->selectRaw('count(*) as bil_lelong, @@ -918,9 +936,11 @@ class SimulasiController extends Controller sum(pinjaman) as total_pembiayaan, sum(bakipjm) as total_bakipjm, gadai.kodcaw, - cawangan.caw_name as caw_name') - ->get(); - + cawangan.caw_name as caw_name + ') + + ->get(); + // dd($senarai); $bil_lelong = sizeof($getsurat); } @@ -987,7 +1007,8 @@ class SimulasiController extends Controller 'jbgadai', 'fasa', 'jbg', - 'cajlelong' + 'cajlelong', + 'tetapan' )); diff --git a/app/Http/Controllers/TetapanController.php b/app/Http/Controllers/TetapanController.php new file mode 100644 index 00000000..6c13a416 --- /dev/null +++ b/app/Http/Controllers/TetapanController.php @@ -0,0 +1,56 @@ +first(); + // dd($tetapan); + + return view('tetapan.parameter',compact('caw','tetapan')); + + } + + public function addparameter(Request $request) + { + $t_lelong = Carbon::parse($request->tarikh_lelong); + $kali = $request->kali; + //create tetapan + $tetapan = Tetapan::find(1); + // dd($tetapan); + $tetapan->tetap_tarikh_lelong = $request->tarikh_lelong; + $tetapan->kali = $request->kali; + $tetapan->cajlelong = $request->cajlelong; + $tetapan->update(); + + return redirect()->route('tetapan.parameter') + ->with('success','Tetapan Berjaya'); + } + + + +} diff --git a/app/Models/Tetapan.php b/app/Models/Tetapan.php new file mode 100644 index 00000000..cb5c14f5 --- /dev/null +++ b/app/Models/Tetapan.php @@ -0,0 +1,21 @@ +date('import_data_sts_date')->nullable(); $table->string('lokasi')->nullable(); $table->integer('fasa')->default(0); + $table->integer('kali')->nullable(); $table->timestamps(); $table->foreign('caw_id') diff --git a/database/migrations/2021_12_14_041557_create_lelongs_table.php b/database/migrations/2021_12_14_041557_create_lelongs_table.php index 00a3f0a8..7e26f397 100644 --- a/database/migrations/2021_12_14_041557_create_lelongs_table.php +++ b/database/migrations/2021_12_14_041557_create_lelongs_table.php @@ -162,6 +162,18 @@ class CreateLelongsTable extends Migration // ->references('norujukan')->on('gadai') // ->onDelete('cascade'); }); + + Schema::create('tetapan', function (Blueprint $table) { + $table->bigIncrements('id'); + $table->datetime('tetap_tarikh_lelong')->nullable(); + $table->string('kali')->nullable(); + $table->integer('cajlelong')->nullable(); + $table->timestamps(); + + // $table->foreign('norujukan') + // ->references('norujukan')->on('gadai') + // ->onDelete('cascade'); + }); } /** diff --git a/database/seeders/RolesSeeder.php b/database/seeders/RolesSeeder.php index cf26e849..c3927228 100644 --- a/database/seeders/RolesSeeder.php +++ b/database/seeders/RolesSeeder.php @@ -123,6 +123,10 @@ class RolesSeeder extends Seeder 'name' => 'importdata', 'description' => 'Import Data Cawangan Dari LIVE to Master' ]); + Permission::create([ + 'name' => 'tetapan', + 'description' => 'Tetapan Parameter' + ]); //account @@ -179,6 +183,7 @@ class RolesSeeder extends Seeder $role6->givePermissionTo('notistamatkontrak'); $role6->givePermissionTo('kemaskinihargaasas'); $role6->givePermissionTo('importdata'); + $role6->givePermissionTo('tetapan'); $role7 = Role::create(['name' => 'account']); $role7->givePermissionTo('pengesahanbayaran'); diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index 5cb36584..fd27893b 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -154,6 +154,9 @@ @endhasrole @hasrole('operasi') +
  • + Tetapan +
  • Import Data
    • diff --git a/resources/views/simulasi/janasimulasi.blade.php b/resources/views/simulasi/janasimulasi.blade.php index c4ec1592..61de86d1 100644 --- a/resources/views/simulasi/janasimulasi.blade.php +++ b/resources/views/simulasi/janasimulasi.blade.php @@ -20,7 +20,7 @@
    - +
    +
    + @csrf +
    + +
    + +
    +
    + + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    +
    +
    + +
    +
    +
    +
    + + + + + +@endsection diff --git a/routes/web.php b/routes/web.php index 9d6fe1c5..81d5ff2f 100644 --- a/routes/web.php +++ b/routes/web.php @@ -245,6 +245,11 @@ Route::group(['middleware' => ['permission:importdata'],'prefix'=>'importdata'], Route::get('/importdatagadai/{caw_id}',['as'=>'importdata.importdatagadai','uses'=>'ImportDataController@importdatagadai']); Route::get('/hapusdatacawangan/{caw_id}',['as'=>'importdata.hapusdatacawangan','uses'=>'ImportDataController@hapusdatacawangan']); }); + +Route::group(['middleware' => ['permission:tetapan'],'prefix'=>'tetapan'], function () { + Route::get('/parameter',['as'=>'tetapan.parameter','uses'=>'TetapanController@parameter']); + Route::post('/addparameter',['as'=>'tetapan.addparameter','uses'=>'TetapanController@addparameter']); +}); //Operasi Route::group(['middleware' => ['permission:serahan'],'prefix'=>'serahan'], function () {