From b36716a43391ae0fc21609f836ff8a9dd7f595aa Mon Sep 17 00:00:00 2001
From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com>
Date: Tue, 29 Mar 2022 16:56:41 +0800
Subject: [PATCH] update tamat kontrak operasi

---
 app/Http/Controllers/TamatKontController.php         |  9 +++------
 resources/views/jananotis/sebelumtamatkont.blade.php | 10 ++++++----
 resources/views/jananotis/senaraitemp.blade.php      |  9 +++++----
 resources/views/jananotis/tempbycaw.blade.php        |  7 ++-----
 routes/web.php                                       |  2 +-
 5 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/app/Http/Controllers/TamatKontController.php b/app/Http/Controllers/TamatKontController.php
index aab0ca59..f88090c8 100644
--- a/app/Http/Controllers/TamatKontController.php
+++ b/app/Http/Controllers/TamatKontController.php
@@ -56,15 +56,12 @@ class TamatKontController extends Controller
     //Operasi
     public function sebelumtamatkont(Request $request)
     {
-        $t_lelong = $request->tarikh_lelong;
-        dd($t_lelong);
-
-        return view('jananotis.sebelumtamatkont', compact('t_lelong'));
+        return view('jananotis.sebelumtamatkont');
     }
 
-    public function senaraitemp(Request $request, $t_lelong)
+    public function senaraitemp(Request $request)
     {
-        dd($request->all());
+        $t_lelong = $request->tarikh_lelong;
 
         $getsurat = Gadai::where('t_matang1', '<', $t_lelong)
                          ->where('sttebus', '=', '')
diff --git a/resources/views/jananotis/sebelumtamatkont.blade.php b/resources/views/jananotis/sebelumtamatkont.blade.php
index fb003b16..7630e56a 100644
--- a/resources/views/jananotis/sebelumtamatkont.blade.php
+++ b/resources/views/jananotis/sebelumtamatkont.blade.php
@@ -4,14 +4,14 @@
 <div class="container-fluid">
     <div class="row ">
         <div class="col-md-12 mx-auto card">
-            <h3 class="pt-3">Notis Sebelum Tamat Kontrak</h3>
+            <h3 class="pt-4" style="margin-left:2%;">Notis Sebelum Tamat Kontrak</h3>
             
             @if ($message = Session::get('failed'))
                 <div class="alert alert-danger">
                     <p>{{ $message }}</p>
                 </div>
             @endif
-            <form action="{{route('notistamatkontrak.sebelumtamatkont')}}" method="POST">
+            <form action="{{route('notistamatkontrak.senaraitemp')}}" id="formsenarai" method="POST">
               @csrf
                 <div class="form-group row" style="margin-top:2%; margin-left:1%;">
                   <label for="tarikh_lelong" class="col-sm-1 col-form-label">Tarikh Lelongan</label>
@@ -26,7 +26,7 @@
                 
                 <div class="form-group row" style="margin-top:2%;">
                   <div class="col-sm-10">
-                    <submit class="btn btn-primary" style="width:8%; margin-left:1%;">Carian</submit>
+                    <button type="button" class="btn btn-primary" onclick="carian()" style="margin-left:2%; width:9%;">Carian</button>
                   </div>
                 </div>
             </form>
@@ -34,7 +34,9 @@
     </div>
 </div>
 <script>
-    
+    function carian() {  
+       $("#formsenarai").submit();
+    }
 </script>
      
 @endsection
diff --git a/resources/views/jananotis/senaraitemp.blade.php b/resources/views/jananotis/senaraitemp.blade.php
index 43fec57a..0486fa32 100644
--- a/resources/views/jananotis/senaraitemp.blade.php
+++ b/resources/views/jananotis/senaraitemp.blade.php
@@ -4,7 +4,7 @@
 <div class="container-fluid">
     <div class="row ">
         <div class="col-md-12 mx-auto card">
-            <h3 class="pt-3" style="margin-left:1%;">Notis Sebelum Tamat Kontrak</h3>
+            <h3 class="pt-3" style="margin-left:1%;">Butiran Gadaian Mengikut Cawangan</h3>
             
             @if ($message = Session::get('failed'))
                 <div class="alert alert-danger">
@@ -12,7 +12,7 @@
                 </div>
             @endif
             <div class="container">
-                <div class="row mb-4">
+                <div class="row mb-2">
                     <div class="col-md-11 mx-auto card p-4" style="margin-top:2%; margin-bottom:2%;">
                         <p> <b>Tarikh Lelong : </b> {{ $t_lelong }}</p>
                         <p> <b>Tarikh Gadai Sehingga : </b></p>
@@ -49,8 +49,9 @@
                     </tr>
                 </tbody>
             </table>
-            <div class="modal-footer" style="margin-top:2%;">
-                <a  href="{{ route('notistamatkontrak.sebelumtamatkont') }}" class="btn btn-primary">Kembali</a>
+            <div class="modal-footer; text-center" style="margin-top:2%; margin-bottom:2%;">
+                <a  href="{{ route('notistamatkontrak.sebelumtamatkont') }}" class="btn btn-primary" style="width:8%;">Kembali</a>
+                <a  href="{{ route('analisa.janadata') }}" class="btn btn-success" style="width:8%; margin-left:1%;">Jana Simulasi</a>
             </div>
         </div>
     </div>
diff --git a/resources/views/jananotis/tempbycaw.blade.php b/resources/views/jananotis/tempbycaw.blade.php
index b58e6716..108fcbb0 100644
--- a/resources/views/jananotis/tempbycaw.blade.php
+++ b/resources/views/jananotis/tempbycaw.blade.php
@@ -4,14 +4,14 @@
 <div class="container-fluid">
     <div class="row ">
         <div class="col-md-12 mx-auto card">
-            <h3 class="pt-3" style="margin-left:1%;">Notis Sebelum Tamat Kontrak</h3>
+            <h3 class="pt-3" style="margin-left:1%;">Butiran Gadaian Cawangan {{ $details }}</h3>
             
             @if ($message = Session::get('failed'))
                 <div class="alert alert-danger">
                     <p>{{ $message }}</p>
                 </div>
             @endif
-                <table class="table table-striped  table-xl text-center" id="senarailelongonline" style="width:100%">
+                <table class="table table-striped  table-xl text-center" id="senarailelongonline" style="width:100%; margin-top:1%;">
                     <thead class="bg-primary text-white">
                             <tr>
                                 <th>Bil</th>
@@ -41,9 +41,6 @@
                         @endforeach
                     </tbody>
                 </table>
-                <div class="modal-footer" style="margin-top:2%;">
-                <a  href="{{ route('notistamatkontrak.senaraitemp', $t_lelong) }}" class="btn btn-primary">Kembali</a>
-                </div>
         </div>
     </div>
 </div>
diff --git a/routes/web.php b/routes/web.php
index 07d89923..c73290f3 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -167,7 +167,7 @@ Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'],
 
 Route::group(['middleware' => ['permission:notistamatkontrak'],'prefix'=>'notistamatkontrak'], function () {
     Route::get('/sebelumtamatkont',['as'=>'notistamatkontrak.sebelumtamatkont','uses'=>'TamatKontController@sebelumtamatkont']); 
-    Route::get('/senaraitemp/{t_lelong}',['as'=>'notistamatkontrak.senaraitemp','uses'=>'TamatKontController@senaraitemp']); 
+    Route::post('/senaraitemp',['as'=>'notistamatkontrak.senaraitemp','uses'=>'TamatKontController@senaraitemp']); 
     Route::get('/tempbycaw/{details}/{t_lelong}',['as'=>'notistamatkontrak.tempbycaw','uses'=>'TamatKontController@tempbycaw']); 
 });
 //Operasi