diff --git a/app/Http/Controllers/PenggunaController.php b/app/Http/Controllers/PenggunaController.php
index bf9b16ce..da6485aa 100644
--- a/app/Http/Controllers/PenggunaController.php
+++ b/app/Http/Controllers/PenggunaController.php
@@ -33,29 +33,33 @@ class PenggunaController extends Controller
     public function index()
     {
         // $alluser = User::all();
-        $alluser = User::with('roles')->orderBy('id')->get();
+        $alluser = User::with('roles','cawangan')->whereHas("roles", function($q) {
+            $q->where("id",'!=', 8);})
+            ->get();
+        // dd($alluser);
         $allroles = Role::all();
         $allRolesPluck= $allroles->pluck('name');
         $caw = Cawangan::all();
-        $user = User::with('roles')->first();
-        $userroles = $user->getRoleNames()->toArray();
+        // $user = User::with('roles')->first();
+        // // dd($user);
+        // $userroles = $user->getRoleNames()->toArray();
         // $user =  Auth::user();
         // $user->assignRole('admin');
-        return view('pengurusanpengguna.index',compact('alluser','allroles','caw','user','userroles', 'allRolesPluck'));
+        return view('pengurusanpengguna.index',compact('alluser','allroles','caw', 'allRolesPluck'));
     }
 
 
     public function show(Request $request, $userid)
     {
         // dd($userid);
-        $user = User::where('id','=',$userid)->with('roles')->first();
+        $user = User::where('id','=',$userid)->with('roles','cawangan')->first();
         $userroles = $user->getRoleNames()->toArray();
-        
+        $caw = Cawangan::all();
         $allroles = Role::all()->pluck('name');
         
         // $active = User::where('id','=',$userid)->update('status', 1);
 
-        return view('pengurusanpengguna.show',compact('user','allroles','userroles'));
+        return view('pengurusanpengguna.show',compact('user','allroles','userroles','caw'));
     }
 
     public function storepengguna(Request $request)
@@ -142,10 +146,12 @@ class PenggunaController extends Controller
         }
 
         $user = User::where('id','=',$request->userid)->first();
-        // dd($user);
+        // dd($request->caw);
+        $user->name = $request->name;
         $user->email = $request->emel;
-        $user->notelbimbit = $request->notelbimbit;
-        $user->nokp = $request->nokp;
+        $user->kodcaw = $request->caw;
+        // $user->notelbimbit = $request->notelbimbit;
+        // $user->nokp = $request->nokp;
         $user->updated_at = $currentdate;
         $user->status = $status;
         
@@ -298,7 +304,11 @@ class PenggunaController extends Controller
         {
             if($request->type == 'User')
             {
-                $data = $model_name::with('roles')->get();
+                // $data = $model_name::with('roles')->get();
+                $data = User::with('roles','cawangan')->whereHas("roles", function($q) {
+                    $q->where("id",'!=', 8);})
+                    ->get();
+
             }
             else{
                 $data = $model_name::all();
diff --git a/app/Models/Cawangan.php b/app/Models/Cawangan.php
index f7d5227a..d518a5bd 100644
--- a/app/Models/Cawangan.php
+++ b/app/Models/Cawangan.php
@@ -61,6 +61,13 @@ class Cawangan extends Model
         return $this->hasMany(LelongBid::class, 'caw_id', 'id');
     }
 
+    public function user()
+    {
+        return $this->belongsTo(User::class, 'kodcaw', 'caw_code');
+    }
+
+  
+
     // public function lelong() 
     // {
     //     return $this->belongsToMany(Lelong::class, 'cawangan_lelong', 'caw_id', 'lelong_id');
diff --git a/app/Models/User.php b/app/Models/User.php
index 778a821c..293389b5 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -67,4 +67,10 @@ class User extends Authenticatable
         $this->notify(new PasswordResetNotification($token));
         // $user->notify(new PasswordResetNotification($user));
     }
+
+    public function cawangan()
+    {
+        return $this->hasOne(Cawangan::class, 'caw_code' , 'kodcaw');
+    }
+
 }
diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php
index 7e06c902..ca80dd70 100644
--- a/resources/views/includes/sidebar.blade.php
+++ b/resources/views/includes/sidebar.blade.php
@@ -291,12 +291,12 @@
             <a href="{{url('pengguna/listpengguna')}}">Pengguna</a>
           </li>
           
