From e55da5ff95e04780a42eb22b55c9d5ec853277b1 Mon Sep 17 00:00:00 2001
From: Nur Izzati Zulkifli <zatizul@gmail.com>
Date: Thu, 6 Apr 2023 10:08:46 +0800
Subject: [PATCH] update button dlm menu laporan dan sorting DESC

---
 app/Http/Controllers/PenggunaController.php      |  1 +
 app/Http/Controllers/ReportController.php        | 16 ++++++++--------
 resources/views/lelong/brgleldetails.blade.php   |  4 ++--
 .../views/lelong/lapbrglelpembidaindex.blade.php |  4 ++--
 resources/views/lelong/laplelongindex.blade.php  |  4 ++--
 .../views/lelong/laporanbidaanindex.blade.php    |  4 ++--
 resources/views/lelong/laporanlelong.blade.php   |  4 ++--
 .../views/lelong/lelongtebusindex.blade.php      |  4 ++--
 resources/views/marhun/ubahmarhuncaw.blade.php   |  8 ++++----
 .../views/pengurusanpengguna/index.blade.php     |  8 +++++---
 .../tangguhlelong/senleltlhtangguh.blade.php     |  8 ++++----
 11 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/app/Http/Controllers/PenggunaController.php b/app/Http/Controllers/PenggunaController.php
index 2dbf6d91..a8af394b 100644
--- a/app/Http/Controllers/PenggunaController.php
+++ b/app/Http/Controllers/PenggunaController.php
@@ -35,6 +35,7 @@ class PenggunaController extends Controller
         // $alluser = User::all();
         $alluser = User::with('roles','cawangan')->whereHas("roles", function($q) {
             $q->where("id",'!=', 8);})
+            ->orderBy('name','ASC')
             ->get();
         // dd($alluser);
         $allroles = Role::all();
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index c65a27a8..ca0c9cbe 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -65,7 +65,7 @@ class ReportController extends Controller
         $laporanpembida= Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
         ->select('lelong_id','tarikh_lelong','lelong.fasa')
         ->distinct()
-        ->orderBy('lelong_id')        
+        ->orderBy('tarikh_lelong','DESC')        
         ->get()
         ->toArray();
 
@@ -74,7 +74,7 @@ class ReportController extends Controller
             $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
             ->where('lelong_id',$laporan['lelong_id'])    
             ->distinct()
-            ->orderBy('lelong_id')
+            // ->orderBy('lelong_id')
             ->get()
             ->toArray();
             array_push($arraydetails,['laporan' => $laporan,'details' => $details]);
@@ -126,7 +126,7 @@ class ReportController extends Controller
         $brgdetails= Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
         ->select('lelong_id','tarikh_lelong','lelong.fasa')
         ->distinct()
-        ->orderBy('lelong_id')
+        ->orderBy('tarikh_lelong','DESC')
         ->get()
         ->toArray();
 
@@ -223,7 +223,7 @@ class ReportController extends Controller
         ->join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id')
         ->select('cawangan_lelong.lelong_id','tarikh_lelong','lelong.fasa')
         ->distinct()
-        ->orderBy('cawangan_lelong.lelong_id')   
+        ->orderBy('lelong.tarikh_lelong','DESC')   
         ->get()
         ->toArray();
         // dd($lelongid);
@@ -384,7 +384,7 @@ class ReportController extends Controller
         ->join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id')
         ->select('cawangan_lelong.lelong_id','tarikh_lelong','lelong.fasa')
         ->distinct()
-        ->orderBy('cawangan_lelong.lelong_id')
+        ->orderBy('lelong.tarikh_lelong','DESC')
         ->get()
         ->toArray();
 
@@ -518,7 +518,7 @@ class ReportController extends Controller
         $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
         ->select('lelong_id','tarikh_lelong','lelong.fasa')
         ->distinct()
-        ->orderBy('lelong_id')       
+        ->orderBy('tarikh_lelong','DESC')       
         ->get()
         ->toArray();
 
@@ -595,7 +595,7 @@ class ReportController extends Controller
         ->join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
         ->select('lelong.id','tarikh_lelong','lelong.fasa','lelong_tebus.batch_no')
         ->distinct()
-        ->orderBy('batch_no')       
+        ->orderBy('lelong.tarikh_lelong','DESC')       
         ->get()
         ->toArray();
         // dd($lelongid);
@@ -956,7 +956,7 @@ class ReportController extends Controller
         ->join('pengesahan','lelong.id','=','pengesahan.lelong_id')
         ->select('cawangan_lelong.lelong_id','tarikh_lelong','lelong.fasa')
         ->distinct()
