daengdeni/usermanagement
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Update Module User

Browse Source 
- Add Nik and branch,
This commit is contained in:
Daeng Deni Mardaeni
2024-08-27 14:45:50 +07:00
parent 18f0f68f1a
commit d3baaa31c1
8 changed files with 121 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/Http/Controllers/UsersController.php
View File

@@ -5,6 +5,7 @@
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
use Maatwebsite\Excel\Facades\Excel;
use Modules\Lpj\Models\Branch;
use Modules\Usermanagement\Exports\UsersExport;
use Modules\Usermanagement\Http\Requests\User as UserRequest;
use Modules\Usermanagement\Models\Role;
@@ -73,8 +74,9 @@
if ($request->has('search') && !empty($request->get('search'))) {
$search = $request->get('search');
$query->where(function ($q) use ($search) {
$q->where('name', 'LIKE', "%$search%")
->orWhere('email', 'LIKE', "%$search%");
$q
->where('name', 'LIKE', "%$search%")
->orWhere('email', 'LIKE', "%$search%");
});
}
@@ -101,10 +103,10 @@
$filteredRecords = $query->count();
// Get the data for the current page
$users = $query->get();
$users = $query->with('branch')->get();
// Calculate the page count
$pageCount = ceil($totalRecords/$request->get('size'));
$pageCount = ceil($totalRecords / $request->get('size'));
// Calculate the current page number
$currentPage = 0 + 1;
@@ -135,9 +137,10 @@
//abort(403, 'Sorry! You are not allowed to edit users.');
}
$user = User::find($id);
$roles = Role::all();
return view('usermanagement::users.create', compact('user', 'roles'));
$user = User::find($id);
$roles = Role::all();
$branches = Branch::all();
return view('usermanagement::users.create', compact('user', 'roles', 'branches'));
}
/**
@@ -239,8 +242,9 @@
//abort(403, 'Sorry! You are not allowed to create a user.');
}
$roles = Role::all();
return view('usermanagement::users.create', compact('roles'));
$roles = Role::all();
$branches = Branch::all();
return view('usermanagement::users.create', compact('roles', 'branches'));
}
public function export()

10
app/Http/Requests/User.php
View File

@@ -20,13 +20,15 @@
public function rules()
: array
{
$rules = [
'name' => 'required|string|max:255',
'name' => 'required|string|max:255',
'nik' => 'nullable|string|max:6|unique:users,nik',
'branch_id' => 'nullable|exists:branches,id',
'profile_photo_path' => 'nullable|image|mimes:jpeg,png,jpg|max:2048',
];
if ($this->password || $this->method() === 'POST') {
$rules['email'] = 'required|email|unique:users,email';
$rules['email'] = 'required|email|unique:users,email';
$rules['password'] = 'required|string|min:8|confirmed';
}
@@ -40,7 +42,7 @@
public function passedValidation()
{
$this->merge([
'password' => Hash::make($this->password)
'password' => Hash::make($this->password),
]);
}
}