-          <li class="{{ (request()->is('pengguna/taraf') || request()->is('pengguna/taraf/*')) ? 'active' : '' }}">
+          {{-- <li class="{{ (request()->is('pengguna/taraf') || request()->is('pengguna/taraf/*')) ? 'active' : '' }}">
             <a href="{{url('pengguna/taraf')}}">Taraf</a>
           </li>
           <li class="{{ (request()->is('pengguna/roles') || request()->is('pengguna/roles/*')) ? 'active' : '' }}">
             <a href="{{url('pengguna/roles')}}">Roles</a>
-          </li>
+          </li> --}}
         </ul>
       </li>
 
diff --git a/resources/views/pdf/pdfsimulasireport.blade.php b/resources/views/pdf/pdfsimulasireport.blade.php
index 93796028..7b14f372 100644
--- a/resources/views/pdf/pdfsimulasireport.blade.php
+++ b/resources/views/pdf/pdfsimulasireport.blade.php
@@ -20,7 +20,7 @@
 #sim tr:hover {}
 
 #sim th {
-    text-align: left;
+    text-align: right;
     border: 0px solid;
 	table-layout:auto;
     color: black;
@@ -32,12 +32,12 @@
 }
 
 .row {
-  margin-left:-5px;
+  margin-right:-5px;
   margin-right:-5px;
 }
   
 .column {
-  float: left;
+  float: right;
   width: 100%;
   padding: 5px;
 }
@@ -57,61 +57,27 @@ table {
 }
 
 td {
-  text-align: left;
+  text-align: right;
   padding: 16px;
 }
 
 th{
-  text-align: left;
+  text-align: right;
   padding: 16px;
-  background-color:gainsboro;
 }
 
 tr:nth-child(even) {
-  background-color: #f2f2f2;
 }
 
 </style>
 
 <body>
-
-          <table width="100%" border="0" id="sim">
-                        <tr>
-                          <td width="50%"><h3>PERMODALAN KELANTAN BERHAD</h3></td>
-                        </tr>
-@foreach($datacaw as $data)
-                        <tr>
-                          <td colspan="2"><u><b>LAPORAN SIMULASI CAWANGAN: {{$data['caw_name']}}</b></u></td>
-@endforeach
-                        </tr>
-                    </table>
-
-                    {{-- <table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim">
-                      <thead>
-                        <br>
-                        <tr>
-                          <td>ID Lelong:  {{$lelong_id}}</td>
-                          @foreach ($info as $info)                     
-                                
-                          <td>Tarikh Lelong: @php
-                            $myDateTime = DateTime::createFromFormat('Y-m-d', $info->tarikh_lelong );
-                            $t_lelong =  $myDateTime->format('d-m-Y');
-                            echo($t_lelong);
-                        @endphp</td>    
-                        <td>Fasa: {{$info->fasa}} </td>                
-                  
-                          @endforeach
-                          @foreach ($arrayinfocaw as $laporancaw)
-                          @foreach ($laporancaw['cawangan'] as $details)
-                          <td>Cawangan : {{$details['caw_name']}}
-                          @endforeach
-                          @endforeach
-                         
-                      </thead>
-                    </table> --}}
-
-                      <br>
-          
+  <div class="header-style-title" style="font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; font-size: 11px">
+    <h5>PERMODALAN KELANTAN BERHAD</h5>
+    @foreach($datacaw as $data)
+    <u><b><h5>LAPORAN SIMULASI CAWANGAN: {{$data['caw_name']}}</h5></b></u>
+    @endforeach
+  </div>
                       <table  cellspacing="0" cellpadding="5" style="float:right;" border="0" width="100%" height="80" align="left" id="sim">
                         
                         <thead>