-        ->orderBy('cawangan_lelong.lelong_id')
+        ->orderBy('lelong.tarikh_lelong','DESC')
         ->get()
         ->toArray();
         // dd($laporan);
diff --git a/resources/views/lelong/brgleldetails.blade.php b/resources/views/lelong/brgleldetails.blade.php
index 3c2813e9..37573b4d 100644
--- a/resources/views/lelong/brgleldetails.blade.php
+++ b/resources/views/lelong/brgleldetails.blade.php
@@ -44,7 +44,7 @@
                                         <td>{{ $laporan['brg']['fasa']}}</td>
                                         <td align="left">
                                             @foreach($laporan['detailsbrg'] as $details)
-                                            <a class="confirmrefresh btn m-1 btn-danger" href=" {{ route('report.senaraibrglelongdetails', ['lelong_id'=>$laporan['brg']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Muat Turun"><i class="fas fa-download"></i></a>
+                                            <a class="btn btn-danger btn-sm m-1" href=" {{ route('report.senaraibrglelongdetails', ['lelong_id'=>$laporan['brg']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Muat Turun"><i class="fas fa-download"></i></a>
                                                 <span class="badge badge-pill badge-info text-white" style="font-size:100%">{{ $details['caw_name']}}</span><br>
                                             @endforeach
                                         </td>
@@ -78,7 +78,7 @@
                 "orderable": false
                 }
             ],
-            order: [[1, 'asc']],
+            order: [[0, 'asc']],
             "info": false,
             "lengthChange": false,
             "pageLength": 15,
diff --git a/resources/views/lelong/lapbrglelpembidaindex.blade.php b/resources/views/lelong/lapbrglelpembidaindex.blade.php
index 1e3bdffc..c3600ead 100644
--- a/resources/views/lelong/lapbrglelpembidaindex.blade.php
+++ b/resources/views/lelong/lapbrglelpembidaindex.blade.php
@@ -47,7 +47,7 @@
                                     <td>{{ $info['laporan']['fasa'] }}</td>
                                     <td>
                                     @foreach($info['details'] as $details)
-                                    <a class="confirmrefresh btn m-1 btn-danger" href=" {{ route('report.lapbrglelpembida', ['lelong_id'=>$info['laporan']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong"><i class="fas fa-download"></i></a>
+                                    <a class="btn btn-danger btn-sm m-1" href=" {{ route('report.lapbrglelpembida', ['lelong_id'=>$info['laporan']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong"><i class="fas fa-download"></i></a>
                                     <span class="badge badge-pill badge-info text-white" style="font-size:100%"> {{ $details['caw_name']}}</span><br>
                                     @endforeach
                                     </td>
@@ -79,7 +79,7 @@
                 "orderable": false
                 }
             ],
-            order: [[1, 'asc']],
+            order: [[0, 'asc']],
             "info": false,
             "lengthChange": false,
             "pageLength": 15,
diff --git a/resources/views/lelong/laplelongindex.blade.php b/resources/views/lelong/laplelongindex.blade.php
index 0d1d542e..cddfd000 100644
--- a/resources/views/lelong/laplelongindex.blade.php
+++ b/resources/views/lelong/laplelongindex.blade.php
@@ -46,7 +46,7 @@
                                     <td>{{ $bid['laporan']['fasa'] }}</td>
                                     <td>
                                     @foreach($bid['details'] as $details)
-                                    <a class="confirmrefresh btn m-1 btn-danger" href=" {{ route('report.laplelong', ['lelong_id'=>$bid['laporan']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong"><i class="fas fa-download"></i></a>
+                                    <a class="btn btn-danger btn-sm m-1" href=" {{ route('report.laplelong', ['lelong_id'=>$bid['laporan']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong"><i class="fas fa-download"></i></a>
                                     <span class="badge badge-pill badge-info text-white" style="font-size:100%"> {{ $details['caw_name']}}</span><br>
                                     @endforeach
 
@@ -80,7 +80,7 @@
                 "orderable": false
                 }
             ],
-            order: [[1, 'asc']],
+            order: [[0, 'asc']],
             "info": false,
             "lengthChange": false,
             "pageLength": 15,
