From 6353fce47dc33700fc052c4f46ea2686a929847e Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Tue, 15 Nov 2022 13:04:21 +0800 Subject: [PATCH] update save pengguna --- app/Http/Controllers/PenggunaController.php | 32 ++++-- app/Models/Cawangan.php | 7 ++ app/Models/User.php | 6 ++ resources/views/includes/sidebar.blade.php | 4 +- .../views/pdf/pdfsimulasireport.blade.php | 102 ++++++------------ resources/views/pdf/penggunapdf.blade.php | 15 ++- .../views/pengurusanpengguna/index.blade.php | 20 ++-- .../views/pengurusanpengguna/show.blade.php | 20 +++- .../views/simulasi/senaraisimulasi.blade.php | 2 +- 9 files changed, 113 insertions(+), 95 deletions(-) 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..50a74808 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->hasMany(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 @@ Pengguna -
  • + {{--
  • Taraf
  • Roles -
    • + --}} 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; } - - - - - -@foreach($datacaw as $data) - - -@endforeach - -

    PERMODALAN KELANTAN BERHAD

    LAPORAN SIMULASI CAWANGAN: {{$data['caw_name']}}
    - - {{-- - -
    - - - @foreach ($info as $info) - - - - - @endforeach - @foreach ($arrayinfocaw as $laporancaw) - @foreach ($laporancaw['cawangan'] as $details) - -
    ID Lelong: {{$lelong_id}}Tarikh Lelong: @php - $myDateTime = DateTime::createFromFormat('Y-m-d', $info->tarikh_lelong ); - $t_lelong = $myDateTime->format('d-m-Y'); - echo($t_lelong); - @endphpFasa: {{$info->fasa}} Cawangan : {{$details['caw_name']}} - @endforeach - @endforeach - -
    --}} - -
    - +
    +
    PERMODALAN KELANTAN BERHAD
    + @foreach($datacaw as $data) +
    LAPORAN SIMULASI CAWANGAN: {{$data['caw_name']}}
     + @endforeach +
    @@ -125,16 +91,17 @@ tr:nth-child(even) { - - - + + - + @php $rugilelong = 0; + $bakilelong = 0; + @endphp @foreach ($arraymarhun as $index=> $marhun) - + @@ -143,24 +110,24 @@ tr:nth-child(even) { - - - - - - + @php + $rugi = 0; + $baki = 0; + if(strpos($marhun['baki'], '-') !== false) + { + $baki = -$marhun['baki']; + $bakilelong += $marhun['baki']; + } + else { + $baki = $marhun['baki']; + $bakilelong += $marhun['baki']; + } + @endphp + - @endforeach + @endforeach @@ -172,7 +139,6 @@ tr:nth-child(even) { - diff --git a/resources/views/pdf/penggunapdf.blade.php b/resources/views/pdf/penggunapdf.blade.php index e2e66a7d..baf8afd1 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 @@ } -

    Pengguna

    +

    Senarai Pengguna Sistem ArrahnBid

    Harga Asas (RM) Pembiayaan (RM) Keuntungan (RM)Caj Lelong (%)Rugi Lelong (RM)Baki Lelong (RM)Caj Lelong (RM)Rugi/Baki Lelong (RM)
    {{$loop->iteration}}{{ $marhun['norujukan']}}{{ $marhun['norujukan']}} {{ number_format($marhun['tempoh'], 2, '.', ',') }} {{ number_format($marhun['berat'], 2, '.', ',') }}{{ number_format($marhun['pinjaman'], 2, '.', ',') }} {{ number_format($marhun['bakiupah'], 2, '.', ',') }} {{ number_format($marhun['cajlelong'], 2, '.', ',') }}{{number_format($rugi, 2, '.', ',')}}{{number_format($baki, 2, '.', ',')}}@if($marhun['baki'] > 0) + {{number_format($marhun['baki'], 2, '.', ',')}} + @elseif($marhun['baki'] < 0 ) ({{number_format(-($marhun['baki']), 2, '.', ',')}}) @endif
    {{ number_format($total_pinjaman, 2, '.', ',') }} {{ number_format($total_bakiupah, 2, '.', ',') }} {{ number_format($total_cajlelong, 2, '.', ',') }}({{ number_format($total_rugilelong, 2, '.', ',') }}) {{ number_format($total_bakilelong, 2, '.', ',') }}
    - + + @foreach ($data as $key=>$value) - + + + - + - + - +
    BIL NamaEmailsEmailCawangan Taraf Status
    {{$key+1}}{{ $value->name }}{{ $value->name }} {{ $value->email }} @foreach ($value->cawangan as $cawuser) + {{$cawuser->caw_name}} + @endforeach @foreach ($value->roles as $taraf)

    {{$taraf->name}}

    diff --git a/resources/views/pengurusanpengguna/index.blade.php b/resources/views/pengurusanpengguna/index.blade.php index a6f0f755..3fee9410 100644 --- a/resources/views/pengurusanpengguna/index.blade.php +++ b/resources/views/pengurusanpengguna/index.blade.php @@ -19,6 +19,12 @@ +
    +
    + Senarai Pengguna +
    +
    +
    @csrf @@ -40,10 +46,12 @@ @foreach ($alluser as $user)
    {{ $user->name }}{{ $user->name }} {{ $user->username }} {{ $user->email }}{{ $user->kodcaw }} @foreach ($user->cawangan as $cawuser) + {{$cawuser->caw_name}} + @endforeach @foreach ($user->roles as $taraf) @@ -100,7 +108,7 @@
    - @foreach ($caw as $item) @@ -112,7 +120,7 @@
    - +
    @@ -168,11 +176,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..b33fd954 100644 --- a/resources/views/pengurusanpengguna/show.blade.php +++ b/resources/views/pengurusanpengguna/show.blade.php @@ -14,13 +14,29 @@
    - +
    - +
    +
    +
    + + +
    +

    Taraf Pengguna

    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 @@
    @endforeach
    		{{$simulasi->fasa}}{{$simulasi->harga_emas_asas}}