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

Merge branch 'nisha' into 'main'

Browse Source 
status semak sag

See merge request online-sistem1/lelong!142
This commit is contained in:
Nur Izzati Zulkifli
2022-08-03 07:57:22 +00:00
parent 8e0fb29682 19e0681c7a
commit f63a183cac
9 changed files with 9408 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/HomeController.php
+26 -1
View File
@@ -12,6 +12,8 @@ use App\Models\Lelong;
use App\Models\CawanganLelong;
use App\Models\Pengesahan;
use Carbon\Carbon;
use App\Models\Cawangan;
use App\Models\LelongBid;
class HomeController extends Controller
{
@@ -34,6 +36,11 @@ class HomeController extends Controller
{
// $user = Auth::user();
// $user->assignRole('admin');
$user = Auth::user();
$caw = Cawangan::where('caw_code','=',$user->kodcaw)->first();
$dateTime = date('Y-m-d');
$arrayinfo = [];
@@ -69,6 +76,8 @@ class HomeController extends Controller
->get()
->toArray();
// dd($lelong);
foreach($lelongmutu as $infomutu)
{
@@ -79,7 +88,23 @@ class HomeController extends Controller
array_push($arrayinfomutu,['info'=>$infomutu, 'detailsinfo'=>$detailsinfo]);
}
return view('home',compact('lelongmutu', 'arrayinfomutu','arrayinfo'));
if($caw <> NULL) {
$sag = LelongBid::where('status_semak', 0) //belum disemak
->where('kodcaw', $caw['caw_code'])
->get();
//dd($sag);
}
else {
$sag = LelongBid::where('status_semak', 0) //belum disemak
->get();
}
return view('home',compact('lelongmutu', 'arrayinfomutu','arrayinfo','sag'));
}
public function about()
package-lock.json
Generated
+9338 -26
View File
File diff suppressed because it is too large Load Diff
resources/views/home.blade.php
+39 -1
View File
@@ -15,19 +15,48 @@
<!-- {{ __('Selamat Datang!') }} -->
@hasrole('admin')
I am a admin!
I am a admin!
@endhasrole
@hasrole('khazanah')
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>
<div class="col-6 col-sm-4">
</div>
</div>
</div>
@endhasrole
@hasrole('teller')
I am a teller!
@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>
<div class="col-6 col-sm-4">
</div>
</div>
</div>
@endhasrole
@hasrole('jurulelong')
Saya jurulelong!
<div class="container">
<div class="row">
<div class="col-6 col-sm-4">
<p><b>SAG Belum Disemak : {{ sizeof($sag) }}</b></p>
</div>
<div class="col-6 col-sm-4">
</div>
</div>
</div>
</div>
@if(count($arrayinfo)> 0)
<table class=" table table-striped table-xl text-center" id="tablelelong" style="width:100%">
@@ -130,6 +159,15 @@
@hasrole('operasi')
<!-- I am a operasi! -->
<div class="container">
<div class="row">
<div class="col-6 col-sm-4">
<p><b>SAG Belum Disemak : {{ sizeof($sag) }}</b></p>
</div>
<div class="col-6 col-sm-4">
</div>
</div>
</div>
@php
@empty($arrayinfomutu)
@endphp
resources/views/lelong/showpindah.blade.php
+1 -1
View File
@@ -21,7 +21,7 @@
@endif
<form action="{{route('lelong.pindahjanadata')}}" method="POST" enctype="multipart/form-data">
@csrf
<div id='loader'></div>
<div id='loader'><img id="loader-image" src="../img/loadingmsg.gif" alt="Sila Tunggu Sebentar..." /></div>
<input type="hidden" name="type" value="User">
<input type="hidden" class="form-control" id="lelongidasal" name="lelongidasal" value="{{$lelong_id}}">
resources/views/lelong/showrenewxlaku.blade.php
+1 -1
View File
@@ -22,7 +22,7 @@
@endif
<form action="{{route('lelong.renewxlakujanadata')}}" method="POST" enctype="multipart/form-data">
@csrf
<div id='loader'></div>
<div id='loader'><img id="loader-image" src="../img/loadingmsg.gif" alt="Sila Tunggu Sebentar..." /></div>
<input type="hidden" name="type" value="User">
<input type="hidden" class="form-control" id="lelongidasal" name="lelongidasal" value="{{$lelong_id}}">
<div class="form-group row">
resources/views/lelong/showtukartarikh.blade.php
+1 -1
View File
@@ -21,7 +21,7 @@
@endif
<form action="{{route('lelong.tukartarikhjanadata')}}" method="POST" enctype="multipart/form-data">
@csrf
<div id='loader'></div>
<div id='loader'><img id="loader-image" src="../img/loadingmsg.gif" alt="Sila Tunggu Sebentar..." /></div>
<input type="hidden" name="type" value="User">
<input type="hidden" class="form-control" id="lelongidasal" name="lelongidasal" value="{{$lelong_id}}">
<div class="form-group row">
resources/views/simulasi/janasimulasi.blade.php
-2
View File
@@ -110,8 +110,6 @@
$(function() {
$( "form" ).submit(function() {
$('#loader').show();
// $message = "Simulasi Sedang Dijana";
// $('#message').show();
});
});
resources/views/simulasi/senaraitempsimulasi.blade.php
+1 -1
View File
@@ -19,7 +19,7 @@
@csrf
<input type="hidden" class="form-control" id="fasa" name="fasa" value="{{$fasa}}">
<div id='loader'></div>
<div id='loader'><img id="loader-image" src="../img/loadingmsg.gif" alt="Sila Tunggu Sebentar..." /></div>
<div class="container">
<div>
resources/views/simulasi/showsimulasi.blade.php
+1 -1
View File
@@ -172,7 +172,7 @@
<div class="col-md-10 mx-auto">
<form action="{{ route('analisa.kemaskiniharga') }}" method="POST" id="formhargaasas">
@csrf
<div id='loader'></div>
<div id='loader'><img id="loader-image" src="../img/loadingmsg.gif" alt="Sila Tunggu Sebentar..." /></div>
<input type="hidden" name="idsimulasi" value="{{$simulasi_id}}">
<table class="table table-striped table-xl" id="kemaskinikarat" style="width:100%" >
<thead class="bg-primary text-white">