diff --git a/resources/views/lelong/laporanbidaanindex.blade.php b/resources/views/lelong/laporanbidaanindex.blade.php
index 6a8fefd1..eab656cb 100644
--- a/resources/views/lelong/laporanbidaanindex.blade.php
+++ b/resources/views/lelong/laporanbidaanindex.blade.php
@@ -46,7 +46,7 @@
                                     <td>{{ $bid['laporan']['fasa']}}</td>
                                     <td>
                                     @foreach($bid['details'] as $details)
-                                    <a  class="btn m-1 btn-primary" href=" {{ route('report.senarailapbidaan', ['lelong_id'=>$bid['laporan']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong"><i class="far fa-edit"></i></a>
+                                    <a  class="btn btn-primary btn-sm m-1" href=" {{ route('report.senarailapbidaan', ['lelong_id'=>$bid['laporan']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong"><i class="far fa-edit"></i></a>
 
                                     <span class="badge badge-pill badge-info text-white" style="font-size:100%"> {{ $details['caw_name']}}</span><br>
                                     
@@ -80,7 +80,7 @@
                 "orderable": false
                 }
             ],
-            order: [[1, 'asc']],
+            order: [[0, 'asc']],
             "info": false,
             "lengthChange": false,
             "pageLength": 15,
diff --git a/resources/views/lelong/laporanlelong.blade.php b/resources/views/lelong/laporanlelong.blade.php
index 2e6f7440..4d9f742f 100644
--- a/resources/views/lelong/laporanlelong.blade.php
+++ b/resources/views/lelong/laporanlelong.blade.php
@@ -47,7 +47,7 @@
                                     <td>{{ $laporan['laporan']['fasa']}}</td>
                                     <td style="text-align: left">
                                         @foreach($laporan['details'] as $details)
-                                        <a  class="confirmrefresh btn m-1 btn-danger" href="{{ route('report.senaraibrglelong', ['lelong_id'=>$laporan['laporan']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Muat Turun"><i class="fas fa-download"></i></a>
+                                        <a  class="btn btn-danger btn-sm m-1" href="{{ route('report.senaraibrglelong', ['lelong_id'=>$laporan['laporan']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Muat Turun"><i class="fas fa-download"></i></a>
                                         <span class="badge badge-pill badge-info text-white" style="font-size:100%">{{ $details['caw_name']}}</span><br>
 
                                         @endforeach
@@ -81,7 +81,7 @@
                 "orderable": false
                 }
             ],
-            order: [[1, 'asc']],
+            order: [[0, 'asc']],
             "info": false,
             "lengthChange": false,
             "pageLength": 15,
diff --git a/resources/views/lelong/lelongtebusindex.blade.php b/resources/views/lelong/lelongtebusindex.blade.php
index ee0beff9..6d6b2295 100644
--- a/resources/views/lelong/lelongtebusindex.blade.php
+++ b/resources/views/lelong/lelongtebusindex.blade.php
@@ -43,7 +43,7 @@
                                         <td>{{ $info['laporan']['fasa'] }}</td>
                                         <td>
                                         @foreach($info['details'] as $details)
-                                        <a class="confirmrefresh btn m-1 btn-danger" href=" {{ route('report.lelongtebus', ['lelong_id'=>$info['laporan']['id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong"><i class="fas fa-download"></i></a>
+                                        <a class="btn btn-danger btn-sm m-1" href=" {{ route('report.lelongtebus', ['lelong_id'=>$info['laporan']['id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong"><i class="fas fa-download"></i></a>
                                         <span class="badge badge-pill badge-info text-white" style="font-size:100%"> {{ $details['caw_name']}}</span><br>
                                         @endforeach
                                         </td>
@@ -75,7 +75,7 @@
                 "orderable": false
                 }
             ],
-            order: [[1, 'asc']],
+            order: [[0, 'asc']],
             "info": false,
             "lengthChange": false,
             "pageLength": 15,
diff --git a/resources/views/marhun/ubahmarhuncaw.blade.php b/resources/views/marhun/ubahmarhuncaw.blade.php
index 3f04f301..e3bb575d 100644
--- a/resources/views/marhun/ubahmarhuncaw.blade.php
+++ b/resources/views/marhun/ubahmarhuncaw.blade.php
@@ -8,7 +8,7 @@
 
                 <div class="card-header header-style">
                     <div class="header-style-title">
-                        Senarai Ubah Marhun
+                        Senarai Perubahan Marhun
                     </div>
                 </div>
 
@@ -44,8 +44,8 @@
                                         <td>{{ $laporan['brg']['fasa']}}</td>
                                         <td align="left">
                                             @foreach($laporan['detailsbrg'] as $details)