@@ -125,16 +91,17 @@ tr:nth-child(even) {
                             <th>Harga Asas (RM)</th>
                             <th>Pembiayaan (RM)</th>
                             <th>Keuntungan (RM)</th>
-                            <th>Caj Lelong (%)</th>
-                            <th>Rugi Lelong (RM)</th>
-                            <th>Baki Lelong (RM)</th>
+                            <th>Caj Lelong (RM)</th>
+                            <th>Rugi/Baki Lelong (RM)</th>
                         </tr>
                         </thead>
-
+                        @php $rugilelong = 0;
+                        $bakilelong = 0;
+                        @endphp
                         @foreach ($arraymarhun as $index=> $marhun)
                         <tr>
                             <td>{{$loop->iteration}}</td>                              
-                            <td>{{ $marhun['norujukan']}}</td>
+                            <td style='white-space:nowrap;'>{{ $marhun['norujukan']}}</td>
                             <!-- <td>{{ $marhun['nama']}}</td> -->
                             <td>{{ number_format($marhun['tempoh'], 2, '.', ',') }}</td> 
                             <td>{{ number_format($marhun['berat'], 2, '.', ',') }}</td>
@@ -143,24 +110,24 @@ tr:nth-child(even) {
                             <td>{{ number_format($marhun['pinjaman'], 2, '.', ',') }}</td>
                             <td>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td>
                             <td>{{ number_format($marhun['cajlelong'], 2, '.', ',') }}</td>
-                            <?php
-                                $rugi = 0;
-                                $baki = 0;
-                                 if(strpos($marhun['baki'], '-') !== false)
-                                 {
-                                    $rugi  = $marhun['baki'];
-                                 }
-                                 else {
-                                    $baki = $marhun['baki'];
-                                 }
-                            ?>
-                            <td>{{number_format($rugi, 2, '.', ',')}}</td>
-                            <td>{{number_format($baki, 2, '.', ',')}}</td>
-                            
-                          
-                           
+                            @php
+                            $rugi = 0;
+                            $baki = 0;
+                            if(strpos($marhun['baki'], '-') !== false)
+                            {
+                            $baki = -$marhun['baki'];
+                            $bakilelong += $marhun['baki'];
+                            }
+                            else {
+                            $baki = $marhun['baki'];
+                            $bakilelong += $marhun['baki'];
+                            }
+                            @endphp
+                            <td>@if($marhun['baki'] > 0)
+                                {{number_format($marhun['baki'], 2, '.', ',')}}
+                                @elseif($marhun['baki'] < 0 ) ({{number_format(-($marhun['baki']), 2, '.', ',')}}) @endif </td>
                         </tr>
-                    @endforeach
+                        @endforeach
 
              
 
@@ -172,7 +139,6 @@ tr:nth-child(even) {
                 <td><strong>{{ number_format($total_pinjaman, 2, '.', ',') }}</strong></td>  
                 <td><strong>{{ number_format($total_bakiupah, 2, '.', ',') }}</strong></td> 
                 <td><strong>{{ number_format($total_cajlelong, 2, '.', ',') }}</strong></td>
-                <td><strong>({{ number_format($total_rugilelong, 2, '.', ',') }})</strong></td>            
                 <td><strong>{{ number_format($total_bakilelong, 2, '.', ',') }}</strong></td>
               </tr>                                         
                        
diff --git a/resources/views/pdf/penggunapdf.blade.php b/resources/views/pdf/penggunapdf.blade.php
index e2e66a7d..c5fc6b7b 100644
--- a/resources/views/pdf/penggunapdf.blade.php
+++ b/resources/views/pdf/penggunapdf.blade.php
@@ -11,11 +11,11 @@
     }
 
     #pengguna td,
-    #pengguna th {
+    #pengguna td {
       border: 1px solid #ddd;
       padding: 3px;
       font-size: 9px;
-      text-align: center;
+      text-align: left;
     }
 
     #pengguna tr:nth-child(even) {
@@ -36,20 +36,25 @@
     }
 </style>
 <body>
-    <h1>Pengguna</h1>
+    <h3>Senarai Pengguna Sistem ArrahnBid</h3>
     <table style="margin-bottom:10px;" id="pengguna">
         <tr>
           <th>BIL</th>
           <th>Nama</th>
-          <th>Emails</th>
+          <th>Email</th>
+          <th>Cawangan</th>
           <th>Taraf</th>
           <th>Status</th>
         </tr>
         @foreach ($data as $key=>$value)
         <tr>
             <td>{{$key+1}}</td>
-            <td>{{ $value->name }}</td>
+            <td align="left">{{ $value->name }}</td>
             <td>{{ $value->email }}</td>
+            <td style='white-space:nowrap;'>  @if($value->cawangan != NULL)
+              {{$value->cawangan->caw_name}}
+              @endif</td>
+            </td>
             <td>
             @foreach ($value->roles as $taraf)
                 <p>{{$taraf->name}}</p>
diff --git a/resources/views/pengurusanpengguna/index.blade.php b/resources/views/pengurusanpengguna/index.blade.php
index a6f0f755..f23f6545 100644
--- a/resources/views/pengurusanpengguna/index.blade.php
+++ b/resources/views/pengurusanpengguna/index.blade.php
@@ -19,6 +19,12 @@
             <?php
             $totaluser = count($alluser);
             ?>
+               <div class="card-header header-style">
+                    <div class="header-style-title">
+                    Senarai Pengguna
+                </div>
+            </div>
+            <br>
             <form id="exportform" action="{{route('pengguna.export')}}" method="POST">
                 @csrf
                 <input type="hidden" name="type" value="User">
