Merge branch 'amirah' into 'main'

scroll sidebar, report backdate, update seeder

See merge request online-sistem1/lelong!251

app/Http/Controllers/ReportController.php

@@ -147,7 +147,7 @@ class ReportController extends Controller
 
         $pdf = PDF::loadView('pdf.listlelong',compact('arrayinfo','marhuns','lelong_id','keuntungan','total_hargaasas',
         'total_berat','datasimulasi'))
-        ->setPaper('a4', 'landscape');
+        ->setPaper('a4', 'potrait');
             
         return $pdf->download('Senarai Barang Lelong.pdf');
     }
@@ -255,11 +255,14 @@ class ReportController extends Controller
         $arraydetails = [];
 
         $lelongid = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
-        ->select('lelong_id','tarikh_lelong','lelong.fasa')
+        ->join('lelongbid','lelong.id','=','lelongbid.lelong_id')
+        ->join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id')
+        ->select('cawangan_lelong.lelong_id','tarikh_lelong','lelong.fasa')
         ->distinct()
-        ->orderBy('lelong_id')   
+        ->orderBy('cawangan_lelong.lelong_id')   
         ->get()
         ->toArray();
+        // dd($lelongid);
 
         foreach($lelongid as $laporan){
             
@@ -347,9 +350,11 @@ class ReportController extends Controller
         $arraydetails =[];
         
         $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
-        ->select('lelong_id','tarikh_lelong','lelong.fasa')
+        ->join('lelongbid','lelong.id','=','lelongbid.lelong_id')
+        ->join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id')
+        ->select('cawangan_lelong.lelong_id','tarikh_lelong','lelong.fasa')
         ->distinct()
-        ->orderBy('lelong_id')
+        ->orderBy('cawangan_lelong.lelong_id')
         ->get()
         ->toArray();
 
@@ -929,6 +934,12 @@ class ReportController extends Controller
         // return view('lelong.senaraimarhun',compact('arraymarhun','marhuns','lelongid','cawid','arrayinfo'));
     }
 
+
+    public function bdbrglelong (){
+
+        return view('laporan.bdbrglelong');
+    }
+
     
   
 

database/seeders/RolesSeeder.php

@@ -122,6 +122,16 @@ class RolesSeeder extends Seeder
             'description' => 'Tetapan Parameter'
         ]);
 
+        Permission::create([
+            'name' => 'backdate',
+            'description' => 'Laporan Back Date'
+        ]);
+
+        Permission::create([
+            'name' => 'reportkali',
+            'description' => 'Laporan By Batch Lelong'
+        ]);
+
         //account
         Permission::create([
             'name' => 'pengesahanbayaran',
@@ -192,6 +202,10 @@ class RolesSeeder extends Seeder
         $role6->givePermissionTo('importdata');
         $role6->givePermissionTo('tetapan');
         $role6->givePermissionTo('jananotis');
+        $role6->givePermissionTo('backdate');
+        $role6->givePermissionTo('reportkali');
+
+
 
         $role7 = Role::create(['name' => 'account']);
         $role7->givePermissionTo('pengesahanbayaran');

resources/views/includes/sidebar.blade.php

@@ -2,6 +2,15 @@
         // $name = Route::currentRouteName();
 
     @endphp
+
+<style>
+  #sidebar {
+    position: fixed;
+    overflow-y: scroll;
+    top: 0;
+    bottom: 0;
+}
+  </style>
 <nav id="sidebar" style="">
     <div class="sidebar-header">
       <h3>AOS</h3>
@@ -437,12 +446,23 @@
   </li>
   {{-- end laporan all --}}
 
-        {{-- Kemaskini Notis --}}
-        
-        <li class="{{ (request()->is('report/*')) ? 'active' : '' }}">
-          <a href="{{url('jananotis/kemaskininotis')}}">Kemaskini Notis Lelong</a>
-        </li>
-        {{-- end Kemaskini Notis --}}
+  {{-- laporan bakcdate --}}
+  	<li class="{{ (request()->is('backdate/')) ? 'active' : '' }}">
+  	  <a href="#reportBackdateSubmenu" data-toggle="collapse" aria-expanded="false"  style="">Laporan Back Date</a>
+  	  <ul class="list-unstyled collapse {{ (request()->is('backdate/*')) ? 'show' : '' }}" id="reportBackdateSubmenu" >
+  	    <li class="{{ (request()->is('backdate/bdbrglelong/*') || request()->is('backdate/bdbrglelong') ) ? 'active' : '' }}">
+  	      <a href="{{url('backdate/bdbrglelong')}}">Barang Lelong</a>
+  	    </li>
+  	  </ul>  
+  	</li>
+  {{-- end laporan backdate --}}
+
+  {{-- Kemaskini Notis --}}
+  
+    <li class="{{ (request()->is('jananotis/*')) ? 'active' : '' }}">
+      <a href="{{url('jananotis/kemaskininotis')}}">Kemaskini Notis Lelong</a>
+    </li>
+  {{-- end Kemaskini Notis --}}
         
       
    

resources/views/laporan/bdbrglelong.blade.php

@@ -0,0 +1 @@
+holla

routes/web.php

@@ -557,6 +557,14 @@ Route::group(['middleware' => ['permission:reportcawkhas'],'prefix'=>'reportcawk
     Route::get('cetaklaporantuntutbaki/{lelong_id}',['as'=>'reportcawkhas.cetaklaporantuntutbaki','uses'=>'ReportCawanganController@cetaklaporantuntutbaki']);
     });
 
+//Report Back Date
+
+Route::group(['middleware' => ['permission:backdate'],'prefix'=>'backdate'], function () { 
+
+    Route::get('/bdbrglelong',['as'=>'backdate.bdbrglelong','uses'=>'ReportController@bdbrglelong']);
 
 
 
+
+});
+