-                                            <a  class="confirmrefresh btn m-1 btn-danger" href="{{ route('report.lapubahmarhunlelongindexpdf', ['lelong_id'=>$laporan['brg']['lelong_id'], 'kodcaw'=>$details['caw_code'], 't_lelong'=>$t_lelong ]) }} " data-toggle="tooltip" data-placement="top" title="Muat Turun"><i class="fas fa-download"></i></a>
-                                            <a class="btn m-1 btn-primary" href=" {{ route('report.lapubahmarhunlelongindex', ['lelong_id'=>$laporan['brg']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Perubahan Marhun"><i class="far fa-edit"></i></a>
+                                            <a  class="btn btn-danger btn-sm m-1" href="{{ route('report.lapubahmarhunlelongindexpdf', ['lelong_id'=>$laporan['brg']['lelong_id'], 'kodcaw'=>$details['caw_code'], 't_lelong'=>$t_lelong ]) }} " data-toggle="tooltip" data-placement="top" title="Muat Turun"><i class="fas fa-download"></i></a>
+                                            <a class="btn btn-primary btn-sm m-1" href=" {{ route('report.lapubahmarhunlelongindex', ['lelong_id'=>$laporan['brg']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Perubahan Marhun"><i class="far fa-edit"></i></a>
                                                 <span class="badge badge-pill badge-info text-white" style="font-size:100%">{{ $details['caw_name']}}</span><br>
                                             @endforeach
                                         </td>
@@ -79,7 +79,7 @@
                 "orderable": false
                 }
             ],
-            order: [[1, 'asc']],
+            order: [[0, 'asc']],
             "info": false,
             "lengthChange": false,
             "pageLength": 15,
diff --git a/resources/views/pengurusanpengguna/index.blade.php b/resources/views/pengurusanpengguna/index.blade.php
index 77075035..141aac1d 100644
--- a/resources/views/pengurusanpengguna/index.blade.php
+++ b/resources/views/pengurusanpengguna/index.blade.php
@@ -32,7 +32,8 @@
                 <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><input type="checkbox" aria-label="Checkbox for following text input" onclick="selectall(this)"></th> --}}
+                            <th>Bil</th>
                             <th>Nama</th>
                             <th>Nama Pengguna</th>
                             <th>Emel</th>
@@ -46,7 +47,8 @@
 
                         @foreach ($alluser as $user)
                         <tr>
-                            <td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $user->id }}"></td>
+                            {{-- <td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $user->id }}"></td> --}}
+                            <td>{{$loop->iteration}}</td>
                             <td style='white-space:nowrap;'>{{ $user->name }}</td>
                             <td>{{ $user->username }}</td>
                             <td>{{ $user->email }}</td>
@@ -240,7 +242,7 @@
             }
         ],
         order: [
-            [1, 'asc']
+            [0, 'asc']
         ],
         // "ordering": false,
         "info": false,
diff --git a/resources/views/tangguhlelong/senleltlhtangguh.blade.php b/resources/views/tangguhlelong/senleltlhtangguh.blade.php
index 1824e051..5675d2d9 100644
--- a/resources/views/tangguhlelong/senleltlhtangguh.blade.php
+++ b/resources/views/tangguhlelong/senleltlhtangguh.blade.php
@@ -67,9 +67,9 @@
                                 @elseif($lel['info']['sts_lelong'] == 1)
                                 <button class="btn btn-warning btn-sm" disabled>LELONG BERMULA</button>
                                 @elseif($lel['info']['sts_lelong'] == 2)
-                                <button class="btn btn-warning btn-sm" disabled>LELONG SELESAI</button>
+                                <button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
                                 @elseif($lel['info']['sts_lelong'] == 3)
-                                <button class="btn btn-warning btn-sm" disabled>LELONG SELESAI</button>
+                                <button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
                                 @endif
                             </td>
                             <td>             
@@ -120,9 +120,9 @@
                                 @elseif($lel['info']['sts_lelong'] == 1)
                                 <button class="btn btn-warning btn-sm" disabled>LELONG BERMULA</button>
                                 @elseif($lel['info']['sts_lelong'] == 2)
-                                <button class="btn btn-warning btn-sm" disabled>LELONG SELESAI</button>
+                                <button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
                                 @elseif($lel['info']['sts_lelong'] == 3)
-                                <button class="btn btn-warning btn-sm" disabled>LELONG SELESAI</button>
+                                <button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
                                 @endif
                             </td>
                             <td>