@@ -40,11 +46,14 @@
                         @foreach ($alluser as $user)
                         <tr>
                             <td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $user->id }}"></td>
-                            <td>{{ $user->name }}</td>
+                            <td style='white-space:nowrap;'>{{ $user->name }}</td>
                             <td>{{ $user->username }}</td>
                             <td>{{ $user->email }}</td>
-                            <td>{{ $user->kodcaw }}</td>
-
+                            <td style='white-space:nowrap;'> 
+                                @if($user->cawangan != NULL)
+                                {{$user->cawangan->caw_name}}
+                                @endif
+                            </td>
                             <td>
                                 @foreach ($user->roles as $taraf)
                                 <button class="btn btn-primary btn-sm hovernone" disabled>{{$taraf->name}}</button><br>
@@ -100,7 +109,7 @@
                     <div class="form-row">
                         <div class="form-group col-md-6">
                             <label for="name">Cawangan</label>
-                            <select class="custom-select" name="caw" id="caw">
+                            <select class="custom-select" name="caw" id="caw" required>
                                 <option disabled>Pilih Cawangan</option>
                                 <option selected value="">-</option>
                                 @foreach ($caw as $item)
@@ -112,7 +121,7 @@
                         </div>
                         <div class="form-group col-md-6">
                             <label for="email">Emel</label>
-                            <input type="email" class="form-control" name="email" id="email">
+                            <input type="email" class="form-control" name="email" id="email" required>
                         </div>
                     </div>
                     <div class="form-row">
@@ -168,11 +177,11 @@
             },
             {
                 "targets": 4,
-                "orderable": false
+                // "orderable": false
             },
             {
                 "targets": 5,
-                "orderable": false
+                // "orderable": false
             }
         ],
         order: [
diff --git a/resources/views/pengurusanpengguna/show.blade.php b/resources/views/pengurusanpengguna/show.blade.php
index 42a2863a..192320a1 100644
--- a/resources/views/pengurusanpengguna/show.blade.php
+++ b/resources/views/pengurusanpengguna/show.blade.php
@@ -14,13 +14,31 @@
                 <div class="form-row">
                   <div class="form-group col-md-6">
                     <label for="inputEmail4">Nama</label>
-                    <input type="text" value="{{$user->name}}" class="form-control" name="name" id="inputText" readonly>
+                    <input type="text" value="{{$user->name}}" class="form-control" name="name" id="inputText" required>
                   </div>
                   <div class="form-group col-md-6">
                     <label for="inputPassword4">Emel</label>
-                    <input type="email" value="{{$user->email}}" class="form-control" name="emel" id="inputEmail4" readonly>
+                    <input type="email" value="{{$user->email}}" class="form-control" name="emel" id="inputEmail4" required>
                   </div>
                 </div>
+                <div class="form-row">
+                <div class="form-group col-md-6">
+                    <label for="name">Cawangan</label>
+                    <select class="custom-select" name="caw" id="caw" required>
+                        <option disabled>Pilih Cawangan</option>
+                        <option selected value="">-</option>
+                        @if($user->cawangan != NULL)
+                        <option selected value="{{$user->kodcaw}}">   
+                            {{$user->cawangan->caw_name}}
+                           </option> @endif
+                        @foreach ($caw as $item)
+                        <option value="{{$item->caw_code}}">{{$item->caw_name}}</option>
+                        @endforeach
+
+                        <!-- <option value="all">Select All</option> -->
+                    </select>
+                </div>
+            </div>
                 <div class="form-row">
                     <h4 class="col-md-3">Taraf Pengguna</h4>
                     <div class="form-group col-md-9">
diff --git a/resources/views/simulasi/senaraisimulasi.blade.php b/resources/views/simulasi/senaraisimulasi.blade.php
index 5bd4e772..70fa5e07 100644
--- a/resources/views/simulasi/senaraisimulasi.blade.php
+++ b/resources/views/simulasi/senaraisimulasi.blade.php
@@ -48,7 +48,7 @@
                                         </div>
                                         @endforeach
                                     </td>
-                                    <td>{{$simulasi->fasa}}</td>
+                                    <td>{{$simulasi->harga_emas_asas}}</td>
                                     <td>
                                         <div class="row justify-content-center">
                                             <a class="confirmrefresh btn m-1 btn-warning" href="{{ route('analisa.kemaskinidata',$simulasi->id) }}" title="Kemaskini Simulasi"><i class="fas fa-sync-alt"></i></a>