KoPKB/lelong
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'atie' into 'main'

Browse Source 
add log user dan list tangguh lelong by caw

See merge request online-sistem1/lelong!72
This commit is contained in:
Nur Izzati Zulkifli
2022-06-18 11:45:59 +00:00
parent 975939aecc c7eb184310
commit 7c5231702c
8 changed files with 254 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LelongController.php
+51 -2
View File
@@ -31,6 +31,7 @@ use App\Models\LelongBidMarhun;
use App\Models\LelKarat;
use App\Models\LelKarat_temp;
use App\Models\Resit;
use App\Models\LogUser;
use Carbon\Carbon;
@@ -282,6 +283,9 @@ class LelongController extends Controller
public function create($id)
{
$user = Auth::user();
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateTimeString();
$simulasi = Simulasi::where('id','=',$id)->first();
$cawangansim = CawanganSimulasi::where('simulasi_id','=',$id)->get();
$simkarat = SimKarat::where('simulasi_id','=',$id)->get();
@@ -397,6 +401,7 @@ class LelongController extends Controller
$updategadai = Gadai::where('norujukan','=', $data->norujukan)->first();
$updategadai->taglel = 1;
$updategadai->save();
// $hapussimulasi = SimulasiBid::where('norujukan','=',$data->norujukan)->first();
// $hapussimulasi->delete();
@@ -432,7 +437,18 @@ class LelongController extends Controller
$hapussimulasi = SimulasiBid::where('norujukan','=',$data->norujukan)->first();
$hapussimulasi->delete();
}
//insert loguser
$loguser = new LogUser;
$loguser->user_id = $user->id;
$loguser->date = $currentdate;
$loguser->username = $user->username;
$loguser->nama_user = $user->name;
$loguser->norujukan = $data->norujukan;
$loguser->nota = 'Daftar Batch Lelong '.$lelong->id;
$loguser->save();
}
}
}
@@ -457,6 +473,10 @@ class LelongController extends Controller
public function delete($id)
{
$user = Auth::user();
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateTimeString();
$lelongbid = LelongBid::where('lelong_id', $id)
->get()->toArray();
@@ -464,7 +484,18 @@ class LelongController extends Controller
{
$gadai = Gadai::where('norujukan', $bid['norujukan'])->first();
$gadai->taglel = 0;
$gadai->update();
$gadai->update();
//insert loguser
$loguser = new LogUser;
$loguser->user_id = $user->id;
$loguser->date = $currentdate;
$loguser->username = $user->username;
$loguser->nama_user = $user->name;
$loguser->norujukan = $bid['norujukan'];
$loguser->nota = ' Hapus Batch Lelong '.$id;
$loguser->save();
}
$lelong = Lelong::where('id','=',$id)->first();
@@ -970,8 +1001,26 @@ class LelongController extends Controller
$data = $request->checkboxdata;
foreach($data as $index=>$norujukan)
{
$user = Auth::user();
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateTimeString();
$marhun = LelongBid::where('norujukan','=',$norujukan)->first();
$marhun->delete();
$updategadai = Gadai::where('norujukan','=', $norujukan)->first();
$updategadai->taglel = 0;
$updategadai->save();
//insert loguser
$loguser = new LogUser;
$loguser->user_id = $user->id;
$loguser->date = $currentdate;
$loguser->username = $user->username;
$loguser->nama_user = $user->name;
$loguser->norujukan = $norujukan;
$loguser->nota = ' Tangguh Lelong';
$loguser->save();
}
return redirect()->route('lelong.senaraimarhun',['lelongid'=>$request->lelongid,'cawid'=>$request->cawid])
app/Http/Controllers/SimulasiController.php
+1
View File
@@ -846,6 +846,7 @@ class SimulasiController extends Controller
{
$marhun = SimulasiBid::where('norujukan','=',$norujukan)->first();
$marhun->delete();
}
return redirect()->route('analisa.senaraimarhunlel',['simulasi_id'=>$request->simulasi_id,'cawid'=>$request->cawid])
app/Http/Controllers/TangguhLelongController.php
+44 -1
View File
@@ -40,7 +40,7 @@ class TangguhLelongController extends Controller
// $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
// ->where('lelong_id',$info['lelong_id'])
$detailsinfo = CawanganLelong::select('cawangan_lelong.caw_id','caw_name','lelongbid.status_jual')
$detailsinfo = CawanganLelong::select('cawangan_lelong.caw_id','caw_name','lelongbid.status_jual','caw_code')
->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->join('lelongbid','lelongbid.kodcaw','=','cawangan.caw_code')
->where('cawangan_lelong.lelong_id', $info['lelong_id'])
@@ -372,4 +372,47 @@ class TangguhLelongController extends Controller
}
return redirect()->route('pengesahan.senaraisahtangguh', [$request->lelong_id, $caw_code])->with('success','Pengesahan Berjaya');
}
//PC
public function listtangguh($lelong_id,$caw_code)
{
$user = Auth::user();
// dd($id);
$tangguhlelong = TangguhLelong::join('lelong', 'tangguhlelong.lelong_id', '=', 'lelong.id')
->where('tangguhlelong.norujukan', 'like', "%$caw_code%")
->whereNotNull('tangguhlelong.tarikhtangguh')
->select('tangguhlelong.id as tangguhlelong_id',
'tangguhlelong.lelongbid_id',
'tangguhlelong.norujukan',
'tangguhlelong.tarikhtangguh',
'tangguhlelong.ditangguh_pada',
'tangguhlelong.ditangguh_oleh',
'tangguhlelong.nota',
'lelong.id as lelong_id',
'lelong.tarikh_lelong',
'lelong.harga_emas_asas',
'lelong.jbg',
'lelong.cajlelong',
'lelong.sts_lelong'
)
->get();
//dd($tangguhlelong);
foreach($tangguhlelong as $index1=>$tanguhlel)
{
$getkodcaw = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code')
->where('lelong_id', $lelong_id)
->where('kodcaw', $caw_code)
->select('cawangan.caw_name','cawangan.caw_code')
->first();
$tangguhlelong[$index1]['details'] = $tanguhlel;
$tangguhlelong[$index1]['nama_caw'] = $getkodcaw;
}
return view('tangguhlelong.listtangguh',compact('tangguhlelong','lelong_id', 'caw_code', 'getkodcaw'));
}
}
app/Models/LogUser.php
+23
View File
@@ -0,0 +1,23 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
class LogUser extends Model
{
use HasFactory;
protected $table = 'loguser';
protected $fillable = [
'recno',
'user_id',
'date',
'username',
'nama_user',
'nota'
];
}
database/migrations/2014_10_12_000000_create_users_table.php
+15
View File
@@ -38,6 +38,21 @@ class CreateUsersTable extends Migration
$table->rememberToken();
$table->timestamps();
});
Schema::create('loguser', function (Blueprint $table) {
$table->bigIncrements('recno');
$table->integer('user_id')->nullable(); //set
$table->datetime('date')->nullable();
$table->string('username')->nullable();
$table->string('nama_user')->nullable();
$table->string('norujukan')->nullable();
$table->string('nota');
$table->timestamps();
// $table->foreign('norujukan')
// ->references('norujukan')->on('gadai')
// ->onDelete('cascade');
});
}
/**
resources/views/tangguhlelong/listtangguh.blade.php
+116
View File
@@ -0,0 +1,116 @@
@extends('layouts.app')
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
<div class="container">
<div class="row mb-2">
<div class="col-md-12 mx-auto card p-4" style="margin-top:2%; margin-bottom:2%;">
<p> <b>Tarikh Lelong : </b> {{ $tangguhlelong[0]['tarikh_lelong'] }}</p>
<p> <b>Nama Cawangan : </b>{{ $getkodcaw->caw_name }}</p>
<p> <b>JBG : </b>{{ $tangguhlelong[0]['jbg'] }}</p>
</div>
</div>
</div>
<form id="exportform" action="" method="POST">
<input type="hidden" name="type" value="User">
<table class="table table-striped table-xl text-center" id="tablelelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>Tarikh Tangguh</th>
<th>No Rujukan</th>
<th>Remark</th>
<th class="text-center">Action</th>
</tr>
</thead>
<tbody>
@foreach ($tangguhlelong as $tangguhlel)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $tangguhlel->tarikhtangguh }}</td>
<td>{{ $tangguhlel->norujukan }}</td>
<td>{{ $tangguhlel->nota }}</td>
<td>
<a href="{{ route('pengesahan.lelbidmarhun', [ $lelong_id, $tangguhlel->norujukan, 'tangguhlelong_id'=>$tangguhlel['details']['tangguhlelong_id'] ]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
</td>
</tr>
@endforeach
</tbody>
</table>
</form>
<div class="modal-footer" style="margin-top:2%;">
<a href="{{ route('pengesahan.senarailelong') }}" class="btn btn-primary">Kembali</a>
</div>
</div>
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
var tablelelong = $('#tablelelong').DataTable( {
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 4,
"orderable": false
}
],
order: [[1, 'asc']],
// "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: '<i class="fas fa-plus" id="test"></i>',
// 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: '<i class="fas fa-download"></i>',
// action: function ( e, dt, node, config ) {
// $("#exportform").submit();
// }
// }
// ]
});
$('.addsim').tooltip();
$('.export').tooltip();
// $( '.dt-buttons').addClass('btn-group');
$( '.addsim').removeClass('dt-button');
$( '.export').removeClass('dt-button');
function selectall(cb) {
tablelelong.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
$(this).prop('checked', cb.checked);
})
}
</script>
@endsection
resources/views/tangguhlelong/senarailelongtangguh.blade.php
+3 -1
View File
@@ -28,6 +28,7 @@
</tr>
</thead>
<tbody>
@foreach ($arrayinfo as $lel)
<tr>
<td>{{$loop->iteration}}</td>
@@ -58,7 +59,8 @@
</td>
<td>
@if($lel['info']['sts_lelong'] == 0)
<a href="{{ route('tangguhlelong.carian', $lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Carian"><i class="fas fa-search"></i></a>
<a href="{{ route('tangguhlelong.carian', $lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Carian" style="margin-right:40px"><i class="fas fa-search"></i></a>
<a href="{{ route('tangguhlelong.listtangguh', [$lel['info']['lelong_id'], $details['caw_code']]) }}" data-toggle="tooltip" data-placement="top" title="Senarai Tangguh" style="margin-right:40px"><i class="fas fa-list"></i></a>
@endif
</td>
</tr>
routes/web.php
+1
View File
@@ -267,6 +267,7 @@ Route::group(['middleware' => ['permission:tangguhlelong'],'prefix'=>'tangguhlel
Route::get('/carian/{lelong_id}', ['as'=>'tangguhlelong.carian','uses'=>'TangguhLelongController@carian']);
Route::post('/searchbyic', ['as'=>'tangguhlelong.searchbyic','uses'=>'TangguhLelongController@searchbyic']);
Route::post('/tangguhlelong', ['as'=>'tangguhlelong.tangguhlelong','uses'=>'TangguhLelongController@tangguhlelong']);
Route::get('/listtangguh/{lelong_id}/{caw_code}', ['as'=>'tangguhlelong.listtangguh','uses'=>'TangguhLelongController@listtangguh']);
});