diff --git a/resources/views/includes/home.blade.php b/resources/views/includes/home.blade.php
index 428edd8..0bb4ddd 100644
--- a/resources/views/includes/home.blade.php
+++ b/resources/views/includes/home.blade.php
@@ -78,7 +78,6 @@
                             <i class="fas fa-chart-pie "></i>
                         </div>
                         <br>
-                        {{-- <button onclick="filterjumlahpembsemasa()" class="btn bg-gradient-primary btn-sm mb-0 mt-3">Tekan</button> --}}
                     </div>
                 </div>
             </div>
@@ -90,15 +89,14 @@
             <div class="card-body">
                 <div class="row">
                     <div class="col">
-                        <h6 class="card-title text-uppercase text-muted mb-0">Pembiayaan<br>Aktif</h6>
+                        <h6  class="card-title text-uppercase text-muted mb-0">Pembiayaan<br>Semasa</h6>
                         <span class="h4 font-weight-bold mb-0">{{ $bilangan }}</span>
                     </div>
                     <div class="col-auto text-center">
-                        <div class="icon icon-shape bg-success text-white rounded-circle shadow text-center">
+                        <div onclick="filterpembiayaanaktif()" class="cursor-pointer icon icon-shape bg-success text-white rounded-circle shadow text-center">
                             <i class="fas fas fa-users text-center"></i>
                         </div>
                         <br>
-                        <button onclick="filterpembiayaanaktif()" class="btn bg-gradient-primary btn-sm mb-0 mt-3">Tekan</button>
                     </div>
                 </div>
             </div>
@@ -113,11 +111,10 @@
                         <span class="h4 font-weight-bold mb-0">{{ $sixmonths }}</span>
                     </div>
                     <div class="col-auto text-center">
-                        <div class="icon icon-shape bg-danger text-white rounded-circle shadow text-center">
+                        <div onclick="filterpembiayaan6bulan()" class="cursor-pointer icon icon-shape bg-danger text-white rounded-circle shadow text-center">
                             <i class="fas fa-chart-bar"></i>
                         </div>
                         <br>
-                        <button onclick="filterpembiayaan6bulan()" class="btn bg-gradient-primary btn-sm mb-0 mt-3">Tekan</button>
                     </div>
                 </div>
             </div>
@@ -132,11 +129,10 @@
                         <span class="h4 font-weight-bold mb-0">{{ $bilanganlelong }}</span>
                     </div>
                     <div class="col-auto text-center">
-                        <div class="icon icon-shape bg-info text-white rounded-circle shadow text-center">
+                        <div onclick="lelongan()" class="cursor-pointer icon icon-shape bg-info text-white rounded-circle shadow text-center">
                             <i class="fas fa-gavel" style="margin-left: 2px;"></i>
                         </div>
                         <br>
-                        <button onclick="filterjumlahpembsemasa()" class="btn bg-gradient-primary btn-sm mb-0 mt-3">Tekan</button>
                     </div>
                 </div>
             </div>
@@ -166,7 +162,7 @@
                             <th>No Rujukan</th>
                             <th>JBG</th>
                             <th>Keuntungan</th>
-                            <th>T Matang</th>
+                            <th>T Lanjut</th>
                             <th>Status</th>
                         </tr>
                     </thead>
@@ -232,89 +228,6 @@ var hargaemastable = $('#harga_emas').DataTable({
         filterpembiayaanaktif();
     });
 
