From f3c58e30349d516a469e6082a20cdccd586e5ae3 Mon Sep 17 00:00:00 2001
From: Nur Izzati Zulkifli <zatizul@gmail.com>
Date: Tue, 15 Nov 2022 14:36:15 +0800
Subject: [PATCH] update pengguna tkr hasone semula

---
 app/Models/User.php                                | 2 +-
 resources/views/pdf/penggunapdf.blade.php          | 6 +++---
 resources/views/pengurusanpengguna/index.blade.php | 9 +++++----
 resources/views/pengurusanpengguna/show.blade.php  | 8 +++++---
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/Models/User.php b/app/Models/User.php
index 50a74808..293389b5 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -70,7 +70,7 @@ class User extends Authenticatable
 
     public function cawangan()
     {
-        return $this->hasMany(Cawangan::class, 'caw_code' , 'kodcaw');
+        return $this->hasOne(Cawangan::class, 'caw_code' , 'kodcaw');
     }
 
 }
diff --git a/resources/views/pdf/penggunapdf.blade.php b/resources/views/pdf/penggunapdf.blade.php
index baf8afd1..c5fc6b7b 100644
--- a/resources/views/pdf/penggunapdf.blade.php
+++ b/resources/views/pdf/penggunapdf.blade.php
@@ -51,9 +51,9 @@
             <td>{{$key+1}}</td>
             <td align="left">{{ $value->name }}</td>
             <td>{{ $value->email }}</td>
-            <td style='white-space:nowrap;'> @foreach ($value->cawangan as $cawuser)
-              {{$cawuser->caw_name}}
-              @endforeach</td>
+            <td style='white-space:nowrap;'>  @if($value->cawangan != NULL)
+              {{$value->cawangan->caw_name}}
+              @endif</td>
             </td>
             <td>
             @foreach ($value->roles as $taraf)
diff --git a/resources/views/pengurusanpengguna/index.blade.php b/resources/views/pengurusanpengguna/index.blade.php
index 3fee9410..f23f6545 100644
--- a/resources/views/pengurusanpengguna/index.blade.php
+++ b/resources/views/pengurusanpengguna/index.blade.php
@@ -49,10 +49,11 @@
                             <td style='white-space:nowrap;'>{{ $user->name }}</td>
                             <td>{{ $user->username }}</td>
                             <td>{{ $user->email }}</td>
-                            <td style='white-space:nowrap;'> @foreach ($user->cawangan as $cawuser)
-                                {{$cawuser->caw_name}}
-                                @endforeach</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>
diff --git a/resources/views/pengurusanpengguna/show.blade.php b/resources/views/pengurusanpengguna/show.blade.php
index b33fd954..192320a1 100644
--- a/resources/views/pengurusanpengguna/show.blade.php
+++ b/resources/views/pengurusanpengguna/show.blade.php
@@ -26,9 +26,11 @@
                     <label for="name">Cawangan</label>
                     <select class="custom-select" name="caw" id="caw" required>
                         <option disabled>Pilih Cawangan</option>
-                        <option selected value="{{$user->kodcaw}}"> @foreach ($user->cawangan as $cawuser)
-                            {{$cawuser->caw_name}}  @endforeach</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