From e2b8c1aa90deaa26fb4aa1e66f37659dedb53274 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Thu, 9 Jun 2022 10:42:04 +0800 Subject: [PATCH] update dashboard jurulelong --- app/Http/Controllers/HomeController.php | 28 +++- app/Http/Controllers/LelongController.php | 139 +++++++++++++++++- app/Models/CawanganLelong.php | 3 + ...2021_12_14_041557_create_lelongs_table.php | 3 + resources/views/home.blade copy.php | 134 +++++++++++++++++ resources/views/home.blade.php | 101 ++++++++++++- resources/views/includes/sidebar.blade.php | 17 ++- .../views/jurulelong/listcawangan.blade.php | 110 ++++++++++++++ routes/web.php | 33 +++-- 9 files changed, 545 insertions(+), 23 deletions(-) create mode 100644 resources/views/home.blade copy.php create mode 100644 resources/views/jurulelong/listcawangan.blade.php diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index c2d1fce4..2ce9c71e 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -7,6 +7,10 @@ use Spatie\Permission\Models\Role; use Spatie\Permission\Models\Permission; use Illuminate\Support\Facades\Auth; +use App\Models\Lelong; +use App\Models\CawanganLelong; +use Carbon\Carbon; + class HomeController extends Controller { /** @@ -28,7 +32,29 @@ class HomeController extends Controller { // $user = Auth::user(); // $user->assignRole('admin'); - return view('home'); + $dateTime = date('Y-m-d'); + $arrayinfo = []; + + $lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') + ->select('fasa','lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') + ->where('tarikh_lelong', $dateTime) + ->groupBy('lelong_id') + ->get() + ->toArray(); + + foreach($lelong as $info) + { + + $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->select('batchlel','lelong_id','cawangan_lelong.caw_id','cawangan.caw_name','cawangan.caw_code','status_online','cawangan_lelong.masamula_lelong','cawangan_lelong.masatamat_lelong') + ->where('lelong_id',$info['lelong_id']) + ->get() + ->toArray(); + array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]); + + + }//dd($detailsinfo); + return view('home',compact('lelong', 'arrayinfo')); } public function about() diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index dd95e54e..16ce91c6 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -55,7 +55,7 @@ class LelongController extends Controller $arrayinfo = []; $lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') - ->select('fasa','lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') + ->select('fasa','lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') ->groupBy('lelong_id') ->get() ->toArray(); @@ -470,14 +470,21 @@ class LelongController extends Controller $lelong->sts_lelong = 1; //start lelong $lelong->save(); + $cawlelong = CawanganLelong::where('lelong_id','=',$id)->first(); + $cawlelong->masamula_lelong = $currenttime; + $cawlelong->masatamat_lelong = $endtime->toTimeString(); + $cawlelong->status_online = 1; //start lelong + $cawlelong->save(); + return redirect()->route('lelong.senarailelong') ->with('success','Lelongan bermula'); } public function refresh($id) { + $date = Carbon::now()->toDateTimeString(); $lelong = Lelong::where('id','=',$id)->first(); - $lelong->masakemaskini_data = '2021-12-20 04:51:50'; + $lelong->masakemaskini_data = $date; $lelong->save(); return redirect()->route('lelong.senarailelong') @@ -692,6 +699,7 @@ class LelongController extends Controller $lelong->masatamat_lelong = $currenttime; $lelong->sts_lelong = 2; //stop lelong $lelong->save(); + return redirect()->route('lelong.senarailelong') ->with('success','Lelongan berhenti'); @@ -1616,6 +1624,133 @@ class LelongController extends Controller return view('lelong.senaraimarhunsimulasi',compact('marhuns','lelongid','cawid','arrayinfo')); } + public function refreshhome($id) + { + $date = Carbon::now()->toDateTimeString(); + $lelong = Lelong::where('id','=',$id)->first(); + $lelong->masakemaskini_data = $date; + $lelong->save(); + + return redirect()->route('home') + ->with('success','Kemaskini Berjaya'); + } + + public function startcawangan($id,$cawid) + { + event(new LelongNotify('start')); + $currentdate = Carbon::now(); + $currenttime = $currentdate->toTimeString(); + $endtime = $currentdate->addHours(2); + + // $lelong = Lelong::where('id','=',$id)->first(); + // $lelong->masamula_lelong = $currenttime; + // $lelong->masatamat_lelong = $endtime->toTimeString(); + // $lelong->sts_lelong = 1; //start lelong + // $lelong->save(); + $lelong = CawanganLelong::where('lelong_id','=',$id)->where('caw_id','=',$cawid)->first(); + $lelong->masamula_lelong = $currenttime; + $lelong->masatamat_lelong = $endtime->toTimeString(); + $lelong->status_online = 1; //start lelong + $lelong->save(); + + return redirect()->route('home') + ->with('success','Lelongan bermula'); + } + + public function stopcawangan($id,$cawid) + { + event(new LelongNotify('start')); + $currentdate = Carbon::now(); + $currenttime = $currentdate->toTimeString(); + $endtime = $currentdate->addHours(2); + + // $lelong = Lelong::where('id','=',$id)->first(); + // $lelong->masamula_lelong = $currenttime; + // $lelong->masatamat_lelong = $endtime->toTimeString(); + // $lelong->sts_lelong = 1; //start lelong + // $lelong->save(); + $lelong = CawanganLelong::where('lelong_id','=',$id)->where('caw_id','=',$cawid)->first(); + // $lelong->masamula_lelong = $currenttime; + $lelong->masatamat_lelong = $currenttime; + $lelong->status_online = 0; //start lelong + $lelong->save(); + + return redirect()->route('home') + ->with('success','Lelongan bermula'); + } + + public function startall($id) + { + event(new LelongNotify('start')); + $currentdate = Carbon::now(); + $currenttime = $currentdate->toTimeString(); + $endtime = $currentdate->addHours(2); + + $lelong = Lelong::where('id','=',$id)->first(); + $lelong->masamula_lelong = $currenttime; + $lelong->masatamat_lelong = $endtime->toTimeString(); + $lelong->sts_lelong = 1; //start lelong + $lelong->save(); + + $cawlelong = CawanganLelong::where('lelong_id','=',$id)->get(); + foreach($cawlelong as $cawlel) //save old harga asas + { + $cawlel->masatamat_lelong = $endtime->toTimeString(); + $cawlel->status_online = 1; //start lelong + $cawlel->save(); + } + + return redirect()->route('home'); + } + + + public function stopall($id) + { + event(new LelongNotify('stop')); + $currentdate = Carbon::now(); + $currenttime = $currentdate->toTimeString(); + $endtime = $currentdate->addHours(2); + + $lelong = Lelong::where('id','=',$id)->first(); + $lelong->masatamat_lelong = $currenttime; + $lelong->sts_lelong = 0; //stop lelong + $lelong->save(); + + $cawlelong = CawanganLelong::where('lelong_id','=',$id)->get(); + foreach($cawlelong as $cawlel) //save old harga asas + { + $cawlel->masatamat_lelong = $currenttime; + $cawlel->status_online = 0; //start lelong + $cawlel->save(); + } + + + return redirect()->route('home') + ->with('success','Lelongan berhenti'); + + } + + public function listcawangan() + { + $arrayinfo = []; + + $lelong = Lelong::where('sts_lelong', 0) + ->get()->toArray(); + + foreach($lelong as $details) + { + $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id', $details['id']) + ->get() + ->toArray(); + + array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=>$detailsinfo]); + } + + return view('jurulelong.listcawangan',compact('lelong', 'arrayinfo')); + } + + } \ No newline at end of file diff --git a/app/Models/CawanganLelong.php b/app/Models/CawanganLelong.php index 2c86b25f..bef247b3 100644 --- a/app/Models/CawanganLelong.php +++ b/app/Models/CawanganLelong.php @@ -15,6 +15,9 @@ class CawanganLelong extends Model 'batchlel', 'lelong_id', 'caw_id', + 'status_online', + 'masamula_lelong', + 'masatamat_lelong', 'online', 'export_data_sts', 'import_data_sts', 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 ce60c677..2e4bb3ae 100644 --- a/database/migrations/2021_12_14_041557_create_lelongs_table.php +++ b/database/migrations/2021_12_14_041557_create_lelongs_table.php @@ -33,6 +33,9 @@ class CreateLelongsTable extends Migration $table->integer('batchlel')->nullable(); $table->unsignedBigInteger('lelong_id')->unsigned(); $table->unsignedBigInteger('caw_id')->unsigned(); + $table->integer('status_online')->default(0)->nullable(); + $table->time('masamula_lelong')->nullable(); + $table->time('masatamat_lelong')->nullable(); $table->string('online'); $table->string('export_data_sts')->nullable(); $table->string('import_data_sts')->nullable(); diff --git a/resources/views/home.blade copy.php b/resources/views/home.blade copy.php new file mode 100644 index 00000000..d73f6b0f --- /dev/null +++ b/resources/views/home.blade copy.php @@ -0,0 +1,134 @@ +@extends('layouts.app') + +@section('content') +
+
+
+
+
{{ __('Dashboard') }}
+
+ @if (session('status')) + + @endif + + {{ __('You are logged in!') }} + @hasrole('admin') + I am a admin! + @endhasrole + @hasrole('khazanah') + I am a khazanah! + @endhasrole + @hasrole('teller') + I am a teller! + @endhasrole + @hasrole('pengurus-cawangan') + I am a pengurus-cawangan! + @endhasrole + @hasrole('jurulelong') + I am a jurulelong! + + + + + + + + + + + + + + + + + + + @foreach ($arrayinfo as $lel) +
LELONGAN HARI INI + + + + + + + + + + + + + + + @endforeach + + + + +
NoLelong IDT.LelongFasaCawanganStatusMasa TamatHarga EmasJBGAction
{{$loop->iteration}}{{ $lel['info']['lelong_id'] }}@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp{{$lel['info']['fasa']}} + @foreach($lel['detailsinfo'] as $details) + {{$details['caw_name']}}
+ @endforeach + 		+ @foreach($lel['detailsinfo'] as $details) + @if($details['status_online'] == '0') +
+ + @elseif($details['status_online'] == '1') +
+ @endif + @endforeach + 		@foreach($lel['detailsinfo'] as $details) + {{$details['masatamat_lelong']}}
+ @endforeach		{{$lel['info']['harga_emas_asas']}}{{$lel['info']['jbg']}} + @hasrole('jurulelong') + + + + + + + + + + + + + + @endhasrole + +
+ @endhasrole + @hasrole('operasi') + I am a operasi! + @endhasrole + @hasrole('account') + I am a account! + @endhasrole + @hasrole('pembida') + I am a pembida! + @endhasrole +
+
+
+
+ + + +
+@endsection diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 4991a5c8..bef751b2 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -1,12 +1,11 @@ @extends('layouts.app') @section('content') -
-
-
+
+
+
{{ __('Dashboard') }}
-
@if (session('status')) -
+
+ + +
@endsection diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index d0162a6d..81ab0685 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -106,16 +106,27 @@
  • Senarai Lelong
    • - + + +
  • + +
    • @endhasrole @hasrole('operasi')
  • Import Data
    • -
  • +
    • diff --git a/resources/views/jurulelong/listcawangan.blade.php b/resources/views/jurulelong/listcawangan.blade.php new file mode 100644 index 00000000..634fab2d --- /dev/null +++ b/resources/views/jurulelong/listcawangan.blade.php @@ -0,0 +1,110 @@ +@extends('layouts.app') + +@section('content') +
      +
      +
      + + @if ($message = Session::get('success')) +
      +

      {{ $message }}

      +
      + @endif +
      + + + + + + + + + + + + + + + @foreach ($arrayinfo as $lel) + + + + + + + + + + @endforeach + +
      NoTarikh LelongNama CawanganHarga Emas AsasJBGCaj LelongAction
      {{$loop->iteration}}{{ $lel['detail']['tarikh_lelong']}} + @foreach($lel['detailsinfo'] as $details) + {{$details['caw_name']}}
      + @endforeach +       		{{$lel['detail']['harga_emas_asas']}}{{$lel['detail']['jbg']}}{{$lel['detail']['cajlelong']}} + +
      +
      +
      + +
      +
      + + +@endsection diff --git a/routes/web.php b/routes/web.php index 0f189f01..b5879ce4 100644 --- a/routes/web.php +++ b/routes/web.php @@ -104,18 +104,17 @@ Route::group(['prefix'=>'lelong'], function () { Route::get('/showlelong/{id}',['as'=>'lelong.show','uses'=>'LelongController@show']); Route::get('/deletelelong/{id}',['as'=>'lelong.delete','uses'=>'LelongController@delete']); Route::get('/export/{id}',['as'=>'lelong.exportnotis','uses'=>'LelongController@exportnotis']); - Route::get('/janapemenang/{id}', ['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']); + // Route::get('/janapemenang/{id}', ['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']); Route::get('/senaraimarhun/{lelongid}/{cawid}', ['as'=>'lelong.senaraimarhun','uses'=>'LelongController@senaraimarhun']); Route::post('/deletemarhun', ['as'=>'lelong.deletemarhun','uses'=>'LelongController@deletemarhun']); Route::get('/showsimulasi/{id}',['as'=>'lelong.showsimulasi','uses'=>'LelongController@showsimulasi']); Route::get('/senaraimarhunsimulasi/{lelongid}/{cawid}', ['as'=>'lelong.senaraimarhunsimulasi','uses'=>'LelongController@senaraimarhunsimulasi']); - Route::get('/lapbrglelongindex',['as'=>'lelong.lapbrglelongindex','uses'=>'LelongController@lapbrglelongindex']); Route::get('/senaraibrglelong/{lelong_id}',['as'=>'lelong.senaraibrglelong','uses'=>'LelongController@senaraibrglelong']); Route::get('/lapbrglelongdetailsindex',['as'=>'lelong.lapbrglelongdetailsindex','uses'=>'LelongController@lapbrglelongdetailsindex']); - + Route::get('/lapbidaanpembidaindex', ['as'=>'lelong.lapbidaanpembidaindex','uses'=>'LelongController@lapbidaanpembidaindex']); Route::get('/senarailapbidaan/{lelong_id}',['as' =>'lelong.senarailapbidaan','uses'=>'LelongController@senarailapbidaan']); @@ -129,12 +128,7 @@ Route::group(['prefix'=>'lelong'], function () { Route::get('/lapbrglelpembida/{lelong_id}',['as'=>'lelong.lapbrglelpembida','uses'=>'LelongController@lapbrglelpembida']); Route::post('/pdflapbrglelpembida',['as'=>'lelong.pdflapbrglelpembida','uses'=>'LelongController@pdflapbrglelpembida']); - - - - - - }); + }); Route::group(['middleware' => ['permission:pengesahanpembayaranpc']], function () { Route::get('/pengesahanPembayaran', ['as'=>'payment.pengesahanPembayaran','uses'=>'PaymentController@pengesahanPembayaran']); @@ -142,6 +136,7 @@ Route::group(['prefix'=>'lelong'], function () { Route::group(['middleware' => ['permission:import']], function () { Route::get('/refresh/{id}',['as'=>'lelong.refresh','uses'=>'LelongController@refresh']); + Route::get('/refreshhome/{id}',['as'=>'lelong.refreshhome','uses'=>'LelongController@refreshhome']); }); Route::group(['middleware' => ['permission:kemaskinihargaasas']], function () { @@ -151,10 +146,23 @@ Route::group(['prefix'=>'lelong'], function () { Route::group(['middleware' => ['permission:lelongan']], function () { Route::get('/lelongstart/{id}',['as'=>'lelong.start','uses'=>'LelongController@start']); Route::get('/lelongstop/{id}',['as'=>'lelong.stop','uses'=>'LelongController@stop']); - }); + Route::get('/lelongstartcawangan/{id}/{cawid}',['as'=>'lelong.startcawangan','uses'=>'LelongController@startcawangan']); + Route::get('/lelongstopcawangan/{id}/{cawid}',['as'=>'lelong.stopcawangan','uses'=>'LelongController@stopcawangan']); + Route::get('/lelongstartall/{id}',['as'=>'lelong.startall','uses'=>'LelongController@startall']); + Route::get('/lelongstopall/{id}',['as'=>'lelong.stopall','uses'=>'LelongController@stopall']); + }); +//jurulelong Route::group(['middleware' => ['permission:janapemenang']], function () { - Route::get('/janapemenang/{id}',['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']); + Route::get('/janapemenang',['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']); + Route::get('/listcawangan',['as'=>'lelong.listcawangan','uses'=>'LelongController@listcawangan']); + }); +}); + + Route::group(['prefix'=>'pemenang'], function () { + Route::group(['middleware' => ['permission:janapemenang']], function () { + Route::get('/janapemenang',['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']); + Route::get('/listcawangan',['as'=>'lelong.listcawangan','uses'=>'LelongController@listcawangan']); }); }); @@ -193,6 +201,7 @@ Route::group(['middleware' => ['permission:pengesahanpembida'],'prefix'=>'pembid Route::get('/senlelpembayaranbidaan',['as'=>'pembida.senlelpembayaranbidaan','uses'=>'PembidaController@senlelpembayaranbidaan']); Route::get('/pembayaranbidaan',['as'=>'pembida.pembayaranbidaan','uses'=>'PembidaController@pembayaranbidaan']); Route::get('/detailsbidaan/{user_id}/{payment_id}/{kodcaw}',['as'=>'pembida.detailsbidaan','uses'=>'PembidaController@detailsbidaan']); + }); Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'], function () { @@ -275,3 +284,5 @@ Route::group(['middleware' => ['permission:jananotis'],'prefix'=>'jananotis'], f + +