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

Fix homepage pc, sag belum semak by lelong_id

Browse Source
This commit is contained in:
Amir
2022-11-22 11:40:53 +08:00
parent 9d245331f3
commit 8992598156
5 changed files with 126 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/HomeController.php
+22 -11
View File
@@ -18,6 +18,7 @@ use App\Models\Payment;
use App\Models\User;
use App\Models\LelongBidder;
use Hash;
use DateTime;
class HomeController extends Controller
{
@@ -132,18 +133,28 @@ class HomeController extends Controller
array_push($arrayinfomutu,['info'=>$infomutu, 'detailsinfo'=>$detailsinfo]);
}
if($caw <> NULL) { //staf cwgn
$sag = LelongBid::where('status_semak', 0) //belum disemak
->where('kodcaw', $caw['caw_code'])
->get();
//dd($sag);
$all_lelong = Lelong::select('id', 'tarikh_lelong')->where('sts_lelong', 0)->get()->keyBy('id');
foreach ($all_lelong as $data) {
$data->tarikh_lelong = DateTime::createFromFormat('Y-m-d', $data->tarikh_lelong);
$data->tarikh_lelong = $data->tarikh_lelong->format('d-m-Y');
}
else { //operasi,jurulelong
if ($caw <> NULL) { //staf cwgn
$sag = LelongBid::where('status_semak', 0) //belum disemak
->get();
->where('kodcaw', $caw['caw_code'])
->get();
$sag_by_lelong_id = $sag->groupBy('lelong_id');
foreach ($sag_by_lelong_id as $index => $lelong) {
if ($all_lelong[$index]); {
$all_lelong[$index]['sag_belum_semak'] = $lelong->count();
}
}
} else { //operasi,jurulelong
$sag = LelongBid::where('status_semak', 0) //belum disemak
->get();
}
//paparan pemenang lelongan harini
@@ -245,7 +256,7 @@ class HomeController extends Controller
//endpaparan untuk account page
return view('home',compact('lelongmutu', 'arrayinfomutu','arrayinfo','sag','semakCountArray','arrayinfomenang','arrayinfoaccount'));
return view('home',compact('all_lelong','lelongmutu', 'arrayinfomutu','arrayinfo','sag','semakCountArray','arrayinfomenang','arrayinfoaccount'));
}
resources/views/home.blade.php
+71 -7
View File
@@ -7,7 +7,6 @@
<div class="card">
<div class="card-header">{{ __('Dashboard') }}</div>
<div class="card-body">
<div class="col-md-11 mx-auto card p-4">
@if (session('status'))
<div class="alert alert-success" role="alert">
{{ session('status') }}
@@ -22,24 +21,89 @@
I am a khazanah!
<div class="container">
<div class="row">
<div class="col-6 col-sm-4">
<p><b>SAG Belum Disemak : {{ sizeof($sag) }}</b></p>
<div class="col-lg-6 col-md-12 card p-4">
@foreach($all_lelong as $lelong)
@if($lelong['sag_belum_semak'] != null)
<div class="form-group row">
<label class="col-6 col-form-label">Tarikh Lelong</label>
<div class="col-6">
<div class="input-group">
<input type="text" readonly class="form-control bg-light" value="{{ $lelong->tarikh_lelong }}">
</div>
</div>
</div>
<div class="form-group row">
<label class="col-6 text-danger col-form-label">SAG Belum Disemak</label>
<div class="col-6">
<div class="input-group">
<input type="text" readonly class="form-control bg-light text-danger" value="12">
</div>
</div>
</div>
@endif
@endforeach
</div>
<div class="col-6 col-sm-4">
</div>
</div>
</div>
</div>
@endhasrole
@hasrole('penilai')
I am a penilai!
<p><b>SAG Belum Disemak : {{ sizeof($sag) }}</b></p>
<div class="container">
<div class="row">
<div class="col-lg-6 col-md-12 card p-4">
@foreach($all_lelong as $lelong)
@if($lelong['sag_belum_semak'] != null)
<div class="form-group row">
<label class="col-6 col-form-label">Tarikh Lelong</label>
<div class="col-6">
<div class="input-group">
<input type="text" readonly class="form-control bg-light" value="{{ $lelong->tarikh_lelong }}">
</div>
</div>
</div>
<div class="form-group row">
<label class="col-6 text-danger col-form-label">SAG Belum Disemak</label>
<div class="col-6">
<div class="input-group">
<input type="text" readonly class="form-control bg-light text-danger" value="12">
</div>
</div>
</div>
@endif
@endforeach
</div>
<div class="col-6 col-sm-4">
</div>
</div>
</div>
@endhasrole
@hasrole('pengurus-cawangan')
I am a pengurus-cawangan!
<div class="container">
<div class="row">
<div class="col-6 col-sm-4">
<p><b>SAG Belum Disemak : {{ sizeof($sag) }}</b></p>
<div class="col-lg-6 col-md-12 card p-4">
@foreach($all_lelong as $lelong)
@if($lelong['sag_belum_semak'] != null)
<div class="form-group row">
<label class="col-6 col-form-label">Tarikh Lelong</label>
<div class="col-6">
<div class="input-group">
<input type="text" readonly class="form-control bg-light" value="{{ $lelong->tarikh_lelong }}">
</div>
</div>
</div>
<div class="form-group row">
<label class="col-6 text-danger col-form-label">SAG Belum Disemak</label>
<div class="col-6">
<div class="input-group">
<input type="text" readonly class="form-control bg-light text-danger" value="12">
</div>
</div>
</div>
@endif
@endforeach
</div>
<div class="col-6 col-sm-4">
</div>
resources/views/lelong/senarailelong.blade.php
+2 -4
View File
@@ -81,12 +81,10 @@
<td>{{$lelong->jbg}}</td>
<td>{{$lelong->cajlelong}}</td>
<td><span class="badge badge-pill badge-info">LELONG BELUM MULA</span></td>
<td>
<div class="row justify-content-center">
<td style="white-space: nowrap;">
<a class="btn m-1 btn-warning confirmrefresh" href="{{ route('lelong.kemaskinidata',$lelong->id) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Lelong"><i class="fas fa-sync-alt"></i></a>
<a class="btn m-1 btn-primary" href="{{ route('lelong.show',$lelong->id) }}" data-toggle="tooltip" data-placement="top" title="Butiran Lelong"><i class="far fa-edit"></i></a>
<a class="btn m-1 btn-danger confirmdel" href="{{ route('lelong.delete',$lelong->id) }}" data-toggle="tooltip" data-placement="top" title="Padam Lelong"><i class="far fa-trash-alt"></i></a>
</div>
</td>
</tr>
@endforeach
@@ -220,7 +218,7 @@
<td>{{$lelong->jbg}}</td>
<td>{{$lelong->cajlelong}}</td>
<td><span class="badge badge-pill badge-success">LELONG SELESAI</span></td>
<td>
<td style="white-space: nowrap;">
<a class="btn m-1 btn-info" href="{{ route('lelong.showsimulasi',$lelong->id) }}" data-toggle="tooltip" data-placement="top" title="Lihat Simulasi"><i class="far fa-edit"></i></a>
<a class="btn m-1 btn-warning" href="{{ route('lelong.showlelongdone',$lelong->id) }}" data-toggle="tooltip" data-placement="top" title="Lihat Senarai Lelong Selesai"><i class="far fa-calendar"></i></a>
<a class="btn m-1 btn-success" href="{{ route('lelong.exportDataByCawangan',$lelong->id) }}" data-toggle="tooltip" data-placement="top" title="Export Data"><i class="fas fa-file-export"></i></a>
resources/views/lelong/showlelong.blade.php
+6 -4
View File
@@ -16,7 +16,7 @@
$myDateTime = DateTime::createFromFormat('Y-m-d', $data['tarikh_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
@endphp
butiran simulasi : {{$t_lelong}}
butiran lelong : {{$t_lelong}}
</div>
</div>
<div class="card-body">
@@ -172,6 +172,7 @@
</div>
</div>
<div style="overflow-x: auto;">
<table class="table text-right table-bordered" id="simulasi">
<thead class="bg-primary text-center text-white">
<tr class="text-center">
@@ -222,8 +223,10 @@
</tfoot>
</table>
</div>
<h6 class="mt-5">Jumlah Berat Mengikut Mutu (Keseluruhan)</h6>
<table class="table table-bordered text-center" id="jumlahberat">
<div style="overflow-x: auto;">
<table width="50%" class="table table-bordered text-center" id="jumlahberat">
<thead class="bg-light">
<!-- <tr class="text-center">
<th colspan="12">JUMLAH BERAT MENGIKUT MUTU (KESELURUHAN)</th>
@@ -254,6 +257,7 @@
</tbody>
</table>
</div>
</form>
<div class="row">
<div class="text-center">
@@ -466,13 +470,11 @@
});
var tablesimulasi = $('#simulasi').DataTable({
"scrollX": true,
"pageLength": 50,
});
var tableJumlahBerat = $('#jumlahberat').DataTable({
"scrollX": true,
"info": false,
"paging": false,
"searching": false,
resources/views/pengurusanpengguna/index.blade.php
+25 -22
View File
@@ -29,15 +29,15 @@
@csrf
<input type="hidden" name="type" value="User">
<div class="overflow-auto">
<table class="table table-striped table-xl" id="pengguna" style="width:100%">
<table class="table table-bordered" id="pengguna" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th><input type="checkbox" aria-label="Checkbox for following text input" onclick="selectall(this)"></th>
<th>Nama</th>
<th>Nama Pengguna</th>
<th>Emel</th>
<th>Cawangan</th>
<th>Taraf</th>
<th class="text-center">Cawangan</th>
<th class="text-center">Taraf</th>
<th>Status</th>
<th class="text-center">Tindakan</th>
</tr>
@@ -52,27 +52,27 @@
<td>{{ $user->email }}</td>
<td style='white-space:nowrap;'>
@if($user->cawangan != NULL)
{{$user->cawangan->caw_name}}
<span class="badge badge-pill badge-info text-white" style="font-size:100%">{{$user->cawangan->caw_name}}</span>
@endif
</td>
<td>
<td class="text-center">
@foreach ($user->roles as $taraf)
<button class="btn btn-primary btn-sm hovernone" disabled>{{$taraf->name}}</button><br>
<span class="badge badge-pill badge-primary">{{$taraf->name}}</span>
@endforeach
</td>
<td class="col-2" >
<td>
@if ($user->status =='active')
<button class="btn btn-success btn-sm hovernone-success" disabled>Aktif</button>
<span class="badge badge-pill badge-success">Aktif</span>
@elseif ($user->status == 'inactive')
<button class="btn btn-warning btn-sm hovernone-warning" disabled>Tidak Aktif</button>
<span class="badge badge-pill badge-warning">Tidak Aktif</span>
@elseif ($user->status =='banned')
<button class="btn btn-danger btn-sm hovernone-danger" disabled>Disekat</button>
<span class="badge badge-pill badge-danger">Disekat</span>
@endif
</td>
<td class="text-center">
<a href="{{ route('pengguna.show',$user->id) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini" style="margin-right:30px"><i class="far fa-edit"></i></a>
<a class="confirmdel" href="{{ route('pengguna.delete',$user->id) }}" data-toggle="tooltip" data-placement="top" title="Padam"><i class="far fa-trash-alt"></i></a>
<td class="text-center" style="white-space:nowrap;">
<a class="btn m-1 btn-primary" href="{{ route('pengguna.show',$user->id) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini" style="margin-right:30px"><i class="far fa-edit"></i></a>
<a class="confirmdel btn m-1 btn-danger" href="{{ route('pengguna.delete',$user->id) }}" data-toggle="tooltip" data-placement="top" title="Padam"><i class="far fa-trash-alt"></i></a>
</td>
</tr>
@endforeach
@@ -155,20 +155,23 @@
$('[data-toggle="tooltip"]').tooltip()
})
$('a.confirmdel').confirm({
title: 'Pengesahan',
content: 'Anda pasti?',
type: 'orange',
title: 'Padam Simulasi',
content: 'Adakah anda pasti? Tindakan ini tidak dapat dikembalikan.',
icon: 'fa fa-exclamation-triangle',
type: 'red',
boxWidth: '500px',
useBootstrap: false,
typeAnimated: true,
buttons: {
Hapus: {
btnClass: 'btn-warning',
action: function() {
location.href = this.$target.attr('href');
}
},
Batal: {
btnClass: 'btn-default',
action: function() {}
},
Hapus: {
btnClass: 'btn-red',
action: function() {
location.href = this.$target.attr('href');
}
}
}
});