-    function filterjumlahpembsemasa(){
-
-        $('#loadertable').removeClass('d-none');
-        $('#formtable').addClass('d-none');
-
-        let datapembsemasa = [];
-        $.ajax({
-            url: '{{ route("info.pembsemasa") }}',
-            method: 'get',
-            async: false, 
-            dataType: "json",
-            success: function(data) {
-                for(i in data){
-                    datapembsemasa.push(data[i]);
-                }
-                $('#loadertable').addClass('d-none');
-                $('#formtable').removeClass('d-none');
-                
-            }
-        });
-
-
-        selepastawarruqtable.clear().draw();
-        var counter = 1;
-        $.each(datapembsemasa,function(index,ps){
-
-            let namacawangan = '';
-            $.ajax({
-                url: api_url + '/api/cawangan/detail/' + ps.kodcaw,
-                method: 'get',
-                async:false,
-                dataType: "json",
-                success: function(data) {
-                    namacawangan = data[0].namacaw;
-                    namacawangan = namacawangan.toLowerCase().substring(8).replace(/\b[a-z]/g, function(value) {
-                                        return value.toUpperCase();
-                                    });
-                }
-            });
-
-            let marhun = [];
-            $.ajax({
-                url: api_url + '/api/marhun/' + ps.norujukan,
-                method: 'get',
-                async:false,
-                dataType: "json",
-                success: function(response) {
-                    // console.log(response);
-                    for(i in response){
-                        marhun.push(response[i]);
-                    }
-                }
-            });
-
-            
-            let marh = JSON.stringify(marhun[0]);
-            
-
-            var t_matang  = new Date(ps.t_matang);
-
-            var statementlelong = '';
-            if(ps.taglel == 0)
-            {
-                statementlelong = '-';
-            }else{
-                statementlelong = 'Akan Dilelong';
-            }
-
-            selepastawarruqtable.row.add([
-                `<input type="checkbox" onclick="tickfunc(this)" name="chkboxsag[]" value="${ps.norujukan}" id="sag-${counter}" data-norujukan="${ps.norujukan}" />`,
-                namacawangan,
-                `<a href="#" onclick="linktargetfunc(this)" class="linktarget" data-toggle="modal" data-nm="${ps.nilaimarhun}" data-berat="${ps.berat}" data-upah12="${ps.upah12}" data-pjmnum="${ps.pinjaman}" data-bakipjm="${ps.bakipjm}" data-lelong="${ps.taglel}" data-marhun='${marh}' data-pinjaman="${ps.pinjaman}" data-norujukan="${ps.norujukan}" data-hargajualan="${ps.hargajualan}" data-kodcaw="${ps.kodcaw}" data-target="#marhunModal"><span class="name mb-0 text-sm">${ps.norujukan}</span></a>`,
-                ps.tempoh,
-                ps.bakiupah,
-                t_matang.toLocaleDateString("en-GB"),
-                statementlelong
-            ]).draw();
-
-            counter = counter + 1;
-        });
-        
-    }
-
     function linktargetfunc(e){
         var arraymarhun = $(e).data('marhun');
         var norujukan = $(e).data('norujukan');
@@ -385,6 +298,12 @@ var hargaemastable = $('#harga_emas').DataTable({
         $('#loadertable').removeClass('d-none');
         $('#formtable').addClass('d-none');
 
+        var empat = selepastawarruqtable.columns(3).header();
+        $(empat).html('JBG');
+        selepastawarruqtable.column( 4 ).visible( true );
+        selepastawarruqtable.column( 5 ).visible( true );
+        selepastawarruqtable.column( 6 ).visible( true );
+
         let datapembaktif = [];
         $.ajax({
             url: '{{ route("info.pembaktif") }}',
@@ -440,6 +359,10 @@ var hargaemastable = $('#harga_emas').DataTable({
             
             var t_matang  = new Date(ps.t_matang);
             
+            var t_matang = '-';
+            if(ps.lelong_tawarruq == 0)
+                t_matang  = new Date(ps.t_matang1).toLocaleDateString("en-GB");
+
             var statementlelong = '';
             if(ps.taglel == 0)
             {
@@ -454,7 +377,7 @@ var hargaemastable = $('#harga_emas').DataTable({
                 `<a href="#" onclick="linktargetfunc(this)" class="linktarget" data-toggle="modal" data-nm="${ps.nilaimarhun}" data-berat="${ps.berat}" data-upah12="${ps.upah12}" data-pjmnum="${ps.pinjaman}" data-bakipjm="${ps.bakipjm}" data-lelong="${ps.taglel}" data-marhun='${marh}' data-pinjaman="${ps.pinjaman}" data-norujukan="${ps.norujukan}" data-hargajualan="${ps.hargajualan}" data-kodcaw="${ps.kodcaw}" data-target="#marhunModal"><span class="name mb-0 text-sm">${ps.norujukan}</span></a>`,
                 ps.tempoh,
                 ps.bakiupah,
-                t_matang.toLocaleDateString("en-GB"),
+                t_matang,
                 statementlelong
             ]).draw();
 
@@ -467,6 +390,12 @@ var hargaemastable = $('#harga_emas').DataTable({
         $('#loadertable').removeClass('d-none');
         $('#formtable').addClass('d-none');
 
+        var empat = selepastawarruqtable.columns(3).header();
+        $(empat).html('JBG');
+        selepastawarruqtable.column( 4 ).visible( true );
+        selepastawarruqtable.column( 5 ).visible( true );
+        selepastawarruqtable.column( 6 ).visible( true );
+
         let datapemb6 = [];
         $.ajax({
             url: '{{ route("info.pemb6bulan") }}',
@@ -521,7 +450,10 @@ var hargaemastable = $('#harga_emas').DataTable({
             
             let marh = JSON.stringify(marhun[0]);
             
-            var t_matang  = new Date(ps.t_matang);
+            var t_matang = '-';
+            if(ps.lelong_tawarruq == 0)
+                t_matang  = new Date(ps.t_matang1).toLocaleDateString("en-GB");
+            
 
             var statementlelong = '';
             if(ps.taglel == 0)
@@ -537,7 +469,7 @@ var hargaemastable = $('#harga_emas').DataTable({
                 `<a href="#" onclick="linktargetfunc(this)" class="linktarget" data-toggle="modal" data-nm="${ps.nilaimarhun}" data-berat="${ps.berat}" data-upah12="${ps.upah12}" data-pjmnum="${ps.pinjaman}" data-bakipjm="${ps.bakipjm}" data-lelong="${ps.taglel}" data-marhun='${marh}' data-pinjaman="${ps.pinjaman}" data-norujukan="${ps.norujukan}" data-hargajualan="${ps.hargajualan}" data-kodcaw="${ps.kodcaw}" data-target="#marhunModal"><span class="name mb-0 text-sm">${ps.norujukan}</span></a>`,
                 ps.tempoh,
                 ps.bakiupah,
-                t_matang.toLocaleDateString("en-GB"),
+                t_matang,
                 statementlelong
             ]).draw();
 
@@ -545,6 +477,48 @@ var hargaemastable = $('#harga_emas').DataTable({
         });
     }
 
+    function lelongan(e){
+
+        $('#loadertable').removeClass('d-none');
+        $('#formtable').addClass('d-none');
+    
+        var empat = selepastawarruqtable.columns(3).header();
+
+        $(empat).html('T. Lelong');
+        selepastawarruqtable.column( 4 ).visible( false );
+        selepastawarruqtable.column( 5 ).visible( false );
+        selepastawarruqtable.column( 6 ).visible( false );
+
+        let datalelong = [];
+        $.ajax({
+            url: '{{ route("info.pemblelongan") }}',
+            method: 'get',
+            async: false, 
+            dataType: "json",
+            success: function(data) {
+                for(i in data){
+                    datalelong.push(data[i]);
+                }
+
+                    $('#loadertable').addClass('d-none');
+                    $('#formtable').removeClass('d-none');
+            }
+        });
+
+
+        selepastawarruqtable.clear().draw();
+
+        selepastawarruqtable.row.add([
+            `<input type="checkbox" onclick="tickfunc(this)" name="chkboxsag[]" value="${ps.norujukan}" id="sag-${counter}" data-norujukan="${ps.norujukan}" />`,
+            namacawangan,   
+            ps.norujukan,
+            ps.t_lelong,
+            '',
+            '',
+            ''
+            ]).draw();
+    }
+
    
 
     function bayaranfunc(e,api){