Merge branch 'Wahida' into 'main'

update new pengguna

See merge request online-sistem1/lelong!17

app/Http/Controllers/PenggunaController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
 use Illuminate\Http\Request;
 use Spatie\Permission\Models\Role;
 use Spatie\Permission\Models\Permission;
+use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Facades\Auth;
 use App\Models\User;
 use Carbon\Carbon;
@@ -37,6 +38,7 @@ class PenggunaController extends Controller
         return view('pengurusanpengguna.index',compact('alluser','allroles'));
     }
 
+
     public function show(Request $request, $userid)
     {
         // dd($userid);
@@ -44,12 +46,45 @@ class PenggunaController extends Controller
         $userroles = $user->getRoleNames()->toArray();
         
         $allroles = Role::all()->pluck('name');
+        
+        // $active = User::where('id','=',$userid)->update('status', 1);
 
         return view('pengurusanpengguna.show',compact('user','allroles','userroles'));
     }
 
+    public function storepengguna(Request $request)
+    {
+        //dd($request->all());
+        $validator = Validator::make($request->all(), [
+            'email' => 'required|string|unique:users|email'
+        ]);
+        
+        if ($validator->fails()) {
+            $errors = [
+                'success' => "error",
+                //'message' => $validator->errors()
+                
+            ];
+
+        return redirect()->route('pengguna.index')
+            ->with('success', 'Sila Masukkan Email Yang Sah');  }
+
+        $user = new User;
+        $user->name = $request->name;
+        $user->username = $request->username;
+        $user->kodcaw = $request->kod_cawangan;
+        $user->email = $request->email;
+        $user->password = 123;
+        $user->user_type = 1;
+        $user->save();
+
+        return redirect()->route('pengguna.index')
+            ->with('success', 'Pengguna Berjaya Disimpan');
+    }
+
     public function store(Request $request)
     {
+        // dd($request->all());
         $currentdate = Carbon::now();
         $currentdate = $currentdate->toDateTimeString();
         
@@ -76,6 +111,9 @@ class PenggunaController extends Controller
         {
             $status = 'banned';
         }
+        // else if(!($request->has('status'))){
+        //     $status = 'active';
+        // }
         else
         {
             $status = 'inactive';
@@ -83,7 +121,7 @@ class PenggunaController extends Controller
 
         $user = User::where('id','=',$request->userid)->first();
         // dd($user);
-        $user->email = $request->email;
+        $user->email = $request->emel;
         $user->notelbimbit = $request->notelbimbit;
         $user->nokp = $request->nokp;
         $user->updated_at = $currentdate;

resources/views/pengurusanpengguna/index.blade.php

@@ -1,6 +1,9 @@
 @extends('layouts.app')
 
 @section('content')
+
+
+
 <div class="container-fluid">
     <div class="row ">
         <div class="col-md-11 mx-auto card p-4">
@@ -34,6 +37,7 @@
                             <td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $user->id }}"></td>
                             <td>{{ $user->name }}</td>
                             <td>{{ $user->email }}</td>
+                            
                             <td>
                             @foreach ($user->roles as $taraf)
                                 <button class="btn btn-primary btn-sm hovernone" disabled>{{$taraf->name}}</button>
@@ -42,6 +46,8 @@
                             <td>
                                 @if ($user->status =='active')
                                     <button class="btn btn-success btn-sm hovernone-success" disabled>{{$user->status}}</button>
+                                @elseif ($user->status == 'inactive')
+                                    <button class="btn btn-warning btn-sm hovernone-warning" disabled>{{$user->status}}</button>
                                 @elseif ($user->status =='banned')
                                 <button class="btn btn-danger btn-sm hovernone-danger" disabled>{{$user->status}}</button>
                                 @endif
@@ -61,6 +67,56 @@
         
     </div>
 </div>
+
+</div>
+    <div class="modal fade" tabindex="-1" id="myModal">
+        <div class="modal-dialog modal-lg">
+          <div class="modal-content">
+            <div class="modal-header">
+              <h5 class="modal-title">New Pengguna</h5>
+              <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                <span aria-hidden="true">&times;</span>
+              </button>
+            </div>
+            <div class="modal-body">
+                <form action="{{ route('pengguna.storepengguna') }}" method="POST" id="formpengguna">
+                    @csrf
+                    <div class="form-row">
+                      <div class="form-group col-md-6">
+                        <label for="name">Nama</label>
+                        <input type="text" class="form-control" name="name" id="name" required>
+                      </div>
+                      <div class="form-group col-md-6">
+                        <label for="username">Username</label>
+                        <input type="text" class="form-control" name="username" id="username" required>
+                      </div>
+                    </div>
+
+                  <div class="form-row">
+                        <div class="form-group col-md-6">
+                          <label for="kodcaw">Kod Cawangan</label>
+                          <label for="kodcaw"></label>
+                            <select id="kodcaw" name="kod cawangan">
+                                 <option>Choose Kod Cawangan</option>
+                                 <option id = "kodcaw" >X0301</option>
+                            </select> 
+                        </div>
+
+                    <div class="form-group col-md-6">
+                          <label for="email">Email</label>
+                          <input type="email" class="form-control" name="email" id="email" >
+                        </div>
+                      </div>
+                  </form>
+            </div>
+            <div class="modal-footer">
+              <button type="button" class="btn btn-secondary" data-dismiss="modal">Tutup</button>
+              <button type="button" class="btn btn-primary" onclick="storepengguna()">Simpan</button>
+            </div>
+          </div>
+        </div>
+      </div>
+
 <script>
      //Enable tooltips everywhere
      $(function () {
@@ -115,9 +171,16 @@
                     text: '<i class="fas fa-plus" id="test"></i>',
                     titleAttr: 'Tambah Pengguna',
                     action: function ( e, dt, node, config ) {
-                        alert( 'Button activated' );
+                        //alert( 'Button activated' );
+                        // console.log('hye');
+
+                        $('#myModal').modal("show");
+                        $('#myModal').on('shown.bs.modal', function () {
+                            $('#rolename').trigger('focus')
+                        })
                     }
                 },
+
                 {
                     className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm  export',
                     titleAttr: 'Export to CSV',
@@ -141,6 +204,9 @@
             $(this).prop('checked', cb.checked);
         })
     }
+    function storepengguna() {
+        $("#formpengguna").submit();
+    }
 </script>
      
-@endsection
+@endsection

routes/web.php

@@ -41,6 +41,7 @@ Route::get('/pembayaran/bidbackend', 'ApiController@bidbackend')->name('pay.bidc
 Route::group(['middleware' => ['permission:pengguna'],'prefix'=>'pengguna'], function () {
     Route::get('/listpengguna',['as'=>'pengguna.index','uses'=>'PenggunaController@index']);
     Route::get('/listpengguna/{userid}',['as'=>'pengguna.show','uses'=>'PenggunaController@show']);
+    Route::post('/storepengguna',['as'=>'pengguna.storepengguna','uses'=>'PenggunaController@storepengguna']);
     Route::post('/store',['as'=>'pengguna.store','uses'=>'PenggunaController@store']);
     Route::get('/delete/{userid}',['as'=>'pengguna.delete','uses'=>'PenggunaController@delete']);